Merge branch 'develop' into feature/TD-1568

f181d585 · Hongze Cheng · bd8cb525 · 39f82130 · f181d585 · f181d585
917 changed file
--- a/.appveyor.yml
+++ b/.appveyor.yml
 version: 1.0.{build}
-os: Visual Studio 2015
+image: 
+  - Visual Studio 2015
+  - macos
 environment:
  matrix:
    - ARCH: amd64
    - ARCH: x86
+matrix:
+  exclude:
+    - image: macos
+      ARCH: x86
+for:
+  - 
+    matrix:
+      only:
+        - image: Visual Studio 2015
+    clone_folder: c:\dev\TDengine
+    clone_depth: 1
-clone_folder: c:\dev\TDengine
+    init:
-clone_depth: 1
+      - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-init:
+    before_build:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
+      - cd c:\dev\TDengine
+      - md build
-before_build:
+    build_script:
-  - cd c:\dev\TDengine
+      - cd build
-  - md build
+      - cmake -G "NMake Makefiles" ..
+      - nmake install
-build_script:
+  -
-  - cd build
+    matrix:
-  - cmake -G "NMake Makefiles" ..
+      only:
-  - nmake install
+        - image: macos
+    clone_depth: 1
+    build_script:
+      - mkdir debug
+      - cd debug
+      - cmake .. > /dev/null
+      - make > /dev/null
 notifications:
 - provider: Email
  to:
  - sangshuduo@gmail.com
  on_build_success: true
  on_build_failure: true
  on_build_status_changed: true
--- a/.drone.yml
+++ b/.drone.yml
+---
+kind: pipeline
+name: test_amd64
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: smoke_test
+  image: python:3.8
+  commands:
+  - apt-get update
+  - apt-get install -y cmake build-essential gcc 
+  - pip3 install psutil
+  - pip3 install guppy3
+  - pip3 install src/connector/python/linux/python3/
+  - mkdir debug
+  - cd debug
+  - cmake .. 
+  - make 
+  - cd ../tests
+  - ./test-all.sh smoke
+  when:
+    branch:
+    - develop
+    - master
+- name: crash_gen
+  image: python:3.8
+  commands:
+  - pip3 install requests
+  - pip3 install src/connector/python/linux/python3/
+  - pip3 install psutil
+  - pip3 install guppy3
+  - cd tests/pytest 
+  - ./crash_gen.sh -a -p -t 4 -s 2000
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: test_arm64
+platform:
+  os: linux
+  arch: arm64
+steps:
+- name: build
+  image: gcc
+  commands:
+  - apt-get update
+  - apt-get install -y cmake build-essential
+  - mkdir debug
+  - cd debug
+  - cmake .. -DCPUTYPE=aarch64 > /dev/null
+  - make 
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: test_arm
+platform:
+  os: linux
+  arch: arm
+steps:
+- name: build
+  image: arm32v7/ubuntu:bionic
+  commands:
+  - apt-get update
+  - apt-get install -y cmake build-essential
+  - mkdir debug
+  - cd debug
+  - cmake .. -DCPUTYPE=aarch32 > /dev/null
+  - make 
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: build_trusty
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: build
+  image: ubuntu:trusty
+  commands:
+  - apt-get update
+  - apt-get install -y gcc cmake3 build-essential git binutils-2.26
+  - mkdir debug
+  - cd debug
+  - cmake .. 
+  - make 
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: build_xenial
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: build
+  image: ubuntu:xenial
+  commands:
+  - apt-get update
+  - apt-get install -y gcc cmake build-essential
+  - mkdir debug
+  - cd debug
+  - cmake .. 
+  - make 
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: build_bionic
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: build
+  image: ubuntu:bionic
+  commands:
+  - apt-get update
+  - apt-get install -y gcc cmake build-essential
+  - mkdir debug
+  - cd debug
+  - cmake .. 
+  - make 
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: goodbye
+platform:
+  os: linux
+  arch: amd64
+steps:
+- name: 64-bit
+  image: alpine
+  commands:
+  - echo 64-bit is good.
+  when:
+    branch:
+    - develop
+    - master
+depends_on:
+- test_arm64
+- test_amd64
\ No newline at end of file
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ tests/hdfs/
 nmake/
 sln/
 hdfs/
-c/
 taoshebei/
 taosdalipu/
 Target/

--- a/.travis.yml
+++ b/.travis.yml
-#
-# 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
-          - unixodbc
-          - unixodbc-dev
-          - mono-complete
-    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 guppy3
-          pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/
-          cd ${TRAVIS_BUILD_DIR}/tests/examples/C#/taosdemo
-          mcs -out:taosdemo *.cs || travis_terminate $?
-          pkill -TERM -x taosd
-          fuser -k -n tcp 6030
-          sleep 1
-          ${TRAVIS_BUILD_DIR}/debug/build/bin/taosd -c ${TRAVIS_BUILD_DIR}/debug/test/cfg > /dev/null &
-          sleep 5
-          mono taosdemo -Q DEFAULT -y || travis_terminate $?
-          pkill -KILL -x taosd
-          fuser -k -n tcp 6030
-          sleep 1
-          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
-          - binutils-2.26
-    env: 
-      - DESC="trusty/gcc-4.8/bintuils-2.26 build"
-    before_script:
-      - export TZ=Asia/Harbin
-      - date
-      - cd ${TRAVIS_BUILD_DIR}
-      - mkdir debug
-      - cd debug
-    script:
-      - cmake .. > /dev/null
-      - export PATH=/usr/lib/binutils-2.26/bin:$PATH && 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="arm64 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: xenial
-    language: c
-    git:
-      - depth: 1
-    addons:
-      apt:
-        packages:
-          - build-essential
-          - cmake
-    env:
-      - DESC="arm64 xenial 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
-    osx_image: xcode11.4
-    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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ SET(TD_GRANT FALSE)
 SET(TD_MQTT FALSE)
 SET(TD_TSDB_PLUGINS FALSE)
 SET(TD_STORAGE FALSE)
+SET(TD_TOPIC FALSE)
+SET(TD_MODULE FALSE)
 SET(TD_COVER FALSE)
 SET(TD_MEM_CHECK FALSE)

--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,7 @@ node {
 }
 def skipstage=0
 def abortPreviousBuilds() {
  def currentJobName = env.JOB_NAME
  def currentBuildNumber = env.BUILD_NUMBER.toInteger()
@@ -24,7 +25,7 @@ def abortPreviousBuilds() {
    build.doKill()    //doTerm(),doKill(),doTerm()
  }
 }
-//abort previous build
+//  abort previous build
 abortPreviousBuilds()
 def abort_previous(){
  def buildNumber = env.BUILD_NUMBER as int
@@ -32,34 +33,68 @@ def abort_previous(){
  milestone(buildNumber)
 }
 def pre_test(){
-    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh '''
-                sudo rmtaos
-                '''
-    }
-    sh '''
+    sh '''
+    sudo rmtaos || echo "taosd has not installed"
+    '''
+    sh '''
+    killall -9 taosd ||echo "no taosd running"
+    killall -9 gdb || echo "no gdb running"
+    cd ${WKC}
+    git reset --hard HEAD~10 >/dev/null
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WKC}
+        git checkout master
+        '''
+        }
+      else {
+        sh '''
+        cd ${WKC}
+        git checkout develop
+        '''
+      } 
+    }
+    sh'''
    cd ${WKC}
-    git checkout develop
+    git pull >/dev/null
-    git reset --hard HEAD~10 >/dev/null 
-    git pull
    git fetch origin +refs/pull/${CHANGE_ID}/merge
    git checkout -qf FETCH_HEAD
-    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0
+    git clean -dfx
    cd ${WK}
    git reset --hard HEAD~10
-    git checkout develop
+    '''
-    git pull
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh '''
+        cd ${WK}
+        git checkout master
+        '''
+        }
+      else {
+        sh '''
+        cd ${WK}
+        git checkout develop
+        '''
+      } 
+    }
+    sh '''
    cd ${WK}
+    git pull >/dev/null 
    export TZ=Asia/Harbin
    date
-    rm -rf ${WK}/debug
+    git clean -dfx
    mkdir debug
    cd debug
    cmake .. > /dev/null
    make > /dev/null
    make install > /dev/null
    cd ${WKC}/tests
+    pip3 install ${WKC}/src/connector/python/linux/python3/
    '''
    return 1
 }
@@ -79,6 +114,10 @@ pipeline {
              changeRequest()
          }
          steps {
+            script{
+              abort_previous()
+              abortPreviousBuilds()
+            }
          sh'''
          cp -r ${WORKSPACE} ${WORKSPACE}.tes
          cd ${WORKSPACE}.tes
@@ -86,7 +125,8 @@ pipeline {
          git pull
          git fetch origin +refs/pull/${CHANGE_ID}/merge
          git checkout -qf FETCH_HEAD
-          '''
+          '''     
          script{
            env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
          }
@@ -115,7 +155,6 @@ pipeline {
              sh '''
              date
              cd ${WKC}/tests
-              find pytest -name '*'sql|xargs rm -rf
              ./test-all.sh p1
              date'''
            }
@@ -131,7 +170,6 @@ pipeline {
                sh '''
                date
                cd ${WKC}/tests
-                find pytest -name '*'sql|xargs rm -rf
                ./test-all.sh p2
                date'''
            }
@@ -181,6 +219,12 @@ pipeline {
            rm -rf /var/log/taos/*
            ./handle_crash_gen_val_log.sh
            '''
+            sh '''
+            cd ${WKC}/tests/pytest
+            rm -rf /var/lib/taos/*
+            rm -rf /var/log/taos/*
+            ./handle_taosd_val_log.sh
+            '''
            timeout(time: 45, unit: 'MINUTES'){
                sh '''
                date
@@ -211,6 +255,11 @@ pipeline {
              cd ${WKC}/tests
              ./test-all.sh b3fq
              date'''
+              sh '''
+              date
+              cd ${WKC}/tests
+              ./test-all.sh full example
+              date'''
            }
          }
        }
@@ -227,6 +276,8 @@ pipeline {
              ./test-all.sh p4
              cd ${WKC}/tests
              ./test-all.sh full jdbc
+              cd ${WKC}/tests
+              ./test-all.sh full unit
              date'''
            }
          }
@@ -266,7 +317,7 @@ pipeline {
              date
              cd ${WKC}/tests
              ./test-all.sh b7fq
-              date'''
+              date'''              
            }
          }
        }        

--- a/README-CN.md
+++ b/README-CN.md
+[![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)
+简体中文 | [English](./README.md) 
+# TDengine 简介
+TDengine是涛思数据专为物联网、车联网、工业互联网、IT运维等设计和优化的大数据平台。除核心的快10倍以上的时序数据库功能外，还提供缓存、数据订阅、流式计算等功能，最大程度减少研发和运维的复杂度，且核心代码，包括集群功能全部开源（开源协议，AGPL v3.0）。
+- 10 倍以上性能提升。定义了创新的数据存储结构，单核每秒就能处理至少2万次请求，插入数百万个数据点，读出一千万以上数据点，比现有通用数据库快了十倍以上。
+- 硬件或云服务成本降至1/5。由于超强性能，计算资源不到通用大数据方案的1/5；通过列式存储和先进的压缩算法，存储空间不到通用数据库的1/10。
+- 全栈时序数据处理引擎。将数据库、消息队列、缓存、流式计算等功能融合一起，应用无需再集成Kafka/Redis/HBase/Spark等软件，大幅降低应用开发和维护成本。
+- 强大的分析功能。无论是十年前还是一秒钟前的数据，指定时间范围即可查询。数据可在时间轴上或多个设备上进行聚合。即席查询可通过Shell/Python/R/Matlab随时进行。
+- 与第三方工具无缝连接。不用一行代码，即可与Telegraf, Grafana, EMQ X, Prometheus, Matlab, R集成。后续还将支持MQTT, OPC, Hadoop，Spark等, BI工具也将无缝连接。
+- 零运维成本、零学习成本。安装、集群一秒搞定，无需分库分表，实时备份。标准SQL，支持JDBC,RESTful，支持Python/Java/C/C++/Go/Node.JS, 与MySQL相似，零学习成本。
+# 文档
+TDengine是一个高效的存储、查询、分析时序大数据的平台，专为物联网、车联网、工业互联网、运维监测等优化而设计。您可以像使用关系型数据库MySQL一样来使用它，但建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](https://www.taosdata.com/cn/documentation/architecture) 与 [数据建模](https://www.taosdata.com/cn/documentation/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。
+# 生成
+TDengine目前2.0版服务器仅能在Linux系统上安装和运行，后续会支持Windows、macOS等系统。客户端可以在Windows或Linux上安装和运行。任何OS的应用也可以选择RESTful接口连接服务器taosd。CPU支持X64/ARM64/MIPS64/Alpha64，后续会支持ARM32、RISC-V等CPU架构。用户可根据需求选择通过[源码](https://www.taosdata.com/cn/getting-started/#通过源码安装)或者[安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装)来安装。本快速指南仅适用于通过源码安装。
+## 安装工具
+### Ubuntu 16.04 及以上版本 & Debian：
+```bash
+sudo apt-get install -y gcc cmake build-essential git
+```
+### Ubuntu 14.04：
+```bash
+sudo apt-get install -y gcc cmake3 build-essential git binutils-2.26
+export PATH=/usr/lib/binutils-2.26/bin:$PATH
+```
+编译或打包 JDBC 驱动源码，需安装 Java JDK 8 或以上版本和 Apache Maven 2.7 或以上版本。
+安装 OpenJDK 8：
+```bash
+sudo apt-get install -y openjdk-8-jdk
+```
+安装 Apache Maven：
+```bash
+sudo apt-get install -y  maven
+```
+### CentOS 7：
+```bash
+sudo yum install -y gcc gcc-c++ make cmake git
+```
+安装 OpenJDK 8：
+```bash
+sudo yum install -y java-1.8.0-openjdk
+```
+安装 Apache Maven：
+```bash
+sudo yum install -y maven
+```
+### CentOS 8 & Fedora:
+```bash
+sudo dnf install -y gcc gcc-c++ make cmake epel-release git
+```
+安装 OpenJDK 8：
+```bash
+sudo dnf install -y java-1.8.0-openjdk
+```
+安装 Apache Maven：
+```bash
+sudo dnf install -y maven
+```
+## 获取源码
+首先，你需要从 GitHub 克隆源码：
+```bash
+git clone https://github.com/taosdata/TDengine.git
+cd TDengine
+```
+Go 连接器和 Grafana 插件在其他独立仓库，如果安装它们的话，需要在 TDengine 目录下通过此命令安装：
+```bash
+git submodule update --init --recursive
+```
+## 生成 TDengine
+### Linux 系统
+```bash
+mkdir debug && cd debug
+cmake .. && cmake --build .
+```
+在X86-64、X86、arm64 和 arm32 平台上，TDengine 生成脚本可以自动检测机器架构。也可以手动配置 CPUTYPE 参数来指定 CPU 类型，如 aarch64 或 aarch32 等。
+aarch64：
+```bash
+cmake .. -DCPUTYPE=aarch64 && cmake --build .
+```
+aarch32：
+```bash
+cmake .. -DCPUTYPE=aarch32 && cmake --build .
+```
+### Windows 系统
+如果你使用的是 Visual Studio 2013 版本：
+打开 cmd.exe，执行 vcvarsall.bat 时，为 64 位操作系统指定“x86_amd64”，为 32 位操作系统指定“x86”。
+```bash
+mkdir debug && cd debug
+"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < x86_amd64 | x86 >
+cmake .. -G "NMake Makefiles"
+nmake
+```
+如果你使用的是 Visual Studio 2019 或 2017 版本：
+打开cmd.exe，执行 vcvarsall.bat 时，为 64 位操作系统指定“x64”，为 32 位操作系统指定“x86”。
+```bash
+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
+```
+你也可以从开始菜单中找到"Visual Studio < 2019 | 2017 >"菜单项，根据你的系统选择"x64 Native Tools Command Prompt for VS < 2019 | 2017 >"或"x86 Native Tools Command Prompt for VS < 2019 | 2017 >"，打开命令行窗口，执行：
+```bash
+mkdir debug && cd debug
+cmake .. -G "NMake Makefiles"
+nmake
+```
+### Mac OS X 系统
+安装 Xcode 命令行工具和 cmake. 在 Catalina 和 Big Sur 操作系统上，需要安装 XCode 11.4+ 版本。
+```bash
+mkdir debug && cd debug
+cmake .. && cmake --build .
+```
+# 安装
+如果你不想安装，可以直接在shell中运行。生成完成后，安装 TDengine：
+```bash
+make install
+```
+用户可以在[文件目录结构](https://www.taosdata.com/cn/documentation/administrator#directories)中了解更多在操作系统中生成的目录或文件。
+安装成功后，在终端中启动 TDengine 服务：
+```bash
+taosd
+```
+用户可以使用 TDengine Shell 来连接 TDengine 服务，在终端中，输入：
+```bash
+taos
+```
+如果 TDengine Shell 连接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印出错误消息。
+## 快速运行
+TDengine 生成后，在终端执行以下命令：
+```bash
+./build/bin/taosd -c test/cfg
+```
+在另一个终端，使用 TDengine shell 连接服务器：
+```bash
+./build/bin/taos -c test/cfg
+```
+"-c test/cfg"指定系统配置文件所在目录。
+# 体验 TDengine
+在TDengine终端中，用户可以通过SQL命令来创建/删除数据库、表等，并进行插入查询操作。
+```bash
+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)
+```
+# 应用开发
+## 官方连接器
+TDengine 提供了丰富的应用程序开发接口，其中包括C/C++、Java、Python、Go、Node.js、C# 、RESTful 等，便于用户快速开发应用：
+- Java
+- C/C++
+- Python
+- Go
+- RESTful API
+- Node.js
+## 第三方连接器
+TDengine 社区生态中也有一些非常友好的第三方连接器，可以通过以下链接访问它们的源码。
+- [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)
+# 运行和添加测试例
+TDengine 的测试框架和所有测试例全部开源。
+点击 [这里](tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md)，了解如何运行测试例和添加新的测试例。
+# 成为社区贡献者
+点击 [这里](https://www.taosdata.com/cn/contributor/)，了解如何成为 TDengine 的贡献者。
+# 加入技术交流群
+TDengine 官方社群「物联网大数据群」对外开放，欢迎您加入讨论。搜索微信号 "tdengine"，加小T为好友，即可入群。
+# [谁在使用TDengine](https://github.com/taosdata/TDengine/issues/2432)
+欢迎所有 TDengine 用户及贡献者在 [这里](https://github.com/taosdata/TDengine/issues/2432) 分享您在当前工作中开发/使用 TDengine 的故事。 
--- a/README.md
+++ b/README.md
-[![Build Status](https://travis-ci.org/taosdata/TDengine.svg?branch=master)](https://travis-ci.org/taosdata/TDengine)
+[![Build Status](https://cloud.drone.io/api/badges/taosdata/TDengine/status.svg?ref=refs/heads/master)](https://cloud.drone.io/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)
@@ -6,6 +6,8 @@
 [![TDengine](TDenginelogo.png)](https://www.taosdata.com)
+English | [简体中文](./README-CN.md) 
 # What is TDengine？
 TDengine is an open-sourced big data platform under [GNU AGPL v3.0](http://www.gnu.org/licenses/agpl-3.0.html), designed and optimized for the Internet of Things (IoT), Connected Cars, Industrial IoT, and IT Infrastructure and Application Monitoring. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and cost of development and operation.
@@ -29,7 +31,7 @@ For user manual, system design and architecture, engineering blogs, refer to [TD
 # 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/) 3.5 or higher versions in the project directory. 
+To build TDengine, use [CMake](https://cmake.org/) 2.8.12.x or higher versions in the project directory. 
 ## Install tools
@@ -160,39 +162,42 @@ mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
-# Quick Run
-# Quick Run
-To quickly start a TDengine server after building, run the command below in terminal:
-```bash
-./build/bin/taosd -c test/cfg
-```
-In another terminal, use the TDengine shell to connect the server:
-```bash
-./build/bin/taos -c test/cfg
-```
-option "-c test/cfg" specifies the system configuration file directory. 
 # Installing
 After building successfully, TDengine can be installed by:
 ```bash
-make install
+sudo make install
 ```
-Users can find more information about directories installed on the system in the [directory and files](https://www.taosdata.com/en/documentation/administrator/#Directory-and-Files) section. It should be noted that installing from source code does not configure service management for TDengine.
+Users can find more information about directories installed on the system in the [directory and files](https://www.taosdata.com/en/documentation/administrator/#Directory-and-Files) section. Since version 2.0, installing from source code will also configure service management for TDengine.
 Users can also choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) for it.
 To start the service after installation, in a terminal, use:
-```cmd
+```bash
-taosd
+sudo systemctl start taosd
 ```
 Then users can use the [TDengine shell](https://www.taosdata.com/en/getting-started/#TDengine-Shell) to connect the TDengine server. In a terminal, use:
-```cmd
+```bash
 taos
 ```
 If TDengine shell connects the server successfully, welcome messages and version info are printed. Otherwise, an error message is shown.
+## Quick Run
+If you don't want to run TDengine as a service, you can run it in current shell. For example, to quickly start a TDengine server after building, run the command below in terminal:
+```bash
+./build/bin/taosd -c test/cfg
+```
+In another terminal, use the TDengine shell to connect the server:
+```bash
+./build/bin/taos -c test/cfg
+```
+option "-c test/cfg" specifies the system configuration file directory. 
 # Try TDengine
 It is easy to run SQL commands from TDengine shell which is the same as other SQL databases.
 ```sql
@@ -245,3 +250,6 @@ Please follow the [contribution guidelines](CONTRIBUTING.md) to contribute to th
 Add WeChat “tdengine” to join the group，you can communicate with other users.
+# [User List](https://github.com/taosdata/TDengine/issues/2432)
+If you are using TDengine and feel it helps or you'd like to do some contributions, please add your company to [user list](https://github.com/taosdata/TDengine/issues/2432) and let us know your needs.
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -25,6 +25,14 @@ IF (TD_STORAGE)
  ADD_DEFINITIONS(-D_STORAGE)
 ENDIF ()
+IF (TD_TOPIC)
+  ADD_DEFINITIONS(-D_TOPIC)
+ENDIF ()
+IF (TD_MODULE)
+  ADD_DEFINITIONS(-D_MODULE)
+ENDIF ()
 IF (TD_GODLL)
  ADD_DEFINITIONS(-D_TD_GO_DLL_)
 ENDIF ()
@@ -49,7 +57,7 @@ IF (TD_LINUX_64)
  ADD_DEFINITIONS(-D_M_X64)
  ADD_DEFINITIONS(-D_TD_LINUX_64)
  MESSAGE(STATUS "linux64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
  ADD_DEFINITIONS(-DUSE_LIBICONV)
 ENDIF ()
@@ -57,16 +65,15 @@ IF (TD_LINUX_32)
  ADD_DEFINITIONS(-D_TD_LINUX_32)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "linux32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 IF (TD_ARM_64)
-  ADD_DEFINITIONS(-D_M_X64)
  ADD_DEFINITIONS(-D_TD_ARM_64)
  ADD_DEFINITIONS(-D_TD_ARM_)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "arm64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 IF (TD_ARM_32)
@@ -74,21 +81,23 @@ IF (TD_ARM_32)
  ADD_DEFINITIONS(-D_TD_ARM_)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "arm32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-incompatible-pointer-types ")
 ENDIF ()
 IF (TD_MIPS_64)
-  ADD_DEFINITIONS(-D_TD_MIPS_64_)
+  ADD_DEFINITIONS(-D_TD_MIPS_)
+  ADD_DEFINITIONS(-D_TD_MIPS_64)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "mips64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 IF (TD_MIPS_32)
-  ADD_DEFINITIONS(-D_TD_MIPS_32_)
+  ADD_DEFINITIONS(-D_TD_MIPS_)
+  ADD_DEFINITIONS(-D_TD_MIPS_32)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "mips32 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 IF (TD_APLHINE)
@@ -129,7 +138,7 @@ IF (TD_DARWIN_64)
  ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
  ADD_DEFINITIONS(-DUSE_LIBICONV)
  MESSAGE(STATUS "darwin64 is defined")
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
  SET(DEBUG_FLAGS "-O0 -g3 -DDEBUG")
  SET(RELEASE_FLAGS "-Og")
  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)

--- a/cmake/env.inc
+++ b/cmake/env.inc
@@ -32,6 +32,7 @@ ENDIF ()
 #
 # Set compiler options
+SET(COMMON_C_FLAGS "${COMMON_FLAGS} -std=gnu99")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")

--- a/cmake/input.inc
+++ b/cmake/input.inc
@@ -9,6 +9,22 @@ ELSEIF (${ACCOUNT} MATCHES "false")
  MESSAGE(STATUS "Build without account plugins")
 ENDIF ()
+IF (${TOPIC} MATCHES "true")
+  SET(TD_TOPIC TRUE)
+  MESSAGE(STATUS "Build with topic plugins")
+ELSEIF (${TOPIC} MATCHES "false")
+  SET(TD_TOPIC FALSE)
+  MESSAGE(STATUS "Build without topic plugins")
+ENDIF ()
+IF (${TD_MODULE} MATCHES "true")
+  SET(TD_MODULE TRUE)
+  MESSAGE(STATUS "Build with module plugins")
+ELSEIF (${TOPIC} MATCHES "false")
+  SET(TD_MODULE FALSE)
+  MESSAGE(STATUS "Build without module plugins")
+ENDIF ()
 IF (${COVER} MATCHES "true")
  SET(TD_COVER TRUE)
  MESSAGE(STATUS "Build with test coverage")

--- a/cmake/install.inc
+++ b/cmake/install.inc
@@ -32,7 +32,7 @@ ELSEIF (TD_WINDOWS)
  #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
  #INSTALL(TARGETS shell RUNTIME DESTINATION .)
  IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.20-dist.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.28-dist.jar DESTINATION connector/jdbc)
  ENDIF ()
 ELSEIF (TD_DARWIN)
  SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")

--- a/cmake/version.inc
+++ b/cmake/version.inc
@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.0.16.0")
+  SET(TD_VER_NUMBER "2.1.0.0")
 ENDIF ()
 IF (DEFINED VERCOMPATIBLE)

--- a/documentation20/cn/00.index/docs.md
+++ b/documentation20/cn/00.index/docs.md
@@ -31,6 +31,20 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [创建超级表](/model#create-stable)：为同一类型的数据采集点创建一个超级表
 * [创建表](/model#create-table)：使用超级表做模板，为每一个具体的数据采集点单独建表
+## [TAOS SQL](/taos-sql)
+* [支持的数据类型](/taos-sql#data-type)：支持时间戳、整型、浮点型、布尔型、字符型等多种数据类型
+* [数据库管理](/taos-sql#management)：添加、删除、查看数据库
+* [表管理](/taos-sql#table)：添加、删除、查看、修改表
+* [超级表管理](/taos-sql#super-table)：添加、删除、查看、修改超级表
+* [标签管理](/taos-sql#tags)：增加、删除、修改标签
+* [数据写入](/taos-sql#insert)：支持单表单条、多条、多表多条写入，支持历史数据写入
+* [数据查询](/taos-sql#select)：支持时间段、值过滤、排序、查询结果手动分页等
+* [SQL函数](/taos-sql#functions)：支持各种聚合函数、选择函数、计算函数，如avg, min, diff等
+* [时间维度聚合](/taos-sql#aggregation)：将表中数据按照时间段进行切割后聚合，降维处理
+* [边界限制](/taos-sql#limitation)：库、表、SQL等边界限制条件
+* [错误码](/taos-sql/error-code)：TDengine 2.0 错误码以及对应的十进制码
 ## [高效写入数据](/insert)
 * [SQL写入](/insert#sql)：使用SQL insert命令向一张或多张表写入单条或多条记录
@@ -94,20 +108,6 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [文件目录结构](/administrator#directories)：TDengine数据文件、配置文件等所在目录
 * [参数限制与保留关键字](/administrator#keywords)：TDengine的参数限制与保留关键字列表
-## [TAOS SQL](/taos-sql)
-* [支持的数据类型](/taos-sql#data-type)：支持时间戳、整型、浮点型、布尔型、字符型等多种数据类型
-* [数据库管理](/taos-sql#management)：添加、删除、查看数据库
-* [表管理](/taos-sql#table)：添加、删除、查看、修改表
-* [超级表管理](/taos-sql#super-table)：添加、删除、查看、修改超级表
-* [标签管理](/taos-sql#tags)：增加、删除、修改标签
-* [数据写入](/taos-sql#insert)：支持单表单条、多条、多表多条写入，支持历史数据写入
-* [数据查询](/taos-sql#select)：支持时间段、值过滤、排序、查询结果手动分页等
-* [SQL函数](/taos-sql#functions)：支持各种聚合函数、选择函数、计算函数，如avg, min, diff等
-* [时间维度聚合](/taos-sql#aggregation)：将表中数据按照时间段进行切割后聚合，降维处理
-* [边界限制](/taos-sql#limitation)：库、表、SQL等边界限制条件
-* [错误码](/taos-sql/error-code)：TDengine 2.0 错误码以及对应的十进制码
 ## TDengine的技术设计
 * [系统模块](/architecture/taosd)：taosd的功能和模块划分
@@ -117,9 +117,10 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 ## 常用工具
 * [TDengine样例导入工具](https://www.taosdata.com/blog/2020/01/18/1166.html)
-* [TDengine性能对比测试工具](https://www.taosdata.com/blog/2020/01/18/1166.html)
+* [TDengine写入性能测试工具](https://www.taosdata.com/blog/2020/01/18/1166.html)
 * [IDEA数据库管理工具可视化使用TDengine](https://www.taosdata.com/blog/2020/08/27/1767.html)
-* [基于eletron开发的跨平台TDengine图形化管理工具](https://github.com/skye0207/TDengineGUI)
+* [基于Electron开发的跨平台TDengine图形化管理工具](https://github.com/skye0207/TDengineGUI)
+* [DataX，支持TDengine的离线数据采集/同步工具](https://github.com/wgzhao/DataX)（文档：[读取插件](https://github.com/wgzhao/DataX/blob/master/docs/src/main/sphinx/reader/tdenginereader.md)、[写入插件](https://github.com/wgzhao/DataX/blob/master/docs/src/main/sphinx/writer/tdenginewriter.md)）
 ## TDengine与其他数据库的对比测试

--- a/documentation20/cn/02.getting-started/01.docker/docs.md
+++ b/documentation20/cn/02.getting-started/01.docker/docs.md
+# 通过 Docker 快速体验 TDengine
+虽然并不推荐在生产环境中通过 Docker 来部署 TDengine 服务，但 Docker 工具能够很好地屏蔽底层操作系统的环境差异，很适合在开发测试或初次体验时用于安装运行 TDengine 的工具集。特别是，借助 Docker，能够比较方便地在 Mac OSX 和 Windows 系统上尝试 TDengine，而无需安装虚拟机或额外租用 Linux 服务器。
+下文通过 Step by Step 风格的介绍，讲解如何通过 Docker 快速建立 TDengine 的单节点运行环境，以支持开发和测试。
+## 下载 Docker
+Docker 工具自身的下载请参考 [Docker官网文档](https://docs.docker.com/get-docker/)。
+安装完毕后可以在命令行终端查看 Docker 版本。如果版本号正常输出，则说明 Docker 环境已经安装成功。
+```bash
+$ docker -v
+Docker version 20.10.5, build 55c4c88
+```
+## 在 Docker 容器中运行 TDengine
+1，使用命令拉取 TDengine 镜像，并使它在后台运行。
+```bash
+$ docker run -d tdengine/tdengine
+cdf548465318c6fc2ad97813f89cc60006393392401cae58a27b15ca9171f316
+```
+- **docker run**：通过 Docker 运行一个容器。
+- **-d**：让容器在后台运行。
+- **tdengine/tdengine**：拉取的 TDengine 官方发布的应用镜像。
+- **cdf548465318c6fc2ad97813f89cc60006393392401cae58a27b15ca9171f316**：这个返回的长字符是容器 ID，我们可以通过容器 ID 来查看对应的容器。
+2，确认容器是否已经正确运行。
+```bash
+$ docker ps
+CONTAINER ID   IMAGE               COMMAND   CREATED          STATUS          ···
+cdf548465318   tdengine/tdengine   "taosd"   14 minutes ago   Up 14 minutes   ···
+```
+- **docker ps**：列出所有正在运行状态的容器信息。
+- **CONTAINER ID**：容器 ID。
+- **IMAGE**：使用的镜像。
+- **COMMAND**：启动容器时运行的命令。
+- **CREATED**：容器创建时间。
+- **STATUS**：容器状态。UP 表示运行中。
+3，进入 Docker 容器内，使用 TDengine。
+```bash
+$ docker exec -it cdf548465318 /bin/bash
+root@cdf548465318:~/TDengine-server-2.0.13.0#
+```
+- **docker exec**：通过 docker exec 命令进入容器，如果退出，容器不会停止。
+- **-i**：进入交互模式。
+- **-t**：指定一个终端。
+- **cdf548465318**：容器 ID，需要根据 docker ps 指令返回的值进行修改。
+- **/bin/bash**：载入容器后运行 bash 来进行交互。
+4，进入容器后，执行 taos shell 客户端程序。
+```bash
+$ root@cdf548465318:~/TDengine-server-2.0.13.0# taos
+Welcome to the TDengine shell from Linux, Client Version:2.0.13.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+taos>
+```
+TDengine 终端成功连接服务端，打印出了欢迎消息和版本信息。如果失败，会有错误信息打印出来。
+在 TDengine 终端中，可以通过 SQL 命令来创建/删除数据库、表、超级表等，并可以进行插入和查询操作。具体可以参考 [TAOS SQL 说明文档](https://www.taosdata.com/cn/documentation/taos-sql)。
+## 通过 taosdemo 进一步了解 TDengine
+1，接上面的步骤，先退出 TDengine 终端程序。
+```bash
+$ taos> q
+root@cdf548465318:~/TDengine-server-2.0.13.0#
+```
+2，在命令行界面执行 taosdemo。
+```bash
+$ root@cdf548465318:~/TDengine-server-2.0.13.0# taosdemo
+###################################################################
+# Server IP:                         localhost:0
+# User:                              root
+# Password:                          taosdata
+# Use metric:                        true
+# Datatype of Columns:               int int int int int int int float
+# Binary Length(If applicable):      -1
+# Number of Columns per record:      3
+# Number of Threads:                 10
+# Number of Tables:                  10000
+# Number of Data per Table:          100000
+# Records/Request:                   1000
+# Database name:                     test
+# Table prefix:                      t
+# Delete method:                     0
+# Test time:                         2021-04-13 02:05:20
+###################################################################
+```
+回车后，该命令将新建一个数据库 test，并且自动创建一张超级表 meters，并以超级表 meters 为模版创建了 1 万张表，表名从 "t0" 到 "t9999"。每张表有 10 万条记录，每条记录有 f1，f2，f3 三个字段，时间戳 ts 字段从 "2017-07-14 10:40:00 000" 到 "2017-07-14 10:41:39 999"。每张表带有 areaid 和 loc 两个标签 TAG，areaid 被设置为 1 到 10，loc 被设置为 "beijing" 或 "shanghai"。
+3，进入 TDengine 终端，查看 taosdemo 生成的数据。
+- **进入命令行。**
+```bash
+$ root@cdf548465318:~/TDengine-server-2.0.13.0# taos
+Welcome to the TDengine shell from Linux, Client Version:2.0.13.0
+Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.
+taos>
+```
+- **查看数据库。**
+```bash
+$ taos> show databases;
+  name        |      created_time       |   ntables   |   vgroups   |    ···
+  test        | 2021-04-13 02:14:15.950 |       10000 |           6 |    ···
+  log         | 2021-04-12 09:36:37.549 |           4 |           1 |	   ···
+```
+- **查看超级表。**
+```bash
+$ taos> use test;
+Database changed.
+$ taos> show stables;
+       name              |      created_time       | columns |  tags  |   tables    |
+=====================================================================================
+       meters            | 2021-04-13 02:14:15.955 |       4 |      2 |       10000 |
+Query OK, 1 row(s) in set (0.001737s)
+```
+- **查看表，限制输出十条。**
+```bash
+$ taos> select * from test.t0 limit 10;
+           ts            |     f1      |     f2      |     f3      |
+====================================================================
+ 2017-07-14 02:40:01.000 |           3 |           9 |           0 |
+ 2017-07-14 02:40:02.000 |           0 |           1 |           2 |
+ 2017-07-14 02:40:03.000 |           7 |           2 |           3 |
+ 2017-07-14 02:40:04.000 |           9 |           4 |           5 |
+ 2017-07-14 02:40:05.000 |           1 |           2 |           5 |
+ 2017-07-14 02:40:06.000 |           6 |           3 |           2 |
+ 2017-07-14 02:40:07.000 |           4 |           7 |           8 |
+ 2017-07-14 02:40:08.000 |           4 |           6 |           6 |
+ 2017-07-14 02:40:09.000 |           5 |           7 |           7 |
+ 2017-07-14 02:40:10.000 |           1 |           5 |           0 |
+Query OK, 10 row(s) in set (0.003638s)
+```
+- **查看 t0 表的标签值。**
+```bash
+$ taos> select areaid, loc from test.t0;
+   areaid    |    loc     |
+===========================
+          10 | shanghai   |
+Query OK, 1 row(s) in set (0.002904s)
+```
+## 停止正在 Docker 中运行的 TDengine 服务
+```bash
+$ docker stop cdf548465318
+cdf548465318
+```
+- **docker stop**：通过 docker stop 停止指定的正在运行中的 docker 镜像。
+- **cdf548465318**：容器 ID，根据 docker ps 指令返回的结果进行修改。
+## 编程开发时连接在 Docker 中的 TDengine
+从 Docker 之外连接使用在 Docker 容器内运行的 TDengine 服务，有以下两个思路：
+1，通过端口映射(-p)，将容器内部开放的网络端口映射到宿主机的指定端口上。通过挂载本地目录(-v)，可以实现宿主机与容器内部的数据同步，防止容器删除后，数据丢失。
+```bash
+$ docker run -d -v /etc/taos:/etc/taos -p 6041:6041 tdengine/tdengine
+526aa188da767ae94b244226a2b2eec2b5f17dd8eff592893d9ec0cd0f3a1ccd
+$ curl -u root:taosdata -d 'show databases' 127.0.0.1:6041/rest/sql
+{"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}
+```
+- 第一条命令，启动一个运行了 TDengine 的 docker 容器，并且将容器的 6041 端口映射到宿主机的 6041 端口上。
+- 第二条命令，通过 RESTful 接口访问 TDengine，这时连接的是本机的 6041 端口，可见连接成功。
+注意：在这个示例中，出于方便性考虑，只映射了 RESTful 需要的 6041 端口。如果希望以非 RESTful 方式连接 TDengine 服务，则需要映射从 6030 开始的共 11 个端口（完整的端口情况请参见 [TDengine 2.0 端口说明](https://www.taosdata.com/cn/documentation/faq#port)）。在例子中，挂载本地目录也只是处理了配置文件所在的 /etc/taos 目录，而没有挂载数据存储目录。
+2，直接通过 exec 命令，进入到 docker 容器中去做开发。也即，把程序代码放在 TDengine 服务端所在的同一个 Docker 容器中，连接容器本地的 TDengine 服务。
+```bash
+$ docker exec -it 526aa188da /bin/bash
+```
--- a/documentation20/cn/02.getting-started/docs.md
+++ b/documentation20/cn/02.getting-started/docs.md
@@ -10,7 +10,9 @@ TDengine软件分为服务器、客户端和报警模块三部分，目前2.0版
 ### 通过Docker容器运行
-请参考[TDengine官方Docker镜像的发布、下载和使用](https://www.taosdata.com/blog/2020/05/13/1509.html)
+暂时不建议生产环境采用 Docker 来部署 TDengine 的客户端或服务端，但在开发环境下或初次尝试时，使用 Docker 方式部署是十分方便的。特别是，利用 Docker，可以方便地在 Mac OSX 和 Windows 环境下尝试 TDengine。
+详细操作方法请参照 [通过Docker快速体验TDengine](https://www.taosdata.com/cn/documentation/getting-started/docker)。
 ### <a class="anchor" id="package-install"></a>通过安装包安装
@@ -101,7 +103,7 @@ $ taos -h 192.168.0.1 -s "use db; show tables;"
 ### 运行SQL命令脚本
-TDengine终端可以通过`source`命令来运行SQL命令脚本.
+TDengine 终端可以通过 `source` 命令来运行 SQL 命令脚本.
 ```mysql
 taos> source <filename>;
@@ -109,10 +111,10 @@ taos> source <filename>;
 ### Shell小技巧
- 可以使用上下光标键查看已经历史输入的命令
+- 可以使用上下光标键查看历史输入的指令
- 修改用户密码。在shell中使用alter user命令
+- 修改用户密码。在 shell 中使用 alter user 指令
 - ctrl+c 中止正在进行中的查询
- 执行`RESET QUERY CACHE`清空本地缓存的表的schema
+- 执行 `RESET QUERY CACHE` 清空本地缓存的表 schema
 ## <a class="anchor" id="demo"></a>TDengine 极速体验
@@ -179,19 +181,20 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 ### TDengine服务器支持的平台列表
-|                | **CentOS**  **6/7/8** | **Ubuntu**  **16/18/20** | **Other Linux** | **统信****UOS** | **银河****/****中标麒麟** | **凝思**  **V60/V80** |
+|                | **CentOS 6/7/8** | **Ubuntu 16/18/20** | **Other Linux** | **统信 UOS** | **银河/中标麒麟** | **凝思 V60/V80** | **华为 EulerOS** |
-| -------------- | --------------------- | ------------------------ | --------------- | --------------- | ------------------------- | --------------------- |
+| -------------- | --------------------- | ------------------------ | --------------- | --------------- | ------------------------- | --------------------- | --------------------- |
-| X64            | ●                     | ●                        |                 | ○               | ●                         | ●                     |
+| X64            | ●                     | ●                        |                 | ○               | ●                         | ●                     | ●                     |
-| 树莓派ARM32    |                       | ●                        | ●               |                 |                           |                       |
+| 树莓派 ARM32    |                       | ●                        | ●               |                 |                           |                       |                       |
-| 龙芯MIPS64     |                       |                          | ●               |                 |                           |                       |
+| 龙芯 MIPS64     |                       |                          | ●               |                 |                           |                       |                       |
-| 鲲鹏  ARM64    |                       | ○                        | ○               |                 | ●                         |                       |
+| 鲲鹏 ARM64    |                       | ○                        | ○               |                 | ●                         |                       |                       |
-| 申威  Alpha64  |                       |                          | ○               | ●               |                           |                       |
+| 申威 Alpha64  |                       |                          | ○               | ●               |                           |                       |                       |
-| 飞腾ARM64      |                       | ○优麒麟                  |                 |                 |                           |                       |
+| 飞腾 ARM64      |                       | ○ 优麒麟                  |                 |                 |                           |                       |                       |
-| 海光X64        | ●                     | ●                        | ●               | ○               | ●                         | ●                     |
+| 海光 X64        | ●                     | ●                        | ●               | ○               | ●                         | ●                     |                       |
-| 瑞芯微ARM64/32 |                       |                          | ○               |                 |                           |                       |
+| 瑞芯微 ARM64/32 |                       |                          | ○               |                 |                           |                       |                       |
-| 全志ARM64/32   |                       |                          | ○               |                 |                           |                       |
+| 全志 ARM64/32   |                       |                          | ○               |                 |                           |                       |                       |
-| 炬力ARM64/32   |                       |                          | ○               |                 |                           |                       |
+| 炬力 ARM64/32   |                       |                          | ○               |                 |                           |                       |                       |
-| TI ARM32       |                       |                          | ○               |                 |                           |                       |
+| TI ARM32       |                       |                          | ○               |                 |                           |                       |                       |
+| 华为云 ARM64   |                       |                          |                 |                 |                           |                       | ●                     |
 注： ● 表示经过官方测试验证， ○ 表示非官方测试验证。
@@ -203,7 +206,7 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 对照矩阵如下：
-| **CPU**     | **X64   64bit** |           |           | **X86   32bit** | **ARM64** | **ARM32** | **MIPS **  **龙芯** | **Alpha **  **申威** | **X64 **  **海光** |
+| **CPU**     | **X64 64bit** |           |           | **X86 32bit** | **ARM64** | **ARM32** | **MIPS 龙芯** | **Alpha 申威** | **X64 海光** |
 | ----------- | --------------- | --------- | --------- | --------------- | --------- | --------- | ------------------- | -------------------- | ------------------ |
 | **OS**      | **Linux**       | **Win64** | **Win32** | **Win32**       | **Linux** | **Linux** | **Linux**           | **Linux**            | **Linux**          |
 | **C/C++**   | ●               | ●         | ●         | ○               | ●         | ●         | ●                   | ●                    | ●                  |
@@ -211,7 +214,7 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 | **Python**  | ●               | ●         | ●         | ○               | ●         | ●         | ●                   | --                   | ●                  |
 | **Go**      | ●               | ●         | ●         | ○               | ●         | ●         | ○                   | --                   | --                 |
 | **NodeJs**  | ●               | ●         | ○         | ○               | ●         | ●         | ○                   | --                   | --                 |
-| **C#**      | ○               | ●         | ●         | ○               | ○         | ○         | ○                   | --                   | --                 |
+| **C#**      | ●               | ●         | ○         | ○               | ○         | ○         | ○                   | --                   | --                 |
 | **RESTful** | ●               | ●         | ●         | ●               | ●         | ●         | ●                   | ●                    | ●                  |
 注： ● 表示经过官方测试验证， ○ 表示非官方测试验证。

--- a/documentation20/cn/03.architecture/docs.md
+++ b/documentation20/cn/03.architecture/docs.md
@@ -145,7 +145,7 @@ TDengine 建议用数据采集点的名字(如上表中的D1001)来做表名。
 在TDengine的设计里，**表用来代表一个具体的数据采集点，超级表用来代表一组相同类型的数据采集点集合**。当为某个具体数据采集点创建表时，用户使用超级表的定义做模板，同时指定该具体采集点（表）的标签值。与传统的关系型数据库相比，表（一个数据采集点）是带有静态标签的，而且这些标签可以事后增加、删除、修改。**一张超级表包含有多张表，这些表具有相同的时序数据schema，但带有不同的标签值**。
-当对多个具有相同数据类型的数据采集点进行聚合操作时，TDengine将先把满足标签过滤条件的表从超级表的中查找出来，然后再扫描这些表的时序数据，进行聚合操作，这样能将需要扫描的数据集大幅减少，从而大幅提高聚合计算的性能。
+当对多个具有相同数据类型的数据采集点进行聚合操作时，TDengine会先把满足标签过滤条件的表从超级表中找出来，然后再扫描这些表的时序数据，进行聚合操作，这样需要扫描的数据集会大幅减少，从而显著提高聚合计算的性能。
 ## <a class="anchor" id="cluster"></a>集群与基本逻辑单元
@@ -166,7 +166,7 @@ TDengine 分布式架构的逻辑结构图如下：
 **虚拟节点(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。
+**管理节点(mnode):** 一个虚拟的逻辑单元，负责所有数据节点运行状态的监控和维护，以及节点之间的负载均衡(图中M)。同时，管理节点也负责元数据(包括用户、数据库、表、静态标签等)的存储和管理，因此也称为 Meta Node。TDengine 集群中可配置多个(开源版最多不超过3个) 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也不会被收回重复利用。
@@ -178,11 +178,11 @@ TDengine 分布式架构的逻辑结构图如下：
 **FQDN配置**：一个数据节点有一个或多个FQDN，可以在系统配置文件taos.cfg通过参数“fqdn"进行指定，如果没有指定，系统将自动获取计算机的hostname作为其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的系统配置参数serverPort决定，对集群内部通讯的端口是serverPort+5。集群内数据节点之间的数据复制操作还占有一个TCP端口，是serverPort+10. 为支持多线程高效的处理UDP数据，每个对内和对外的UDP连接，都需要占用5个连续的端口。因此一个数据节点总的端口范围为serverPort到serverPort + 10，总共11个TCP/UDP端口。（另外还可能有 RESTful、Arbitrator 所使用的端口，那样的话就一共是 13 个。）使用时，需要确保防火墙将这些端口打开，以备使用。每个数据节点可以配置不同的serverPort。（详细的端口情况请参见 [TDengine 2.0 端口说明](https://www.taosdata.com/cn/documentation/faq#port)）
 **集群对外连接:** 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, 获取节点配置参数firstEp, secondEp，（这两个参数指定的节点可以是不带mnode的普通节点，这样的话，节点被连接时会尝试重定向到mnode节点）如果不存在或者taos.cfg里没有这两个配置参数，或无效，进入第三步；3：将自己的EP设为mnode EP, 并独立运行起来。获取mnode EP列表后，数据节点发起连接，如果连接成功，则成功加入进工作的集群，如果不成功，则尝试mnode EP列表中的下一个。如果都尝试了，但连接都仍然失败，则休眠几秒后，再进行尝试。
+**集群内部通讯**: 各个数据节点之间通过TCP/UDP进行连接。一个数据节点启动时，将获取mnode所在的dnode的EP信息，然后与系统中的mnode建立起连接，交换信息。获取mnode的EP信息有三步，1：检查mnodeEpSet文件是否存在，如果不存在或不能正常打开获得mnode EP信息，进入第二步；2：检查系统配置文件taos.cfg, 获取节点配置参数firstEp, secondEp，（这两个参数指定的节点可以是不带mnode的普通节点，这样的话，节点被连接时会尝试重定向到mnode节点）如果不存在或者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自己根据资源做出的决定。

--- a/documentation20/cn/06.queries/docs.md
+++ b/documentation20/cn/06.queries/docs.md
@@ -12,7 +12,7 @@ TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, G
 - 时间戳对齐的连接查询（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条。
+例如：在TAOS Shell中，从表d1001中查询出voltage > 215的记录，按时间降序排列，仅仅输出2条。
 ```mysql
 taos> select * from d1001 where voltage > 215 order by ts desc limit 2;
           ts            |       current        |   voltage   |        phase         |

--- a/documentation20/cn/07.advanced-features/docs.md
+++ b/documentation20/cn/07.advanced-features/docs.md
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -16,7 +16,6 @@ TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致
 * TDengine 目前不支持针对单条数据记录的删除操作。
 * 目前不支持事务操作。
-* 目前不支持表间的 union 操作。
 * 目前不支持嵌套查询（nested query）。
 * 对每个 Connection 的实例，至多只能有一个打开的 ResultSet 实例；如果在 ResultSet 还没关闭的情况下执行了新的查询，taos-jdbcdriver 会自动关闭上一个 ResultSet。
@@ -285,7 +284,7 @@ JDBC连接器可能报错的错误码包括3种：JDBC driver本身的报错（
 * https://github.com/taosdata/TDengine/blob/develop/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
 * https://github.com/taosdata/TDengine/blob/develop/src/inc/taoserror.h
-### 订阅
+### <a class="anchor" id="subscribe"></a>订阅
 #### 创建
@@ -447,11 +446,12 @@ Query OK, 1 row(s) in set (0.000141s)
-## TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本
+## <a class="anchor" id="version"></a>TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本
 | taos-jdbcdriver 版本 | TDengine 版本     | JDK 版本 |
 | -------------------- | ----------------- | -------- |
-| 2.0.12 及以上        | 2.0.8.0 及以上    | 1.8.x    |
+| 2.0.22              | 2.0.18.0 及以上     | 1.8.x    |
+| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.0 | 1.8.x    |
 | 2.0.4 - 2.0.11       | 2.0.0.0 - 2.0.7.x | 1.8.x    |
 | 1.0.3                | 1.6.1.x 及以上    | 1.8.x    |
 | 1.0.2                | 1.6.1.x 及以上    | 1.8.x    |
@@ -470,9 +470,11 @@ TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对
 | BIGINT            | java.lang.Long     |
 | FLOAT             | java.lang.Float    |
 | DOUBLE            | java.lang.Double   |
-| SMALLINT, TINYINT | java.lang.Short    |
+| SMALLINT	    | java.lang.Short    |
+| TINYINT           | java.lang.Byte     |
 | BOOL              | java.lang.Boolean  |
-| BINARY, NCHAR     | java.lang.String   |
+| BINARY            | byte array         |
+| NCHAR             | java.lang.String   |

--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -14,7 +14,7 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、Java、
 | **Python**  | ●               | ●               | ●               | ○               | ●         | ●         | ○               | --               | ○              |
 | **Go**      | ●               | ●               | ●               | ○               | ●         | ●         | ○               | --               | --             |
 | **NodeJs**  | ●               | ●               | ○               | ○               | ●         | ●         | ○               | --               | --             |
-| **C#**      | ○               | ●               | ●               | ○               | ○         | ○         | ○               | --               | --             |
+| **C#**      | ●               | ●               | ○               | ○               | ○         | ○         | ○               | --               | --             |
 | **RESTful** | ●               | ●               | ●               | ●               | ●         | ●         | ○               | ○                | ○              |
 其中 ● 表示经过官方测试验证， ○ 表示非官方测试验证。
@@ -23,7 +23,7 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、Java、
 * 在没有安装TDengine服务端软件的系统中使用连接器（除RESTful外）访问 TDengine 数据库，需要安装相应版本的客户端安装包来使应用驱动（Linux系统中文件名为libtaos.so，Windows系统中为taos.dll）被安装在系统中，否则会产生无法找到相应库文件的错误。
 * 所有执行 SQL 语句的 API，例如 C/C++ Connector 中的 `tao_query`、`taos_query_a`、`taos_subscribe` 等，以及其它语言中与它们对应的API，每次都只能执行一条 SQL 语句，如果实际参数中包含了多条语句，它们的行为是未定义的。
-* 升级到TDengine到2.0.8.0版本的用户，必须更新JDBC连接TDengine必须升级taos-jdbcdriver到2.0.12及以上。
+* 升级到TDengine到2.0.8.0版本的用户，必须更新JDBC连接TDengine必须升级taos-jdbcdriver到2.0.12及以上。详细的版本依赖关系请参见 [taos-jdbcdriver 文档](https://www.taosdata.com/cn/documentation/connector/java#version)。
 * 无论选用何种编程语言的连接器，2.0 及以上版本的 TDengine 推荐数据库应用的每个线程都建立一个独立的连接，或基于线程建立连接池，以避免连接内的“USE statement”状态量在线程之间相互干扰（但连接的查询和写入操作都是线程安全的）。
 ## <a class="anchor" id="driver"></a>安装连接器驱动步骤
@@ -32,7 +32,7 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、Java、
 **Linux**
-**1.   从涛思官网（https://www.taosdata.com/cn/all-downloads/）下载**
+**1.   从[涛思官网](https://www.taosdata.com/cn/all-downloads/)下载**
 * X64硬件环境：TDengine-client-2.x.x.x-Linux-x64.tar.gz
@@ -68,7 +68,7 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、Java、
 **Windows x64/x86**
-**1.   从涛思官网（https://www.taosdata.com/cn/all-downloads/）下载 ：**
+**1.   从[涛思官网](https://www.taosdata.com/cn/all-downloads/)下载 ：**
 * X64硬件环境：TDengine-client-2.X.X.X-Windows-x64.exe
@@ -209,11 +209,11 @@ C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine
 - `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
-  该API用来执行SQL语句，可以是DQL、DML或DDL语句。 其中的`taos`参数是通过`taos_connect`获得的指针。返回值 NULL 表示失败。
+  该API用来执行SQL语句，可以是DQL、DML或DDL语句。 其中的`taos`参数是通过`taos_connect`获得的指针。不能通过返回值是否是 NULL 来判断执行结果是否失败，而是需要用`taos_errno`函数解析结果集中的错误代码来进行判断。
 - `int taos_result_precision(TAOS_RES *res)`
-  返回结果集时间戳字段的精度，`0` 代表毫秒，`1` 代表微秒，`2` 代表纳秒。
+  返回结果集时间戳字段的精度，`0` 代表毫秒，`1` 代表微秒。
 - `TAOS_ROW taos_fetch_row(TAOS_RES *res)`
@@ -349,7 +349,7 @@ TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时
    * param：是应用提供的用于回调的一个参数，回调时，提供给应用
    * callback: 第二个回调函数，会在连续查询自动停止时被调用。
-  返回值为NULL，表示创建成功，返回值不为空，表示成功。
+  返回值为NULL，表示创建失败；返回值不为空，表示成功。
 - `void taos_close_stream (TAOS_STREAM *tstr)`
@@ -377,6 +377,7 @@ TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时
    * res：查询结果集，注意结果集中可能没有记录
    * param：调用 `taos_subscribe`时客户程序提供的附加参数
    * code：错误码
+  **注意**：在这个回调函数里不可以做耗时过长的处理，尤其是对于返回的结果集中数据较多的情况，否则有可能导致客户端阻塞等异常状态。如果必须进行复杂计算，则建议在另外的线程中进行处理。
 * `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
@@ -591,7 +592,8 @@ curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
 ```json
 {
    "status": "succ",
-    "head": ["Time Stamp","current", …],
+    "head": ["ts","current", …],
+    "column_meta": [["ts",9,8],["current",6,4], …],
    "data": [
        ["2018-10-03 14:38:05.000", 10.3, …],
        ["2018-10-03 14:38:15.000", 12.6, …]
@@ -602,10 +604,23 @@ curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
 说明：
- status: 告知操作结果是成功还是失败
+- status: 告知操作结果是成功还是失败。
- head: 表的定义，如果不返回结果集，仅有一列“affected_rows”
+- head: 表的定义，如果不返回结果集，则仅有一列“affected_rows”。（从 2.0.17 版本开始，建议不要依赖 head 返回值来判断数据列类型，而推荐使用 column_meta。在未来版本中，有可能会从返回值中去掉 head 这一项。）
- data: 具体返回的数据，一排一排的呈现，如果不返回结果集，仅[[affected_rows]]
+- column_meta: 从 2.0.17 版本开始，返回值中增加这一项来说明 data 里每一列的数据类型。具体每个列会用三个值来说明，分别为：列名、列类型、类型长度。例如`["current",6,4]`表示列名为“current”；列类型为 6，也即 float 类型；类型长度为 4，也即对应 4 个字节表示的 float。如果列类型为 binary 或 nchar，则类型长度表示该列最多可以保存的内容长度，而不是本次返回值中的具体数据长度。当列类型是 nchar 的时候，其类型长度表示可以保存的 unicode 字符数量，而不是 bytes。
- rows: 表明总共多少行数据
+- data: 具体返回的数据，一行一行的呈现，如果不返回结果集，那么就仅有[[affected_rows]]。data 中每一行的数据列顺序，与 column_meta 中描述数据列的顺序完全一致。
+- rows: 表明总共多少行数据。
+column_meta 中的列类型说明：
+* 1：BOOL
+* 2：TINYINT
+* 3：SMALLINT
+* 4：INT
+* 5：BIGINT
+* 6：FLOAT
+* 7：DOUBLE
+* 8：BINARY
+* 9：TIMESTAMP
+* 10：NCHAR
 ### 自定义授权码
@@ -651,7 +666,8 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001
 ```json
 {
    "status": "succ",
-    "head": ["Time Stamp","current","voltage","phase"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
    "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]
@@ -671,8 +687,9 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 19
 {
    "status": "succ",
    "head": ["affected_rows"],
+    "column_meta": [["affected_rows",4,4]],
    "data": [[1]],
-    "rows": 1,
+    "rows": 1
 }
 ```
@@ -691,7 +708,8 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001
 ```json
 {
    "status": "succ",
-    "head": ["column1","column2","column3"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
    "data": [
        [1538548685000,10.3,219,0.31],
        [1538548695000,12.6,218,0.33]
@@ -712,7 +730,8 @@ HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间
 ```json
 {
    "status": "succ",
-    "head": ["column1","column2","column3"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
    "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]
@@ -725,7 +744,7 @@ HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间
 下面仅列出一些与RESTful接口有关的配置参数，其他系统参数请看配置文件里的说明。注意：配置修改后，需要重启taosd服务才能生效
- httpPort: 对外提供RESTful服务的端口号，默认绑定到6041
+- 对外提供RESTful服务的端口号，默认绑定到 6041（实际取值是 serverPort + 11，因此可以通过修改 serverPort 参数的设置来修改）
 - httpMaxThreads: 启动的线程数量，默认为2（2.0.17版本开始，默认值改为CPU核数的一半向下取整）
 - restfulRowLimit: 返回结果集（JSON格式）的最大条数，默认值为10240
 - httpEnableCompress: 是否支持压缩，默认不支持，目前TDengine仅支持gzip压缩格式

--- a/documentation20/cn/09.connections/docs.md
+++ b/documentation20/cn/09.connections/docs.md
@@ -155,11 +155,3 @@ TDengine客户端暂不支持如下函数：
 - dbExistsTable(conn, "test")：是否存在表test
 - dbListTables(conn)：显示连接中的所有表
-## <a class="anchor" id="datax"></a>DataX
-[DataX](https://github.com/alibaba/DataX) 是阿里巴巴集团开源的一款通用离线数据采集/同步工具，能够简单、高效地接入 TDengine 进行数据写入和读取。
-* 数据读取集成的方法请参见 [TSDBReader 插件文档](https://github.com/alibaba/DataX/blob/master/tsdbreader/doc/tsdbreader.md)
-* 数据写入集成的方法请参见 [TSDBWriter 插件文档](https://github.com/alibaba/DataX/blob/master/tsdbwriter/doc/tsdbhttpwriter.md)
--- a/documentation20/cn/10.cluster/docs.md
+++ b/documentation20/cn/10.cluster/docs.md
@@ -13,7 +13,7 @@ TDengine的集群管理极其简单，除添加和删除节点需要人工干预
 **第零步**：规划集群所有物理节点的FQDN，将规划好的FQDN分别添加到每个物理节点的/etc/hostname；修改每个物理节点的/etc/hosts，将所有集群物理节点的IP与FQDN的对应添加好。【如部署了DNS，请联系网络管理员在DNS上做好相关配置】
 **第一步**：如果搭建集群的物理节点中，存有之前的测试数据、装过1.X的版本，或者装过其他版本的TDengine，请先将其删除，并清空所有数据，具体步骤请参考博客[《TDengine多种安装包的安装和卸载》](https://www.taosdata.com/blog/2019/08/09/566.html )   
-**注意1：**因为FQDN的信息会写进文件，如果之前没有配置或者更改FQDN，且启动了TDengine。请一定在确保数据无用或者备份的前提下，清理一下之前的数据（rm -rf /var/lib/taos/）；  
+**注意1：**因为FQDN的信息会写进文件，如果之前没有配置或者更改FQDN，且启动了TDengine。请一定在确保数据无用或者备份的前提下，清理一下之前的数据（`rm -rf /var/lib/taos/*`）；  
 **注意2：**客户端也需要配置，确保它可以正确解析每个节点的FQDN配置，不管是通过DNS服务，还是 Host 文件。
 **第二步**：建议关闭所有物理节点的防火墙，至少保证端口：6030 - 6042的TCP和UDP端口都是开放的。**强烈建议**先关闭防火墙，集群搭建完毕之后，再来配置端口；
@@ -55,12 +55,11 @@ arbitrator            ha.taosdata.com:6042
 | 4     | statusInterval     | dnode向mnode报告状态时长                 |
 | 5     | arbitrator         | 系统中裁决器的end point                  |
 | 6     | timezone           | 时区                                     |
-| 7     | locale             | 系统区位信息及编码格式                   |
+| 7     | balance            | 是否启动负载均衡                         |
-| 8     | charset            | 字符集编码                               |
+| 8     | maxTablesPerVnode  | 每个vnode中能够创建的最大表个数          |
-| 9     | balance            | 是否启动负载均衡                         |
+| 9     | maxVgroupsPerDb    | 每个DB中能够使用的最大vgroup个数         |
-| 10    | maxTablesPerVnode  | 每个vnode中能够创建的最大表个数          |
-| 11    | maxVgroupsPerDb    | 每个DB中能够使用的最大vgroup个数         |
+备注：在 2.0.19.0 及更早的版本中，除以上 9 项参数外，dnode 加入集群时，还会要求 locale 和 charset 参数的取值也一致。
 ## <a class="anchor" id="node-one"></a>启动第一个数据节点
@@ -111,9 +110,10 @@ taos>
 **提示：**
- 任何已经加入集群在线的数据节点，都可以作为后续待加入节点的firstEP。
+- 任何已经加入集群在线的数据节点，都可以作为后续待加入节点的 firstEP。
- firstEp这个参数仅仅在该数据节点首次加入集群时有作用，加入集群后，该数据节点会保存最新的mnode的End Point列表，不再依赖这个参数。
+- firstEp 这个参数仅仅在该数据节点首次加入集群时有作用，加入集群后，该数据节点会保存最新的 mnode 的 End Point 列表，不再依赖这个参数。
- 两个没有配置firstEp参数的数据节点dnode启动后，会独立运行起来。这个时候，无法将其中一个数据节点加入到另外一个数据节点，形成集群。**无法将两个独立的集群合并成为新的集群**。
+  - 接下来，配置文件中的 firstEp 参数就主要在客户端连接的时候使用了，例如 taos shell 如果不加参数，会默认连接由 firstEp 指定的节点。
+- 两个没有配置 firstEp 参数的数据节点 dnode 启动后，会独立运行起来。这个时候，无法将其中一个数据节点加入到另外一个数据节点，形成集群。**无法将两个独立的集群合并成为新的集群**。
 ## <a class="anchor" id="management"></a>数据节点管理
@@ -225,7 +225,13 @@ SHOW MNODES;
 ## <a class="anchor" id="arbitrator"></a>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就能正常工作。
+如果副本数为偶数，当一个 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服务器运行它即可。请点击[安装包下载](https://www.taosdata.com/cn/all-downloads/)，在TDengine Arbitrator Linux一节中，选择适合的版本下载并安装。该程序对系统资源几乎没有要求，只需要保证有网络连接即可。该应用的命令行参数`-p`可以指定其对外服务的端口号，缺省是6042。配置每个taosd实例时，可以在配置文件taos.cfg里将参数arbitrator设置为Arbitrator的End Point。如果该参数配置了，当副本数为偶数时，系统将自动连接配置的Arbitrator。如果副本数为奇数，即使配置了Arbitrator，系统也不会去建立连接。
+总之，在目前版本下，TDengine 建议在双副本环境要配置 Arbitrator，以提升系统的可用性。
+Arbitrator 的执行程序名为 tarbitrator。该程序对系统资源几乎没有要求，只需要保证有网络连接，找任何一台 Linux 服务器运行它即可。以下简要描述安装配置的步骤：
+1. 请点击 [安装包下载](https://www.taosdata.com/cn/all-downloads/)，在 TDengine Arbitrator Linux 一节中，选择合适的版本下载并安装。
+2. 该应用的命令行参数 `-p` 可以指定其对外服务的端口号，缺省是 6042。
+3. 修改每个 taosd 实例的配置文件，在 taos.cfg 里将参数 arbitrator 设置为 tarbitrator 程序所对应的 End Point。（如果该参数配置了，当副本数为偶数时，系统将自动连接配置的 Arbitrator。如果副本数为奇数，即使配置了 Arbitrator，系统也不会去建立连接。）
+4. 在配置文件中配置了的 Arbitrator，会出现在 `SHOW DNODES;` 指令的返回结果中，对应的 role 列的值会是“arb”。
--- a/documentation20/cn/11.administrator/docs.md
+++ b/documentation20/cn/11.administrator/docs.md
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
--- a/documentation20/cn/13.faq/docs.md
+++ b/documentation20/cn/13.faq/docs.md
@@ -16,13 +16,13 @@
 ## 1. TDengine2.0之前的版本升级到2.0及以上的版本应该注意什么？☆☆☆
-2.0版本在之前版本的基础上，进行了完全的重构，配置文件和数据文件是不兼容的。在升级之前务必进行如下操作：
+2.0版在之前版本的基础上，进行了完全的重构，配置文件和数据文件是不兼容的。在升级之前务必进行如下操作：
-1. 删除配置文件，执行 <code> sudo rm -rf /etc/taos/taos.cfg </code>
+1. 删除配置文件，执行 `sudo rm -rf /etc/taos/taos.cfg`
-2. 删除日志文件，执行 <code> sudo rm -rf /var/log/taos/ </code>
+2. 删除日志文件，执行 `sudo rm -rf /var/log/taos/`
-3. 确保数据已经不再需要的前提下，删除数据文件，执行 <code> sudo rm -rf /var/lib/taos/ </code>
+3. 确保数据已经不再需要的前提下，删除数据文件，执行 `sudo rm -rf /var/lib/taos/`
-4. 安装最新稳定版本的TDengine
+4. 安装最新稳定版本的 TDengine
-5. 如果数据需要迁移数据或者数据文件损坏，请联系涛思数据官方技术支持团队，进行协助解决
+5. 如果需要迁移数据或者数据文件损坏，请联系涛思数据官方技术支持团队，进行协助解决
 ## 2. Windows平台下JDBCDriver找不到动态链接库，怎么办？
@@ -92,6 +92,8 @@ TDengine 目前尚不支持删除功能，未来根据用户需求可能会支
 从 2.0.8.0 开始，TDengine 支持更新已经写入数据的功能。使用更新功能需要在创建数据库时使用 UPDATE 1 参数，之后可以使用 INSERT INTO 命令更新已经写入的相同时间戳数据。UPDATE 参数不支持 ALTER DATABASE 命令修改。没有使用 UPDATE 1 参数创建的数据库，写入相同时间戳的数据不会修改之前的数据，也不会报错。
+另需注意，在 UPDATE 设置为 0 时，后发送的相同时间戳的数据会被直接丢弃，但并不会报错，而且仍然会被计入 affected rows （所以不能利用 INSERT 指令的返回信息进行时间戳查重）。这样设计的主要原因是，TDengine 把写入的数据看做一个数据流，无论时间戳是否出现冲突，TDengine 都认为产生数据的原始设备真实地产生了这样的数据。UPDATE 参数只是控制这样的流数据在进行持久化时要怎样处理——UPDATE 为 0 时，表示先写入的数据覆盖后写入的数据；而 UPDATE 为 1 时，表示后写入的数据覆盖先写入的数据。这种覆盖关系如何选择，取决于对数据的后续使用和统计中，希望以先还是后生成的数据为准。
 ## 10. 我怎么创建超过1024列的表？
 使用2.0及其以上版本，默认支持1024列；2.0之前的版本，TDengine最大允许创建250列的表。但是如果确实超过限值，建议按照数据特性，逻辑地将这个宽表分解成几个小表。
@@ -100,7 +102,7 @@ TDengine 目前尚不支持删除功能，未来根据用户需求可能会支
 批量插入。每条写入语句可以一张表同时插入多条记录，也可以同时插入多张表的多条记录。
-## 12. 最有效的写入数据的方法是什么？windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
+## 12. windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
 Windows下插入nchar类的数据中如果有中文，请先确认系统的地区设置成了中国（在Control Panel里可以设置），这时cmd中的`taos`客户端应该已经可以正常工作了；如果是在IDE里开发Java应用，比如Eclipse， Intellij，请确认IDE里的文件编码为GBK（这是Java默认的编码类型），然后在生成Connection时，初始化客户端的配置，具体语句如下：
 ```JAVA
@@ -154,3 +156,28 @@ ALTER LOCAL RESETLOG;
 ```
 其含义是，清空本机所有由客户端生成的日志文件。
+## <a class="anchor" id="timezone"></a>18. 时间戳的时区信息是怎样处理的？
+TDengine 中时间戳的时区总是由客户端进行处理，而与服务端无关。具体来说，客户端会对 SQL 语句中的时间戳进行时区转换，转为 UTC 时区（即 Unix 时间戳——Unix Timestamp）再交由服务端进行写入和查询；在读取数据时，服务端也是采用 UTC 时区提供原始数据，客户端收到后再根据本地设置，把时间戳转换为本地系统所要求的时区进行显示。
+客户端在处理时间戳字符串时，会采取如下逻辑：
+1. 在未做特殊设置的情况下，客户端默认使用所在操作系统的时区设置。
+2. 如果在 taos.cfg 中设置了 timezone 参数，则客户端会以这个配置文件中的设置为准。
+3. 如果在 C/C++/Java/Python 等各种编程语言的 Connector Driver 中，在建立数据库连接时显式指定了 timezone，那么会以这个指定的时区设置为准。例如 Java Connector 的 JDBC URL 中就有 timezone 参数。
+4. 在书写 SQL 语句时，也可以直接使用 Unix 时间戳（例如 `1554984068000`）或带有时区的时间戳字符串，也即以 RFC 3339 格式（例如 `2013-04-12T15:52:01.123+08:00`）或 ISO-8601 格式（例如 `2013-04-12T15:52:01.123+0800`）来书写时间戳，此时这些时间戳的取值将不再受其他时区设置的影响。
+## <a class="anchor" id="port"></a>19. TDengine 都会用到哪些网络端口？
+在 TDengine 2.0 版本中，会用到以下这些网络端口（以默认端口 6030 为前提进行说明，如果修改了配置文件中的设置，那么这里列举的端口都会出现变化），管理员可以参考这里的信息调整防火墙设置：
+| 协议 | 默认端口   | 用途说明                         | 修改方法                        |
+| --- | --------- | ------------------------------- | ------------------------------ |
+| TCP | 6030      | 客户端与服务端之间通讯。            | 由配置文件设置 serverPort 决定。 |
+| TCP | 6035      | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
+| TCP | 6040      | 多节点集群的节点间数据同步。        | 随 serverPort 端口变化。         |
+| TCP | 6041      | 客户端与服务端之间的 RESTful 通讯。 | 随 serverPort 端口变化。        |
+| TCP | 6042      | Arbitrator 的服务端口。           | 因 Arbitrator 启动参数设置变化。 |
+| TCP | 6060      | 企业版内 Monitor 服务的网络端口。   |                               |
+| UDP | 6030-6034 | 客户端与服务端之间通讯。            | 随 serverPort 端口变化。        |
+| UDP | 6035-6039 | 多节点集群的节点间通讯。            | 随 serverPort 端口变化。        |
--- a/importSampleData/README.md
+++ b/importSampleData/README.md
@@ -97,7 +97,7 @@ go build -o bin/taosimport app/main.go
    是否保存统计信息到 tdengine 的 statistic 表中，1 是，0 否， 默认 0。
-* -savetb int
+* -savetb string
    当 save 为 1 时保存统计信息的表名， 默认 statistic。

--- a/importSampleData/app/main.go
+++ b/importSampleData/app/main.go
--- a/importSampleData/data/sensor_info.csv
+++ b/importSampleData/data/sensor_info.csv
@@ -899,103 +899,103 @@ devid,location,color,devgroup,ts,temperature,humidity
 8, haerbing, yellow, 2, 1575129697000, 31, 16.321497
 8, haerbing, yellow, 2, 1575129698000, 25, 15.864515
 8, haerbing, yellow, 2, 1575129699000, 25, 16.492443
-9, sijiazhuang, blue, 0, 1575129600000, 23, 16.002889
+9, shijiazhuang, blue, 0, 1575129600000, 23, 16.002889
-9, sijiazhuang, blue, 0, 1575129601000, 26, 17.034610
+9, shijiazhuang, blue, 0, 1575129601000, 26, 17.034610
-9, sijiazhuang, blue, 0, 1575129602000, 29, 12.892319
+9, shijiazhuang, blue, 0, 1575129602000, 29, 12.892319
-9, sijiazhuang, blue, 0, 1575129603000, 34, 15.321807
+9, shijiazhuang, blue, 0, 1575129603000, 34, 15.321807
-9, sijiazhuang, blue, 0, 1575129604000, 29, 12.562642
+9, shijiazhuang, blue, 0, 1575129604000, 29, 12.562642
-9, sijiazhuang, blue, 0, 1575129605000, 32, 17.190246
+9, shijiazhuang, blue, 0, 1575129605000, 32, 17.190246
-9, sijiazhuang, blue, 0, 1575129606000, 19, 15.361774
+9, shijiazhuang, blue, 0, 1575129606000, 19, 15.361774
-9, sijiazhuang, blue, 0, 1575129607000, 26, 15.022364
+9, shijiazhuang, blue, 0, 1575129607000, 26, 15.022364
-9, sijiazhuang, blue, 0, 1575129608000, 31, 14.837084
+9, shijiazhuang, blue, 0, 1575129608000, 31, 14.837084
-9, sijiazhuang, blue, 0, 1575129609000, 25, 11.554289
+9, shijiazhuang, blue, 0, 1575129609000, 25, 11.554289
-9, sijiazhuang, blue, 0, 1575129610000, 21, 15.313973
+9, shijiazhuang, blue, 0, 1575129610000, 21, 15.313973
-9, sijiazhuang, blue, 0, 1575129611000, 27, 18.621783
+9, shijiazhuang, blue, 0, 1575129611000, 27, 18.621783
-9, sijiazhuang, blue, 0, 1575129612000, 31, 18.018101
+9, shijiazhuang, blue, 0, 1575129612000, 31, 18.018101
-9, sijiazhuang, blue, 0, 1575129613000, 23, 14.421450
+9, shijiazhuang, blue, 0, 1575129613000, 23, 14.421450
-9, sijiazhuang, blue, 0, 1575129614000, 28, 10.833142
+9, shijiazhuang, blue, 0, 1575129614000, 28, 10.833142
-9, sijiazhuang, blue, 0, 1575129615000, 33, 18.169837
+9, shijiazhuang, blue, 0, 1575129615000, 33, 18.169837
-9, sijiazhuang, blue, 0, 1575129616000, 21, 18.772730
+9, shijiazhuang, blue, 0, 1575129616000, 21, 18.772730
-9, sijiazhuang, blue, 0, 1575129617000, 24, 18.893146
+9, shijiazhuang, blue, 0, 1575129617000, 24, 18.893146
-9, sijiazhuang, blue, 0, 1575129618000, 24, 10.290187
+9, shijiazhuang, blue, 0, 1575129618000, 24, 10.290187
-9, sijiazhuang, blue, 0, 1575129619000, 23, 17.393345
+9, shijiazhuang, blue, 0, 1575129619000, 23, 17.393345
-9, sijiazhuang, blue, 0, 1575129620000, 30, 12.949215
+9, shijiazhuang, blue, 0, 1575129620000, 30, 12.949215
-9, sijiazhuang, blue, 0, 1575129621000, 19, 19.267621
+9, shijiazhuang, blue, 0, 1575129621000, 19, 19.267621
-9, sijiazhuang, blue, 0, 1575129622000, 33, 14.831735
+9, shijiazhuang, blue, 0, 1575129622000, 33, 14.831735
-9, sijiazhuang, blue, 0, 1575129623000, 21, 14.711125
+9, shijiazhuang, blue, 0, 1575129623000, 21, 14.711125
-9, sijiazhuang, blue, 0, 1575129624000, 16, 17.168485
+9, shijiazhuang, blue, 0, 1575129624000, 16, 17.168485
-9, sijiazhuang, blue, 0, 1575129625000, 17, 16.426433
+9, shijiazhuang, blue, 0, 1575129625000, 17, 16.426433
-9, sijiazhuang, blue, 0, 1575129626000, 19, 13.879050
+9, shijiazhuang, blue, 0, 1575129626000, 19, 13.879050
-9, sijiazhuang, blue, 0, 1575129627000, 21, 18.308168
+9, shijiazhuang, blue, 0, 1575129627000, 21, 18.308168
-9, sijiazhuang, blue, 0, 1575129628000, 17, 10.845681
+9, shijiazhuang, blue, 0, 1575129628000, 17, 10.845681
-9, sijiazhuang, blue, 0, 1575129629000, 20, 10.238272
+9, shijiazhuang, blue, 0, 1575129629000, 20, 10.238272
-9, sijiazhuang, blue, 0, 1575129630000, 19, 19.424976
+9, shijiazhuang, blue, 0, 1575129630000, 19, 19.424976
-9, sijiazhuang, blue, 0, 1575129631000, 31, 13.885909
+9, shijiazhuang, blue, 0, 1575129631000, 31, 13.885909
-9, sijiazhuang, blue, 0, 1575129632000, 15, 19.264740
+9, shijiazhuang, blue, 0, 1575129632000, 15, 19.264740
-9, sijiazhuang, blue, 0, 1575129633000, 30, 12.460645
+9, shijiazhuang, blue, 0, 1575129633000, 30, 12.460645
-9, sijiazhuang, blue, 0, 1575129634000, 27, 17.608036
+9, shijiazhuang, blue, 0, 1575129634000, 27, 17.608036
-9, sijiazhuang, blue, 0, 1575129635000, 25, 13.493812
+9, shijiazhuang, blue, 0, 1575129635000, 25, 13.493812
-9, sijiazhuang, blue, 0, 1575129636000, 19, 10.955939
+9, shijiazhuang, blue, 0, 1575129636000, 19, 10.955939
-9, sijiazhuang, blue, 0, 1575129637000, 24, 11.956587
+9, shijiazhuang, blue, 0, 1575129637000, 24, 11.956587
-9, sijiazhuang, blue, 0, 1575129638000, 15, 19.141381
+9, shijiazhuang, blue, 0, 1575129638000, 15, 19.141381
-9, sijiazhuang, blue, 0, 1575129639000, 24, 14.801530
+9, shijiazhuang, blue, 0, 1575129639000, 24, 14.801530
-9, sijiazhuang, blue, 0, 1575129640000, 17, 14.347318
+9, shijiazhuang, blue, 0, 1575129640000, 17, 14.347318
-9, sijiazhuang, blue, 0, 1575129641000, 29, 14.803237
+9, shijiazhuang, blue, 0, 1575129641000, 29, 14.803237
-9, sijiazhuang, blue, 0, 1575129642000, 28, 10.342297
+9, shijiazhuang, blue, 0, 1575129642000, 28, 10.342297
-9, sijiazhuang, blue, 0, 1575129643000, 29, 19.368282
+9, shijiazhuang, blue, 0, 1575129643000, 29, 19.368282
-9, sijiazhuang, blue, 0, 1575129644000, 31, 17.491654
+9, shijiazhuang, blue, 0, 1575129644000, 31, 17.491654
-9, sijiazhuang, blue, 0, 1575129645000, 18, 13.161736
+9, shijiazhuang, blue, 0, 1575129645000, 18, 13.161736
-9, sijiazhuang, blue, 0, 1575129646000, 17, 16.067354
+9, shijiazhuang, blue, 0, 1575129646000, 17, 16.067354
-9, sijiazhuang, blue, 0, 1575129647000, 18, 13.736465
+9, shijiazhuang, blue, 0, 1575129647000, 18, 13.736465
-9, sijiazhuang, blue, 0, 1575129648000, 23, 19.103276
+9, shijiazhuang, blue, 0, 1575129648000, 23, 19.103276
-9, sijiazhuang, blue, 0, 1575129649000, 29, 16.075892
+9, shijiazhuang, blue, 0, 1575129649000, 29, 16.075892
-9, sijiazhuang, blue, 0, 1575129650000, 21, 10.728566
+9, shijiazhuang, blue, 0, 1575129650000, 21, 10.728566
-9, sijiazhuang, blue, 0, 1575129651000, 15, 18.921849
+9, shijiazhuang, blue, 0, 1575129651000, 15, 18.921849
-9, sijiazhuang, blue, 0, 1575129652000, 24, 16.914709
+9, shijiazhuang, blue, 0, 1575129652000, 24, 16.914709
-9, sijiazhuang, blue, 0, 1575129653000, 19, 13.501651
+9, shijiazhuang, blue, 0, 1575129653000, 19, 13.501651
-9, sijiazhuang, blue, 0, 1575129654000, 19, 13.538347
+9, shijiazhuang, blue, 0, 1575129654000, 19, 13.538347
-9, sijiazhuang, blue, 0, 1575129655000, 16, 13.261095
+9, shijiazhuang, blue, 0, 1575129655000, 16, 13.261095
-9, sijiazhuang, blue, 0, 1575129656000, 32, 16.315746
+9, shijiazhuang, blue, 0, 1575129656000, 32, 16.315746
-9, sijiazhuang, blue, 0, 1575129657000, 27, 16.400939
+9, shijiazhuang, blue, 0, 1575129657000, 27, 16.400939
-9, sijiazhuang, blue, 0, 1575129658000, 24, 13.321819
+9, shijiazhuang, blue, 0, 1575129658000, 24, 13.321819
-9, sijiazhuang, blue, 0, 1575129659000, 27, 19.070181
+9, shijiazhuang, blue, 0, 1575129659000, 27, 19.070181
-9, sijiazhuang, blue, 0, 1575129660000, 27, 13.040922
+9, shijiazhuang, blue, 0, 1575129660000, 27, 13.040922
-9, sijiazhuang, blue, 0, 1575129661000, 32, 10.872530
+9, shijiazhuang, blue, 0, 1575129661000, 32, 10.872530
-9, sijiazhuang, blue, 0, 1575129662000, 28, 16.428657
+9, shijiazhuang, blue, 0, 1575129662000, 28, 16.428657
-9, sijiazhuang, blue, 0, 1575129663000, 32, 13.883854
+9, shijiazhuang, blue, 0, 1575129663000, 32, 13.883854
-9, sijiazhuang, blue, 0, 1575129664000, 33, 14.299554
+9, shijiazhuang, blue, 0, 1575129664000, 33, 14.299554
-9, sijiazhuang, blue, 0, 1575129665000, 30, 16.445130
+9, shijiazhuang, blue, 0, 1575129665000, 30, 16.445130
-9, sijiazhuang, blue, 0, 1575129666000, 15, 18.059404
+9, shijiazhuang, blue, 0, 1575129666000, 15, 18.059404
-9, sijiazhuang, blue, 0, 1575129667000, 21, 12.348847
+9, shijiazhuang, blue, 0, 1575129667000, 21, 12.348847
-9, sijiazhuang, blue, 0, 1575129668000, 32, 13.315378
+9, shijiazhuang, blue, 0, 1575129668000, 32, 13.315378
-9, sijiazhuang, blue, 0, 1575129669000, 17, 15.689507
+9, shijiazhuang, blue, 0, 1575129669000, 17, 15.689507
-9, sijiazhuang, blue, 0, 1575129670000, 22, 15.591808
+9, shijiazhuang, blue, 0, 1575129670000, 22, 15.591808
-9, sijiazhuang, blue, 0, 1575129671000, 27, 16.386065
+9, shijiazhuang, blue, 0, 1575129671000, 27, 16.386065
-9, sijiazhuang, blue, 0, 1575129672000, 25, 10.564803
+9, shijiazhuang, blue, 0, 1575129672000, 25, 10.564803
-9, sijiazhuang, blue, 0, 1575129673000, 20, 12.276544
+9, shijiazhuang, blue, 0, 1575129673000, 20, 12.276544
-9, sijiazhuang, blue, 0, 1575129674000, 26, 15.828786
+9, shijiazhuang, blue, 0, 1575129674000, 26, 15.828786
-9, sijiazhuang, blue, 0, 1575129675000, 18, 12.236420
+9, shijiazhuang, blue, 0, 1575129675000, 18, 12.236420
-9, sijiazhuang, blue, 0, 1575129676000, 15, 19.439522
+9, shijiazhuang, blue, 0, 1575129676000, 15, 19.439522
-9, sijiazhuang, blue, 0, 1575129677000, 19, 19.831531
+9, shijiazhuang, blue, 0, 1575129677000, 19, 19.831531
-9, sijiazhuang, blue, 0, 1575129678000, 22, 17.115744
+9, shijiazhuang, blue, 0, 1575129678000, 22, 17.115744
-9, sijiazhuang, blue, 0, 1575129679000, 29, 19.879456
+9, shijiazhuang, blue, 0, 1575129679000, 29, 19.879456
-9, sijiazhuang, blue, 0, 1575129680000, 34, 10.207136
+9, shijiazhuang, blue, 0, 1575129680000, 34, 10.207136
-9, sijiazhuang, blue, 0, 1575129681000, 16, 17.633523
+9, shijiazhuang, blue, 0, 1575129681000, 16, 17.633523
-9, sijiazhuang, blue, 0, 1575129682000, 15, 14.227873
+9, shijiazhuang, blue, 0, 1575129682000, 15, 14.227873
-9, sijiazhuang, blue, 0, 1575129683000, 34, 12.027768
+9, shijiazhuang, blue, 0, 1575129683000, 34, 12.027768
-9, sijiazhuang, blue, 0, 1575129684000, 22, 11.376610
+9, shijiazhuang, blue, 0, 1575129684000, 22, 11.376610
-9, sijiazhuang, blue, 0, 1575129685000, 21, 11.711299
+9, shijiazhuang, blue, 0, 1575129685000, 21, 11.711299
-9, sijiazhuang, blue, 0, 1575129686000, 33, 14.281126
+9, shijiazhuang, blue, 0, 1575129686000, 33, 14.281126
-9, sijiazhuang, blue, 0, 1575129687000, 31, 10.895302
+9, shijiazhuang, blue, 0, 1575129687000, 31, 10.895302
-9, sijiazhuang, blue, 0, 1575129688000, 31, 13.971350
+9, shijiazhuang, blue, 0, 1575129688000, 31, 13.971350
-9, sijiazhuang, blue, 0, 1575129689000, 15, 15.262790
+9, shijiazhuang, blue, 0, 1575129689000, 15, 15.262790
-9, sijiazhuang, blue, 0, 1575129690000, 23, 12.440568
+9, shijiazhuang, blue, 0, 1575129690000, 23, 12.440568
-9, sijiazhuang, blue, 0, 1575129691000, 32, 19.731267
+9, shijiazhuang, blue, 0, 1575129691000, 32, 19.731267
-9, sijiazhuang, blue, 0, 1575129692000, 22, 10.518092
+9, shijiazhuang, blue, 0, 1575129692000, 22, 10.518092
-9, sijiazhuang, blue, 0, 1575129693000, 34, 17.863021
+9, shijiazhuang, blue, 0, 1575129693000, 34, 17.863021
-9, sijiazhuang, blue, 0, 1575129694000, 28, 11.478909
+9, shijiazhuang, blue, 0, 1575129694000, 28, 11.478909
-9, sijiazhuang, blue, 0, 1575129695000, 16, 15.075524
+9, shijiazhuang, blue, 0, 1575129695000, 16, 15.075524
-9, sijiazhuang, blue, 0, 1575129696000, 16, 10.292127
+9, shijiazhuang, blue, 0, 1575129696000, 16, 10.292127
-9, sijiazhuang, blue, 0, 1575129697000, 22, 13.716012
+9, shijiazhuang, blue, 0, 1575129697000, 22, 13.716012
-9, sijiazhuang, blue, 0, 1575129698000, 32, 10.906551
+9, shijiazhuang, blue, 0, 1575129698000, 32, 10.906551
-9, sijiazhuang, blue, 0, 1575129699000, 19, 18.386868
+9, shijiazhuang, blue, 0, 1575129699000, 19, 18.386868
\ No newline at end of file
--- a/importSampleData/go.mod
+++ b/importSampleData/go.mod
+module github.com/taosdata/TDengine/importSampleData
+go 1.13
+require (
+	github.com/pelletier/go-toml v1.9.0 // indirect
+	github.com/taosdata/driver-go v0.0.0-20210415143420-d99751356e28 // indirect
+)
--- a/importSampleData/import/import_config.go
+++ b/importSampleData/import/import_config.go
@@ -14,23 +14,23 @@ var (
 	once sync.Once
 )
-// Config inclue all scene import config
+// Config include all scene import config
 type Config struct {
 	UserCases map[string]CaseConfig
 }
 // CaseConfig include the sample data config and tdengine config
 type CaseConfig struct {
-	Format                string
+	Format              string
-	FilePath              string
+	FilePath            string
-	Separator             string
+	Separator           string
-	Stname                string
+	StName              string
-	SubTableName          string
+	SubTableName        string
-	Timestamp             string
+	Timestamp           string
-	TimestampType   	  string
+	TimestampType       string
-	TimestampTypeFormat   string
+	TimestampTypeFormat string
-	Tags                  []FieldInfo
+	Tags                []FieldInfo
-	Fields                []FieldInfo
+	Fields              []FieldInfo
 }
 // FieldInfo is field or tag info

--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -29,6 +29,9 @@
 # number of threads per CPU core
 # numOfThreadsPerCore       1.0
+# number of threads to commit cache data
+# numOfCommitThreads        4
 # the proportion of total CPU cores available for query processing
 # 2.0: the query threads will be set to double of the CPU cores.
 # 1.0: all CPU cores are available for query processing [default].
@@ -61,7 +64,7 @@
 # monitorInterval           30
 # number of seconds allowed for a dnode to be offline, for cluster only 
-# offlineThreshold          8640000
+# offlineThreshold          864000
 # RPC re-try timer, millisecond
 # rpcTimer                  300

--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -12,9 +12,13 @@ RUN tar -zxf ${pkgFile}
 WORKDIR /root/${dirName}/
 RUN /bin/bash install.sh -e no
+RUN apt-get clean && apt-get update && apt-get install -y locales
+RUN locale-gen en_US.UTF-8
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
-ENV LANG=C.UTF-8
+ENV LC_CTYPE=en_US.UTF-8
-ENV LC_ALL=C.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
 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/" ]
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
@@ -36,10 +36,10 @@ done
 echo "verNumber=${verNumber}"
 #docker manifest create -a tdengine/tdengine:${verNumber} tdengine/tdengine-amd64:${verNumber} tdengine/tdengine-aarch64:${verNumber} tdengine/tdengine-aarch32:${verNumber}
-docker manifest create -a tdengine/tdengine tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
+docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
-docker manifest push tdengine/tdengine
+docker manifest push tdengine/tdengine:latest
 # how set latest version ???
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -120,7 +120,7 @@ function clean_service_on_systemd() {
    if [ "$verMode" == "cluster" ]; then
 		  nginx_service_config="${service_config_dir}/${nginx_service_name}.service"	
-   	 	if [ -d ${bin_dir}/web ]; then
+   	 	if [ -d ${install_nginxd_dir} ]; 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
@@ -213,10 +213,10 @@ fi
 if echo $osinfo | grep -qwi "ubuntu" ; then
 #  echo "this is ubuntu system"
-   ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
+   ${csudo} dpkg --force-all  -P tdengine || :
 elif echo $osinfo | grep -qwi "debian" ; then
 #  echo "this is debian system"
-   ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
+   ${csudo} dpkg --force-all  -P tdengine || :
 elif  echo $osinfo | grep -qwi "centos" ; then
 #  echo "this is centos system"
  ${csudo} rpm -e --noscripts tdengine || :

--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
 name: tdengine
 base: core18
-version: '2.0.16.0'
+version: '2.1.0.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +73,7 @@ parts:
      - usr/bin/taosd
      - usr/bin/taos
      - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.0.16.0
+      - usr/lib/libtaos.so.2.1.0.0
      - usr/lib/libtaos.so.1
      - usr/lib/libtaos.so

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,6 @@ ADD_SUBDIRECTORY(tsdb)
 ADD_SUBDIRECTORY(wal)
 ADD_SUBDIRECTORY(cq)
 ADD_SUBDIRECTORY(dnode)
-#ADD_SUBDIRECTORY(connector/odbc)
+ADD_SUBDIRECTORY(connector/odbc)
 ADD_SUBDIRECTORY(connector/jdbc)
--- a/src/balance/src/bnMain.c
+++ b/src/balance/src/bnMain.c
@@ -425,7 +425,7 @@ static bool bnMonitorVgroups() {
  while (1) {
    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
-    if (pVgroup == NULL) break;
+    if (pVgroup == NULL || pVgroup->pDb == NULL) break;
    int32_t dbReplica = pVgroup->pDb->cfg.replications;
    int32_t vgReplica = pVgroup->numOfVnodes;
@@ -721,4 +721,4 @@ int32_t bnAlterDnode(struct SDnodeObj *pSrcDnode, int32_t vnodeId, int32_t dnode
  mnodeDecDnodeRef(pDestDnode);
  return code;
 }
\ No newline at end of file
--- a/src/client/inc/tscLocalMerge.h
+++ b/src/client/inc/tscLocalMerge.h
@@ -44,23 +44,15 @@ typedef struct SLocalMerger {
  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.
-  bool                   hasPrevRow;   // cannot be released
-  bool                   hasUnprocessedRow;
  tOrderDescriptor *     pDesc;
  SColumnModel *         resColModel;
  SColumnModel*          finalModel;
  tExtMemBuffer **       pExtMemBuffer;      // disk-based buffer
-  SFillInfo*             pFillInfo;          // interpolation support structure
-  char*                  pFinalRes;          // result data after interpo
-  tFilePage*             discardData;
-  bool                   discard;
-  int32_t                offset;             // limit offset value
  bool                   orderPrjOnSTable;   // projection query on stable
 } SLocalMerger;
@@ -94,7 +86,7 @@ void tscCreateLocalMerger(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrde
 void tscDestroyLocalMerger(SSqlObj *pSql);
-int32_t tscDoLocalMerge(SSqlObj *pSql);
+//int32_t tscDoLocalMerge(SSqlObj *pSql);
 #ifdef __cplusplus
 }

--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -48,6 +48,8 @@ void tscLockByThread(int64_t *lockedBy);
 void tscUnlockByThread(int64_t *lockedBy);
+int tsInsertInitialCheck(SSqlObj *pSql);
 #ifdef __cplusplus
 }
 #endif

--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -36,19 +36,6 @@ extern "C" {
 #define UTIL_TABLE_IS_NORMAL_TABLE(metaInfo)\
  (!(UTIL_TABLE_IS_SUPER_TABLE(metaInfo) || UTIL_TABLE_IS_CHILD_TABLE(metaInfo)))
-typedef struct SParsedColElem {
-  int16_t colIndex;
-  uint16_t offset;
-} SParsedColElem;
-typedef struct SParsedDataColInfo {
-  int16_t        numOfCols;
-  int16_t        numOfAssignedCols;
-  SParsedColElem elems[TSDB_MAX_COLUMNS];
-  bool           hasVal[TSDB_MAX_COLUMNS];
-} SParsedDataColInfo;
 #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,
@@ -83,14 +70,28 @@ typedef struct SJoinSupporter {
  SArray*         pVgroupTables;
 } SJoinSupporter;
+typedef struct SMergeCtx {
+  SJoinSupporter* p;
+  int32_t         idx;
+  SArray*         res;
+  int8_t          compared;
+}SMergeCtx;
+typedef struct SMergeTsCtx {
+  SJoinSupporter* p;
+  STSBuf*         res;
+  int64_t         numOfInput;
+  int8_t          compared;
+}SMergeTsCtx;
 typedef struct SVgroupTableInfo {
  SVgroupInfo vgInfo;
-  SArray*     itemList;   //SArray<STableIdInfo>
+  SArray     *itemList;   // SArray<STableIdInfo>
 } SVgroupTableInfo;
-static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex) {
+static FORCE_INLINE SQueryInfo* tscGetQueryInfo(SSqlCmd* pCmd, int32_t subClauseIndex) {
  assert(pCmd != NULL && subClauseIndex >= 0);
  if (pCmd->pQueryInfo == NULL || subClauseIndex >= pCmd->numOfClause) {
    return NULL;
  }
@@ -98,10 +99,14 @@ static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t sub
  return pCmd->pQueryInfo[subClauseIndex];
 }
+SQueryInfo* tscGetActiveQueryInfo(SSqlCmd* pCmd);
 int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, SName* name, STableMeta* pTableMeta, STableDataBlocks** dataBlocks);
 void tscDestroyDataBlock(STableDataBlocks* pDataBlock, bool removeMeta);
 void tscSortRemoveDataBlockDupRows(STableDataBlocks* dataBuf);
+void tscDestroyBoundColumnInfo(SParsedDataColInfo* pColInfo);
 SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes,
                                   uint32_t offset);
@@ -123,6 +128,15 @@ int32_t tscGetDataBlockFromList(SHashObj* pHashList, int64_t id, int32_t size, i
 bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo);
 bool tscIsTWAQuery(SQueryInfo* pQueryInfo);
 bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo);
+bool tscGroupbyColumn(SQueryInfo* pQueryInfo);
+bool tscIsTopBotQuery(SQueryInfo* pQueryInfo);
+bool hasTagValOutput(SQueryInfo* pQueryInfo);
+bool timeWindowInterpoRequired(SQueryInfo *pQueryInfo);
+bool isStabledev(SQueryInfo* pQueryInfo);
+bool isTsCompQuery(SQueryInfo* pQueryInfo);
+bool isSimpleAggregate(SQueryInfo* pQueryInfo);
+bool isBlockDistQuery(SQueryInfo* pQueryInfo);
+int32_t tscGetTopbotQueryParam(SQueryInfo* pQueryInfo);
 bool tscNonOrderedProjectionQueryOnSTable(SQueryInfo *pQueryInfo, int32_t tableIndex);
 bool tscOrderedProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex);
@@ -133,8 +147,9 @@ bool tscIsProjectionQuery(SQueryInfo* pQueryInfo);
 bool tscIsTwoStageSTableQuery(SQueryInfo* pQueryInfo, int32_t tableIndex);
 bool tscQueryTags(SQueryInfo* pQueryInfo);
 bool tscMultiRoundQuery(SQueryInfo* pQueryInfo, int32_t tableIndex);
+bool tscQueryBlockInfo(SQueryInfo* pQueryInfo);
-SSqlExpr* tscAddFuncInSelectClause(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
+SExprInfo* tscAddFuncInSelectClause(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
                                       SColumnIndex* pIndex, SSchema* pColSchema, int16_t colType);
 int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pzTableName, SSqlObj* pSql);
@@ -152,7 +167,6 @@ SInternalField* tscFieldInfoInsert(SFieldInfo* pFieldInfo, int32_t index, TAOS_F
 SInternalField* tscFieldInfoGetInternalField(SFieldInfo* pFieldInfo, int32_t index);
 TAOS_FIELD* tscFieldInfoGetField(SFieldInfo* pFieldInfo, int32_t index);
-void tscFieldInfoUpdateOffset(SQueryInfo* pQueryInfo);
 void tscFieldInfoUpdateOffset(SQueryInfo* pQueryInfo);
 int16_t tscFieldInfoGetOffset(SQueryInfo* pQueryInfo, int32_t index);
@@ -160,32 +174,36 @@ 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);
+int32_t tscFieldInfoCompare(const SFieldInfo* pFieldInfo1, const SFieldInfo* pFieldInfo2, int32_t *diffSize);
+int32_t tscFieldInfoSetSize(const SFieldInfo* pFieldInfo1, const SFieldInfo* pFieldInfo2);
 void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes);
 int32_t   tscGetResRowLength(SArray* pExprList);
-SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+SExprInfo* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
    int16_t size, int16_t resColId, int16_t interSize, bool isTagCol);
-SSqlExpr* tscSqlExprAppend(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+SExprInfo* tscSqlExprAppend(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
                           int16_t size, int16_t resColId, int16_t interSize, bool isTagCol);
-SSqlExpr* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, int16_t srcColumnIndex, int16_t type,
+SExprInfo* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, int16_t srcColumnIndex, int16_t type,
                           int16_t size);
 size_t   tscSqlExprNumOfExprs(SQueryInfo* pQueryInfo);
-void tscInsertPrimaryTsSourceColumn(SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
+void tscInsertPrimaryTsSourceColumn(SQueryInfo* pQueryInfo, uint64_t uid);
-SSqlExpr* tscSqlExprGet(SQueryInfo* pQueryInfo, int32_t index);
+SExprInfo* tscSqlExprGet(SQueryInfo* pQueryInfo, int32_t index);
 int32_t   tscSqlExprCopy(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy);
+void      tscSqlExprAssign(SExprInfo* dst, const SExprInfo* src);
 void      tscSqlExprInfoDestroy(SArray* pExprInfo);
 SColumn* tscColumnClone(const SColumn* src);
-SColumn* tscColumnListInsert(SArray* pColList, SColumnIndex* colIndex);
+bool tscColumnExists(SArray* pColumnList, int32_t columnIndex, uint64_t uid);
-SArray* tscColumnListClone(const SArray* src, int16_t tableIndex);
+SColumn* tscColumnListInsert(SArray* pColumnList, int32_t columnIndex, uint64_t uid, SSchema* pSchema);
 void tscColumnListDestroy(SArray* pColList);
+void convertQueryResult(SSqlRes* pRes, SQueryInfo* pQueryInfo);
 void tscDequoteAndTrimToken(SStrToken* pToken);
 int32_t tscValidateName(SStrToken* pToken);
@@ -207,8 +225,11 @@ bool tscShouldBeFreed(SSqlObj* pSql);
 STableMetaInfo* tscGetTableMetaInfoFromCmd(SSqlCmd *pCmd, int32_t subClauseIndex, int32_t tableIndex);
 STableMetaInfo* tscGetMetaInfo(SQueryInfo *pQueryInfo, int32_t tableIndex);
-SQueryInfo *tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex);
+void        tscInitQueryInfo(SQueryInfo* pQueryInfo);
-SQueryInfo *tscGetQueryInfoDetailSafely(SSqlCmd *pCmd, int32_t subClauseIndex);
+void        tscClearSubqueryInfo(SSqlCmd* pCmd);
+int32_t     tscAddQueryInfo(SSqlCmd *pCmd);
+SQueryInfo *tscGetQueryInfo(SSqlCmd* pCmd, int32_t subClauseIndex);
+SQueryInfo *tscGetQueryInfoS(SSqlCmd *pCmd, int32_t subClauseIndex);
 void tscClearTableMetaInfo(STableMetaInfo* pTableMetaInfo);
@@ -216,11 +237,7 @@ STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, SName* name, STableM
                                    SVgroupsInfo* vgroupList, SArray* pTagCols, SArray* pVgroupTables);
 STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo *pQueryInfo);
-int32_t tscAddSubqueryInfo(SSqlCmd *pCmd);
-void tscInitQueryInfo(SQueryInfo* pQueryInfo);
-void tscClearSubqueryInfo(SSqlCmd* pCmd);
 void tscFreeVgroupTableInfo(SArray* pVgroupTables);
 SArray* tscVgroupTableInfoDup(SArray* pVgroupTables);
 void tscRemoveVgroupTableGroup(SArray* pVgroupTable, int32_t index);
@@ -232,6 +249,8 @@ int  tscGetTableMetaEx(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, bool creat
 void tscResetForNextRetrieve(SSqlRes* pRes);
 void tscDoQuery(SSqlObj* pSql);
+void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo);
+void doExecuteQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo);
 SVgroupsInfo* tscVgroupInfoClone(SVgroupsInfo *pInfo);
 void* tscVgroupInfoClear(SVgroupsInfo *pInfo);
@@ -265,7 +284,7 @@ void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex);
 int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid);
 int16_t tscGetTagColIndexById(STableMeta* pTableMeta, int16_t colId);
-void tscPrintSelectClause(SSqlObj* pSql, int32_t subClauseIndex);
+void tscPrintSelNodeList(SSqlObj* pSql, int32_t subClauseIndex);
 bool hasMoreVnodesToTry(SSqlObj *pSql);
 bool hasMoreClauseToTry(SSqlObj* pSql);
@@ -288,9 +307,12 @@ STableMeta* createSuperTableMeta(STableMetaMsg* pChild);
 uint32_t tscGetTableMetaSize(STableMeta* pTableMeta);
 CChildTableMeta* tscCreateChildMeta(STableMeta* pTableMeta);
 uint32_t tscGetTableMetaMaxSize();
-int32_t tscCreateTableMetaFromCChildMeta(STableMeta* pChild, const char* name);
+int32_t tscCreateTableMetaFromCChildMeta(STableMeta* pChild, const char* name, void* buf);
 STableMeta* tscTableMetaDup(STableMeta* pTableMeta);
+int32_t tscCreateQueryFromQueryInfo(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAttr, void* addr);
+void tsCreateSQLFunctionCtx(SQueryInfo* pQueryInfo, SQLFunctionCtx* pCtx, SSchema* pSchema);
+void* createQueryInfoFromQueryNode(SQueryInfo* pQueryInfo, SExprInfo* pExprs, STableGroupInfo* pTableGroupInfo, SOperatorInfo* pOperator, char* sql, void* addr, int32_t stage);
 void* malloc_throw(size_t size);
 void* calloc_throw(size_t nmemb, size_t size);

--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -35,6 +35,7 @@ extern "C" {
 #include "qExecutor.h"
 #include "qSqlparser.h"
 #include "qTsbuf.h"
+#include "qUtil.h"
 #include "tcmdtype.h"
 // forward declaration
@@ -83,6 +84,7 @@ typedef struct STableMeta {
 typedef struct STableMetaInfo {
  STableMeta   *pTableMeta;      // table meta, cached in client side and acquired by name
+  uint32_t       tableMetaSize;
  SVgroupsInfo *vgroupList;
  SArray       *pVgroupTables;   // SArray<SVgroupTableInfo>
@@ -96,31 +98,21 @@ typedef struct STableMetaInfo {
  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];  // as aliasName
-  SColIndex colInfo;
-  uint64_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.
-  int16_t   resColId;       // result column id
-} SSqlExpr;
 typedef struct SColumnIndex {
  int16_t tableIndex;
  int16_t columnIndex;
 } SColumnIndex;
+typedef struct SColumn {
+  uint64_t     tableUid;
+  int32_t      columnIndex;
+  SColumnInfo  info;
+} SColumn;
 typedef struct SInternalField {
  TAOS_FIELD      field;
  bool            visible;
-  SExprInfo      *pArithExprInfo;
+  SExprInfo      *pExpr;
-  SSqlExpr       *pSqlExpr;
 } SInternalField;
 typedef struct SFieldInfo {
@@ -129,12 +121,6 @@ typedef struct SFieldInfo {
  SArray      *internalField; // SArray<SInternalField>
 } SFieldInfo;
-typedef struct SColumn {
-  SColumnIndex       colIndex;
-  int32_t            numOfFilters;
-  SColumnFilterInfo *filterInfo;
-} SColumn;
 typedef struct SCond {
  uint64_t uid;
  int32_t  len;  // length of tag query condition data
@@ -142,15 +128,15 @@ typedef struct SCond {
 } SCond;
 typedef struct SJoinNode {
-  char     tableName[TSDB_TABLE_FNAME_LEN];
  uint64_t uid;
  int16_t  tagColId;
+  SArray*  tsJoin;
+  SArray*  tagJoin;
 } SJoinNode;
 typedef struct SJoinInfo {
  bool      hasJoin;
-  SJoinNode left;
+  SJoinNode*  joinTables[TSDB_MAX_JOIN_TABLE_NUM];
-  SJoinNode right;
 } SJoinInfo;
 typedef struct STagCond {
@@ -169,12 +155,24 @@ typedef struct STagCond {
 typedef struct SParamInfo {
  int32_t  idx;
-  char     type;
+  uint8_t  type;
  uint8_t  timePrec;
  int16_t  bytes;
  uint32_t offset;
 } SParamInfo;
+typedef struct SBoundColumn {
+  bool    hasVal;  // denote if current column has bound or not
+  int32_t offset;  // all column offset value
+} SBoundColumn;
+typedef struct SParsedDataColInfo {
+  int16_t         numOfCols;
+  int16_t         numOfBound;
+  int32_t        *boundedColumns;
+  SBoundColumn   *cols;
+} SParsedDataColInfo;
 typedef struct STableDataBlocks {
  SName       tableName;
  int8_t      tsSource;     // where does the UNIX timestamp come from, server or client
@@ -189,6 +187,8 @@ typedef struct STableDataBlocks {
  STableMeta *pTableMeta;   // the tableMeta of current table, the table meta will be used during submit, keep a ref to avoid to be removed from cache
  char       *pData;
+  SParsedDataColInfo  boundColumnInfo;
  // for parameter ('?') binding
  uint32_t    numOfAllocedParams;
  uint32_t    numOfParams;
@@ -198,17 +198,19 @@ typedef struct STableDataBlocks {
 typedef struct SQueryInfo {
  int16_t          command;       // the command may be different for each subclause, so keep it seperately.
  uint32_t         type;          // query/insert type
+  STimeWindow      window;        // the whole query time window
-  STimeWindow      window;        // query time window
+  SInterval        interval;      // tumble time window
-  SInterval        interval;
+  SSessionWindow   sessionWindow; // session time window
-  SSqlGroupbyExpr  groupbyExpr;   // group by tags info
+  SSqlGroupbyExpr  groupbyExpr;   // groupby tags info
  SArray *         colList;       // SArray<SColumn*>
  SFieldInfo       fieldsInfo;
-  SArray *         exprList;      // SArray<SSqlExpr*>
+  SArray *         exprList;      // SArray<SExprInfo*>
  SLimitVal        limit;
  SLimitVal        slimit;
  STagCond         tagCond;
  SOrderVal        order;
  int16_t          fillType;      // final result fill type
  int16_t          numOfTables;
@@ -227,11 +229,21 @@ typedef struct SQueryInfo {
  int32_t          round;         // 0/1/....
  int32_t          bufLen;
  char*            buf;
+  SQInfo*          pQInfo;      // global merge operator
+  SArray*          pDSOperator;    // data source operator
+  SArray*          pPhyOperator;   // physical query execution plan
+  SQueryAttr*      pQueryAttr;     // query object
+  struct SQueryInfo *sibling;     // sibling
+  SArray            *pUpstream;   // SArray<struct SQueryInfo>
+  struct SQueryInfo *pDownstream;
+  int32_t            havingFieldNum;
 } SQueryInfo;
 typedef struct {
  int     command;
  uint8_t msgType;
+  char    reserve1[3];        // fix bus error on arm32
  bool    autoCreated;        // create table if it is not existed during retrieve table meta in mnode
  union {
@@ -240,29 +252,35 @@ typedef struct {
  };
  uint32_t     insertType;   // TODO remove it
-  int32_t      clauseIndex;  // index of multiple subclause query
  char *       curSql;       // current sql, resume position of sql after parsing paused
  int8_t       parseFinished;
+  char         reserve2[3];        // fix bus error on arm32
  int16_t      numOfCols;
+  char         reserve3[2];        // fix bus error on arm32
  uint32_t     allocSize;
  char *       payload;
  int32_t      payloadLen;
  SQueryInfo **pQueryInfo;
  int32_t      numOfClause;
+  int32_t      clauseIndex;  // index of multiple subclause query
+  SQueryInfo  *active;       // current active query info
  int32_t      batchSize;    // for parameter ('?') binding and batch processing
  int32_t      numOfParams;
  int8_t       dataSourceType;     // load data from file or not
+  char    reserve4[3];         // fix bus error on arm32
  int8_t       submitSchema;   // submit block is built with table schema
+  char    reserve5[3];         // fix bus error on arm32
  STagData     tagData;        // NOTE: pTagData->data is used as a variant length array
  SName      **pTableNameList; // all involved tableMeta list of current insert sql statement.
  int32_t      numOfTables;
  SHashObj    *pTableBlockHashList;     // data block for each table
-  SArray      *pDataBlocks;    // SArray<STableDataBlocks*>. Merged submit block for each vgroup
+  SArray      *pDataBlocks;             // SArray<STableDataBlocks*>. Merged submit block for each vgroup
 } SSqlCmd;
 typedef struct SResRec {
@@ -278,7 +296,7 @@ typedef struct {
  char *         pRsp;
  int32_t        rspType;
  int32_t        rspLen;
-  uint64_t       qhandle;
+  uint64_t       qId;
  int64_t        useconds;
  int64_t        offset;  // offset value from vnode during projection query of stable
  int32_t        row;
@@ -295,6 +313,7 @@ typedef struct {
  char **        buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
  SColumnIndex*  pColumnIndex;
+  TAOS_FIELD*           final;
  SArithmeticSupport   *pArithSup;   // support the arithmetic expression calculation on agg functions
  struct SLocalMerger  *pLocalMerger;
 } SSqlRes;
@@ -353,7 +372,8 @@ typedef struct SSqlObj {
  tsem_t           rspSem;
  SSqlCmd          cmd;
  SSqlRes          res;
+  bool             isBind;
  SSubqueryState   subState;
  struct SSqlObj **pSubs;
@@ -361,7 +381,7 @@ typedef struct SSqlObj {
  int64_t          svgroupRid;
  int64_t          squeryLock;
+  int32_t          retryReason;  // previous error code
  struct SSqlObj  *prev, *next;
  int64_t          self;
 } SSqlObj;
@@ -397,7 +417,6 @@ typedef struct SSqlStream {
 void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable);
 int  tscAcquireRpc(const char *key, const char *user, const char *secret,void **pRpcObj);
 void tscReleaseRpc(void *param);
 void tscInitMsgsFp();
@@ -405,7 +424,7 @@ void tscInitMsgsFp();
 int tsParseSql(SSqlObj *pSql, bool initial);
 void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet);
-int  tscProcessSql(SSqlObj *pSql);
+int  tscBuildAndSendRequest(SSqlObj *pSql, SQueryInfo* pQueryInfo);
 int  tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex);
 void tscAsyncResultOnError(SSqlObj *pSql);
@@ -420,6 +439,10 @@ void    tscRestoreFuncForSTableQuery(SQueryInfo *pQueryInfo);
 int32_t tscCreateResPointerInfo(SSqlRes *pRes, SQueryInfo *pQueryInfo);
 void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo);
+void tscSetResRawPtrRv(SSqlRes* pRes, SQueryInfo* pQueryInfo, SSDataBlock* pBlock);
+void handleDownstreamOperator(SSqlRes* pRes, SQueryInfo* pQueryInfo);
+void destroyTableNameList(SSqlCmd* pCmd);
 void tscResetSqlCmd(SSqlCmd *pCmd, bool removeMeta);
@@ -434,6 +457,8 @@ void tscFreeSqlResult(SSqlObj *pSql);
 * @param pObj
 */
 void tscFreeSqlObj(SSqlObj *pSql);
+void tscFreeSubobj(SSqlObj* pSql);
 void tscFreeRegisteredSqlObj(void *pSql);
 void tscCloseTscObj(void *pObj);
@@ -455,6 +480,7 @@ char* tscGetSqlStr(SSqlObj* pSql);
 bool tscIsQueryWithLimit(SSqlObj* pSql);
 bool tscHasReachLimitation(SQueryInfo *pQueryInfo, SSqlRes *pRes);
+void tscSetBoundColumnInfo(SParsedDataColInfo *pColInfo, SSchema *pSchema, int32_t numOfCols);
 char *tscGetErrorMsgPayload(SSqlCmd *pCmd);
@@ -463,47 +489,6 @@ int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo,  const char* s
 int32_t tscToSQLCmd(SSqlObj *pSql, struct SSqlInfo *pInfo);
-static FORCE_INLINE void tscGetResultColumnChr(SSqlRes* pRes, SFieldInfo* pFieldInfo, int32_t columnIndex, int32_t offset) {
-  SInternalField* pInfo = (SInternalField*) TARRAY_GET_ELEM(pFieldInfo->internalField, columnIndex);
-  int32_t type = pInfo->field.type;
-  int32_t bytes = pInfo->field.bytes;
-  char* pData = pRes->data + (int32_t)(offset * pRes->numOfRows + bytes * pRes->row);
-  UNUSED(pData);
-//   user defined constant value output columns
-  if (pInfo->pSqlExpr != NULL && 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 : (unsigned char*)pData;
-    } else {
-      assert(bytes == tDataTypes[type].bytes);
-      pRes->tsrow[columnIndex] = isNull(pData, type) ? NULL : (unsigned char*)&pInfo->pSqlExpr->param[1].i64;
-      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 : (unsigned char*)((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 == tDataTypes[type].bytes);
-      pRes->tsrow[columnIndex] = isNull(pData, type) ? NULL : (unsigned char*)pData;
-      pRes->length[columnIndex] = bytes;
-    }
-  }
-}
 extern int32_t    sentinel;
 extern SHashObj  *tscVgroupMap;
 extern SHashObj  *tscTableMetaInfo;

--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -49,6 +49,14 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getTsCharset
  (JNIEnv *, jclass);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    getResultTimePrecision
+ * Signature: (J)J
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TDDBJNIConnector_getResultTimePrecision
+        (JNIEnv *, jobject, jlong, jlong);
 /*
 * Class:     com_taosdata_jdbc_TSDBJNIConnector
 * Method:    connectImp
@@ -92,7 +100,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp
 /*
 * Class:     com_taosdata_jdbc_TSDBJNIConnector
 * Method:    isUpdateQueryImp
- * Signature: (J)J
+ * Signature: (JJ)I
 */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp
  (JNIEnv *env, jobject jobj, jlong con, jlong tres);
@@ -177,6 +185,44 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_unsubscribeImp
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTableSqlImp
  (JNIEnv *, jobject, jlong, jbyteArray);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    prepareStmtImp
+ * Signature: ([BJ)I
+ */
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_prepareStmtImp
+  (JNIEnv *, jobject, jbyteArray, jlong);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    setBindTableNameImp
+ * Signature: (JLjava/lang/String;J)I
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setBindTableNameImp
+  (JNIEnv *, jobject, jlong, jstring, jlong);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    bindColDataImp
+ * Signature: (J[B[B[BIIIIJ)J
+ */
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_bindColDataImp
+(JNIEnv *, jobject, jlong, jbyteArray, jbyteArray, jbyteArray, jint, jint, jint, jint, jlong);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    executeBatchImp
+ * Signature: (JJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeBatchImp(JNIEnv *env, jobject jobj, jlong stmt, jlong con);
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    executeBatchImp
+ * Signature: (JJ)I
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeStmt(JNIEnv *env, jobject jobj, jlong stmt, jlong con);
 #ifdef __cplusplus
 }
 #endif

--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -481,15 +481,19 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
      case TSDB_DATA_TYPE_BOOL:
        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetBooleanFp, i, (jboolean)(*((char *)row[i]) == 1));
        break;
+      case TSDB_DATA_TYPE_UTINYINT:
      case TSDB_DATA_TYPE_TINYINT:
        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteFp, i, (jbyte) * ((int8_t *)row[i]));
        break;
+      case TSDB_DATA_TYPE_USMALLINT:
      case TSDB_DATA_TYPE_SMALLINT:
        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetShortFp, i, (jshort) * ((int16_t *)row[i]));
        break;
+      case TSDB_DATA_TYPE_UINT:
      case TSDB_DATA_TYPE_INT:
        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetIntFp, i, (jint) * (int32_t *)row[i]);
        break;
+      case TSDB_DATA_TYPE_UBIGINT:
      case TSDB_DATA_TYPE_BIGINT:
        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetLongFp, i, (jlong) * ((int64_t *)row[i]));
        break;
@@ -667,3 +671,210 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getTsCharset(JNIEnv *env, jobject jobj) {
  return (*env)->NewStringUTF(env, (const char *)tsCharset);
 }
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TDDBJNIConnector_getResultTimePrecision(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;
+  }
+  TAOS_RES *result = (TAOS_RES *)res;
+  if (result == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+  return taos_result_precision(result);
+}
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_prepareStmtImp(JNIEnv *env, jobject jobj, jbyteArray jsql, jlong con) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+  if (jsql == NULL) {
+    jniError("jobj:%p, conn:%p, empty sql string", jobj, tscon);
+    return JNI_SQL_NULL;
+  }
+  jsize len = (*env)->GetArrayLength(env, jsql);
+  char *str = (char *) calloc(1, sizeof(char) * (len + 1));
+  if (str == NULL) {
+    jniError("jobj:%p, conn:%p, alloc memory failed", jobj, tscon);
+    return JNI_OUT_OF_MEMORY;
+  }
+  (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)str);
+  if ((*env)->ExceptionCheck(env)) {
+    // todo handle error
+  }
+  TAOS_STMT* pStmt = taos_stmt_init(tscon);
+  int32_t code = taos_stmt_prepare(pStmt, str, len);
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+  free(str);
+  return (jlong) pStmt;
+}
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setBindTableNameImp(JNIEnv *env, jobject jobj, jlong stmt, jstring jname, jlong conn) {
+  TAOS *tsconn = (TAOS *)conn;
+  if (tsconn == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+  TAOS_STMT* pStmt = (TAOS_STMT*) stmt;
+  if (pStmt == NULL) {
+    jniError("jobj:%p, conn:%p, invalid stmt handle", jobj, tsconn);
+    return JNI_SQL_NULL;
+  }
+  const char *name = (*env)->GetStringUTFChars(env, jname, NULL);
+  int32_t code = taos_stmt_set_tbname((void*)stmt, name);
+  if (code != TSDB_CODE_SUCCESS) {
+    (*env)->ReleaseStringUTFChars(env, jname, name);
+    jniError("jobj:%p, conn:%p, code:%s", jobj, tsconn, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+  jniDebug("jobj:%p, conn:%p, set stmt bind table name:%s", jobj, tsconn, name);
+  (*env)->ReleaseStringUTFChars(env, jname, name);
+  return JNI_SUCCESS;
+}
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_bindColDataImp(JNIEnv *env, jobject jobj, jlong stmt,
+    jbyteArray colDataList, jbyteArray lengthList, jbyteArray nullList, jint dataType, jint dataBytes, jint numOfRows, jint colIndex, jlong con) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+  TAOS_STMT* pStmt = (TAOS_STMT*) stmt;
+  if (pStmt == NULL) {
+    jniError("jobj:%p, conn:%p, invalid stmt", jobj, tscon);
+    return JNI_SQL_NULL;
+  }
+  // todo refactor
+  jsize len = (*env)->GetArrayLength(env, colDataList);
+  char *colBuf = (char *)calloc(1, len);
+  (*env)->GetByteArrayRegion(env, colDataList, 0, len, (jbyte *)colBuf);
+  if ((*env)->ExceptionCheck(env)) {
+    // todo handle error
+  }
+  len = (*env)->GetArrayLength(env, lengthList);
+  char *lengthArray = (char*) calloc(1, len);
+  (*env)->GetByteArrayRegion(env, lengthList, 0, len, (jbyte*) lengthArray);
+  if ((*env)->ExceptionCheck(env)) {
+  }
+  len = (*env)->GetArrayLength(env, nullList);
+  char *nullArray = (char*) calloc(1, len);
+  (*env)->GetByteArrayRegion(env, nullList, 0, len, (jbyte*) nullArray);
+  if ((*env)->ExceptionCheck(env)) {
+  }
+  // bind multi-rows with only one invoke.
+  TAOS_MULTI_BIND* b = calloc(1, sizeof(TAOS_MULTI_BIND));
+  b->num           = numOfRows;
+  b->buffer_type   = dataType;  // todo check data type
+  b->buffer_length = IS_VAR_DATA_TYPE(dataType)? dataBytes:tDataTypes[dataType].bytes;
+  b->is_null       = nullArray;
+  b->buffer        = colBuf;
+  b->length        = (int32_t*)lengthArray;
+  // set the length and is_null array
+  switch(dataType) {
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_TIMESTAMP:
+    case TSDB_DATA_TYPE_BIGINT: {
+      int32_t bytes = tDataTypes[dataType].bytes;
+      for(int32_t i = 0; i < numOfRows; ++i) {
+        b->length[i]  = bytes;
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_NCHAR:
+    case TSDB_DATA_TYPE_BINARY: {
+      // do nothing
+    }
+  }
+  int32_t code = taos_stmt_bind_single_param_batch(pStmt, b, colIndex);
+  tfree(b->length);
+  tfree(b->buffer);
+  tfree(b->is_null);
+  tfree(b);
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+  return JNI_SUCCESS;
+}
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeBatchImp(JNIEnv *env, jobject jobj, jlong stmt, jlong con) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+  TAOS_STMT *pStmt = (TAOS_STMT*) stmt;
+  if (pStmt == NULL) {
+    jniError("jobj:%p, conn:%p, invalid stmt", jobj, tscon);
+    return JNI_SQL_NULL;
+  }
+  taos_stmt_add_batch(pStmt);
+  int32_t code = taos_stmt_execute(pStmt);
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+  jniDebug("jobj:%p, conn:%p, batch execute", jobj, tscon);
+  return JNI_SUCCESS;
+}
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeStmt(JNIEnv *env, jobject jobj, jlong stmt, jlong con) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection already closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+  TAOS_STMT *pStmt = (TAOS_STMT*) stmt;
+  if (pStmt == NULL) {
+    jniError("jobj:%p, conn:%p, invalid stmt", jobj, tscon);
+    return JNI_SQL_NULL;
+  }
+  int32_t code = taos_stmt_close(pStmt);
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
+    return JNI_TDENGINE_ERROR;
+  }
+  jniDebug("jobj:%p, conn:%p, stmt closed", jobj, tscon);
+  return JNI_SUCCESS;
+}
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -61,7 +61,7 @@ void tscAddIntoSqlList(SSqlObj *pSql) {
  pSql->stime = taosGetTimestampMs();
  pSql->listed = 1;
-  tscDebug("%p added into sqlList", pSql);
+  tscDebug("0x%"PRIx64" added into sqlList", pSql->self);
 }
 void tscSaveSlowQueryFpCb(void *param, TAOS_RES *result, int code) {
@@ -99,12 +99,12 @@ void tscSaveSlowQuery(SSqlObj *pSql) {
    return;
  }
-  tscDebug("%p query time:%" PRId64 " sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
+  tscDebug("0x%"PRIx64" query time:%" PRId64 " sql:%s", pSql->self, 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);
+    tscError("0x%"PRIx64" failed to allocate memory to sent slow query to dnode", pSql->self);
    return;
  }
@@ -141,7 +141,7 @@ void tscRemoveFromSqlList(SSqlObj *pSql) {
  pSql->listed = 0;
  tscSaveSlowQuery(pSql);
-  tscDebug("%p removed from sqlList", pSql);
+  tscDebug("0x%"PRIx64" removed from sqlList", pSql->self);
 }
 void tscKillQuery(STscObj *pObj, uint32_t killId) {
@@ -158,7 +158,7 @@ void tscKillQuery(STscObj *pObj, uint32_t killId) {
  if (pSql == NULL) {
    tscError("failed to kill query, id:%d, it may have completed/terminated", killId);
  } else {
-    tscDebug("%p query is killed, queryId:%d", pSql, killId);
+    tscDebug("0x%"PRIx64" query is killed, queryId:%d", pSql->self, killId);
    taos_stop_query(pSql);
  }
 }
@@ -213,7 +213,7 @@ void tscKillStream(STscObj *pObj, uint32_t killId) {
  pthread_mutex_unlock(&pObj->mutex);
  if (pStream) {
-    tscDebug("%p stream:%p is killed, streamId:%d", pStream->pSql, pStream, killId);
+    tscDebug("0x%"PRIx64" stream:%p is killed, streamId:%d", pStream->pSql->self, pStream, killId);
    if (pStream->callback) {
      pStream->callback(pStream->param);
    }
@@ -250,7 +250,7 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
    pQdesc->queryId = htonl(pSql->queryId);
    //pQdesc->useconds = htobe64(pSql->res.useconds);
    pQdesc->useconds = htobe64(now - pSql->stime);
-    pQdesc->qHandle = htobe64(pSql->res.qhandle);
+    pQdesc->qId = htobe64(pSql->res.qId);
    pHeartbeat->numOfQueries++;
    pQdesc++;
@@ -273,7 +273,7 @@ int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
    pSdesc->num = htobe64(pStream->num);
    pSdesc->useconds = htobe64(pStream->useconds);
-    pSdesc->stime = htobe64(pStream->stime - pStream->interval.interval);
+    pSdesc->stime = (pStream->stime == INT64_MIN) ? htobe64(pStream->stime) : htobe64(pStream->stime - pStream->interval.interval);
    pSdesc->ctime = htobe64(pStream->ctime);
    pSdesc->slidingTime = htobe64(pStream->interval.sliding);

--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -144,8 +144,9 @@ SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) {
  SNewVgroupInfo info = {0};
  info.numOfEps = pVgroupMsg->numOfEps;
  info.vgId     = pVgroupMsg->vgId;
-  info.inUse    = 0;
+  info.inUse    = 0;   // 0 is the default value of inUse in case of multiple replica
+  assert(info.numOfEps >= 1 && info.vgId >= 1);
  for(int32_t i = 0; i < pVgroupMsg->numOfEps; ++i) {
    tstrncpy(info.ep[i].fqdn, pVgroupMsg->epAddr[i].fqdn, TSDB_FQDN_LEN);
    info.ep[i].port = pVgroupMsg->epAddr[i].port;

--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -149,7 +149,7 @@ static SSub* tscCreateSubscription(STscObj* pObj, const char* topic, const char*
  }
  strtolower(pSql->sqlstr, pSql->sqlstr);
-  pRes->qhandle = 0;
+  pRes->qId = 0;
  pRes->numOfRows = 1;
  code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
@@ -224,11 +224,11 @@ static SArray* getTableList( SSqlObj* pSql ) {
  SSqlObj* pNew = taos_query(pSql->pTscObj, sql);
  if (pNew == NULL) {
-    tscError("failed to retrieve table id: cannot create new sql object.");
+    tscError("0x%"PRIx64"failed to retrieve table id: cannot create new sql object.", pSql->self);
    return NULL;
  } else if (taos_errno(pNew) != TSDB_CODE_SUCCESS) {
-    tscError("failed to retrieve table id: %s", tstrerror(taos_errno(pNew)));
+    tscError("0x%"PRIx64"failed to retrieve table id,error: %s", pSql->self, tstrerror(taos_errno(pNew)));
    return NULL;
  }
@@ -284,7 +284,7 @@ static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
  }
  size_t numOfTables = taosArrayGetSize(tables);
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd, 0);
  SArray* progress = taosArrayInit(numOfTables, sizeof(SSubscriptionProgress));
  for( size_t i = 0; i < numOfTables; i++ ) {
    STidTags* tt = taosArrayGet( tables, i );
@@ -304,7 +304,7 @@ static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
  }
  taosArrayDestroy(tables);
-  TSDB_QUERY_SET_TYPE(tscGetQueryInfoDetail(pCmd, 0)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
+  TSDB_QUERY_SET_TYPE(tscGetQueryInfo(pCmd, 0)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
  return 1;
 }
@@ -448,7 +448,7 @@ SSqlObj* recreateSqlObj(SSub* pSub) {
    return NULL;
  }
-  pRes->qhandle = 0;
+  pRes->qId = 0;
  pRes->numOfRows = 1;
  int code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
@@ -487,11 +487,13 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
    if (pSql == NULL) {
      return NULL;
    }
    if (pSub->pSql->self != 0) {
      taosReleaseRef(tscObjRef, pSub->pSql->self);
    } else {
      tscFreeSqlObj(pSub->pSql);
    }
    pSub->pSql = pSql;
    pSql->pSubscription = pSub;
  }
@@ -502,10 +504,20 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
  SSqlRes *pRes = &pSql->res;
  SSqlCmd *pCmd = &pSql->cmd;
  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  SQueryInfo *pQueryInfo = tscGetQueryInfo(pCmd, 0);
-  if (taosArrayGetSize(pSub->progress) > 0) { // fix crash in single tabel subscription
+  if (taosArrayGetSize(pSub->progress) > 0) { // fix crash in single table subscription
-    pQueryInfo->window.skey = ((SSubscriptionProgress*)taosArrayGet(pSub->progress, 0))->key;
-    tscDebug("subscribe:%s set subscribe skey:%"PRId64, pSub->topic, pQueryInfo->window.skey);
+    size_t size = taosArrayGetSize(pSub->progress);
+    TSKEY s = INT64_MAX;
+    for(int32_t i = 0; i < size; ++i) {
+      TSKEY k = ((SSubscriptionProgress*)taosArrayGet(pSub->progress, i))->key;
+      if (s > k) {
+        s = k;
+      }
+    }
+    pQueryInfo->window.skey = s;
+    tscDebug("subscribe:%s set next round subscribe skey:%"PRId64, pSub->topic, pQueryInfo->window.skey);
  }
  if (pSub->pTimer == NULL) {
@@ -536,7 +548,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
    uint32_t type = pQueryInfo->type;
    tscFreeSqlResult(pSql);
    pRes->numOfRows = 1;
-    pRes->qhandle = 0;
+    pRes->qId = 0;
    pSql->cmd.command = TSDB_SQL_SELECT;
    pQueryInfo->type = type;
@@ -545,7 +557,10 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
    pSql->fp = asyncCallback;
    pSql->fetchFp = asyncCallback;
    pSql->param = pSub;
-    tscDoQuery(pSql);
+    pSql->cmd.active = pQueryInfo;
+    executeQuery(pSql, pQueryInfo);
    tsem_wait(&pSub->sem);
    if (pRes->code != TSDB_CODE_SUCCESS) {

--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
--- a/src/common/inc/tcmdtype.h
+++ b/src/common/inc/tcmdtype.h
@@ -51,6 +51,7 @@ enum {
  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_SYNC_DB_REPLICA, "sync db-replica")
  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" )
@@ -79,6 +80,7 @@ enum {
  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_STABLE, "show-create-stable")
  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SHOW_CREATE_DATABASE, "show-create-database")
  /*
@@ -87,13 +89,13 @@ enum {
   */
  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_RESET_CACHE,  "reset-cache" )
-  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SERV_STATUS, "serv-status" )
+  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_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_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_CFG_LOCAL,    "cfg-local" )
  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_MAX, "max" )
 };

--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
--- a/src/common/inc/texpr.h
+++ b/src/common/inc/texpr.h
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
--- a/src/common/inc/tname.h
+++ b/src/common/inc/tname.h
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
--- a/src/common/src/tname.c
+++ b/src/common/src/tname.c
--- a/src/common/src/tvariant.c
+++ b/src/common/src/tvariant.c
--- a/src/connector/C#/TDengineDriver.cs
+++ b/src/connector/C#/TDengineDriver.cs
--- a/src/connector/jdbc/CMakeLists.txt
+++ b/src/connector/jdbc/CMakeLists.txt
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/SavedPreparedStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBParameterMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetWrapper.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/bean/TSDBPreparedParam.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/bean/TSDBPreparedParam.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulParameterMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/NullType.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/OSUtils.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/UtcTimestampUtil.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/UtcTimestampUtil.java
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
--- a/src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver
+++ b/src/connector/jdbc/src/main/resources/META-INF/services/java.sql.Driver
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBJNIConnectorTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBParameterMetaDataTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBResultSetTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DriverAutoloadTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DriverAutoloadTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertDbwithoutUseDbTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertDbwithoutUseDbTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertSpecialCharacterJniTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertSpecialCharacterJniTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertSpecialCharacterRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertSpecialCharacterRestfulTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetForJdbcJniTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetForJdbcJniTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetForJdbcRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetForJdbcRestfulTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TD3841Test.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TD3841Test.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TwoTypeTimestampPercisionInJniTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TwoTypeTimestampPercisionInJniTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TwoTypeTimestampPercisionInRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TwoTypeTimestampPercisionInRestfulTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberJniTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberJniTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberRestfulTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulConnectionTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulConnectionTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDatabaseMetaDataTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulParameterMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulParameterMetaDataTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/OSUtilsTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/OSUtilsTest.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/TimeStampUtil.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/TimeStampUtil.java
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/UtilsTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/UtilsTest.java
--- a/src/connector/odbc/.gitignore
+++ b/src/connector/odbc/.gitignore
--- a/src/connector/odbc/CMakeLists.txt
+++ b/src/connector/odbc/CMakeLists.txt
--- a/src/connector/odbc/README.cn.md
+++ b/src/connector/odbc/README.cn.md
--- a/src/connector/odbc/README.md
+++ b/src/connector/odbc/README.md
--- a/src/connector/odbc/examples/CMakeLists.txt
+++ b/src/connector/odbc/examples/CMakeLists.txt
--- a/src/connector/odbc/examples/c/CMakeLists.txt
+++ b/src/connector/odbc/examples/c/CMakeLists.txt
--- a/src/connector/odbc/tests/main.c
+++ b/src/connector/odbc/tests/main.c
--- a/src/connector/odbc/examples/c/main.cpp
+++ b/src/connector/odbc/examples/c/main.cpp
--- a/src/connector/odbc/examples/go/odbc.go
+++ b/src/connector/odbc/examples/go/odbc.go
--- a/src/connector/odbc/examples/js/.gitignore
+++ b/src/connector/odbc/examples/js/.gitignore
--- a/src/connector/odbc/examples/js/odbc.js
+++ b/src/connector/odbc/examples/js/odbc.js
--- a/src/connector/odbc/examples/js/package.json
+++ b/src/connector/odbc/examples/js/package.json
--- a/src/connector/odbc/examples/lua/odbc.lua
+++ b/src/connector/odbc/examples/lua/odbc.lua
--- a/src/connector/odbc/examples/py/odbc.py
+++ b/src/connector/odbc/examples/py/odbc.py
--- a/src/connector/odbc/examples/rust/.gitignore
+++ b/src/connector/odbc/examples/rust/.gitignore
--- a/src/connector/odbc/examples/rust/main/Cargo.toml
+++ b/src/connector/odbc/examples/rust/main/Cargo.toml
--- a/src/connector/odbc/examples/rust/main/src/main.rs
+++ b/src/connector/odbc/examples/rust/main/src/main.rs
--- a/src/connector/odbc/tests/create_data.stmts
+++ b/src/connector/odbc/tests/create_data.stmts
--- a/src/connector/odbc/tests/query_data.stmts
+++ b/src/connector/odbc/tests/query_data.stmts
--- a/src/connector/odbc/tests/select.stmts
+++ b/src/connector/odbc/tests/select.stmts
--- a/src/connector/odbc/tests/simples.stmts
+++ b/src/connector/odbc/tests/simples.stmts
--- a/src/connector/odbc/src/CMakeLists.txt
+++ b/src/connector/odbc/src/CMakeLists.txt
--- a/src/connector/odbc/src/base.c
+++ b/src/connector/odbc/src/base.c
--- a/src/connector/odbc/src/base.h
+++ b/src/connector/odbc/src/base.h
--- a/src/connector/odbc/src/base/CMakeLists.txt
+++ b/src/connector/odbc/src/base/CMakeLists.txt
--- a/src/connector/odbc/src/base/conn.c
+++ b/src/connector/odbc/src/base/conn.c
--- a/src/connector/odbc/src/base/conn.h
+++ b/src/connector/odbc/src/base/conn.h
--- a/src/connector/odbc/src/base/env.c
+++ b/src/connector/odbc/src/base/env.c
--- a/src/os/src/alpine/alpineEnv.c
+++ b/src/os/src/alpine/alpineEnv.c
--- a/src/connector/odbc/src/base/err.c
+++ b/src/connector/odbc/src/base/err.c
--- a/src/connector/odbc/src/base/err.h
+++ b/src/connector/odbc/src/base/err.h
--- a/src/connector/odbc/src/base/field.c
+++ b/src/connector/odbc/src/base/field.c
--- a/src/connector/odbc/src/base/field.h
+++ b/src/connector/odbc/src/base/field.h
--- a/src/connector/odbc/src/base/null_conn.c
+++ b/src/connector/odbc/src/base/null_conn.c
--- a/src/connector/odbc/src/base/null_conn.h
+++ b/src/connector/odbc/src/base/null_conn.h
--- a/src/connector/odbc/src/base/param.c
+++ b/src/connector/odbc/src/base/param.c
--- a/src/connector/odbc/src/base/param.h
+++ b/src/connector/odbc/src/base/param.h
--- a/src/os/src/darwin/darwinString.c
+++ b/src/os/src/darwin/darwinString.c
--- a/src/connector/odbc/src/base/rs.h
+++ b/src/connector/odbc/src/base/rs.h
--- a/src/connector/odbc/src/base/stmt.c
+++ b/src/connector/odbc/src/base/stmt.c
--- a/src/connector/odbc/src/base/stmt.h
+++ b/src/connector/odbc/src/base/stmt.h
--- a/src/connector/odbc/src/base/tsdb_impl.c
+++ b/src/connector/odbc/src/base/tsdb_impl.c
--- a/src/connector/odbc/src/base/tsdb_impl.h
+++ b/src/connector/odbc/src/base/tsdb_impl.h
--- a/src/connector/odbc/src/col.h
+++ b/src/connector/odbc/src/col.h
--- a/src/connector/odbc/src/install.cmd
+++ b/src/connector/odbc/src/install.cmd
--- a/src/connector/odbc/src/install.sh
+++ b/src/connector/odbc/src/install.sh
--- a/src/connector/odbc/src/todbc.c
+++ b/src/connector/odbc/src/todbc.c
--- a/src/connector/odbc/src/todbc.def
+++ b/src/connector/odbc/src/todbc.def
--- a/src/connector/odbc/src/todbc_buf.c
+++ b/src/connector/odbc/src/todbc_buf.c
--- a/src/connector/odbc/src/todbc_buf.h
+++ b/src/connector/odbc/src/todbc_buf.h
--- a/src/connector/odbc/src/todbc_conv.c
+++ b/src/connector/odbc/src/todbc_conv.c
--- a/src/connector/odbc/src/todbc_conv.h
+++ b/src/connector/odbc/src/todbc_conv.h
--- a/src/connector/odbc/src/todbc_flex.h
+++ b/src/connector/odbc/src/todbc_flex.h
--- a/src/connector/odbc/src/todbc_hash.c
+++ b/src/connector/odbc/src/todbc_hash.c
--- a/src/os/src/darwin/darwinFile.c
+++ b/src/os/src/darwin/darwinFile.c
--- a/src/connector/odbc/src/todbc_iconv.c
+++ b/src/connector/odbc/src/todbc_iconv.c
--- a/src/connector/odbc/src/todbc_iconv.h
+++ b/src/connector/odbc/src/todbc_iconv.h
--- a/src/connector/odbc/src/todbc_list.c
+++ b/src/connector/odbc/src/todbc_list.c
--- a/src/os/inc/osArm64.h
+++ b/src/os/inc/osArm64.h
--- a/src/connector/odbc/src/todbc_log.c
+++ b/src/connector/odbc/src/todbc_log.c
--- a/src/connector/odbc/src/todbc_log.h
+++ b/src/connector/odbc/src/todbc_log.h
--- a/src/connector/odbc/src/todbc_scanner.l
+++ b/src/connector/odbc/src/todbc_scanner.l
--- a/src/connector/odbc/src/todbc_string.c
+++ b/src/connector/odbc/src/todbc_string.c
--- a/src/os/inc/osLinux64.h
+++ b/src/os/inc/osLinux64.h
--- a/src/connector/odbc/src/todbc_tls.c
+++ b/src/connector/odbc/src/todbc_tls.c
--- a/src/connector/odbc/src/todbc_tls.h
+++ b/src/connector/odbc/src/todbc_tls.h
--- a/src/connector/odbc/src/todbc_util.c
+++ b/src/connector/odbc/src/todbc_util.c
--- a/src/connector/odbc/src/todbc_util.h
+++ b/src/connector/odbc/src/todbc_util.h
--- a/src/connector/odbc/tests/CMakeLists.txt
+++ b/src/connector/odbc/tests/CMakeLists.txt
--- a/src/connector/odbc/tests/odbc.py
+++ b/src/connector/odbc/tests/odbc.py
--- a/src/connector/odbc/tools/CMakeLists.txt
+++ b/src/connector/odbc/tools/CMakeLists.txt
--- a/src/connector/odbc/tests/tconv.c
+++ b/src/connector/odbc/tests/tconv.c
--- a/src/connector/python/.gitignore
+++ b/src/connector/python/.gitignore
--- a/src/connector/python/linux/python2/LICENSE
+++ b/src/connector/python/linux/python2/LICENSE
--- a/src/connector/python/README.md
+++ b/src/connector/python/README.md
--- a/src/connector/python/examples/demo.py
+++ b/src/connector/python/examples/demo.py
--- a/src/connector/python/linux/python2
+++ b/src/connector/python/linux/python2
--- a/src/connector/python/linux/python2/README.md
+++ b/src/connector/python/linux/python2/README.md
--- a/src/connector/python/linux/python2/setup.py
+++ b/src/connector/python/linux/python2/setup.py
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
--- a/src/connector/python/linux/python3
+++ b/src/connector/python/linux/python3
--- a/src/connector/python/linux/python3/LICENSE
+++ b/src/connector/python/linux/python3/LICENSE
--- a/src/connector/python/linux/python3/README.md
+++ b/src/connector/python/linux/python3/README.md
--- a/src/connector/python/linux/python3/taos/__init__.py
+++ b/src/connector/python/linux/python3/taos/__init__.py
--- a/src/connector/python/linux/python3/taos/connection.py
+++ b/src/connector/python/linux/python3/taos/connection.py
--- a/src/connector/python/linux/python3/taos/constants.py
+++ b/src/connector/python/linux/python3/taos/constants.py
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
--- a/src/connector/python/linux/python3/taos/dbapi.py
+++ b/src/connector/python/linux/python3/taos/dbapi.py
--- a/src/connector/python/linux/python3/taos/error.py
+++ b/src/connector/python/linux/python3/taos/error.py
--- a/src/connector/python/linux/python3/taos/subscription.py
+++ b/src/connector/python/linux/python3/taos/subscription.py
--- a/src/connector/python/osx/python3
+++ b/src/connector/python/osx/python3
--- a/src/connector/python/osx/python3/LICENSE
+++ b/src/connector/python/osx/python3/LICENSE
--- a/src/connector/python/osx/python3/README.md
+++ b/src/connector/python/osx/python3/README.md
--- a/src/connector/python/osx/python3/setup.py
+++ b/src/connector/python/osx/python3/setup.py
--- a/src/connector/python/osx/python3/taos/__init__.py
+++ b/src/connector/python/osx/python3/taos/__init__.py
--- a/src/connector/python/osx/python3/taos/cinterface.py
+++ b/src/connector/python/osx/python3/taos/cinterface.py
--- a/src/connector/python/osx/python3/taos/connection.py
+++ b/src/connector/python/osx/python3/taos/connection.py
--- a/src/connector/python/osx/python3/taos/constants.py
+++ b/src/connector/python/osx/python3/taos/constants.py
--- a/src/connector/python/osx/python3/taos/cursor.py
+++ b/src/connector/python/osx/python3/taos/cursor.py
--- a/src/connector/python/osx/python3/taos/dbapi.py
+++ b/src/connector/python/osx/python3/taos/dbapi.py
--- a/src/connector/python/osx/python3/taos/error.py
+++ b/src/connector/python/osx/python3/taos/error.py
--- a/src/connector/python/osx/python3/taos/subscription.py
+++ b/src/connector/python/osx/python3/taos/subscription.py
--- a/src/connector/python/linux/python3/setup.py
+++ b/src/connector/python/linux/python3/setup.py
--- a/src/connector/python/linux/python2/taos/__init__.py
+++ b/src/connector/python/linux/python2/taos/__init__.py
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
--- a/src/connector/python/linux/python2/taos/connection.py
+++ b/src/connector/python/linux/python2/taos/connection.py
--- a/src/connector/python/linux/python2/taos/constants.py
+++ b/src/connector/python/linux/python2/taos/constants.py
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
--- a/src/connector/python/linux/python2/taos/dbapi.py
+++ b/src/connector/python/linux/python2/taos/dbapi.py
--- a/src/connector/python/linux/python2/taos/error.py
+++ b/src/connector/python/linux/python2/taos/error.py
--- a/src/connector/python/linux/python2/taos/subscription.py
+++ b/src/connector/python/linux/python2/taos/subscription.py
--- a/src/connector/python/windows/python2
+++ b/src/connector/python/windows/python2
--- a/src/connector/python/windows/python2/LICENSE
+++ b/src/connector/python/windows/python2/LICENSE
--- a/src/connector/python/windows/python2/README.md
+++ b/src/connector/python/windows/python2/README.md
--- a/src/connector/python/windows/python2/setup.py
+++ b/src/connector/python/windows/python2/setup.py
--- a/src/connector/python/windows/python2/taos/__init__.py
+++ b/src/connector/python/windows/python2/taos/__init__.py
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
--- a/src/connector/python/windows/python2/taos/connection.py
+++ b/src/connector/python/windows/python2/taos/connection.py
--- a/src/connector/python/windows/python2/taos/constants.py
+++ b/src/connector/python/windows/python2/taos/constants.py
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
--- a/src/connector/python/windows/python2/taos/dbapi.py
+++ b/src/connector/python/windows/python2/taos/dbapi.py
--- a/src/connector/python/windows/python2/taos/error.py
+++ b/src/connector/python/windows/python2/taos/error.py
--- a/src/connector/python/windows/python2/taos/subscription.py
+++ b/src/connector/python/windows/python2/taos/subscription.py
--- a/src/connector/python/windows/python3
+++ b/src/connector/python/windows/python3
--- a/src/connector/python/windows/python3/LICENSE
+++ b/src/connector/python/windows/python3/LICENSE
--- a/src/connector/python/windows/python3/README.md
+++ b/src/connector/python/windows/python3/README.md
--- a/src/connector/python/windows/python3/setup.py
+++ b/src/connector/python/windows/python3/setup.py
--- a/src/connector/python/windows/python3/taos/__init__.py
+++ b/src/connector/python/windows/python3/taos/__init__.py
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
--- a/src/connector/python/windows/python3/taos/connection.py
+++ b/src/connector/python/windows/python3/taos/connection.py
--- a/src/connector/python/windows/python3/taos/constants.py
+++ b/src/connector/python/windows/python3/taos/constants.py
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
--- a/src/connector/python/windows/python3/taos/dbapi.py
+++ b/src/connector/python/windows/python3/taos/dbapi.py
--- a/src/connector/python/windows/python3/taos/error.py
+++ b/src/connector/python/windows/python3/taos/error.py
--- a/src/connector/python/windows/python3/taos/subscription.py
+++ b/src/connector/python/windows/python3/taos/subscription.py
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
--- a/src/cq/test/cqtest.c
+++ b/src/cq/test/cqtest.c
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
--- a/src/dnode/src/dnodeCfg.c
+++ b/src/dnode/src/dnodeCfg.c
--- a/src/dnode/src/dnodeEps.c
+++ b/src/dnode/src/dnodeEps.c
--- a/src/dnode/src/dnodeMInfos.c
+++ b/src/dnode/src/dnodeMInfos.c
--- a/src/dnode/src/dnodeMWrite.c
+++ b/src/dnode/src/dnodeMWrite.c
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
--- a/src/dnode/src/dnodePeer.c
+++ b/src/dnode/src/dnodePeer.c
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
--- a/src/dnode/src/dnodeVMgmt.c
+++ b/src/dnode/src/dnodeVMgmt.c
--- a/src/dnode/src/dnodeVWrite.c
+++ b/src/dnode/src/dnodeVWrite.c
--- a/src/dnode/src/dnodeVnodes.c
+++ b/src/dnode/src/dnodeVnodes.c
--- a/src/os/inc/osCommon.h
+++ b/src/os/inc/osCommon.h
--- a/src/inc/query.h
+++ b/src/inc/query.h
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
--- a/src/inc/tcq.h
+++ b/src/inc/tcq.h
--- a/src/inc/tfs.h
+++ b/src/inc/tfs.h
--- a/src/os/src/windows/wGodll.c
+++ b/src/os/src/windows/wGodll.c
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
--- a/src/inc/tsync.h
+++ b/src/inc/tsync.h
--- a/src/inc/ttokendef.h
+++ b/src/inc/ttokendef.h
--- a/src/inc/ttype.h
+++ b/src/inc/ttype.h
--- a/src/inc/twal.h
+++ b/src/inc/twal.h
--- a/src/inc/vnode.h
+++ b/src/inc/vnode.h
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
--- a/src/kit/shell/src/shellCheck.c
+++ b/src/kit/shell/src/shellCheck.c
--- a/src/kit/shell/src/shellCommand.c
+++ b/src/kit/shell/src/shellCommand.c
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
--- a/src/kit/taosdemo/insert-interlace.json
+++ b/src/kit/taosdemo/insert-interlace.json
--- a/src/kit/taosdemo/insert.json
+++ b/src/kit/taosdemo/insert.json
--- a/src/kit/taosdemo/query.json
+++ b/src/kit/taosdemo/query.json
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
--- a/src/mnode/inc/mnodeDb.h
+++ b/src/mnode/inc/mnodeDb.h
--- a/src/mnode/inc/mnodeDef.h
+++ b/src/mnode/inc/mnodeDef.h
--- a/src/mnode/inc/mnodeVgroup.h
+++ b/src/mnode/inc/mnodeVgroup.h
--- a/src/mnode/src/mnodeDb.c
+++ b/src/mnode/src/mnodeDb.c
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
--- a/src/mnode/src/mnodeMnode.c
+++ b/src/mnode/src/mnodeMnode.c
--- a/src/mnode/src/mnodeProfile.c
+++ b/src/mnode/src/mnodeProfile.c
--- a/src/mnode/src/mnodeSdb.c
+++ b/src/mnode/src/mnodeSdb.c
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
--- a/src/mnode/src/mnodeUser.c
+++ b/src/mnode/src/mnodeUser.c
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
--- a/src/os/inc/os.h
+++ b/src/os/inc/os.h
--- a/src/os/inc/osArm32.h
+++ b/src/os/inc/osArm32.h
--- a/src/os/inc/osAtomic.h
+++ b/src/os/inc/osAtomic.h
--- a/src/os/inc/osDarwin.h
+++ b/src/os/inc/osDarwin.h
--- a/src/os/inc/osDef.h
+++ b/src/os/inc/osDef.h
--- a/src/os/inc/osDir.h
+++ b/src/os/inc/osDir.h
--- a/src/os/inc/eok.h
+++ b/src/os/inc/eok.h
--- a/src/os/inc/osFile.h
+++ b/src/os/inc/osFile.h
--- a/src/os/inc/osAlpine.h
+++ b/src/os/inc/osAlpine.h
--- a/src/os/inc/osLinux32.h
+++ b/src/os/inc/osLinux32.h
--- a/src/os/inc/osLz4.h
+++ b/src/os/inc/osLz4.h
--- a/src/os/inc/osMath.h
+++ b/src/os/inc/osMath.h
--- a/src/os/inc/osMemory.h
+++ b/src/os/inc/osMemory.h
--- a/src/os/inc/osNingsi.h
+++ b/src/os/inc/osNingsi.h
--- a/src/os/inc/osRand.h
+++ b/src/os/inc/osRand.h
--- a/src/os/inc/osSemphone.h
+++ b/src/os/inc/osSemphone.h
--- a/src/os/inc/osSignal.h
+++ b/src/os/inc/osSignal.h
--- a/src/os/inc/osSleep.h
+++ b/src/os/inc/osSleep.h
--- a/src/os/inc/osSocket.h
+++ b/src/os/inc/osSocket.h
--- a/src/os/inc/osString.h
+++ b/src/os/inc/osString.h
--- a/src/os/inc/osSysinfo.h
+++ b/src/os/inc/osSysinfo.h
--- a/src/os/inc/osTime.h
+++ b/src/os/inc/osTime.h
--- a/src/os/inc/osTimer.h
+++ b/src/os/inc/osTimer.h
--- a/src/os/inc/osWindows.h
+++ b/src/os/inc/osWindows.h
--- a/src/os/src/alpine/CMakeLists.txt
+++ b/src/os/src/alpine/CMakeLists.txt
--- a/src/os/src/darwin/CMakeLists.txt
+++ b/src/os/src/darwin/CMakeLists.txt
--- a/src/os/src/darwin/darwinEnv.c
+++ b/src/os/src/darwin/darwinEnv.c
--- a/src/os/src/darwin/eok.c
+++ b/src/os/src/darwin/eok.c
--- a/src/os/src/darwin/darwinSemphone.c
+++ b/src/os/src/darwin/darwinSemphone.c
--- a/src/os/src/darwin/darwinSocket.c
+++ b/src/os/src/darwin/darwinSocket.c
--- a/src/os/src/darwin/darwinSysInfo.c
+++ b/src/os/src/darwin/darwinSysInfo.c
--- a/src/os/src/darwin/darwinTimer.c
+++ b/src/os/src/darwin/darwinTimer.c
--- a/src/os/src/detail/CMakeLists.txt
+++ b/src/os/src/detail/CMakeLists.txt
--- a/src/os/src/linux/ningsi.c
+++ b/src/os/src/linux/ningsi.c
--- a/src/os/src/detail/osDir.c
+++ b/src/os/src/detail/osDir.c
--- a/src/os/src/detail/osFile.c
+++ b/src/os/src/detail/osFile.c
--- a/src/os/src/detail/osRand.c
+++ b/src/os/src/detail/osRand.c
--- a/src/os/src/detail/osSemphone.c
+++ b/src/os/src/detail/osSemphone.c
--- a/src/os/src/detail/osSignal.c
+++ b/src/os/src/detail/osSignal.c
--- a/src/os/src/detail/osSleep.c
+++ b/src/os/src/detail/osSleep.c
--- a/src/os/src/detail/osSocket.c
+++ b/src/os/src/detail/osSocket.c
--- a/src/os/src/detail/osString.c
+++ b/src/os/src/detail/osString.c
--- a/src/os/src/detail/osSysinfo.c
+++ b/src/os/src/detail/osSysinfo.c
--- a/src/os/src/detail/osTimer.c
+++ b/src/os/src/detail/osTimer.c
--- a/src/os/src/linux/CMakeLists.txt
+++ b/src/os/src/linux/CMakeLists.txt
--- a/src/os/src/linux/linuxEnv.c
+++ b/src/os/src/linux/linuxEnv.c
--- a/src/os/src/windows/CMakeLists.txt
+++ b/src/os/src/windows/CMakeLists.txt
--- a/src/os/src/windows/wFile.c
+++ b/src/os/src/windows/wFile.c
--- a/src/os/src/windows/wGetline.c
+++ b/src/os/src/windows/wGetline.c
--- a/src/os/src/windows/wSocket.c
+++ b/src/os/src/windows/wSocket.c
--- a/src/os/src/windows/wString.c
+++ b/src/os/src/windows/wString.c
--- a/src/os/src/windows/wSysinfo.c
+++ b/src/os/src/windows/wSysinfo.c
--- a/src/os/src/windows/wTimer.c
+++ b/src/os/src/windows/wTimer.c
--- a/src/os/tests/CMakeLists.txt
+++ b/src/os/tests/CMakeLists.txt
--- a/src/os/tests/test.cpp
+++ b/src/os/tests/test.cpp
--- a/src/plugins/http/inc/httpContext.h
+++ b/src/plugins/http/inc/httpContext.h
--- a/src/plugins/http/inc/httpInt.h
+++ b/src/plugins/http/inc/httpInt.h
--- a/src/plugins/http/inc/httpJson.h
+++ b/src/plugins/http/inc/httpJson.h
--- a/src/plugins/http/src/httpContext.c
+++ b/src/plugins/http/src/httpContext.c
--- a/src/plugins/http/src/httpHandle.c
+++ b/src/plugins/http/src/httpHandle.c
--- a/src/plugins/http/src/httpJson.c
+++ b/src/plugins/http/src/httpJson.c
--- a/src/plugins/http/src/httpParser.c
+++ b/src/plugins/http/src/httpParser.c
--- a/src/plugins/http/src/httpRestJson.c
+++ b/src/plugins/http/src/httpRestJson.c
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
--- a/src/plugins/monitor/src/monMain.c
+++ b/src/plugins/monitor/src/monMain.c
--- a/src/query/inc/qAggMain.h
+++ b/src/query/inc/qAggMain.h
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
--- a/src/query/inc/qExtbuffer.h
+++ b/src/query/inc/qExtbuffer.h
--- a/src/query/inc/qFill.h
+++ b/src/query/inc/qFill.h
--- a/src/query/inc/qPlan.h
+++ b/src/query/inc/qPlan.h
--- a/src/query/inc/qResultbuf.h
+++ b/src/query/inc/qResultbuf.h
--- a/src/query/inc/qSqlparser.h
+++ b/src/query/inc/qSqlparser.h
--- a/src/query/inc/qTsbuf.h
+++ b/src/query/inc/qTsbuf.h
--- a/src/query/inc/qUtil.h
+++ b/src/query/inc/qUtil.h
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
--- a/src/query/src/qExtbuffer.c
+++ b/src/query/src/qExtbuffer.c
--- a/src/query/src/qFill.c
+++ b/src/query/src/qFill.c
--- a/src/query/src/qFilterfunc.c
+++ b/src/query/src/qFilterfunc.c
--- a/src/query/src/qPercentile.c
+++ b/src/query/src/qPercentile.c
--- a/src/query/src/qPlan.c
+++ b/src/query/src/qPlan.c
--- a/src/query/src/qResultbuf.c
+++ b/src/query/src/qResultbuf.c
--- a/src/query/src/qParserImpl.c
+++ b/src/query/src/qParserImpl.c
--- a/src/query/src/qTokenizer.c
+++ b/src/query/src/qTokenizer.c
--- a/src/query/src/qTsbuf.c
+++ b/src/query/src/qTsbuf.c
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
--- a/src/query/src/queryMain.c
+++ b/src/query/src/queryMain.c
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
--- a/src/query/tests/percentileTest.cpp
+++ b/src/query/tests/percentileTest.cpp
--- a/src/query/tests/resultBufferTest.cpp
+++ b/src/query/tests/resultBufferTest.cpp
--- a/src/query/tests/unitTest.cpp
+++ b/src/query/tests/unitTest.cpp
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
--- a/src/rpc/test/rserver.c
+++ b/src/rpc/test/rserver.c
--- a/src/sync/CMakeLists.txt
+++ b/src/sync/CMakeLists.txt
--- a/src/sync/inc/syncInt.h
+++ b/src/sync/inc/syncInt.h
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
--- a/src/sync/src/syncRetrieve.c
+++ b/src/sync/src/syncRetrieve.c
--- a/src/tfs/inc/tfsint.h
+++ b/src/tfs/inc/tfsint.h
--- a/src/tfs/src/tdisk.c
+++ b/src/tfs/src/tdisk.c
--- a/src/tfs/src/tfs.c
+++ b/src/tfs/src/tfs.c
--- a/src/tfs/src/ttier.c
+++ b/src/tfs/src/ttier.c
--- a/src/tsdb/inc/tsdbFile.h
+++ b/src/tsdb/inc/tsdbFile.h
--- a/src/tsdb/inc/tsdbMemTable.h
+++ b/src/tsdb/inc/tsdbMemTable.h
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
--- a/src/tsdb/src/tsdbFS.c
+++ b/src/tsdb/src/tsdbFS.c
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
--- a/src/tsdb/src/tsdbSync.c
+++ b/src/tsdb/src/tsdbSync.c
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
--- a/src/util/inc/tarray.h
+++ b/src/util/inc/tarray.h
--- a/src/util/inc/tbuffer.h
+++ b/src/util/inc/tbuffer.h
--- a/src/util/inc/tchecksum.h
+++ b/src/util/inc/tchecksum.h
--- a/src/util/inc/tidpool.h
+++ b/src/util/inc/tidpool.h
--- a/src/util/inc/tsocket.h
+++ b/src/util/inc/tsocket.h
--- a/src/util/inc/tstoken.h
+++ b/src/util/inc/tstoken.h
--- a/src/util/src/exception.c
+++ b/src/util/src/exception.c
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
--- a/src/util/src/tbase64.c
+++ b/src/util/src/tbase64.c
--- a/src/util/src/tbuffer.c
+++ b/src/util/src/tbuffer.c
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
--- a/src/util/src/tcrc32c.c
+++ b/src/util/src/tcrc32c.c
--- a/src/util/src/tdes.c
+++ b/src/util/src/tdes.c
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
--- a/src/util/src/tfile.c
+++ b/src/util/src/tfile.c
--- a/src/util/src/thashutil.c
+++ b/src/util/src/thashutil.c
--- a/src/util/src/tidpool.c
+++ b/src/util/src/tidpool.c
--- a/src/util/src/tlist.c
+++ b/src/util/src/tlist.c
--- a/src/util/src/tlockfree.c
+++ b/src/util/src/tlockfree.c
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
--- a/src/util/src/tlosertree.c
+++ b/src/util/src/tlosertree.c
--- a/src/util/src/tmd5.c
+++ b/src/util/src/tmd5.c
--- a/src/util/src/tnettest.c
+++ b/src/util/src/tnettest.c
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
--- a/src/util/tests/CMakeLists.txt
+++ b/src/util/tests/CMakeLists.txt
--- a/src/vnode/inc/vnodeBackup.h
+++ b/src/vnode/inc/vnodeBackup.h
--- a/src/vnode/inc/vnodeInt.h
+++ b/src/vnode/inc/vnodeInt.h
--- a/src/vnode/inc/vnodeMain.h
+++ b/src/vnode/inc/vnodeMain.h
--- a/src/vnode/inc/vnodeSync.h
+++ b/src/vnode/inc/vnodeSync.h
--- a/src/vnode/src/vnodeBackup.c
+++ b/src/vnode/src/vnodeBackup.c
--- a/src/vnode/src/vnodeCfg.c
+++ b/src/vnode/src/vnodeCfg.c
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
--- a/src/vnode/src/vnodeMgmt.c
+++ b/src/vnode/src/vnodeMgmt.c
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
--- a/src/vnode/src/vnodeStatus.c
+++ b/src/vnode/src/vnodeStatus.c
--- a/src/vnode/src/vnodeSync.c
+++ b/src/vnode/src/vnodeSync.c
--- a/src/vnode/src/vnodeVersion.c
+++ b/src/vnode/src/vnodeVersion.c
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
--- a/src/wal/src/walMgmt.c
+++ b/src/wal/src/walMgmt.c
--- a/src/wal/src/walWrite.c
+++ b/src/wal/src/walWrite.c
--- a/src/wal/test/CMakeLists.txt
+++ b/src/wal/test/CMakeLists.txt
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
--- a/tests/comparisonTest/cassandra/cassandratest/pom.xml
+++ b/tests/comparisonTest/cassandra/cassandratest/pom.xml
--- a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
--- a/tests/examples/C#/C#checker/C#checker.cs
+++ b/tests/examples/C#/C#checker/C#checker.cs
--- a/tests/examples/C#/TDengineDriver.cs
+++ b/tests/examples/C#/TDengineDriver.cs
--- a/tests/examples/C#/TDengineTest.cs
+++ b/tests/examples/C#/TDengineTest.cs
--- a/tests/examples/C#/taosdemo/TDengineDriver.cs
+++ b/tests/examples/C#/taosdemo/TDengineDriver.cs
--- a/tests/examples/C#/taosdemo/taosdemo.cs
+++ b/tests/examples/C#/taosdemo/taosdemo.cs
--- a/tests/examples/JDBC/JDBCDemo/pom.xml
+++ b/tests/examples/JDBC/JDBCDemo/pom.xml
--- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java
--- a/tests/examples/JDBC/springbootdemo/pom.xml
+++ b/tests/examples/JDBC/springbootdemo/pom.xml
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/domain/Weather.java
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SqlExecuteTask.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SqlExecuteTask.java
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/Printer.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/utils/Printer.java
--- a/tests/examples/JDBC/taosdemo/src/main/resources/insert.json
+++ b/tests/examples/JDBC/taosdemo/src/main/resources/insert.json
--- a/tests/examples/c/apitest.c
+++ b/tests/examples/c/apitest.c
--- a/tests/examples/c/asyncdemo.c
+++ b/tests/examples/c/asyncdemo.c
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
--- a/tests/examples/c/epoll.c
+++ b/tests/examples/c/epoll.c
--- a/tests/examples/c/makefile
+++ b/tests/examples/c/makefile
--- a/tests/examples/go/taosdemo.go
+++ b/tests/examples/go/taosdemo.go
--- a/tests/examples/lua/README.md
+++ b/tests/examples/lua/README.md
--- a/tests/examples/lua/benchmark.lua
+++ b/tests/examples/lua/benchmark.lua
--- a/tests/examples/lua/build.sh
+++ b/tests/examples/lua/build.sh
--- a/tests/examples/lua/lua51/build.sh
+++ b/tests/examples/lua/lua51/build.sh
--- a/tests/examples/lua/lua_connector.c
+++ b/tests/examples/lua/lua_connector.c
--- a/tests/perftest-scripts/perftest-query.sh
+++ b/tests/perftest-scripts/perftest-query.sh
--- a/tests/perftest-scripts/perftest-taosdemo-compare.sh
+++ b/tests/perftest-scripts/perftest-taosdemo-compare.sh
--- a/tests/pytest/alter/alterTabAddTagWithNULL.py
+++ b/tests/pytest/alter/alterTabAddTagWithNULL.py
--- a/tests/pytest/alter/alterTimestampColDataProcess.py
+++ b/tests/pytest/alter/alterTimestampColDataProcess.py
--- a/tests/pytest/client/thousandsofClient.py
+++ b/tests/pytest/client/thousandsofClient.py
--- a/tests/pytest/client/version.py
+++ b/tests/pytest/client/version.py
--- a/tests/pytest/cluster/TD-3693/how-to-use
+++ b/tests/pytest/cluster/TD-3693/how-to-use
--- a/tests/pytest/cluster/TD-3693/insert1Data.json
+++ b/tests/pytest/cluster/TD-3693/insert1Data.json
--- a/tests/pytest/cluster/TD-3693/insert2Data.json
+++ b/tests/pytest/cluster/TD-3693/insert2Data.json
--- a/tests/pytest/cluster/TD-3693/multClient.py
+++ b/tests/pytest/cluster/TD-3693/multClient.py
--- a/tests/pytest/cluster/TD-3693/multQuery.py
+++ b/tests/pytest/cluster/TD-3693/multQuery.py
--- a/tests/pytest/cluster/TD-3693/queryCount.json
+++ b/tests/pytest/cluster/TD-3693/queryCount.json
--- a/tests/pytest/cluster/clusterEnvSetup/basic.py
+++ b/tests/pytest/cluster/clusterEnvSetup/basic.py
--- a/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
+++ b/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
--- a/tests/pytest/cluster/clusterEnvSetup/node4.yml
+++ b/tests/pytest/cluster/clusterEnvSetup/node4.yml
--- a/tests/pytest/cluster/clusterEnvSetup/node5.yml
+++ b/tests/pytest/cluster/clusterEnvSetup/node5.yml
--- a/tests/pytest/cluster/clusterSetup.py
+++ b/tests/pytest/cluster/clusterSetup.py
--- a/tests/pytest/concurrent_inquiry.sh
+++ b/tests/pytest/concurrent_inquiry.sh
--- a/tests/pytest/crash_gen/README.md
+++ b/tests/pytest/crash_gen/README.md
--- a/tests/pytest/crash_gen/crash_gen_main.py
+++ b/tests/pytest/crash_gen/crash_gen_main.py
--- a/tests/pytest/crash_gen/db.py
+++ b/tests/pytest/crash_gen/db.py
--- a/tests/pytest/crash_gen/misc.py
+++ b/tests/pytest/crash_gen/misc.py
--- a/tests/pytest/crash_gen/service_manager.py
+++ b/tests/pytest/crash_gen/service_manager.py
--- a/tests/pytest/crash_gen/settings.py
+++ b/tests/pytest/crash_gen/settings.py
--- a/tests/pytest/crash_gen/valgrind_taos.supp
+++ b/tests/pytest/crash_gen/valgrind_taos.supp
--- a/tests/pytest/cluster/clusterEnvSetup/Dockerfile
+++ b/tests/pytest/cluster/clusterEnvSetup/Dockerfile
--- a/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
+++ b/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
--- a/tests/pytest/dockerCluster/__init__.py
+++ b/tests/pytest/dockerCluster/__init__.py
--- a/tests/pytest/dockerCluster/basic.py
+++ b/tests/pytest/dockerCluster/basic.py
--- a/tests/pytest/dockerCluster/buildClusterEnv.sh
+++ b/tests/pytest/dockerCluster/buildClusterEnv.sh
--- a/tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
+++ b/tests/pytest/cluster/clusterEnvSetup/docker-compose.yml
--- a/tests/pytest/cluster/clusterEnvSetup/insert.json
+++ b/tests/pytest/cluster/clusterEnvSetup/insert.json
--- a/tests/pytest/cluster/clusterEnvSetup/node3.yml
+++ b/tests/pytest/cluster/clusterEnvSetup/node3.yml
--- a/tests/pytest/cluster/clusterEnvSetup/taosdemoWrapper.py
+++ b/tests/pytest/cluster/clusterEnvSetup/taosdemoWrapper.py
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
--- a/tests/pytest/functions/function_count_last_stab.py
+++ b/tests/pytest/functions/function_count_last_stab.py
--- a/tests/pytest/functions/function_operations.py
+++ b/tests/pytest/functions/function_operations.py
--- a/tests/pytest/functions/function_operations_restart.py
+++ b/tests/pytest/functions/function_operations_restart.py
--- a/tests/pytest/functions/function_percentile2.py
+++ b/tests/pytest/functions/function_percentile2.py
--- a/tests/pytest/functions/function_stddev.py
+++ b/tests/pytest/functions/function_stddev.py
--- a/tests/pytest/handle_crash_gen_val_log.sh
+++ b/tests/pytest/handle_crash_gen_val_log.sh
--- a/tests/pytest/handle_taosd_val_log.sh
+++ b/tests/pytest/handle_taosd_val_log.sh
--- a/tests/pytest/import_merge/importDataLastS.py
+++ b/tests/pytest/import_merge/importDataLastS.py
--- a/tests/pytest/insert/basic.py
+++ b/tests/pytest/insert/basic.py
--- a/tests/pytest/insert/boundary2.py
+++ b/tests/pytest/insert/boundary2.py
--- a/tests/pytest/insert/bug3654.py
+++ b/tests/pytest/insert/bug3654.py
--- a/tests/pytest/insert/insertDynamicColBeforeVal.py
+++ b/tests/pytest/insert/insertDynamicColBeforeVal.py
--- a/tests/pytest/insert/metadataUpdate.py
+++ b/tests/pytest/insert/metadataUpdate.py
--- a/tests/pytest/perfbenchmark/bug3433.py
+++ b/tests/pytest/perfbenchmark/bug3433.py
--- a/tests/pytest/perfbenchmark/bug3589.py
+++ b/tests/pytest/perfbenchmark/bug3589.py
--- a/tests/pytest/perfbenchmark/joinPerformance.py
+++ b/tests/pytest/perfbenchmark/joinPerformance.py
--- a/tests/pytest/pytest_1.sh
+++ b/tests/pytest/pytest_1.sh
--- a/tests/pytest/pytest_2.sh
+++ b/tests/pytest/pytest_2.sh
--- a/tests/pytest/pytest_3.sh
+++ b/tests/pytest/pytest_3.sh
--- a/tests/pytest/pytest_4.sh
+++ b/tests/pytest/pytest_4.sh
--- a/tests/pytest/query/bug3351.py
+++ b/tests/pytest/query/bug3351.py
--- a/tests/pytest/query/bug3375.py
+++ b/tests/pytest/query/bug3375.py
--- a/tests/pytest/query/computeErrorinWhere.py
+++ b/tests/pytest/query/computeErrorinWhere.py
--- a/tests/pytest/query/filter.py
+++ b/tests/pytest/query/filter.py
--- a/tests/pytest/query/query1970YearsAf.py
+++ b/tests/pytest/query/query1970YearsAf.py
--- a/tests/pytest/query/queryBetweenAnd.py
+++ b/tests/pytest/query/queryBetweenAnd.py
--- a/tests/pytest/query/queryFilterTswithDateUnit.py
+++ b/tests/pytest/query/queryFilterTswithDateUnit.py
--- a/tests/pytest/query/queryGroupbySort.py
+++ b/tests/pytest/query/queryGroupbySort.py
--- a/tests/pytest/query/queryJoin10tables.py
+++ b/tests/pytest/query/queryJoin10tables.py
--- a/tests/pytest/query/queryNormal.py
+++ b/tests/pytest/query/queryNormal.py
--- a/tests/pytest/query/querySecondtscolumnTowherenow.py
+++ b/tests/pytest/query/querySecondtscolumnTowherenow.py
--- a/tests/pytest/query/queryStddevWithGroupby.py
+++ b/tests/pytest/query/queryStddevWithGroupby.py
--- a/tests/pytest/query/queryTscomputWithNow.py
+++ b/tests/pytest/query/queryTscomputWithNow.py
--- a/tests/pytest/query/queryTsisNull.py
+++ b/tests/pytest/query/queryTsisNull.py
--- a/tests/pytest/query/unionAllTest.py
+++ b/tests/pytest/query/unionAllTest.py
--- a/tests/pytest/smoketest.sh
+++ b/tests/pytest/smoketest.sh
--- a/tests/pytest/stream/cqSupportBefore1970.py
+++ b/tests/pytest/stream/cqSupportBefore1970.py
--- a/tests/pytest/stream/new.py
+++ b/tests/pytest/stream/new.py
--- a/tests/pytest/stream/showStreamExecTimeisNull.py
+++ b/tests/pytest/stream/showStreamExecTimeisNull.py
--- a/tests/pytest/stream/stream2.py
+++ b/tests/pytest/stream/stream2.py
--- a/tests/pytest/stream/sys.py
+++ b/tests/pytest/stream/sys.py
--- a/tests/pytest/tools/insert-interlace.json
+++ b/tests/pytest/tools/insert-interlace.json
--- a/tests/pytest/tools/insert-tblimit-tboffset-createdb.json
+++ b/tests/pytest/tools/insert-tblimit-tboffset-createdb.json
--- a/tests/pytest/tools/insert-tblimit-tboffset-insertrec.json
+++ b/tests/pytest/tools/insert-tblimit-tboffset-insertrec.json
--- a/tests/pytest/tools/insert-tblimit-tboffset.json
+++ b/tests/pytest/tools/insert-tblimit-tboffset.json
--- a/tests/pytest/tools/insert-tblimit-tboffset0.json
+++ b/tests/pytest/tools/insert-tblimit-tboffset0.json
--- a/tests/pytest/tools/insert-tblimit1-tboffset.json
+++ b/tests/pytest/tools/insert-tblimit1-tboffset.json
--- a/tests/pytest/tools/insert.json
+++ b/tests/pytest/tools/insert.json
--- a/tests/pytest/tools/query.json
+++ b/tests/pytest/tools/query.json
--- a/tests/pytest/tools/sampledata.csv
+++ b/tests/pytest/tools/sampledata.csv
--- a/tests/pytest/tools/taosdemo-sampledata.json
+++ b/tests/pytest/tools/taosdemo-sampledata.json
--- a/tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.json
+++ b/tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.json
--- a/tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.py
+++ b/tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.py
--- a/tests/pytest/tools/taosdemoAllTest/TD-3453/queryall.json
+++ b/tests/pytest/tools/taosdemoAllTest/TD-3453/queryall.json
--- a/tests/pytest/tools/taosdemoAllTest/convertResFile.py
+++ b/tests/pytest/tools/taosdemoAllTest/convertResFile.py
--- a/tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-1s1tntmr.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-1s1tntmr.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-disorder.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-disorder.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-illegal.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-illegal.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-interlace-row.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-interlace-row.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-interval-speed.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-interval-speed.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-newdb.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-newdb.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-newtable.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-newtable.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-nodbnodrop.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-nodbnodrop.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-offset.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-offset.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-renewdb.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-renewdb.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-sample.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-sample.json
--- a/tests/pytest/tools/taosdemoAllTest/insert-timestep.json
+++ b/tests/pytest/tools/taosdemoAllTest/insert-timestep.json
--- a/tests/pytest/tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar16384.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar16384.json
--- a/tests/pytest/tools/taosdemoAllTest/insertChildTab0.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertChildTab0.json
--- a/tests/pytest/tools/taosdemoAllTest/insertChildTabLess0.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertChildTabLess0.json
--- a/tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNum1024.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNum1024.json
--- a/tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNumLarge1024.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNumLarge1024.json
--- a/tests/pytest/tools/taosdemoAllTest/insertColumnsNum0.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertColumnsNum0.json
--- a/tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReq0.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReq0.json
--- a/tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json
--- a/tests/pytest/tools/taosdemoAllTest/insertSigcolumnsNum1024.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertSigcolumnsNum1024.json
--- a/tests/pytest/tools/taosdemoAllTest/insertTagsNumLarge128.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertTagsNumLarge128.json
--- a/tests/pytest/tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json
+++ b/tests/pytest/tools/taosdemoAllTest/insertTimestepMulRowsLargeint16.json
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py
+++ b/tests/pytest/tools/taosdemoAllTest/moredemo-insert-offset.py
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit1.json
+++ b/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit1.json
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit5.json
+++ b/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit5.json
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit94.json
+++ b/tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit94.json
--- a/tests/pytest/tools/taosdemoAllTest/moredemo-offset-newdb.json
+++ b/tests/pytest/tools/taosdemoAllTest/moredemo-offset-newdb.json
--- a/tests/pytest/tools/taosdemoAllTest/query-interrupt.json
+++ b/tests/pytest/tools/taosdemoAllTest/query-interrupt.json
--- a/tests/pytest/tools/taosdemoAllTest/query-interrupt.py
+++ b/tests/pytest/tools/taosdemoAllTest/query-interrupt.py
--- a/tests/pytest/tools/taosdemoAllTest/queryQps.json
+++ b/tests/pytest/tools/taosdemoAllTest/queryQps.json
--- a/tests/pytest/tools/taosdemoAllTest/querySpeciMutisql100.json
+++ b/tests/pytest/tools/taosdemoAllTest/querySpeciMutisql100.json
--- a/tests/pytest/tools/taosdemoAllTest/querySuperMutisql100.json
+++ b/tests/pytest/tools/taosdemoAllTest/querySuperMutisql100.json
--- a/tests/pytest/tools/taosdemoAllTest/queryall.json
+++ b/tests/pytest/tools/taosdemoAllTest/queryall.json
--- a/tests/pytest/tools/taosdemoAllTest/sample.csv
+++ b/tests/pytest/tools/taosdemoAllTest/sample.csv
--- a/tests/pytest/tools/taosdemoAllTest/speciQueryInsertdata.json
+++ b/tests/pytest/tools/taosdemoAllTest/speciQueryInsertdata.json
--- a/tests/pytest/tools/taosdemoAllTest/speciQueryRestful.json
+++ b/tests/pytest/tools/taosdemoAllTest/speciQueryRestful.json
--- a/tests/pytest/tools/taosdemoAllTest/speciQueryTaosc.json
+++ b/tests/pytest/tools/taosdemoAllTest/speciQueryTaosc.json
--- a/tests/pytest/tools/taosdemoAllTest/sub.json
+++ b/tests/pytest/tools/taosdemoAllTest/sub.json
--- a/tests/pytest/tools/taosdemoAllTest/subInsertdata.json
+++ b/tests/pytest/tools/taosdemoAllTest/subInsertdata.json
--- a/tests/pytest/tools/taosdemoAllTest/tags.csv
+++ b/tests/pytest/tools/taosdemoAllTest/tags.csv
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py
--- a/tests/pytest/tools/taosdemoPerformance.py
+++ b/tests/pytest/tools/taosdemoPerformance.py
--- a/tests/pytest/tools/taosdemoTest.py
+++ b/tests/pytest/tools/taosdemoTest.py
--- a/tests/pytest/tools/taosdemoTestInterlace.py
+++ b/tests/pytest/tools/taosdemoTestInterlace.py
--- a/tests/pytest/tools/taosdemoTestLimitOffset.py
+++ b/tests/pytest/tools/taosdemoTestLimitOffset.py
--- a/tests/pytest/tools/taosdemoTestQuery.py
+++ b/tests/pytest/tools/taosdemoTestQuery.py
--- a/tests/pytest/tools/taosdemoTestSampleData.py
+++ b/tests/pytest/tools/taosdemoTestSampleData.py
--- a/tests/pytest/tools/taosdemoTest2.py
+++ b/tests/pytest/tools/taosdemoTest2.py
--- a/tests/pytest/tools/lowaTest.py
+++ b/tests/pytest/tools/lowaTest.py
--- a/tests/pytest/tools/taosdemoTestWithoutMetric.py
+++ b/tests/pytest/tools/taosdemoTestWithoutMetric.py
--- a/tests/pytest/topic/topicQuery.py
+++ b/tests/pytest/topic/topicQuery.py
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
--- a/tests/script/api/batchprepare.c
+++ b/tests/script/api/batchprepare.c
--- a/tests/script/api/makefile
+++ b/tests/script/api/makefile
--- a/tests/script/general/cache/new_metrics.sim
+++ b/tests/script/general/cache/new_metrics.sim
--- a/tests/script/general/cache/restart_metrics.sim
+++ b/tests/script/general/cache/restart_metrics.sim
--- a/tests/script/general/cache/restart_table.sim
+++ b/tests/script/general/cache/restart_table.sim
--- a/tests/script/general/column/commit.sim
+++ b/tests/script/general/column/commit.sim
--- a/tests/script/general/column/metrics.sim
+++ b/tests/script/general/column/metrics.sim
--- a/tests/script/general/column/table.sim
+++ b/tests/script/general/column/table.sim
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
--- a/tests/script/general/compute/avg.sim
+++ b/tests/script/general/compute/avg.sim
--- a/tests/script/general/compute/bottom.sim
+++ b/tests/script/general/compute/bottom.sim
--- a/tests/script/general/compute/count.sim
+++ b/tests/script/general/compute/count.sim
--- a/tests/script/general/compute/diff.sim
+++ b/tests/script/general/compute/diff.sim
--- a/tests/script/general/compute/diff2.sim
+++ b/tests/script/general/compute/diff2.sim
--- a/tests/script/general/compute/first.sim
+++ b/tests/script/general/compute/first.sim
--- a/tests/script/general/compute/interval.sim
+++ b/tests/script/general/compute/interval.sim
--- a/tests/script/general/compute/last.sim
+++ b/tests/script/general/compute/last.sim
--- a/tests/script/general/compute/last_row.sim
+++ b/tests/script/general/compute/last_row.sim
--- a/tests/script/general/compute/leastsquare.sim
+++ b/tests/script/general/compute/leastsquare.sim
--- a/tests/script/general/compute/max.sim
+++ b/tests/script/general/compute/max.sim
--- a/tests/script/general/compute/min.sim
+++ b/tests/script/general/compute/min.sim
--- a/tests/script/general/compute/null.sim
+++ b/tests/script/general/compute/null.sim
--- a/tests/script/general/compute/percentile.sim
+++ b/tests/script/general/compute/percentile.sim
--- a/tests/script/general/compute/stddev.sim
+++ b/tests/script/general/compute/stddev.sim
--- a/tests/script/general/compute/sum.sim
+++ b/tests/script/general/compute/sum.sim
--- a/tests/script/general/compute/top.sim
+++ b/tests/script/general/compute/top.sim
--- a/tests/script/general/db/backup/keep.sim
+++ b/tests/script/general/db/backup/keep.sim
--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
--- a/tests/script/general/db/len.sim
+++ b/tests/script/general/db/len.sim
--- a/tests/script/general/db/show_create_db.sim
+++ b/tests/script/general/db/show_create_db.sim
--- a/tests/script/general/db/show_create_table.sim
+++ b/tests/script/general/db/show_create_table.sim
--- a/tests/script/general/db/tables.sim
+++ b/tests/script/general/db/tables.sim
--- a/tests/script/general/db/topic1.sim
+++ b/tests/script/general/db/topic1.sim
--- a/tests/script/general/db/topic2.sim
+++ b/tests/script/general/db/topic2.sim
--- a/tests/script/general/db/vnodes.sim
+++ b/tests/script/general/db/vnodes.sim
--- a/tests/script/general/field/2.sim
+++ b/tests/script/general/field/2.sim
--- a/tests/script/general/field/3.sim
+++ b/tests/script/general/field/3.sim
--- a/tests/script/general/field/4.sim
+++ b/tests/script/general/field/4.sim
--- a/tests/script/general/field/5.sim
+++ b/tests/script/general/field/5.sim
--- a/tests/script/general/field/6.sim
+++ b/tests/script/general/field/6.sim
--- a/tests/script/general/field/bigint.sim
+++ b/tests/script/general/field/bigint.sim
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/general/field/binary.sim
--- a/tests/script/general/field/bool.sim
+++ b/tests/script/general/field/bool.sim
--- a/tests/script/general/field/double.sim
+++ b/tests/script/general/field/double.sim
--- a/tests/script/general/field/float.sim
+++ b/tests/script/general/field/float.sim
--- a/tests/script/general/field/int.sim
+++ b/tests/script/general/field/int.sim
--- a/tests/script/general/field/single.sim
+++ b/tests/script/general/field/single.sim
--- a/tests/script/general/field/smallint.sim
+++ b/tests/script/general/field/smallint.sim
--- a/tests/script/general/field/tinyint.sim
+++ b/tests/script/general/field/tinyint.sim
--- a/tests/script/general/http/grafana.sim
+++ b/tests/script/general/http/grafana.sim
--- a/tests/script/general/http/grafana_bug.sim
+++ b/tests/script/general/http/grafana_bug.sim
--- a/tests/script/general/http/prepare.sim
+++ b/tests/script/general/http/prepare.sim
--- a/tests/script/general/http/restful_insert.sim
+++ b/tests/script/general/http/restful_insert.sim
--- a/tests/script/general/http/restful_limit.sim
+++ b/tests/script/general/http/restful_limit.sim
--- a/tests/script/general/http/telegraf.sim
+++ b/tests/script/general/http/telegraf.sim
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/general/import/basic.sim
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
--- a/tests/script/general/import/large.sim
+++ b/tests/script/general/import/large.sim
--- a/tests/script/general/insert/basic.sim
+++ b/tests/script/general/insert/basic.sim
--- a/tests/script/general/insert/query_block1_file.sim
+++ b/tests/script/general/insert/query_block1_file.sim
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/general/insert/query_block1_memory.sim
--- a/tests/script/general/insert/query_block2_file.sim
+++ b/tests/script/general/insert/query_block2_file.sim
--- a/tests/script/general/insert/query_block2_memory.sim
+++ b/tests/script/general/insert/query_block2_memory.sim
--- a/tests/script/general/insert/query_file_memory.sim
+++ b/tests/script/general/insert/query_file_memory.sim
--- a/tests/script/general/insert/query_multi_file.sim
+++ b/tests/script/general/insert/query_multi_file.sim
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/general/insert/tcp.sim
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
--- a/tests/script/general/parser/alter1.sim
+++ b/tests/script/general/parser/alter1.sim
--- a/tests/script/general/parser/alter_stable.sim
+++ b/tests/script/general/parser/alter_stable.sim
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
--- a/tests/script/general/parser/between_and.sim
+++ b/tests/script/general/parser/between_and.sim
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
--- a/tests/script/general/parser/col_arithmetic_query.sim
+++ b/tests/script/general/parser/col_arithmetic_query.sim
--- a/tests/script/general/parser/columnValue.sim
+++ b/tests/script/general/parser/columnValue.sim
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
--- a/tests/script/general/parser/constCol.sim
+++ b/tests/script/general/parser/constCol.sim
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
--- a/tests/script/general/parser/create_mt.sim
+++ b/tests/script/general/parser/create_mt.sim
--- a/tests/script/general/parser/create_tb.sim
+++ b/tests/script/general/parser/create_tb.sim
--- a/tests/script/general/parser/create_tb_with_tag_name.sim
+++ b/tests/script/general/parser/create_tb_with_tag_name.sim
--- a/tests/script/general/parser/dbtbnameValidate.sim
+++ b/tests/script/general/parser/dbtbnameValidate.sim
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
--- a/tests/script/general/parser/fill_stb.sim
+++ b/tests/script/general/parser/fill_stb.sim
--- a/tests/script/general/parser/fill_us.sim
+++ b/tests/script/general/parser/fill_us.sim
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
--- a/tests/script/general/parser/first_last_query.sim
+++ b/tests/script/general/parser/first_last_query.sim
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
--- a/tests/script/general/parser/gendata.sh
+++ b/tests/script/general/parser/gendata.sh
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
--- a/tests/script/general/parser/having.sim
+++ b/tests/script/general/parser/having.sim
--- a/tests/script/general/parser/having_child.sim
+++ b/tests/script/general/parser/having_child.sim
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
--- a/tests/script/general/parser/import_file.sim
+++ b/tests/script/general/parser/import_file.sim
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
--- a/tests/script/general/parser/insert_tb.sim
+++ b/tests/script/general/parser/insert_tb.sim
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
--- a/tests/script/general/parser/interp_test.sim
+++ b/tests/script/general/parser/interp_test.sim
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
--- a/tests/script/general/parser/join_manyblocks.sim
+++ b/tests/script/general/parser/join_manyblocks.sim
--- a/tests/script/general/parser/join_multitables.sim
+++ b/tests/script/general/parser/join_multitables.sim
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
--- a/tests/script/general/parser/last_groupby.sim
+++ b/tests/script/general/parser/last_groupby.sim
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
--- a/tests/script/general/parser/lastrow_query.sim
+++ b/tests/script/general/parser/lastrow_query.sim
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
--- a/tests/script/general/parser/limit1_stb.sim
+++ b/tests/script/general/parser/limit1_stb.sim
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
--- a/tests/script/general/parser/nchar.sim
+++ b/tests/script/general/parser/nchar.sim
--- a/tests/script/general/parser/null_char.sim
+++ b/tests/script/general/parser/null_char.sim
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
--- a/tests/script/general/parser/select_distinct_tag.sim
+++ b/tests/script/general/parser/select_distinct_tag.sim
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
--- a/tests/script/general/parser/sliding.sim
+++ b/tests/script/general/parser/sliding.sim
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
--- a/tests/script/general/parser/stableOp.sim
+++ b/tests/script/general/parser/stableOp.sim
--- a/tests/script/general/parser/subInfrom.sim
+++ b/tests/script/general/parser/subInfrom.sim
--- a/tests/script/general/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
--- a/tests/script/general/parser/union.sim
+++ b/tests/script/general/parser/union.sim
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
--- a/tests/script/general/stable/disk.sim
+++ b/tests/script/general/stable/disk.sim
--- a/tests/script/general/stable/dnode3.sim
+++ b/tests/script/general/stable/dnode3.sim
--- a/tests/script/general/stable/metrics.sim
+++ b/tests/script/general/stable/metrics.sim
--- a/tests/script/general/stable/refcount.sim
+++ b/tests/script/general/stable/refcount.sim
--- a/tests/script/general/stable/show.sim
+++ b/tests/script/general/stable/show.sim
--- a/tests/script/general/stable/values.sim
+++ b/tests/script/general/stable/values.sim
--- a/tests/script/general/stable/vnode3.sim
+++ b/tests/script/general/stable/vnode3.sim
--- a/tests/script/general/stream/metrics_del.sim
+++ b/tests/script/general/stream/metrics_del.sim
--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
--- a/tests/script/general/stream/restart_stream.sim
+++ b/tests/script/general/stream/restart_stream.sim
--- a/tests/script/general/stream/stream_1970.sim
+++ b/tests/script/general/stream/stream_1970.sim
--- a/tests/script/general/stream/stream_3.sim
+++ b/tests/script/general/stream/stream_3.sim
--- a/tests/script/general/stream/stream_restart.sim
+++ b/tests/script/general/stream/stream_restart.sim
--- a/tests/script/general/stream/table_del.sim
+++ b/tests/script/general/stream/table_del.sim
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
--- a/tests/script/general/table/bigint.sim
+++ b/tests/script/general/table/bigint.sim
--- a/tests/script/general/table/binary.sim
+++ b/tests/script/general/table/binary.sim
--- a/tests/script/general/table/bool.sim
+++ b/tests/script/general/table/bool.sim
--- a/tests/script/general/table/column2.sim
+++ b/tests/script/general/table/column2.sim
--- a/tests/script/general/table/column_name.sim
+++ b/tests/script/general/table/column_name.sim
--- a/tests/script/general/table/column_num.sim
+++ b/tests/script/general/table/column_num.sim
--- a/tests/script/general/table/column_value.sim
+++ b/tests/script/general/table/column_value.sim
--- a/tests/script/general/table/date.sim
+++ b/tests/script/general/table/date.sim
--- a/tests/script/general/table/db.table.sim
+++ b/tests/script/general/table/db.table.sim
--- a/tests/script/general/table/delete_reuse1.sim
+++ b/tests/script/general/table/delete_reuse1.sim
--- a/tests/script/general/table/delete_reuse2.sim
+++ b/tests/script/general/table/delete_reuse2.sim
--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
--- a/tests/script/general/table/describe.sim
+++ b/tests/script/general/table/describe.sim
--- a/tests/script/general/table/double.sim
+++ b/tests/script/general/table/double.sim
--- a/tests/script/general/table/fill.sim
+++ b/tests/script/general/table/fill.sim
--- a/tests/script/general/table/float.sim
+++ b/tests/script/general/table/float.sim
--- a/tests/script/general/table/int.sim
+++ b/tests/script/general/table/int.sim
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
--- a/tests/script/general/table/smallint.sim
+++ b/tests/script/general/table/smallint.sim
--- a/tests/script/general/table/table.sim
+++ b/tests/script/general/table/table.sim
--- a/tests/script/general/table/table_len.sim
+++ b/tests/script/general/table/table_len.sim
--- a/tests/script/general/table/tinyint.sim
+++ b/tests/script/general/table/tinyint.sim
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
--- a/tests/script/general/tag/3.sim
+++ b/tests/script/general/tag/3.sim
--- a/tests/script/general/tag/4.sim
+++ b/tests/script/general/tag/4.sim
--- a/tests/script/general/tag/5.sim
+++ b/tests/script/general/tag/5.sim
--- a/tests/script/general/tag/6.sim
+++ b/tests/script/general/tag/6.sim
--- a/tests/script/general/tag/bigint.sim
+++ b/tests/script/general/tag/bigint.sim
--- a/tests/script/general/tag/binary.sim
+++ b/tests/script/general/tag/binary.sim
--- a/tests/script/general/tag/binary_binary.sim
+++ b/tests/script/general/tag/binary_binary.sim
--- a/tests/script/general/tag/bool.sim
+++ b/tests/script/general/tag/bool.sim
--- a/tests/script/general/tag/bool_binary.sim
+++ b/tests/script/general/tag/bool_binary.sim
--- a/tests/script/general/tag/bool_int.sim
+++ b/tests/script/general/tag/bool_int.sim
--- a/tests/script/general/tag/column.sim
+++ b/tests/script/general/tag/column.sim
--- a/tests/script/general/tag/create.sim
+++ b/tests/script/general/tag/create.sim
--- a/tests/script/general/tag/double.sim
+++ b/tests/script/general/tag/double.sim
--- a/tests/script/general/tag/float.sim
+++ b/tests/script/general/tag/float.sim
--- a/tests/script/general/tag/int.sim
+++ b/tests/script/general/tag/int.sim
--- a/tests/script/general/tag/int_binary.sim
+++ b/tests/script/general/tag/int_binary.sim
--- a/tests/script/general/tag/int_float.sim
+++ b/tests/script/general/tag/int_float.sim
--- a/tests/script/general/tag/smallint.sim
+++ b/tests/script/general/tag/smallint.sim
--- a/tests/script/general/tag/tinyint.sim
+++ b/tests/script/general/tag/tinyint.sim
--- a/tests/script/general/user/monitor.sim
+++ b/tests/script/general/user/monitor.sim
--- a/tests/script/general/vector/metrics_field.sim
+++ b/tests/script/general/vector/metrics_field.sim
--- a/tests/script/general/vector/metrics_mix.sim
+++ b/tests/script/general/vector/metrics_mix.sim
--- a/tests/script/general/vector/metrics_query.sim
+++ b/tests/script/general/vector/metrics_query.sim
--- a/tests/script/general/vector/metrics_tag.sim
+++ b/tests/script/general/vector/metrics_tag.sim
--- a/tests/script/general/vector/metrics_time.sim
+++ b/tests/script/general/vector/metrics_time.sim
--- a/tests/script/general/vector/multi.sim
+++ b/tests/script/general/vector/multi.sim
--- a/tests/script/general/vector/single.sim
+++ b/tests/script/general/vector/single.sim
--- a/tests/script/general/vector/table_field.sim
+++ b/tests/script/general/vector/table_field.sim
--- a/tests/script/general/vector/table_mix.sim
+++ b/tests/script/general/vector/table_mix.sim
--- a/tests/script/general/vector/table_query.sim
+++ b/tests/script/general/vector/table_query.sim
--- a/tests/script/general/vector/table_time.sim
+++ b/tests/script/general/vector/table_time.sim
--- a/tests/script/issue/TD-3300.sim
+++ b/tests/script/issue/TD-3300.sim
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
--- a/tests/script/jenkins/basic_1.txt
+++ b/tests/script/jenkins/basic_1.txt
--- a/tests/script/jenkins/basic_2.txt
+++ b/tests/script/jenkins/basic_2.txt
--- a/tests/script/jenkins/basic_3.txt
+++ b/tests/script/jenkins/basic_3.txt
--- a/tests/script/jenkins/basic_4.txt
+++ b/tests/script/jenkins/basic_4.txt
--- a/tests/script/jenkins/basic_5.txt
+++ b/tests/script/jenkins/basic_5.txt
--- a/tests/script/jenkins/basic_6.txt
+++ b/tests/script/jenkins/basic_6.txt
--- a/tests/script/jenkins/basic_7.txt
+++ b/tests/script/jenkins/basic_7.txt
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
--- a/tests/script/unique/big/tcp.sim
+++ b/tests/script/unique/big/tcp.sim
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
--- a/tests/script/unique/cluster/cache.sim
+++ b/tests/script/unique/cluster/cache.sim
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
--- a/tests/script/unique/stable/dnode2.sim
+++ b/tests/script/unique/stable/dnode2.sim
--- a/tests/script/unique/stable/dnode3.sim
+++ b/tests/script/unique/stable/dnode3.sim
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
--- a/tests/script/unique/stream/metrics_replica1_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim
--- a/tests/script/unique/stream/metrics_replica2_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim
--- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
--- a/tests/script/unique/stream/metrics_replica2_dnode3.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim
--- a/tests/script/unique/stream/metrics_replica3_dnode4.sim
+++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim
--- a/tests/script/unique/stream/metrics_vnode_stop.sim
+++ b/tests/script/unique/stream/metrics_vnode_stop.sim
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
--- a/tests/script/unique/stream/table_replica1_dnode2.sim
+++ b/tests/script/unique/stream/table_replica1_dnode2.sim
--- a/tests/script/unique/stream/table_replica2_dnode2.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2.sim
--- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
--- a/tests/script/unique/stream/table_replica2_dnode3.sim
+++ b/tests/script/unique/stream/table_replica2_dnode3.sim
--- a/tests/script/unique/stream/table_replica3_dnode4.sim
+++ b/tests/script/unique/stream/table_replica3_dnode4.sim
--- a/tests/script/unique/stream/table_vnode_stop.sim
+++ b/tests/script/unique/stream/table_vnode_stop.sim
--- a/tests/script/unique/vnode/backup/replica4.sim
+++ b/tests/script/unique/vnode/backup/replica4.sim
--- a/tests/script/unique/vnode/backup/replica5.sim
+++ b/tests/script/unique/vnode/backup/replica5.sim
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
--- a/tests/tsim/inc/sim.h
+++ b/tests/tsim/inc/sim.h
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
--- a/tests/tsim/src/simMain.c
+++ b/tests/tsim/src/simMain.c
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c