[TD-4034]merge from develop

.drone.yml

@@ -7,41 +7,22 @@ platform:
   arch: amd64
 
 steps:
-- name: smoke_test
-  image: python:3.8
+- name: build
+  image: gcc
   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/
+  - apt-get install -y cmake build-essential 
   - mkdir debug
   - cd debug
   - cmake .. 
   - make 
-  - cd ../tests
-  - ./test-all.sh smoke
+  trigger:
+    event:
+      - pull_request
   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
@@ -60,6 +41,9 @@ steps:
   - cd debug
   - cmake .. -DCPUTYPE=aarch64 > /dev/null
   - make 
+  trigger:
+    event:
+      - pull_request
   when:
     branch:
     - develop
@@ -82,6 +66,9 @@ steps:
   - cd debug
   - cmake .. -DCPUTYPE=aarch32 > /dev/null
   - make 
+  trigger:
+    event:
+      - pull_request
   when:
     branch:
     - develop
@@ -106,11 +93,13 @@ steps:
   - cd debug
   - cmake .. 
   - make 
+  trigger:
+    event:
+      - pull_request
   when:
     branch:
     - develop
     - master
-
 ---
 kind: pipeline
 name: build_xenial
@@ -129,6 +118,9 @@ steps:
   - cd debug
   - cmake .. 
   - make 
+  trigger:
+    event:
+      - pull_request
   when:
     branch:
     - develop
@@ -151,6 +143,32 @@ steps:
   - cd debug
   - cmake .. 
   - make 
+  trigger:
+    event:
+      - pull_request
+  when:
+    branch:
+    - develop
+    - master
+---
+kind: pipeline
+name: build_centos7
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: ansible/centos7-ansible
+  commands:
+  - yum install -y gcc gcc-c++ make cmake
+  - mkdir debug
+  - cd debug
+  - cmake .. 
+  - make 
+  trigger:
+    event:
+      - pull_request
   when:
     branch:
     - develop

.gitignore

@@ -2,6 +2,7 @@ build/
 .vscode/
 .idea/
 cmake-build-debug/
+cmake-build-release/
 cscope.out
 .DS_Store
 debug/

CMakeLists.txt

@@ -3,7 +3,7 @@ IF (CMAKE_VERSION VERSION_LESS 3.0)
   PROJECT(TDengine CXX)
   SET(PROJECT_VERSION_MAJOR "${LIB_MAJOR_VERSION}")
   SET(PROJECT_VERSION_MINOR "${LIB_MINOR_VERSION}")
-  SET(PROJECT_VERSION_PATCH"${LIB_PATCH_VERSION}")
+  SET(PROJECT_VERSION_PATCH "${LIB_PATCH_VERSION}")
   SET(PROJECT_VERSION "${LIB_VERSION_STRING}")
 ELSE ()
   CMAKE_POLICY(SET CMP0048 NEW)
@@ -42,6 +42,13 @@ INCLUDE(cmake/env.inc)
 INCLUDE(cmake/version.inc)
 INCLUDE(cmake/install.inc)
 
+IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -pipe -Wall -Wshadow -Werror")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -Wall -Wshadow -Werror")
+ENDIF ()
+MESSAGE(STATUS "CMAKE_C_FLAGS:   ${CMAKE_C_FLAGS}")
+MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+
 ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)

Jenkinsfile

@@ -94,7 +94,7 @@ def pre_test(){
     make > /dev/null
     make install > /dev/null
     cd ${WKC}/tests
-    pip3 install ${WKC}/src/connector/python/linux/python3/
+    pip3 install ${WKC}/src/connector/python
     '''
     return 1
 }

cmake/define.inc

@@ -57,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 "-Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
   ADD_DEFINITIONS(-DUSE_LIBICONV)
 ENDIF ()
 
@@ -65,7 +65,7 @@ IF (TD_LINUX_32)
   ADD_DEFINITIONS(-D_TD_LINUX_32)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "linux32 is defined")
-  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -munaligned-access -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_ARM_64)
@@ -73,7 +73,7 @@ IF (TD_ARM_64)
   ADD_DEFINITIONS(-D_TD_ARM_)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "arm64 is defined")
-  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_ARM_32)
@@ -81,7 +81,7 @@ IF (TD_ARM_32)
   ADD_DEFINITIONS(-D_TD_ARM_)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "arm32 is defined")
-  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 ")
+  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 ")
 ENDIF ()
 
 IF (TD_MIPS_64)
@@ -89,7 +89,7 @@ IF (TD_MIPS_64)
   ADD_DEFINITIONS(-D_TD_MIPS_64)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "mips64 is defined")
-  SET(COMMON_FLAGS "-Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_MIPS_32)
@@ -97,7 +97,7 @@ IF (TD_MIPS_32)
   ADD_DEFINITIONS(-D_TD_MIPS_32)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "mips32 is defined")
-  SET(COMMON_FLAGS "-Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
 IF (TD_APLHINE)
@@ -138,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 "-Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(COMMON_FLAGS "-std=gnu99 -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)
@@ -157,7 +157,7 @@ IF (TD_WINDOWS)
     IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
       SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
     ENDIF ()
-    SET(DEBUG_FLAGS "/Zi /W3 /GL")
+    SET(DEBUG_FLAGS "/fsanitize=thread /fsanitize=leak /fsanitize=memory /fsanitize=undefined /fsanitize=hwaddress /Zi /W3 /GL")
     SET(RELEASE_FLAGS "/W0 /O3 /GL")
   ENDIF ()
 

documentation20/cn/08.connector/docs.md

@@ -345,7 +345,7 @@ TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时
     * taos：已经建立好的数据库连接
     * sql：SQL查询语句（仅能使用查询语句）
     * fp：用户定义的回调函数指针，每次流式计算完成后，TDengine将查询的结果（TAOS_ROW）、查询状态（TAOS_RES）、用户定义参数（PARAM）传递给回调函数，在回调函数内，用户可以使用taos_num_fields获取结果集列数，taos_fetch_fields获取结果集每列数据的类型。
-    * stime：是流式计算开始的时间，如果是0，表示从现在开始，如果不为零，表示从指定的时间开始计算（UTC时间从1970/1/1算起的毫秒数）
+    * stime：是流式计算开始的时间。如果是“64位整数最小值”，表示从现在开始；如果不为“64位整数最小值”，表示从指定的时间开始计算（UTC时间从1970/1/1算起的毫秒数）。
     * param：是应用提供的用于回调的一个参数，回调时，提供给应用
     * callback: 第二个回调函数，会在连续查询自动停止时被调用。
 
@@ -400,27 +400,22 @@ Python连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/
 
 #### Linux
 
-用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到python2和python3的connector安装包。用户可以通过pip命令安装： 
+用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到connector安装包。用户可以通过pip命令安装： 
 
-​		`pip install src/connector/python/linux/python2/`
+​		`pip install src/connector/python/`
 
 或
 
-​		`pip3 install src/connector/python/linux/python3/`
+​		`pip3 install src/connector/python/`
 
 #### Windows
 在已安装Windows TDengine 客户端的情况下， 将文件"C:\TDengine\driver\taos.dll" 拷贝到 "C:\windows\system32" 目录下, 然后进入Windwos <em>cmd</em> 命令行界面
 ```cmd
-cd C:\TDengine\connector\python\windows
-python -m pip install python2\
-```
-或
-```cmd
-cd C:\TDengine\connector\python\windows
-python -m pip install python3\
+cd C:\TDengine\connector\python
+python -m pip install .
 ```
 
-* 如果机器上没有pip命令，用户可将src/connector/python/python3或src/connector/python/python2下的taos文件夹拷贝到应用程序的目录使用。
+* 如果机器上没有pip命令，用户可将src/connector/python下的taos文件夹拷贝到应用程序的目录使用。
 对于windows 客户端，安装TDengine windows 客户端后，将C:\TDengine\driver\taos.dll拷贝到C:\windows\system32目录下即可。
 
 ### 使用

documentation20/cn/09.connections/docs.md

@@ -16,7 +16,7 @@ TDengine的Grafana插件在安装包的/usr/local/taos/connector/grafanaplugin
 以CentOS 7.2操作系统为例，将grafanaplugin目录拷贝到/var/lib/grafana/plugins目录下，重新启动grafana即可。
 
 ```bash
-sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/tdengine
+sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/plugins/tdengine
 ```
 
 ### 使用 Grafana

documentation20/cn/12.taos-sql/docs.md

@@ -135,6 +135,14 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
     SHOW DATABASES;
     ```
 
+- **显示一个数据库的创建语句**
+
+    ```mysql
+    SHOW CREATE DATABASE db_name;
+    ```
+    常用于数据库迁移。对一个已经存在的数据库，返回其创建语句；在另一个集群中执行该语句，就能得到一个设置完全相同的 Database。
+
+
 ## <a class="anchor" id="table"></a>表管理
 
 - **创建数据表**
@@ -200,6 +208,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
 
     通配符匹配：1）’%’ (百分号)匹配0到任意个字符；2）’\_’下划线匹配一个字符。
 
+- **显示一个数据表的创建语句**
+
+    ```mysql
+    SHOW CREATE TABLE tb_name;
+    ```
+    常用于数据库迁移。对一个已经存在的数据表，返回其创建语句；在另一个集群中执行该语句，就能得到一个结构完全相同的数据表。
+
 - **在线修改显示字符宽度**
 
     ```mysql
@@ -265,6 +280,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过修改配置参数 enableM
     ```
     查看数据库内全部 STable，及其相关信息，包括 STable 的名称、创建时间、列数量、标签（TAG）数量、通过该 STable 建表的数量。
 
+- **显示一个超级表的创建语句**
+
+    ```mysql
+    SHOW CREATE STABLE stb_name;
+    ```
+    常用于数据库迁移。对一个已经存在的超级表，返回其创建语句；在另一个集群中执行该语句，就能得到一个结构完全相同的超级表。
+
 - **获取超级表的结构信息**
 
     ```mysql

packaging/release.sh

 #!/bin/bash
 #
-# Generate the deb package for ubunt, or rpm package for centos, or tar.gz package for other linux os
+# Generate the deb package for ubuntu, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
 #set -x
 
-# releash.sh  -v [cluster | edge]  
+# release.sh  -v [cluster | edge]
 #             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] 
 #             -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
 #             -V [stable | beta]

packaging/tools/install.sh

@@ -607,6 +607,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'         >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
@@ -630,6 +631,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
@@ -655,6 +657,7 @@ function install_service_on_systemd() {
         ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                            >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"

packaging/tools/install_arbi.sh

@@ -205,6 +205,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"

packaging/tools/install_arbi_power.sh

@@ -205,6 +205,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"

packaging/tools/install_power.sh

@@ -577,6 +577,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo 'Type=simple'                         >> ${powerd_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/powerd'           >> ${powerd_service_config}"
     ${csudo} bash -c "echo 'ExecStartPre=/usr/local/power/bin/startPre.sh'           >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'             >> ${powerd_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'                >> ${powerd_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                 >> ${powerd_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                  >> ${powerd_service_config}"
@@ -599,6 +600,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
@@ -624,6 +626,7 @@ function install_service_on_systemd() {
         ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                            >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
         ${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"

packaging/tools/make_install.sh

@@ -333,6 +333,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"

packaging/tools/makeclient_power.sh

@@ -148,20 +148,11 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   cp -r ${connector_dir}/python  ${install_dir}/connector/
   cp -r ${connector_dir}/go      ${install_dir}/connector 
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/cinterface.py
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/subscription.py
   
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py 
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/connection.py
 fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}

packaging/tools/makepkg_power.sh

@@ -170,20 +170,11 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   cp -r ${connector_dir}/python  ${install_dir}/connector/
   cp -r ${connector_dir}/go      ${install_dir}/connector
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/cinterface.py
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/subscription.py
   
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/connection.py
 fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}

packaging/tools/post.sh

@@ -405,6 +405,7 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"

src/client/src/tscLocal.c

@@ -713,13 +713,12 @@ static int32_t tscProcessShowCreateDatabase(SSqlObj *pSql) {
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }  
 
-  SCreateBuilder *param = (SCreateBuilder *)malloc(sizeof(SCreateBuilder));    
+  SCreateBuilder *param = (SCreateBuilder *)calloc(1, sizeof(SCreateBuilder));    
   if (param == NULL) {
     free(pInterSql);
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
-
-  strncpy(param->buf, tNameGetTableName(&pTableMetaInfo->name), TSDB_TABLE_NAME_LEN);
+  tNameGetDbName(&pTableMetaInfo->name, param->buf);
 
   param->pParentSql = pSql;
   param->pInterSql  = pInterSql;

src/client/src/tscParseInsert.c

@@ -577,12 +577,13 @@ int32_t tsParseValues(char **str, STableDataBlocks *pDataBlock, int maxRows, SSq
 
     index = 0;
     sToken = tStrGetToken(*str, &index, false);
-    *str += index;
     if (sToken.n == 0 || sToken.type != TK_RP) {
       tscSQLSyntaxErrMsg(pCmd->payload, ") expected", *str);
       code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
-      return -1;
+      return code;
     }
+    
+    *str += index;
 
     (*numOfRows)++;
   }
@@ -712,6 +713,9 @@ static int32_t doParseInsertStatement(SSqlCmd* pCmd, char **str, STableDataBlock
 
   int32_t numOfRows = 0;
   code = tsParseValues(str, dataBuf, maxNumOfRows, pCmd, &numOfRows, tmpTokenBuf);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
 
   for (uint32_t i = 0; i < dataBuf->numOfParams; ++i) {
     SParamInfo *param = dataBuf->params + i;

src/client/src/tscPrepare.c

@@ -276,6 +276,60 @@ static char* normalStmtBuildSql(STscStmt* stmt) {
   return taosStringBuilderGetResult(&sb, NULL);
 }
 
+static int fillColumnsNull(STableDataBlocks* pBlock, int32_t rowNum) {
+  SParsedDataColInfo* spd = &pBlock->boundColumnInfo;
+  int32_t offset = 0;
+  SSchema *schema = (SSchema*)pBlock->pTableMeta->schema;
+
+  for (int32_t i = 0; i < spd->numOfCols; ++i) {
+    if (!spd->cols[i].hasVal) {  // current column do not have any value to insert, set it to null
+      for (int32_t n = 0; n < rowNum; ++n) {          
+        char *ptr = pBlock->pData + sizeof(SSubmitBlk) + pBlock->rowSize * n + offset;
+        
+        if (schema[i].type == TSDB_DATA_TYPE_BINARY) {
+          varDataSetLen(ptr, sizeof(int8_t));
+          *(uint8_t*) varDataVal(ptr) = TSDB_DATA_BINARY_NULL;
+        } else if (schema[i].type == TSDB_DATA_TYPE_NCHAR) {
+          varDataSetLen(ptr, sizeof(int32_t));
+          *(uint32_t*) varDataVal(ptr) = TSDB_DATA_NCHAR_NULL;
+        } else {
+          setNull(ptr, schema[i].type, schema[i].bytes);
+        }
+      }
+    }
+    
+    offset += schema[i].bytes;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+
+int32_t fillTablesColumnsNull(SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+
+  STableDataBlocks** p = taosHashIterate(pCmd->pTableBlockHashList, NULL);
+
+  STableDataBlocks* pOneTableBlock = *p;
+  while(pOneTableBlock) {
+    SSubmitBlk* pBlocks = (SSubmitBlk*) pOneTableBlock->pData;
+    if (pBlocks->numOfRows > 0 && pOneTableBlock->boundColumnInfo.numOfBound < pOneTableBlock->boundColumnInfo.numOfCols) {
+      fillColumnsNull(pOneTableBlock, pBlocks->numOfRows);
+    }
+    
+    p = taosHashIterate(pCmd->pTableBlockHashList, p);
+    if (p == NULL) {
+      break;
+    }
+
+    pOneTableBlock = *p;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // functions for insertion statement preparation
 static int doBindParam(STableDataBlocks* pBlock, char* data, SParamInfo* param, TAOS_BIND* bind, int32_t colNum) {
@@ -1027,6 +1081,8 @@ static int insertStmtExecute(STscStmt* stmt) {
   pBlk->uid = pTableMeta->id.uid;
   pBlk->tid = pTableMeta->id.tid;
 
+  fillTablesColumnsNull(stmt->pSql);
+
   int code = tscMergeTableDataBlocks(stmt->pSql, false);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
@@ -1120,10 +1176,15 @@ static int insertBatchStmtExecute(STscStmt* pStmt) {
   
   pStmt->pSql->retry = pStmt->pSql->maxRetry + 1;  //no retry
 
-  if (taosHashGetSize(pStmt->pSql->cmd.pTableBlockHashList) > 0) { // merge according to vgId
-    if ((code = tscMergeTableDataBlocks(pStmt->pSql, false)) != TSDB_CODE_SUCCESS) {
-      return code;
-    }
+  if (taosHashGetSize(pStmt->pSql->cmd.pTableBlockHashList) <= 0) { // merge according to vgId
+    tscError("0x%"PRIx64" no data block to insert", pStmt->pSql->self);
+    return TSDB_CODE_TSC_APP_ERROR;
+  }
+
+  fillTablesColumnsNull(pStmt->pSql);
+
+  if ((code = tscMergeTableDataBlocks(pStmt->pSql, false)) != TSDB_CODE_SUCCESS) {
+    return code;
   }
 
   code = tscHandleMultivnodeInsert(pStmt->pSql);

src/client/src/tscProfile.c

@@ -54,14 +54,14 @@ void tscAddIntoSqlList(SSqlObj *pSql) {
   pSql->next = pObj->sqlList;
   if (pObj->sqlList) pObj->sqlList->prev = pSql;
   pObj->sqlList = pSql;
-  pSql->queryId = queryId++;
+  pSql->queryId = atomic_fetch_add_32(&queryId, 1);
 
   pthread_mutex_unlock(&pObj->mutex);
 
   pSql->stime = taosGetTimestampMs();
   pSql->listed = 1;
 
-  tscDebug("0x%"PRIx64" added into sqlList", pSql->self);
+  tscDebug("0x%"PRIx64" added into sqlList, queryId:%u", pSql->self, pSql->queryId);
 }
 
 void tscSaveSlowQueryFpCb(void *param, TAOS_RES *result, int code) {

src/client/src/tscSQLParser.c

@@ -467,8 +467,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       if (pToken->n > TSDB_DB_NAME_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
-
-      return tscSetTableFullName(pTableMetaInfo, pToken, pSql);
+      return tNameSetDbName(&pTableMetaInfo->name, getAccountId(pSql), pToken);
     }
     case TSDB_SQL_CFG_DNODE: {
       const char* msg2 = "invalid configure options or values, such as resetlog / debugFlag 135 / balance 'vnode:2-dnode:2' / monitor 1 ";

src/client/src/tscSubquery.c

@@ -55,9 +55,9 @@ static void skipRemainValue(STSBuf* pTSBuf, tVariant* tag1) {
   }
 
   while (tsBufNextPos(pTSBuf)) {
-    STSElem el1 = tsBufGetElem(pTSBuf);
+    el1 = tsBufGetElem(pTSBuf);
 
-    int32_t res = tVariantCompare(el1.tag, tag1);
+    res = tVariantCompare(el1.tag, tag1);
     if (res != 0) { // it is a record with new tag
       return;
     }
@@ -2861,7 +2861,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
     tscDebug("0x%"PRIx64" sub:%p retrieve numOfRows:%d totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d",
         pParentSql->self, pSql, pRes->numOfRows, pState->numOfRetrievedRows, pSql->epSet.fqdn[pSql->epSet.inUse], idx);
 
-    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
+    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0) && !(tscGetQueryInfo(&pParentSql->cmd, 0)->distinctTag)) {
       tscError("0x%"PRIx64" sub:0x%"PRIx64" num of OrderedRes is too many, max allowed:%" PRId32 " , current:%" PRId64,
                pParentSql->self, pSql->self, tsMaxNumOfOrderedResults, num);
       tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_SORTED_RES_TOO_MANY);

src/client/src/tscUtil.c

@@ -2859,16 +2859,21 @@ void tscDoQuery(SSqlObj* pSql) {
     return;
   }
   
-  if (pCmd->command == TSDB_SQL_SELECT) {
-    tscAddIntoSqlList(pSql);
-  }
-
   if (pCmd->dataSourceType == DATA_FROM_DATA_FILE) {
     tscImportDataFromFile(pSql);
   } else {
     SQueryInfo *pQueryInfo = tscGetQueryInfo(pCmd, pCmd->clauseIndex);
     uint16_t type = pQueryInfo->type;
 
+    if ((pCmd->command == TSDB_SQL_SELECT) && (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_SUBQUERY)) && (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_STABLE_SUBQUERY))) {
+      tscAddIntoSqlList(pSql);
+    }
+  
+    if (TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_INSERT)) {  // multi-vnodes insertion
+      tscHandleMultivnodeInsert(pSql);
+      return;
+    }
+
     if (QUERY_IS_JOIN_QUERY(type)) {
       if (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_SUBQUERY)) {
         tscHandleMasterJoinQuery(pSql);

src/client/tests/timeParseTest.cpp

@@ -98,7 +98,7 @@ TEST(testCase, parse_time) {
   taosParseTime(t41, &time, strlen(t41), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 852048000999);
 
-  int64_t k = timezone;
+//  int64_t k = timezone;
   char    t42[] = "1997-1-1T0:0:0.999999999Z";
   taosParseTime(t42, &time, strlen(t42), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 852048000999 - timezone * MILLISECOND_PER_SECOND);
@@ -163,7 +163,7 @@ TEST(testCase, parse_time) {
   taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, -28800 * MILLISECOND_PER_SECOND);
 
-  char* t = "2021-01-08T02:11:40.000+00:00";
+  char t[] = "2021-01-08T02:11:40.000+00:00";
   taosParseTime(t, &time, strlen(t), TSDB_TIME_PRECISION_MILLI, 0);
   printf("%ld\n", time);
 }

src/common/inc/texpr.h

@@ -87,6 +87,8 @@ tExprNode* exprTreeFromBinary(const void* data, size_t size);
 tExprNode* exprTreeFromTableName(const char* tbnameCond);
 tExprNode* exprdup(tExprNode* pTree);
 
+void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
+
 bool exprTreeApplyFilter(tExprNode *pExpr, const void *pItem, SExprTraverseSupp *param);
 
 void arithmeticTreeTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,

go @ 7a26c432

-Subproject commit 050667e5b4d0eafa5387e4283e713559b421203f
+Subproject commit 7a26c432f8b4203e42344ff3290b9b9b01b983d5

src/connector/jdbc/pom.xml

@@ -122,6 +122,7 @@
                         <exclude>**/FailOverTest.java</exclude>
                         <exclude>**/InvalidResultSetPointerTest.java</exclude>
                         <exclude>**/RestfulConnectionTest.java</exclude>
+                        <exclude>**/TD4144Test.java</exclude>
                     </excludes>
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>

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

@@ -30,6 +30,7 @@ public abstract class TSDBConstants {
     public static final int JNI_FETCH_END = -6;
     public static final int JNI_OUT_OF_MEMORY = -7;
     // TSDB Data Types
+    public static final int TSDB_DATA_TYPE_NULL = 0;
     public static final int TSDB_DATA_TYPE_BOOL = 1;
     public static final int TSDB_DATA_TYPE_TINYINT = 2;
     public static final int TSDB_DATA_TYPE_SMALLINT = 3;

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java

@@ -6,11 +6,13 @@ import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
 import com.taosdata.jdbc.*;
+import com.taosdata.jdbc.utils.Utils;
 
 import java.math.BigDecimal;
 import java.sql.*;
 import java.time.Instant;
 import java.time.ZoneOffset;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -18,14 +20,13 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     private volatile boolean isClosed;
     private int pos = -1;
 
-
     private final String database;
     private final Statement statement;
     // data
-    private final ArrayList<ArrayList<Object>> resultSet;
+    private final ArrayList<ArrayList<Object>> resultSet = new ArrayList<>();
     // meta
-    private ArrayList<String> columnNames;
-    private ArrayList<Field> columns;
+    private ArrayList<String> columnNames = new ArrayList<>();
+    private ArrayList<Field> columns = new ArrayList<>();
     private RestfulResultSetMetaData metaData;
 
     /**
@@ -37,10 +38,46 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         this.database = database;
         this.statement = statement;
 
-        // column metadata
+        // get column metadata
         JSONArray columnMeta = resultJson.getJSONArray("column_meta");
-        columnNames = new ArrayList<>();
-        columns = new ArrayList<>();
+        // get row data
+        JSONArray data = resultJson.getJSONArray("data");
+        if (data == null || data.isEmpty()) {
+            columnNames.clear();
+            columns.clear();
+            this.resultSet.clear();
+            return;
+        }
+        // get head
+        JSONArray head = resultJson.getJSONArray("head");
+        // get rows
+        Integer rows = resultJson.getInteger("rows");
+        // parse column_meta
+        if (columnMeta != null) {
+            parseColumnMeta_new(columnMeta);
+        } else {
+            parseColumnMeta_old(head, data, rows);
+        }
+        this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
+        // parse row data
+        resultSet.clear();
+        for (int rowIndex = 0; rowIndex < data.size(); rowIndex++) {
+            ArrayList row = new ArrayList();
+            JSONArray jsonRow = data.getJSONArray(rowIndex);
+            for (int colIndex = 0; colIndex < this.metaData.getColumnCount(); colIndex++) {
+                row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).taos_type));
+            }
+            resultSet.add(row);
+        }
+    }
+
+    /***
+     * use this method after TDengine-2.0.18.0 to parse column meta, restful add column_meta in resultSet
+     * @Param columnMeta
+     */
+    private void parseColumnMeta_new(JSONArray columnMeta) throws SQLException {
+        columnNames.clear();
+        columns.clear();
         for (int colIndex = 0; colIndex < columnMeta.size(); colIndex++) {
             JSONArray col = columnMeta.getJSONArray(colIndex);
             String col_name = col.getString(0);
@@ -50,23 +87,55 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             columnNames.add(col_name);
             columns.add(new Field(col_name, col_type, col_length, "", taos_type));
         }
-        this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
+    }
 
-        // row data
-        JSONArray data = resultJson.getJSONArray("data");
-        resultSet = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < data.size(); rowIndex++) {
-            ArrayList row = new ArrayList();
-            JSONArray jsonRow = data.getJSONArray(rowIndex);
-            for (int colIndex = 0; colIndex < jsonRow.size(); colIndex++) {
-                row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).taos_type));
+    /**
+     * use this method before TDengine-2.0.18.0 to parse column meta
+     */
+    private void parseColumnMeta_old(JSONArray head, JSONArray data, int rows) {
+        columnNames.clear();
+        columns.clear();
+        for (int colIndex = 0; colIndex < head.size(); colIndex++) {
+            String col_name = head.getString(colIndex);
+            columnNames.add(col_name);
+
+            int col_type = Types.NULL;
+            int col_length = 0;
+            int taos_type = TSDBConstants.TSDB_DATA_TYPE_NULL;
+
+            JSONArray row0Json = data.getJSONArray(0);
+            if (colIndex < row0Json.size()) {
+                Object value = row0Json.get(colIndex);
+                if (value instanceof Boolean) {
+                    col_type = Types.BOOLEAN;
+                    col_length = 1;
+                    taos_type = TSDBConstants.TSDB_DATA_TYPE_BOOL;
+                }
+                if (value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long) {
+                    col_type = Types.BIGINT;
+                    col_length = 8;
+                    taos_type = TSDBConstants.TSDB_DATA_TYPE_BIGINT;
+                }
+                if (value instanceof Float || value instanceof Double || value instanceof BigDecimal) {
+                    col_type = Types.DOUBLE;
+                    col_length = 8;
+                    taos_type = TSDBConstants.TSDB_DATA_TYPE_DOUBLE;
+                }
+                if (value instanceof String) {
+                    col_type = Types.NCHAR;
+                    col_length = ((String) value).length();
+                    taos_type = TSDBConstants.TSDB_DATA_TYPE_NCHAR;
+                }
             }
-            resultSet.add(row);
+            columns.add(new Field(col_name, col_type, col_length, "", taos_type));
         }
     }
 
+
     private Object parseColumnData(JSONArray row, int colIndex, int taosType) throws SQLException {
         switch (taosType) {
+            case TSDBConstants.TSDB_DATA_TYPE_NULL:
+                return null;
             case TSDBConstants.TSDB_DATA_TYPE_BOOL:
                 return row.getBoolean(colIndex);
             case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
@@ -290,8 +359,10 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return 0;
         }
         wasNull = false;
-        if (value instanceof Float || value instanceof Double)
+        if (value instanceof Float)
             return (float) value;
+        if (value instanceof Double)
+            return new Float((Double) value);
         return Float.parseFloat(value.toString());
     }
 
@@ -329,6 +400,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return Shorts.toByteArray((short) value);
         if (value instanceof Byte)
             return new byte[]{(byte) value};
+        if (value instanceof Timestamp) {
+            return Utils.formatTimestamp((Timestamp) value).getBytes();
+        }
 
         return value.toString().getBytes();
     }
@@ -342,7 +416,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return null;
         if (value instanceof Timestamp)
             return new Date(((Timestamp) value).getTime());
-        return Date.valueOf(value.toString());
+        Date date = null;
+        date = Utils.parseDate(value.toString());
+        return date;
     }
 
     @Override
@@ -354,7 +430,13 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return null;
         if (value instanceof Timestamp)
             return new Time(((Timestamp) value).getTime());
-        return Time.valueOf(value.toString());
+        Time time = null;
+        try {
+            time = Utils.parseTime(value.toString());
+        } catch (DateTimeParseException e) {
+            time = null;
+        }
+        return time;
     }
 
     @Override
@@ -366,14 +448,20 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return null;
         if (value instanceof Timestamp)
             return (Timestamp) value;
-//        if (value instanceof Long) {
-//            if (1_0000_0000_0000_0L > (long) value)
-//                return Timestamp.from(Instant.ofEpochMilli((long) value));
-//            long epochSec = (long) value / 1000_000L;
-//            long nanoAdjustment = (long) ((long) value % 1000_000L * 1000);
-//            return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
-//        }
-        return Timestamp.valueOf(value.toString());
+        if (value instanceof Long) {
+            if (1_0000_0000_0000_0L > (long) value)
+                return Timestamp.from(Instant.ofEpochMilli((long) value));
+            long epochSec = (long) value / 1000_000L;
+            long nanoAdjustment = (long) value % 1000_000L * 1000;
+            return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
+        }
+        Timestamp ret;
+        try {
+            ret = Utils.parseTimestamp(value.toString());
+        } catch (Exception e) {
+            ret = null;
+        }
+        return ret;
     }
 
     @Override
@@ -415,7 +503,13 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return new BigDecimal(Double.valueOf(value.toString()));
         if (value instanceof Timestamp)
             return new BigDecimal(((Timestamp) value).getTime());
-        return new BigDecimal(value.toString());
+        BigDecimal ret;
+        try {
+            ret = new BigDecimal(value.toString());
+        } catch (Exception e) {
+            ret = null;
+        }
+        return ret;
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/UtcTimestampUtil.java

-package com.taosdata.jdbc.utils;
-
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-
-public class UtcTimestampUtil {
-    public static final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-            .appendPattern("yyyy-MM-ddTHH:mm:ss.SSS+")
-//            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
-            .toFormatter();
-
-}

src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java

@@ -5,7 +5,15 @@ import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
 
 import java.nio.charset.Charset;
+import java.sql.Date;
+import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -17,6 +25,41 @@ public class Utils {
 
     private static Pattern ptn = Pattern.compile(".*?'");
 
+    private static final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+            .appendPattern("yyyy-MM-dd HH:mm:ss.SSS").toFormatter();
+    private static final DateTimeFormatter formatter2 = new DateTimeFormatterBuilder()
+            .appendPattern("yyyy-MM-dd HH:mm:ss.SSSSSS").toFormatter();
+
+    public static Time parseTime(String timestampStr) throws DateTimeParseException {
+        LocalTime time;
+        try {
+            time = LocalTime.parse(timestampStr, formatter);
+        } catch (DateTimeParseException e) {
+            time = LocalTime.parse(timestampStr, formatter2);
+        }
+        return Time.valueOf(time);
+    }
+
+    public static Date parseDate(String timestampStr) throws DateTimeParseException {
+        LocalDate date;
+        try {
+            date = LocalDate.parse(timestampStr, formatter);
+        } catch (DateTimeParseException e) {
+            date = LocalDate.parse(timestampStr, formatter2);
+        }
+        return Date.valueOf(date);
+    }
+
+    public static Timestamp parseTimestamp(String timeStampStr) {
+        LocalDateTime dateTime;
+        try {
+            dateTime = LocalDateTime.parse(timeStampStr, formatter);
+        } catch (DateTimeParseException e) {
+            dateTime = LocalDateTime.parse(timeStampStr, formatter2);
+        }
+        return Timestamp.valueOf(dateTime);
+    }
+
     public static String escapeSingleQuota(String origin) {
         Matcher m = ptn.matcher(origin);
         StringBuffer sb = new StringBuffer();
@@ -133,4 +176,13 @@ public class Utils {
         }).collect(Collectors.joining());
     }
 
+
+    public static String formatTimestamp(Timestamp timestamp) {
+        int nanos = timestamp.getNanos();
+        if (nanos % 1000000l != 0)
+            return timestamp.toLocalDateTime().format(formatter2);
+        return timestamp.toLocalDateTime().format(formatter);
+    }
+
+
 }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBPreparedStatementTest.java

@@ -8,6 +8,8 @@ import org.junit.Test;
 import java.io.IOException;
 import java.io.Serializable;
 import java.sql.*;
+import java.util.ArrayList;
+import java.util.Random;
 
 public class TSDBPreparedStatementTest {
     private static final String host = "127.0.0.1";
@@ -97,6 +99,118 @@ public class TSDBPreparedStatementTest {
         Assert.assertEquals(1, result);
     }
 
+    @Test
+    public void executeTest() throws SQLException {   
+        Statement stmt = conn.createStatement();            
+
+        int numOfRows = 1000;        
+
+        for (int loop = 0; loop < 10; loop++){
+            stmt.execute("drop table if exists weather_test");
+            stmt.execute("create table weather_test(ts timestamp, f1 nchar(4), f2 float, f3 double, f4 timestamp, f5 int, f6 bool, f7 binary(10))");            
+
+            TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? values(?, ?, ?, ?, ?, ?, ?, ?)");
+            Random r = new Random();
+            s.setTableName("weather_test");
+            
+            ArrayList<Long> ts = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                ts.add(System.currentTimeMillis() + i);
+            }        
+            s.setTimestamp(0, ts);
+
+            int random = 10 + r.nextInt(5);
+            ArrayList<String> s2 = new ArrayList<String>();        
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s2.add(null);
+                }else{
+                    s2.add("分支" + i % 4);
+                }
+            }        
+            s.setNString(1, s2, 4);      
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Float> s3 = new ArrayList<Float>();        
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s3.add(null);
+                }else{
+                    s3.add(r.nextFloat());
+                }
+            }        
+            s.setFloat(2, s3);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Double> s4 = new ArrayList<Double>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s4.add(null);
+                }else{
+                    s4.add(r.nextDouble());
+                }
+            }
+            s.setDouble(3, s4);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Long> ts2 = new ArrayList<Long>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    ts2.add(null);
+                }else{
+                    ts2.add(System.currentTimeMillis() + i);
+                }
+            }
+            s.setTimestamp(4, ts2);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Integer>  vals = new ArrayList<>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    vals.add(null);
+                }else{
+                    vals.add(r.nextInt());
+                }                
+            }
+            s.setInt(5, vals);
+
+            random = 10 + r.nextInt(5);
+            ArrayList<Boolean> sb = new ArrayList<>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    sb.add(null);
+                }else{
+                    sb.add(i % 2 == 0 ? true : false);
+                }
+            }
+            s.setBoolean(6, sb);        
+
+            random = 10 + r.nextInt(5);
+            ArrayList<String> s5 = new ArrayList<String>();
+            for(int i = 0; i < numOfRows; i++) {
+                if(i % random == 0) {
+                    s5.add(null);
+                }else{
+                    s5.add("test" + i % 10);
+                }
+            }
+            s.setString(7, s5, 10);        
+
+            s.columnDataAddBatch();
+            s.columnDataExecuteBatch();
+            s.columnDataCloseBatch();
+
+            String sql = "select * from weather_test";
+            PreparedStatement statement = conn.prepareStatement(sql);
+            ResultSet rs = statement.executeQuery();
+            int rows = 0;
+            while(rs.next()) {
+                rows++;
+            }
+            Assert.assertEquals(numOfRows, rows);
+        }
+    }
+
     @Test
     public void setBoolean() throws SQLException {
         pstmt_insert.setTimestamp(1, new Timestamp(System.currentTimeMillis()));

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/InsertSpecialCharacterRestfulTest.java

@@ -7,7 +7,6 @@ import java.sql.*;
 public class InsertSpecialCharacterRestfulTest {
 
     private static final String host = "127.0.0.1";
-    //    private static final String host = "master";
     private static Connection conn;
     private static String dbName = "spec_char_test";
     private static String tbname1 = "test";

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TD4144Test.java

+package com.taosdata.jdbc.cases;
+
+import com.taosdata.jdbc.TSDBConnection;
+import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.TSDBResultSet;
+import com.taosdata.jdbc.TSDBSubscribe;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.DriverManager;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+public class TD4144Test {
+
+    private static TSDBConnection connection;
+    private static final String host = "127.0.0.1";
+
+    private static final String topic = "topic-meter-current-bg-10";
+    private static final String sql = "select * from meters where current > 10";
+    private static final String sql2 = "select * from meters where ts >= '2020-08-15 12:20:00.000'";
+
+
+    @Test
+    public void test() throws SQLException {
+        TSDBSubscribe subscribe = null;
+        TSDBResultSet res = null;
+        boolean hasNext = false;
+
+        try {
+            subscribe = connection.subscribe(topic, sql, false);
+            int count = 0;
+            while (true) {
+                // 等待1秒，避免频繁调用 consume，给服务端造成压力
+                TimeUnit.SECONDS.sleep(1);
+                if (res == null) {
+                    // 消费数据
+                    res = subscribe.consume();
+                    hasNext = res.next();
+                }
+
+                if (res == null) {
+                    continue;
+                }
+                ResultSetMetaData metaData = res.getMetaData();
+                int number = 0;
+                while (hasNext) {
+                    int columnCount = metaData.getColumnCount();
+                    for (int i = 1; i <= columnCount; i++) {
+                        System.out.print(metaData.getColumnLabel(i) + ": " + res.getString(i) + "\t");
+                    }
+                    System.out.println();
+                    count++;
+                    number++;
+                    hasNext = res.next();
+                    if (!hasNext) {
+                        res.close();
+                        res = null;
+                        System.out.println("rows： " + count);
+                    }
+                    if (hasNext == true && number >= 10) {
+                        System.out.println("batch" + number);
+                        break;
+                    }
+                }
+
+            }
+
+        } catch (SQLException | InterruptedException throwables) {
+            throwables.printStackTrace();
+        } finally {
+            if (subscribe != null)
+                subscribe.close(true);
+        }
+    }
+
+    @BeforeClass
+    public static void beforeClass() throws SQLException {
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+        connection = (DriverManager.getConnection(url, properties)).unwrap(TSDBConnection.class);
+        try (Statement stmt = connection.createStatement()) {
+            stmt.execute("drop database if exists power");
+            stmt.execute("create database if not exists power");
+            stmt.execute("use power");
+            stmt.execute("create table meters(ts timestamp, current float, voltage int, phase int) tags(location binary(64), groupId int)");
+            stmt.execute("create table d1001 using meters tags(\"Beijing.Chaoyang\", 2)");
+            stmt.execute("create table d1002 using meters tags(\"Beijing.Haidian\", 2)");
+            stmt.execute("insert into d1001 values(\"2020-08-15 12:00:00.000\", 12, 220, 1),(\"2020-08-15 12:10:00.000\", 12.3, 220, 2),(\"2020-08-15 12:20:00.000\", 12.2, 220, 1)");
+            stmt.execute("insert into d1002 values(\"2020-08-15 12:00:00.000\", 9.9, 220, 1),(\"2020-08-15 12:10:00.000\", 10.3, 220, 1),(\"2020-08-15 12:20:00.000\", 11.2, 220, 1)");
+        }
+    }
+
+    @AfterClass
+    public static void afterClass() throws SQLException {
+        if (connection != null)
+            connection.close();
+    }
+}

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TD4174Test.java

+package com.taosdata.jdbc.cases;
+
+import com.alibaba.fastjson.JSONObject;
+import com.taosdata.jdbc.TSDBDriver;
+import org.junit.*;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class TD4174Test {
+    private Connection conn;
+    private static final String host = "127.0.0.1";
+
+    @Test
+    public void test() {
+        long ts = System.currentTimeMillis();
+        try (PreparedStatement pstmt = conn.prepareStatement("insert into weather values(" + ts + ", ?)")) {
+            JSONObject value = new JSONObject();
+            value.put("name", "John Smith");
+            value.put("age", 20);
+            Assert.assertEquals("{\"name\":\"John Smith\",\"age\":20}",value.toJSONString());
+            pstmt.setString(1, value.toJSONString());
+
+            int ret = pstmt.executeUpdate();
+            Assert.assertEquals(1, ret);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) {
+        JSONObject value = new JSONObject();
+        value.put("name", "John Smith");
+        value.put("age", 20);
+        System.out.println(value.toJSONString());
+    }
+
+    @Before
+    public void before() throws SQLException {
+        String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+
+        conn = DriverManager.getConnection(url, properties);
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists td4174");
+            stmt.execute("create database if not exists td4174");
+            stmt.execute("use td4174");
+            stmt.execute("create table weather(ts timestamp, text binary(64))");
+        }
+    }
+
+    @After
+    public void after() throws SQLException {
+        if (conn != null)
+            conn.close();
+
+    }
+
+}

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/TwoTypeTimestampPercisionInRestfulTest.java

@@ -13,6 +13,7 @@ import java.util.Properties;
 public class TwoTypeTimestampPercisionInRestfulTest {
 
     private static final String host = "127.0.0.1";
+
     private static final String ms_timestamp_db = "ms_precision_test";
     private static final String us_timestamp_db = "us_precision_test";
     private static final long timestamp1 = System.currentTimeMillis();
@@ -94,7 +95,8 @@ public class TwoTypeTimestampPercisionInRestfulTest {
         try (Statement stmt = conn3.createStatement()) {
             ResultSet rs = stmt.executeQuery("select last_row(ts) from " + ms_timestamp_db + ".weather");
             rs.next();
-            long ts = rs.getTimestamp(1).getTime();
+            Timestamp actual = rs.getTimestamp(1);
+            long ts = actual == null ? 0 : actual.getTime();
             Assert.assertEquals(timestamp1, ts);
             ts = rs.getLong(1);
             Assert.assertEquals(timestamp1, ts);
@@ -110,7 +112,7 @@ public class TwoTypeTimestampPercisionInRestfulTest {
             rs.next();
 
             Timestamp timestamp = rs.getTimestamp(1);
-            long ts = timestamp.getTime();
+            long ts = timestamp == null ? 0 : timestamp.getTime();
             Assert.assertEquals(timestamp1, ts);
             int nanos = timestamp.getNanos();
             Assert.assertEquals(timestamp2 % 1000_000l * 1000, nanos);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberJniTest.java

@@ -9,19 +9,19 @@ import java.util.Properties;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class UnsignedNumberJniTest {
+
     private static final String host = "127.0.0.1";
     private static Connection conn;
+    private static long ts;
 
     @Test
     public void testCase001() {
         try (Statement stmt = conn.createStatement()) {
             ResultSet rs = stmt.executeQuery("select * from us_table");
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals(ts, rs.getTimestamp(1).getTime());
                 Assert.assertEquals("127", rs.getString(2));
                 Assert.assertEquals("32767", rs.getString(3));
                 Assert.assertEquals("2147483647", rs.getString(4));
@@ -37,13 +37,10 @@ public class UnsignedNumberJniTest {
         try (Statement stmt = conn.createStatement()) {
             ResultSet rs = stmt.executeQuery("select * from us_table");
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
+
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(ts, rs.getTimestamp(1).getTime());
                 Assert.assertEquals(127, rs.getByte(2));
                 Assert.assertEquals(32767, rs.getShort(3));
                 Assert.assertEquals(2147483647, rs.getInt(4));
@@ -61,16 +58,14 @@ public class UnsignedNumberJniTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,2147483647, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
                 Assert.assertEquals(127, rs.getByte(2));
                 Assert.assertEquals(32767, rs.getShort(3));
                 Assert.assertEquals(2147483647, rs.getInt(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getLong(5);
             }
         }
     }
@@ -82,15 +77,15 @@ public class UnsignedNumberJniTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
+
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
                 Assert.assertEquals(127, rs.getByte(2));
                 Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getInt(4);
             }
         }
     }
@@ -102,15 +97,15 @@ public class UnsignedNumberJniTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 65534,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
-            while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+            assertResultSetMetaData(meta);
 
+            while (rs.next()) {
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
                 Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals("65534", rs.getString(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getShort(3);
             }
         }
     }
@@ -122,37 +117,27 @@ public class UnsignedNumberJniTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
-            while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
-            }
-        }
-    }
+            assertResultSetMetaData(meta);
 
-    @Test
-    public void testCase007() throws SQLException {
-        try (Statement stmt = conn.createStatement()) {
-            long now = System.currentTimeMillis();
-            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
-            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
-            ResultSetMetaData meta = rs.getMetaData();
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
                 Assert.assertEquals("254", rs.getString(2));
                 Assert.assertEquals("65534", rs.getString(3));
                 Assert.assertEquals("4294967294", rs.getString(4));
                 Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getByte(2);
             }
         }
     }
 
+    private void assertResultSetMetaData(ResultSetMetaData meta) throws SQLException {
+        Assert.assertEquals(5, meta.getColumnCount());
+        Assert.assertEquals("ts", meta.getColumnLabel(1));
+        Assert.assertEquals("f1", meta.getColumnLabel(2));
+        Assert.assertEquals("f2", meta.getColumnLabel(3));
+        Assert.assertEquals("f3", meta.getColumnLabel(4));
+        Assert.assertEquals("f4", meta.getColumnLabel(5));
+    }
 
     @BeforeClass
     public static void beforeClass() {
@@ -160,20 +145,19 @@ public class UnsignedNumberJniTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        ts = System.currentTimeMillis();
 
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
             final String url = "jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata";
             conn = DriverManager.getConnection(url, properties);
-
             Statement stmt = conn.createStatement();
             stmt.execute("drop database if exists unsign_jni");
             stmt.execute("create database if not exists unsign_jni");
             stmt.execute("use unsign_jni");
             stmt.execute("create table us_table(ts timestamp, f1 tinyint unsigned, f2 smallint unsigned, f3 int unsigned, f4 bigint unsigned)");
-            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(now, 127, 32767,2147483647, 9223372036854775807)");
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + ts + ", 127, 32767,2147483647, 9223372036854775807)");
             stmt.close();
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
     }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/UnsignedNumberRestfulTest.java

@@ -13,17 +13,20 @@ public class UnsignedNumberRestfulTest {
 
     private static final String host = "127.0.0.1";
     private static Connection conn;
+    private static long ts;
 
     @Test
     public void testCase001() {
         try (Statement stmt = conn.createStatement()) {
             ResultSet rs = stmt.executeQuery("select * from us_table");
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals(ts, rs.getTimestamp(1).getTime());
+                Assert.assertEquals("127", rs.getString(2));
+                Assert.assertEquals("32767", rs.getString(3));
+                Assert.assertEquals("2147483647", rs.getString(4));
+                Assert.assertEquals("9223372036854775807", rs.getString(5));
             }
         } catch (SQLException e) {
             e.printStackTrace();
@@ -35,13 +38,14 @@ public class UnsignedNumberRestfulTest {
         try (Statement stmt = conn.createStatement()) {
             ResultSet rs = stmt.executeQuery("select * from us_table");
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
+
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(ts, rs.getTimestamp(1).getTime());
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals(2147483647, rs.getInt(4));
+                Assert.assertEquals(9223372036854775807l, rs.getLong(5));
             }
         } catch (SQLException e) {
             e.printStackTrace();
@@ -55,13 +59,14 @@ public class UnsignedNumberRestfulTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,2147483647, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals(2147483647, rs.getInt(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getLong(5);
             }
         }
     }
@@ -73,13 +78,15 @@ public class UnsignedNumberRestfulTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 32767,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
+
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals(32767, rs.getShort(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getInt(4);
             }
         }
     }
@@ -91,13 +98,15 @@ public class UnsignedNumberRestfulTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 127, 65534,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
+            assertResultSetMetaData(meta);
+
             while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
+                Assert.assertEquals(127, rs.getByte(2));
+                Assert.assertEquals("65534", rs.getString(3));
+                Assert.assertEquals("4294967294", rs.getString(4));
+                Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getShort(3);
             }
         }
     }
@@ -109,57 +118,47 @@ public class UnsignedNumberRestfulTest {
             stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
             ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
             ResultSetMetaData meta = rs.getMetaData();
-            while (rs.next()) {
-                System.out.print(meta.getColumnLabel(1) + ": " + rs.getTimestamp(1) + "\t");
-                System.out.print(meta.getColumnLabel(2) + ": " + rs.getByte(2) + "\t");
-                System.out.print(meta.getColumnLabel(3) + ": " + rs.getShort(3) + "\t");
-                System.out.print(meta.getColumnLabel(4) + ": " + rs.getInt(4) + "\t");
-                System.out.print(meta.getColumnLabel(5) + ": " + rs.getLong(5) + "\t");
-                System.out.println();
-            }
-        }
-    }
+            assertResultSetMetaData(meta);
 
-    @Test
-    public void testCase007() throws SQLException {
-        try (Statement stmt = conn.createStatement()) {
-            long now = System.currentTimeMillis();
-            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + now + ", 254, 65534,4294967294, 18446744073709551614)");
-            ResultSet rs = stmt.executeQuery("select * from us_table where ts = " + now);
-            ResultSetMetaData meta = rs.getMetaData();
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals(now, rs.getTimestamp(1).getTime());
                 Assert.assertEquals("254", rs.getString(2));
                 Assert.assertEquals("65534", rs.getString(3));
                 Assert.assertEquals("4294967294", rs.getString(4));
                 Assert.assertEquals("18446744073709551614", rs.getString(5));
+                rs.getByte(2);
             }
         }
     }
 
+    private void assertResultSetMetaData(ResultSetMetaData meta) throws SQLException {
+        Assert.assertEquals(5, meta.getColumnCount());
+        Assert.assertEquals("ts", meta.getColumnLabel(1));
+        Assert.assertEquals("f1", meta.getColumnLabel(2));
+        Assert.assertEquals("f2", meta.getColumnLabel(3));
+        Assert.assertEquals("f3", meta.getColumnLabel(4));
+        Assert.assertEquals("f4", meta.getColumnLabel(5));
+    }
+
     @BeforeClass
     public static void beforeClass() {
         Properties properties = new Properties();
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        ts = System.currentTimeMillis();
 
         try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
             final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata";
             conn = DriverManager.getConnection(url, properties);
-
             Statement stmt = conn.createStatement();
             stmt.execute("drop database if exists unsign_restful");
             stmt.execute("create database if not exists unsign_restful");
             stmt.execute("use unsign_restful");
             stmt.execute("create table us_table(ts timestamp, f1 tinyint unsigned, f2 smallint unsigned, f3 int unsigned, f4 bigint unsigned)");
-            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(now, 127, 32767,2147483647, 9223372036854775807)");
+            stmt.executeUpdate("insert into us_table(ts,f1,f2,f3,f4) values(" + ts + ", 127, 32767,2147483647, 9223372036854775807)");
             stmt.close();
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
     }

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java

@@ -10,7 +10,6 @@ import java.sql.*;
 
 public class RestfulPreparedStatementTest {
     private static final String host = "127.0.0.1";
-    //    private static final String host = "master";
     private static Connection conn;
     private static final String sql_insert = "insert into t1 values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     private static PreparedStatement pstmt_insert;
@@ -371,7 +370,6 @@ public class RestfulPreparedStatementTest {
         pstmt_insert.setSQLXML(1, null);
     }
 
-
     @BeforeClass
     public static void beforeClass() {
         try {

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java

@@ -18,7 +18,6 @@ import java.text.SimpleDateFormat;
 public class RestfulResultSetTest {
 
     private static final String host = "127.0.0.1";
-
     private static Connection conn;
     private static Statement stmt;
     private static ResultSet rs;
@@ -95,7 +94,8 @@ public class RestfulResultSetTest {
     @Test
     public void getBigDecimal() throws SQLException {
         BigDecimal f1 = rs.getBigDecimal("f1");
-        Assert.assertEquals(1609430400000l, f1.longValue());
+        long actual = (f1 == null) ? 0 : f1.longValue();
+        Assert.assertEquals(1609430400000l, actual);
 
         BigDecimal f2 = rs.getBigDecimal("f2");
         Assert.assertEquals(1, f2.intValue());
@@ -119,7 +119,7 @@ public class RestfulResultSetTest {
     @Test
     public void getBytes() throws SQLException {
         byte[] f1 = rs.getBytes("f1");
-        Assert.assertEquals("2021-01-01 00:00:00.0", new String(f1));
+        Assert.assertEquals("2021-01-01 00:00:00.000", new String(f1));
 
         byte[] f2 = rs.getBytes("f2");
         Assert.assertEquals(1, Ints.fromByteArray(f2));

src/connector/odbc/examples/c/main.c

@@ -18,8 +18,8 @@
 #define CHK_TEST(statement)                       \
 do {                                              \
   D("testing: %s", #statement);                   \
-  int r = (statement);                            \
-  if (r) {                                        \
+  int _r = (statement);                            \
+  if (_r) {                                        \
     D("testing failed: %s", #statement);          \
     return 1;                                     \
   }                                               \
@@ -181,7 +181,7 @@ static int do_statement(SQLHSTMT stmt, const char *statement) {
     r = traverse_cols(stmt, cols);
     char buf[4096];
     while (1) {
-      SQLRETURN r = SQLFetch(stmt);
+      r = SQLFetch(stmt);
       if (r==SQL_NO_DATA) break;
       CHK_RESULT(r, SQL_HANDLE_STMT, stmt, "");
       for (size_t i=0; i<cols; ++i) {

src/connector/odbc/src/base/tsdb_impl.c

@@ -1762,8 +1762,8 @@ static SQLRETURN tsdb_conn_prepare(stmt_t *stmt) {
       tsdb_stmt->tsdb_params     = tsdb_params;
 
       for (int i=0; i<nums; ++i) {
-        SQLRETURN r = do_fill_param(stmt, i);
-        if (r) return r;
+        SQLRETURN _r = do_fill_param(stmt, i);
+        if (_r) return _r;
       }
     }
 

src/connector/python/linux/python2

-../
\ No newline at end of file

src/connector/python/linux/python3

-../
\ No newline at end of file

src/connector/python/osx/python3

-../
\ No newline at end of file

src/connector/python/windows/python2

-../
\ No newline at end of file

src/connector/python/windows/python3

-../
\ No newline at end of file

src/kit/shell/src/shellCheck.c

@@ -148,15 +148,15 @@ static void *shellCheckThreadFp(void *arg) {
   return NULL;
 }
 
-static void shellRunCheckThreads(TAOS *con, SShellArguments *args) {
+static void shellRunCheckThreads(TAOS *con, SShellArguments *_args) {
   pthread_attr_t  thattr;
-  ShellThreadObj *threadObj = (ShellThreadObj *)calloc(args->threadNum, sizeof(ShellThreadObj));
-  for (int t = 0; t < args->threadNum; ++t) {
+  ShellThreadObj *threadObj = (ShellThreadObj *)calloc(_args->threadNum, sizeof(ShellThreadObj));
+  for (int t = 0; t < _args->threadNum; ++t) {
     ShellThreadObj *pThread = threadObj + t;
     pThread->threadIndex = t;
-    pThread->totalThreads = args->threadNum;
+    pThread->totalThreads = _args->threadNum;
     pThread->taos = con;
-    pThread->db = args->database;
+    pThread->db = _args->database;
 
     pthread_attr_init(&thattr);
     pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
@@ -167,31 +167,31 @@ static void shellRunCheckThreads(TAOS *con, SShellArguments *args) {
     }
   }
 
-  for (int t = 0; t < args->threadNum; ++t) {
+  for (int t = 0; t < _args->threadNum; ++t) {
     pthread_join(threadObj[t].threadID, NULL);
   }
 
-  for (int t = 0; t < args->threadNum; ++t) {
+  for (int t = 0; t < _args->threadNum; ++t) {
     taos_close(threadObj[t].taos);
   }
   free(threadObj);
 }
 
-void shellCheck(TAOS *con, SShellArguments *args) {
+void shellCheck(TAOS *con, SShellArguments *_args) {
   int64_t start = taosGetTimestampMs();
 
-  if (shellUseDb(con, args->database) != 0) {
+  if (shellUseDb(con, _args->database) != 0) {
     shellFreeTbnames();
     return;
   }
 
-  if (shellShowTables(con, args->database) != 0) {
+  if (shellShowTables(con, _args->database) != 0) {
     shellFreeTbnames();
     return;
   }
 
-  fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, args->threadNum);
-  shellRunCheckThreads(con, args);
+  fprintf(stdout, "total %d tables will be checked by %d threads\n", tbNum, _args->threadNum);
+  shellRunCheckThreads(con, _args);
 
   int64_t end = taosGetTimestampMs();
   fprintf(stdout, "total %d tables checked, failed:%d, time spent %.2f seconds\n", checkedNum, errorNum,

src/kit/shell/src/shellEngine.c

@@ -56,24 +56,24 @@ extern TAOS *taos_connect_auth(const char *ip, const char *user, const char *aut
 /*
  * FUNCTION: Initialize the shell.
  */
-TAOS *shellInit(SShellArguments *args) {
+TAOS *shellInit(SShellArguments *_args) {
   printf("\n");
   printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
   fflush(stdout);
 
   // set options before initializing
-  if (args->timezone != NULL) {
-    taos_options(TSDB_OPTION_TIMEZONE, args->timezone);
+  if (_args->timezone != NULL) {
+    taos_options(TSDB_OPTION_TIMEZONE, _args->timezone);
   }
 
-  if (args->is_use_passwd) {
-    if (args->password == NULL) args->password = getpass("Enter password: ");
+  if (_args->is_use_passwd) {
+    if (_args->password == NULL) _args->password = getpass("Enter password: ");
   } else {
-    args->password = TSDB_DEFAULT_PASS;
+    _args->password = TSDB_DEFAULT_PASS;
   }
 
-  if (args->user == NULL) {
-    args->user = TSDB_DEFAULT_USER;
+  if (_args->user == NULL) {
+    _args->user = TSDB_DEFAULT_USER;
   }
 
   if (taos_init()) {
@@ -84,10 +84,10 @@ TAOS *shellInit(SShellArguments *args) {
 
   // Connect to the database.
   TAOS *con = NULL;
-  if (args->auth == NULL) {
-    con = taos_connect(args->host, args->user, args->password, args->database, args->port);
+  if (_args->auth == NULL) {
+    con = taos_connect(_args->host, _args->user, _args->password, _args->database, _args->port);
   } else {
-    con = taos_connect_auth(args->host, args->user, args->auth, args->database, args->port);
+    con = taos_connect_auth(_args->host, _args->user, _args->auth, _args->database, _args->port);
   }
 
   if (con == NULL) {
@@ -100,14 +100,14 @@ TAOS *shellInit(SShellArguments *args) {
   read_history();
 
   // Check if it is temperory run
-  if (args->commands != NULL || args->file[0] != 0) {
-    if (args->commands != NULL) {
-      printf("%s%s\n", PROMPT_HEADER, args->commands);
-      shellRunCommand(con, args->commands);
+  if (_args->commands != NULL || _args->file[0] != 0) {
+    if (_args->commands != NULL) {
+      printf("%s%s\n", PROMPT_HEADER, _args->commands);
+      shellRunCommand(con, _args->commands);
     }
 
-    if (args->file[0] != 0) {
-      source_file(con, args->file);
+    if (_args->file[0] != 0) {
+      source_file(con, _args->file);
     }
 
     taos_close(con);
@@ -116,14 +116,14 @@ TAOS *shellInit(SShellArguments *args) {
   }
 
 #ifndef WINDOWS
-  if (args->dir[0] != 0) {
-    source_dir(con, args);
+  if (_args->dir[0] != 0) {
+    source_dir(con, _args);
     taos_close(con);
     exit(EXIT_SUCCESS);
   }
 
-  if (args->check != 0) {
-    shellCheck(con, args);
+  if (_args->check != 0) {
+    shellCheck(con, _args);
     taos_close(con);
     exit(EXIT_SUCCESS);
   }

src/kit/shell/src/shellImport.c

@@ -233,15 +233,15 @@ void* shellImportThreadFp(void *arg)
   return NULL;
 }
 
-static void shellRunImportThreads(SShellArguments* args)
+static void shellRunImportThreads(SShellArguments* _args)
 {
   pthread_attr_t thattr;
-  ShellThreadObj *threadObj = (ShellThreadObj *)calloc(args->threadNum, sizeof(ShellThreadObj));
-  for (int t = 0; t < args->threadNum; ++t) {
+  ShellThreadObj *threadObj = (ShellThreadObj *)calloc(_args->threadNum, sizeof(ShellThreadObj));
+  for (int t = 0; t < _args->threadNum; ++t) {
     ShellThreadObj *pThread = threadObj + t;
     pThread->threadIndex = t;
-    pThread->totalThreads = args->threadNum;
-    pThread->taos = taos_connect(args->host, args->user, args->password, args->database, tsDnodeShellPort);
+    pThread->totalThreads = _args->threadNum;
+    pThread->taos = taos_connect(_args->host, _args->user, _args->password, _args->database, tsDnodeShellPort);
     if (pThread->taos == NULL) {
       fprintf(stderr, "ERROR: thread:%d failed connect to TDengine, error:%s\n", pThread->threadIndex, "null taos"/*taos_errstr(pThread->taos)*/);
       exit(0);
@@ -256,18 +256,18 @@ static void shellRunImportThreads(SShellArguments* args)
     }
   }
 
-  for (int t = 0; t < args->threadNum; ++t) {
+  for (int t = 0; t < _args->threadNum; ++t) {
     pthread_join(threadObj[t].threadID, NULL);
   }
 
-  for (int t = 0; t < args->threadNum; ++t) {
+  for (int t = 0; t < _args->threadNum; ++t) {
     taos_close(threadObj[t].taos);
   }
   free(threadObj);
 }
 
-void source_dir(TAOS* con, SShellArguments* args) {
-  shellGetDirectoryFileList(args->dir);
+void source_dir(TAOS* con, SShellArguments* _args) {
+  shellGetDirectoryFileList(_args->dir);
   int64_t start = taosGetTimestampMs();
 
   if (shellTablesSQLFile[0] != 0) {
@@ -276,7 +276,7 @@ void source_dir(TAOS* con, SShellArguments* args) {
     fprintf(stdout, "import %s finished, time spent %.2f seconds\n", shellTablesSQLFile, (end - start) / 1000.0);
   }
 
-  shellRunImportThreads(args);
+  shellRunImportThreads(_args);
   int64_t end = taosGetTimestampMs();
-  fprintf(stdout, "import %s finished, time spent %.2f seconds\n", args->dir, (end - start) / 1000.0);
+  fprintf(stdout, "import %s finished, time spent %.2f seconds\n", _args->dir, (end - start) / 1000.0);
 }

src/kit/shell/src/shellLinux.c

@@ -415,7 +415,7 @@ void set_terminal_mode() {
   }
 }
 
-void get_history_path(char *history) { snprintf(history, TSDB_FILENAME_LEN, "%s/%s", getenv("HOME"), HISTORY_FILE); }
+void get_history_path(char *_history) { snprintf(_history, TSDB_FILENAME_LEN, "%s/%s", getenv("HOME"), HISTORY_FILE); }
 
 void clearScreen(int ecmd_pos, int cursor_pos) {
   struct winsize w;

src/kit/taosdump/taosdump.c

@@ -1017,7 +1017,7 @@ int taosDumpOut(struct arguments *arguments) {
       sprintf(command, "use %s", dbInfos[0]->name);
 
       result = taos_query(taos, command);
-      int32_t code = taos_errno(result);
+      code = taos_errno(result);
       if (code != 0) {
         fprintf(stderr, "invalid database %s\n", dbInfos[0]->name);
         goto _exit_failure;

src/mnode/src/mnodeDnode.c

@@ -522,13 +522,13 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
   pStatus->lastReboot   = htonl(pStatus->lastReboot);
   pStatus->numOfCores   = htons(pStatus->numOfCores);
 
-  uint32_t version = htonl(pStatus->version);
-  if (version != tsVersion) {
+  uint32_t _version = htonl(pStatus->version);
+  if (_version != tsVersion) {
     pDnode = mnodeGetDnodeByEp(pStatus->dnodeEp);
     if (pDnode != NULL && pDnode->status != TAOS_DN_STATUS_READY) {
       pDnode->offlineReason = TAOS_DN_OFF_VERSION_NOT_MATCH;
     }
-    mError("dnode:%d, status msg version:%d not equal with cluster:%d", pStatus->dnodeId, version, tsVersion);
+    mError("dnode:%d, status msg version:%d not equal with cluster:%d", pStatus->dnodeId, _version, tsVersion);
     return TSDB_CODE_MND_INVALID_MSG_VERSION;
   }
 

src/mnode/src/mnodeProfile.c

@@ -123,8 +123,9 @@ SConnObj *mnodeAccquireConn(int32_t connId, char *user, uint32_t ip, uint16_t po
   if (/* pConn->ip != ip || */ pConn->port != port /* || strcmp(pConn->user, user) != 0 */) {
     mDebug("connId:%d, incoming conn user:%s ip:%s:%u, not match exist conn user:%s ip:%s:%u", connId, user,
            taosIpStr(ip), port, pConn->user, taosIpStr(pConn->ip), pConn->port);
-    taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
-    return NULL;
+    pConn->port = port;
+    //taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+    //return NULL;
   }
 
   // mDebug("connId:%d, is incoming, user:%s ip:%s:%u", connId, pConn->user, taosIpStr(pConn->ip), pConn->port);

src/mnode/src/mnodeShow.c

@@ -253,10 +253,6 @@ static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
     
   int32_t connId = htonl(pHBMsg->connId);
   SConnObj *pConn = mnodeAccquireConn(connId, connInfo.user, connInfo.clientIp, connInfo.clientPort);
-  if (pConn == NULL) {
-    pHBMsg->pid = htonl(pHBMsg->pid);
-    pConn = mnodeCreateConn(connInfo.user, connInfo.clientIp, connInfo.clientPort, pHBMsg->pid, pHBMsg->appName);
-  }
 
   if (pConn == NULL) {
     // do not close existing links, otherwise

src/plugins/http/src/httpGzip.c

@@ -132,10 +132,10 @@ int32_t ehttp_gzip_write(ehttp_gzip_t *gzip, const char *buf, int32_t len) {
       if (ret != Z_STREAM_END) continue;
     }
 
-    int32_t len = (int32_t)(gzip->gzip->next_out - (z_const Bytef *)gzip->chunk);
+    int32_t _len = (int32_t)(gzip->gzip->next_out - (z_const Bytef *)gzip->chunk);
 
     gzip->gzip->next_out[0] = '\0';
-    gzip->callbacks.on_data(gzip, gzip->arg, gzip->chunk, len);
+    gzip->callbacks.on_data(gzip, gzip->arg, gzip->chunk, _len);
     gzip->gzip->next_out = (z_const Bytef *)gzip->chunk;
     gzip->gzip->avail_out = gzip->conf.chunk_size;
   }

src/plugins/http/src/httpParser.c

@@ -163,9 +163,9 @@ static int32_t httpOnRequestLine(HttpParser *pParser, char *method, char *target
 
   // parse decode method
   for (int32_t i = 0; i < tsHttpServer.methodScannerLen; i++) {
-    HttpDecodeMethod *method = tsHttpServer.methodScanner[i];
-    if (strcmp(method->module, pParser->path[0].str) == 0) {
-      pContext->decodeMethod = method;
+    HttpDecodeMethod *_method = tsHttpServer.methodScanner[i];
+    if (strcmp(_method->module, pParser->path[0].str) == 0) {
+      pContext->decodeMethod = _method;
       break;
     }
   }

src/plugins/http/src/httpTgHandle.c

@@ -209,7 +209,7 @@ void tgParseSchemaMetric(cJSON *metric) {
         parsedOk = false;
         goto ParseEnd;
       }
-      int32_t nameLen = (int32_t)strlen(field->valuestring);
+      nameLen = (int32_t)strlen(field->valuestring);
       if (nameLen == 0 || nameLen >= TSDB_TABLE_NAME_LEN) {
         parsedOk = false;
         goto ParseEnd;

src/query/src/qExecutor.c

@@ -115,6 +115,8 @@ int64_t genQueryId(void) {
 
   uid |= sid;
 
+  qDebug("gen qid:0x%"PRIx64, uid);
+
   return uid;
 }
 

src/query/src/qSqlParser.c

@@ -592,14 +592,14 @@ void tSetDbName(SStrToken *pCpxName, SStrToken *pDb) {
 
 void tSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType) {
   int32_t maxLen = sizeof(pField->name) / sizeof(pField->name[0]);
-  
-  // truncate the column name
-  if ((int32_t)pName->n >= maxLen) {
-    pName->n = maxLen - 1;
-  }
 
-  strncpy(pField->name, pName->z, pName->n);
-  pField->name[pName->n] = 0;
+  // column name is too long, set the it to be invalid.
+  if ((int32_t) pName->n >= maxLen) {
+    pName->n = -1;
+  } else {
+    strncpy(pField->name, pName->z, pName->n);
+    pField->name[pName->n] = 0;
+  }
 
   pField->type = pType->type;
   if(!isValidDataType(pField->type)){

src/query/tests/CMakeLists.txt

@@ -13,3 +13,10 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     ADD_EXECUTABLE(queryTest ${SOURCE_LIST})
     TARGET_LINK_LIBRARIES(queryTest taos query gtest pthread gcov)
 ENDIF()
+
+SET_SOURCE_FILES_PROPERTIES(./astTest.cpp PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(./histogramTest.cpp PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(./percentileTest.cpp PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(./resultBufferTest.cpp PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(./tsBufTest.cpp PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(./unitTest.cpp PROPERTIES COMPILE_FLAGS -w)

src/rpc/src/rpcMain.c

@@ -1471,7 +1471,7 @@ static int32_t rpcCompressRpcMsg(char* pCont, int32_t contLen) {
    * only the compressed size is less than the value of contLen - overhead, the compression is applied
    * The first four bytes is set to 0, the second four bytes are utilized to keep the original length of message
    */
-  if (compLen < contLen - overhead) {
+  if (compLen > 0 && compLen < contLen - overhead) {
     SRpcComp *pComp = (SRpcComp *)pCont;
     pComp->reserved = 0; 
     pComp->contLen = htonl(contLen); 

src/rpc/src/rpcTcp.c

@@ -576,7 +576,7 @@ static void *taosProcessTcpData(void *param) {
   }
 
   while (pThreadObj->pHead) {
-    SFdObj *pFdObj = pThreadObj->pHead;
+    pFdObj = pThreadObj->pHead;
     pThreadObj->pHead = pFdObj->next;
     taosReportBrokenLink(pFdObj);
   }

src/sync/src/syncMain.c

@@ -389,17 +389,17 @@ int32_t syncForwardToPeer(int64_t rid, void *data, void *mhandle, int32_t qtype,
   return code;
 }
 
-void syncConfirmForward(int64_t rid, uint64_t version, int32_t code, bool force) {
+void syncConfirmForward(int64_t rid, uint64_t _version, int32_t code, bool force) {
   SSyncNode *pNode = syncAcquireNode(rid);
   if (pNode == NULL) return;
 
   SSyncPeer *pPeer = pNode->pMaster;
   if (pPeer && (pNode->quorum > 1 || force)) {
     SFwdRsp rsp;
-    syncBuildSyncFwdRsp(&rsp, pNode->vgId, version, code);
+    syncBuildSyncFwdRsp(&rsp, pNode->vgId, _version, code);
 
     if (taosWriteMsg(pPeer->peerFd, &rsp, sizeof(SFwdRsp)) == sizeof(SFwdRsp)) {
-      sTrace("%s, forward-rsp is sent, code:0x%x hver:%" PRIu64, pPeer->id, code, version);
+      sTrace("%s, forward-rsp is sent, code:0x%x hver:%" PRIu64, pPeer->id, code, _version);
     } else {
       sDebug("%s, failed to send forward-rsp, restart", pPeer->id);
       syncRestartConnection(pPeer);
@@ -1302,14 +1302,14 @@ static void syncProcessBrokenLink(int64_t rid) {
   syncReleasePeer(pPeer);
 }
 
-static int32_t syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle) {
+static int32_t syncSaveFwdInfo(SSyncNode *pNode, uint64_t _version, void *mhandle) {
   SSyncFwds *pSyncFwds = pNode->pSyncFwds;
   int64_t    time = taosGetTimestampMs();
 
   if (pSyncFwds->fwds >= SYNC_MAX_FWDS) {
     // pSyncFwds->first = (pSyncFwds->first + 1) % SYNC_MAX_FWDS;
     // pSyncFwds->fwds--;
-    sError("vgId:%d, failed to save fwd info, hver:%" PRIu64 " fwds:%d", pNode->vgId, version, pSyncFwds->fwds);
+    sError("vgId:%d, failed to save fwd info, hver:%" PRIu64 " fwds:%d", pNode->vgId, _version, pSyncFwds->fwds);
     return TSDB_CODE_SYN_TOO_MANY_FWDINFO;
   }
 
@@ -1319,12 +1319,12 @@ static int32_t syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle
 
   SFwdInfo *pFwdInfo = pSyncFwds->fwdInfo + pSyncFwds->last;
   memset(pFwdInfo, 0, sizeof(SFwdInfo));
-  pFwdInfo->version = version;
+  pFwdInfo->version = _version;
   pFwdInfo->mhandle = mhandle;
   pFwdInfo->time = time;
 
   pSyncFwds->fwds++;
-  sTrace("vgId:%d, fwd info is saved, hver:%" PRIu64 " fwds:%d ", pNode->vgId, version, pSyncFwds->fwds);
+  sTrace("vgId:%d, fwd info is saved, hver:%" PRIu64 " fwds:%d ", pNode->vgId, _version, pSyncFwds->fwds);
 
   return 0;
 }

src/sync/src/syncMsg.c

@@ -61,13 +61,13 @@ void syncBuildSyncFwdMsg(SSyncHead *pHead, int32_t vgId, int32_t len) {
   syncBuildHead(pHead);
 }
 
-void syncBuildSyncFwdRsp(SFwdRsp *pMsg, int32_t vgId, uint64_t version, int32_t code) {
+void syncBuildSyncFwdRsp(SFwdRsp *pMsg, int32_t vgId, uint64_t _version, int32_t code) {
   pMsg->head.type = TAOS_SMSG_SYNC_FWD_RSP;
   pMsg->head.vgId = vgId;
   pMsg->head.len = sizeof(SFwdRsp) - sizeof(SSyncHead);
   syncBuildHead(&pMsg->head);
 
-  pMsg->version = version;
+  pMsg->version = _version;
   pMsg->code = code;
 }
 

src/tsdb/inc/tsdbBuffer.h

@@ -28,8 +28,9 @@ typedef struct {
   int            bufBlockSize;
   int            tBufBlocks;
   int            nBufBlocks;
+  int            nRecycleBlocks;
   int64_t        index;
-  SList*         bufBlockList;
+  SList*         bufBlockList;  
 } STsdbBufPool;
 
 #define TSDB_BUFFER_RESERVE 1024  // Reseve 1K as commit threshold
@@ -39,5 +40,7 @@ void          tsdbFreeBufPool(STsdbBufPool* pBufPool);
 int           tsdbOpenBufPool(STsdbRepo* pRepo);
 void          tsdbCloseBufPool(STsdbRepo* pRepo);
 SListNode*    tsdbAllocBufBlockFromPool(STsdbRepo* pRepo);
+int           tsdbExpendPool(STsdbRepo* pRepo, int32_t oldTotalBlocks);
+void          tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode);
 
 #endif /* _TD_TSDB_BUFFER_H_ */
\ No newline at end of file

src/tsdb/inc/tsdbMeta.h

@@ -72,7 +72,7 @@ void       tsdbFreeMeta(STsdbMeta* pMeta);
 int        tsdbOpenMeta(STsdbRepo* pRepo);
 int        tsdbCloseMeta(STsdbRepo* pRepo);
 STable*    tsdbGetTableByUid(STsdbMeta* pMeta, uint64_t uid);
-STSchema*  tsdbGetTableSchemaByVersion(STable* pTable, int16_t version);
+STSchema*  tsdbGetTableSchemaByVersion(STable* pTable, int16_t _version);
 int        tsdbWLockRepoMeta(STsdbRepo* pRepo);
 int        tsdbRLockRepoMeta(STsdbRepo* pRepo);
 int        tsdbUnlockRepoMeta(STsdbRepo* pRepo);
@@ -92,16 +92,16 @@ static FORCE_INLINE int tsdbCompareSchemaVersion(const void *key1, const void *k
   }
 }
 
-static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, bool copy, int16_t version) {
+static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, bool copy, int16_t _version) {
   STable*   pDTable = (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) ? pTable->pSuper : pTable;
   STSchema* pSchema = NULL;
   STSchema* pTSchema = NULL;
 
   if (lock) TSDB_RLOCK_TABLE(pDTable);
-  if (version < 0) {  // get the latest version of schema
+  if (_version < 0) {  // get the latest version of schema
     pTSchema = pDTable->schema[pDTable->numOfSchemas - 1];
   } else {  // get the schema with version
-    void* ptr = taosbsearch(&version, pDTable->schema, pDTable->numOfSchemas, sizeof(STSchema*),
+    void* ptr = taosbsearch(&_version, pDTable->schema, pDTable->numOfSchemas, sizeof(STSchema*),
                             tsdbCompareSchemaVersion, TD_EQ);
     if (ptr == NULL) {
       terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION;

src/tsdb/inc/tsdbint.h

@@ -71,6 +71,11 @@ struct STsdbRepo {
   uint8_t state;
 
   STsdbCfg        config;
+
+  STsdbCfg        save_config;    // save apply config
+  bool            config_changed; // config changed flag
+  pthread_mutex_t save_mutex;     // protect save config
+
   STsdbAppH       appH;
   STsdbStat       stat;
   STsdbMeta*      tsdbMeta;

src/tsdb/src/tsdbBuffer.c

@@ -70,6 +70,7 @@ int tsdbOpenBufPool(STsdbRepo *pRepo) {
   pPool->tBufBlocks = pCfg->totalBlocks;
   pPool->nBufBlocks = 0;
   pPool->index = 0;
+  pPool->nRecycleBlocks = 0;
 
   for (int i = 0; i < pCfg->totalBlocks; i++) {
     STsdbBufBlock *pBufBlock = tsdbNewBufBlock(pPool->bufBlockSize);
@@ -156,4 +157,46 @@ _err:
   return NULL;
 }
 
-static void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock) { tfree(pBufBlock); }
\ No newline at end of file
+static void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock) { tfree(pBufBlock); }
+
+int tsdbExpendPool(STsdbRepo* pRepo, int32_t oldTotalBlocks) {
+  if (oldTotalBlocks == pRepo->config.totalBlocks) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  int err = TSDB_CODE_SUCCESS;
+
+  if (tsdbLockRepo(pRepo) < 0) return terrno;
+  STsdbBufPool* pPool = pRepo->pPool;
+
+  if (pRepo->config.totalBlocks > oldTotalBlocks) {
+    for (int i = 0; i < pRepo->config.totalBlocks - oldTotalBlocks; i++) {
+      STsdbBufBlock *pBufBlock = tsdbNewBufBlock(pPool->bufBlockSize);
+      if (pBufBlock == NULL) goto err;
+
+      if (tdListAppend(pPool->bufBlockList, (void *)(&pBufBlock)) < 0) {
+        tsdbFreeBufBlock(pBufBlock);
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        err = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto err;
+      }
+
+      pPool->nBufBlocks++;      
+    }
+    pthread_cond_signal(&pPool->poolNotEmpty);
+  } else {
+    pPool->nRecycleBlocks = oldTotalBlocks - pRepo->config.totalBlocks;
+  } 
+
+err:
+  tsdbUnlockRepo(pRepo);
+  return err;
+}
+
+void tsdbRecycleBufferBlock(STsdbBufPool* pPool, SListNode *pNode) {
+  STsdbBufBlock *pBufBlock = NULL;
+  tdListNodeGetData(pPool->bufBlockList, pNode, (void *)(&pBufBlock));
+  tsdbFreeBufBlock(pBufBlock);
+  free(pNode);
+  pPool->nBufBlocks--;
+}
\ No newline at end of file

src/tsdb/src/tsdbCommit.c

@@ -958,11 +958,11 @@ static int tsdbWriteBlockInfo(SCommitH *pCommih) {
 }
 
 static int tsdbWriteBlockIdx(SCommitH *pCommih) {
-  SBlockIdx *pBlkIdx;
+  SBlockIdx *pBlkIdx = NULL;
   SDFile *   pHeadf = TSDB_COMMIT_HEAD_FILE(pCommih);
   size_t     nidx = taosArrayGetSize(pCommih->aBlkIdx);
-  int        tlen = 0, size;
-  int64_t    offset;
+  int        tlen = 0, size = 0;
+  int64_t    offset = 0;
 
   if (nidx <= 0) {
     // All data are deleted

src/tsdb/src/tsdbCommitQueue.c

@@ -112,6 +112,32 @@ int tsdbScheduleCommit(STsdbRepo *pRepo) {
   return 0;
 }
 
+static void tsdbApplyRepoConfig(STsdbRepo *pRepo) {
+  pRepo->config_changed = false;
+  STsdbCfg * pSaveCfg = &pRepo->save_config;
+
+  int32_t oldTotalBlocks = pRepo->config.totalBlocks;
+
+  pRepo->config.compression = pRepo->save_config.compression;
+  pRepo->config.keep = pRepo->save_config.keep;
+  pRepo->config.keep1 = pRepo->save_config.keep1;
+  pRepo->config.keep2 = pRepo->save_config.keep2;
+  pRepo->config.cacheLastRow = pRepo->save_config.cacheLastRow;
+  pRepo->config.totalBlocks = pRepo->save_config.totalBlocks;
+
+  tsdbInfo("vgId:%d apply new config: compression(%d), keep(%d,%d,%d), totalBlocks(%d), cacheLastRow(%d),totalBlocks(%d)",
+    REPO_ID(pRepo),
+    pSaveCfg->compression, pSaveCfg->keep,pSaveCfg->keep1, pSaveCfg->keep2,
+    pSaveCfg->totalBlocks, pSaveCfg->cacheLastRow, pSaveCfg->totalBlocks);
+
+  int err = tsdbExpendPool(pRepo, oldTotalBlocks);
+  if (!TAOS_SUCCEEDED(err)) {
+    tsdbError("vgId:%d expand pool from %d to %d fail,reason:%s",
+      REPO_ID(pRepo), oldTotalBlocks, pSaveCfg->totalBlocks, tstrerror(err));
+  }
+
+}
+
 static void *tsdbLoopCommit(void *arg) {
   SCommitQueue *pQueue = &tsCommitQueue;
   SListNode *   pNode = NULL;
@@ -138,6 +164,13 @@ static void *tsdbLoopCommit(void *arg) {
 
     pRepo = ((SCommitReq *)pNode->data)->pRepo;
 
+    // check if need to apply new config
+    if (pRepo->config_changed) {
+      pthread_mutex_lock(&pRepo->save_mutex);       
+      tsdbApplyRepoConfig(pRepo);
+      pthread_mutex_unlock(&pRepo->save_mutex);
+    }
+
     tsdbCommitData(pRepo);
     listNodeFree(pNode);
   }

src/tsdb/src/tsdbFS.c

@@ -957,10 +957,10 @@ static int tsdbRestoreMeta(STsdbRepo *pRepo) {
         regfree(&regex);
         return -1;
       } else {
-        uint32_t version = 0;
+        uint32_t _version = 0;
         if (strcmp(bname, "meta") != 0) {
-          sscanf(bname, "meta-ver%" PRIu32, &version);
-          pfs->cstatus->meta.version = version;
+          sscanf(bname, "meta-ver%" PRIu32, &_version);
+          pfs->cstatus->meta.version = _version;
         }
 
         pfs->cstatus->pmf = &(pfs->cstatus->mf);
@@ -1103,10 +1103,10 @@ static int tsdbRestoreDFileSet(STsdbRepo *pRepo) {
       int         tvid, tfid;
       TSDB_FILE_T ttype;
       uint32_t    tversion;
-      char        bname[TSDB_FILENAME_LEN];
+      char        _bname[TSDB_FILENAME_LEN];
 
-      tfsbasename(pf, bname);
-      tsdbParseDFilename(bname, &tvid, &tfid, &ttype, &tversion);
+      tfsbasename(pf, _bname);
+      tsdbParseDFilename(_bname, &tvid, &tfid, &ttype, &tversion);
 
       ASSERT(tvid == REPO_ID(pRepo));
 

src/tsdb/src/tsdbFile.c

@@ -410,7 +410,7 @@ int tsdbUpdateDFileHeader(SDFile *pDFile) {
 
 int tsdbLoadDFileHeader(SDFile *pDFile, SDFInfo *pInfo) {
   char     buf[TSDB_FILE_HEAD_SIZE] = "\0";
-  uint32_t version;
+  uint32_t _version;
 
   ASSERT(TSDB_FILE_OPENED(pDFile));
 
@@ -428,7 +428,7 @@ int tsdbLoadDFileHeader(SDFile *pDFile, SDFInfo *pInfo) {
   }
 
   void *pBuf = buf;
-  pBuf = taosDecodeFixedU32(pBuf, &version);
+  pBuf = taosDecodeFixedU32(pBuf, &_version);
   pBuf = tsdbDecodeDFInfo(pBuf, pInfo);
   return 0;
 }
@@ -660,12 +660,12 @@ int tsdbScanAndTryFixDFileSet(STsdbRepo *pRepo, SDFileSet *pSet) {
   return 0;
 }
 
-int tsdbParseDFilename(const char *fname, int *vid, int *fid, TSDB_FILE_T *ftype, uint32_t *version) {
+int tsdbParseDFilename(const char *fname, int *vid, int *fid, TSDB_FILE_T *ftype, uint32_t *_version) {
   char *p = NULL;
-  *version = 0;
+  *_version = 0;
   *ftype = TSDB_FILE_MAX;
 
-  sscanf(fname, "v%df%d.%m[a-z]-ver%" PRIu32, vid, fid, &p, version);
+  sscanf(fname, "v%df%d.%m[a-z]-ver%" PRIu32, vid, fid, &p, _version);
   for (TSDB_FILE_T i = 0; i < TSDB_FILE_MAX; i++) {
     if (strcmp(p, TSDB_FNAME_SUFFIX[i]) == 0) {
       *ftype = i;

src/tsdb/src/tsdbMain.c

@@ -203,6 +203,70 @@ void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int
 
 int32_t tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg) {
   // TODO: think about multithread cases
+  if (tsdbCheckAndSetDefaultCfg(pCfg) < 0) return -1;
+  
+  STsdbCfg * pRCfg = &repo->config;
+  
+  ASSERT(pRCfg->tsdbId == pCfg->tsdbId);
+  ASSERT(pRCfg->cacheBlockSize == pCfg->cacheBlockSize);
+  ASSERT(pRCfg->daysPerFile == pCfg->daysPerFile);
+  ASSERT(pRCfg->minRowsPerFileBlock == pCfg->minRowsPerFileBlock);
+  ASSERT(pRCfg->maxRowsPerFileBlock == pCfg->maxRowsPerFileBlock);
+  ASSERT(pRCfg->precision == pCfg->precision);
+
+  bool configChanged = false;
+  if (pRCfg->compression != pCfg->compression) {
+    configChanged = true;
+  }
+  if (pRCfg->keep != pCfg->keep) {
+    configChanged = true;
+  }
+  if (pRCfg->keep1 != pCfg->keep1) {
+    configChanged = true;
+  }
+  if (pRCfg->keep2 != pCfg->keep2) {
+    configChanged = true;
+  }
+  if (pRCfg->cacheLastRow != pCfg->cacheLastRow) {
+    configChanged = true;
+  }
+  if (pRCfg->totalBlocks != pCfg->totalBlocks) {
+    configChanged = true;
+  }
+
+  if (!configChanged) {
+    tsdbError("vgId:%d no config changed", REPO_ID(repo));
+  }
+
+  int code = pthread_mutex_lock(&repo->save_mutex);
+  if (code != 0) {
+    tsdbError("vgId:%d failed to lock tsdb save config mutex since %s", REPO_ID(repo), strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+
+  STsdbCfg * pSaveCfg = &repo->save_config;
+  *pSaveCfg = repo->config;
+
+  pSaveCfg->compression = pCfg->compression;
+  pSaveCfg->keep = pCfg->keep;
+  pSaveCfg->keep1 = pCfg->keep1;
+  pSaveCfg->keep2 = pCfg->keep2;
+  pSaveCfg->cacheLastRow = pCfg->cacheLastRow;
+  pSaveCfg->totalBlocks = pCfg->totalBlocks;
+
+  tsdbInfo("vgId:%d old config: compression(%d), keep(%d,%d,%d), cacheLastRow(%d),totalBlocks(%d)",
+    REPO_ID(repo),
+    pRCfg->compression, pRCfg->keep, pRCfg->keep1,pRCfg->keep2,
+    pRCfg->cacheLastRow, pRCfg->totalBlocks);
+  tsdbInfo("vgId:%d new config: compression(%d), keep(%d,%d,%d), cacheLastRow(%d),totalBlocks(%d)",
+    REPO_ID(repo),
+    pSaveCfg->compression, pSaveCfg->keep,pSaveCfg->keep1, pSaveCfg->keep2,
+    pSaveCfg->cacheLastRow,pSaveCfg->totalBlocks);
+
+  repo->config_changed = true;
+
+  pthread_mutex_unlock(&repo->save_mutex);
   return 0;
 #if 0
   STsdbRepo *pRepo = (STsdbRepo *)repo;
@@ -476,6 +540,14 @@ static STsdbRepo *tsdbNewRepo(STsdbCfg *pCfg, STsdbAppH *pAppH) {
     return NULL;
   }
 
+  code = pthread_mutex_init(&(pRepo->save_mutex), NULL);
+  if (code != 0) {
+    terrno = TAOS_SYSTEM_ERROR(code);
+    tsdbFreeRepo(pRepo);
+    return NULL;
+  }
+  pRepo->config_changed = false;
+
   code = tsem_init(&(pRepo->readyToCommit), 0, 1);
   if (code != 0) {
     code = errno;

src/tsdb/src/tsdbMemTable.c

@@ -98,17 +98,26 @@ int tsdbUnRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
     STsdbBufPool *pBufPool = pRepo->pPool;
 
     SListNode *pNode = NULL;
+    bool recycleBlocks = pBufPool->nRecycleBlocks > 0;
     if (tsdbLockRepo(pRepo) < 0) return -1;
     while ((pNode = tdListPopHead(pMemTable->bufBlockList)) != NULL) {
-      tdListAppendNode(pBufPool->bufBlockList, pNode);
+      if (pBufPool->nRecycleBlocks > 0) {
+        tsdbRecycleBufferBlock(pBufPool, pNode);
+        pBufPool->nRecycleBlocks -= 1;
+      } else {
+        tdListAppendNode(pBufPool->bufBlockList, pNode);
+      }      
     }
-    int code = pthread_cond_signal(&pBufPool->poolNotEmpty);
-    if (code != 0) {
-      if (tsdbUnlockRepo(pRepo) < 0) return -1;
-      tsdbError("vgId:%d failed to signal pool not empty since %s", REPO_ID(pRepo), strerror(code));
-      terrno = TAOS_SYSTEM_ERROR(code);
-      return -1;
+    if (!recycleBlocks) {
+      int code = pthread_cond_signal(&pBufPool->poolNotEmpty);
+      if (code != 0) {
+        if (tsdbUnlockRepo(pRepo) < 0) return -1;
+        tsdbError("vgId:%d failed to signal pool not empty since %s", REPO_ID(pRepo), strerror(code));
+        terrno = TAOS_SYSTEM_ERROR(code);
+        return -1;
+      }
     }
+
     if (tsdbUnlockRepo(pRepo) < 0) return -1;
 
     for (int i = 0; i < pMemTable->maxTables; i++) {
@@ -1006,7 +1015,14 @@ static void updateTableLatestColumn(STsdbRepo *pRepo, STable *pTable, SDataRow r
 static int tsdbUpdateTableLatestInfo(STsdbRepo *pRepo, STable *pTable, SDataRow row) {
   STsdbCfg *pCfg = &pRepo->config;
 
-  //tsdbDebug("vgId:%d tsdbUpdateTableLatestInfo, %ld, %ld, %d", REPO_ID(pRepo), tsdbGetTableLastKeyImpl(pTable), dataRowKey(row), pCfg->cacheLastRow);
+  // if cacheLastRow config has been reset, free the lastRow
+  if (!pCfg->cacheLastRow && pTable->lastRow != NULL) {
+    taosTZfree(pTable->lastRow);
+    TSDB_WLOCK_TABLE(pTable);
+    pTable->lastRow = NULL;
+    pTable->lastKey = TSKEY_INITIAL_VAL;
+    TSDB_WUNLOCK_TABLE(pTable);
+  }
 
   if (tsdbGetTableLastKeyImpl(pTable) < dataRowKey(row)) {
     if (CACHE_LAST_ROW(pCfg) || pTable->lastRow != NULL) {

src/tsdb/src/tsdbMeta.c

@@ -532,8 +532,8 @@ STable *tsdbGetTableByUid(STsdbMeta *pMeta, uint64_t uid) {
   return *(STable **)ptr;
 }
 
-STSchema *tsdbGetTableSchemaByVersion(STable *pTable, int16_t version) {
-  return tsdbGetTableSchemaImpl(pTable, true, false, version);
+STSchema *tsdbGetTableSchemaByVersion(STable *pTable, int16_t _version) {
+  return tsdbGetTableSchemaImpl(pTable, true, false, _version);
 }
 
 int tsdbWLockRepoMeta(STsdbRepo *pRepo) {
@@ -907,9 +907,9 @@ static void tsdbRemoveTableFromMeta(STsdbRepo *pRepo, STable *pTable, bool rmFro
     maxCols = 0;
     maxRowBytes = 0;
     for (int i = 0; i < pMeta->maxTables; i++) {
-      STable *pTable = pMeta->tables[i];
-      if (pTable != NULL) {
-        pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+      STable *_pTable = pMeta->tables[i];
+      if (_pTable != NULL) {
+        pSchema = tsdbGetTableSchemaImpl(_pTable, false, false, -1);
         maxCols = MAX(maxCols, schemaNCols(pSchema));
         maxRowBytes = MAX(maxRowBytes, schemaTLen(pSchema));
       }

src/util/inc/tskiplist.h

@@ -96,6 +96,7 @@ typedef struct tSkipListState {
 } tSkipListState;
 
 typedef struct SSkipList {
+  unsigned int      seed;
   __compar_fn_t     comparFn;
   __sl_key_fn_t     keyFn;
   pthread_rwlock_t *lock;

src/util/src/tdes.c

@@ -155,26 +155,26 @@ void generate_key(unsigned char* key) {
   }
 }
 
-void print_key_set(key_set key_set) {
+void print_key_set(key_set _key_set) {
   int i;
   printf("K: \n");
   for (i = 0; i < 8; i++) {
-    printf("%02X : ", key_set.k[i]);
-    print_char_as_binary(key_set.k[i]);
+    printf("%02X : ", _key_set.k[i]);
+    print_char_as_binary(_key_set.k[i]);
     printf("\n");
   }
   printf("\nC: \n");
 
   for (i = 0; i < 4; i++) {
-    printf("%02X : ", key_set.c[i]);
-    print_char_as_binary(key_set.c[i]);
+    printf("%02X : ", _key_set.c[i]);
+    print_char_as_binary(_key_set.c[i]);
     printf("\n");
   }
   printf("\nD: \n");
 
   for (i = 0; i < 4; i++) {
-    printf("%02X : ", key_set.d[i]);
-    print_char_as_binary(key_set.d[i]);
+    printf("%02X : ", _key_set.d[i]);
+    print_char_as_binary(_key_set.d[i]);
     printf("\n");
   }
   printf("\n");

src/util/src/tskiplist.c

@@ -50,6 +50,7 @@ SSkipList *tSkipListCreate(uint8_t maxLevel, uint8_t keyType, uint16_t keyLen, _
   pSkipList->len = keyLen;
   pSkipList->flags = flags;
   pSkipList->keyFn = fn;
+  pSkipList->seed = rand();
   if (comparFn == NULL) {
     pSkipList->comparFn = getKeyComparFunc(keyType);
   } else {
@@ -545,7 +546,12 @@ static FORCE_INLINE int32_t getSkipListNodeRandomHeight(SSkipList *pSkipList) {
   const uint32_t factor = 4;
 
   int32_t n = 1;
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   while ((rand() % factor) == 0 && n <= pSkipList->maxLevel) {
+#else
+  while ((rand_r(&(pSkipList->seed)) % factor) == 0 && n <= pSkipList->maxLevel) {
+#endif
     n++;
   }
 

src/vnode/src/vnodeMain.c

@@ -170,29 +170,31 @@ static int32_t vnodeAlterImp(SVnodeObj *pVnode, SCreateVnodeMsg *pVnodeCfg) {
 
   vDebug("vgId:%d, tsdbchanged:%d syncchanged:%d while alter vnode", pVnode->vgId, tsdbCfgChanged, syncCfgChanged);
 
-  if (/*tsdbCfgChanged || */syncCfgChanged) {
+  if (tsdbCfgChanged || syncCfgChanged) {
     // vnode in non-ready state and still needs to return success instead of TSDB_CODE_VND_INVALID_STATUS
     // dbCfgVersion can be corrected by status msg
-    if (!vnodeSetUpdatingStatus(pVnode)) {
-      vDebug("vgId:%d, vnode is not ready, do alter operation later", pVnode->vgId);
-      pVnode->dbCfgVersion = dbCfgVersion;
-      pVnode->vgCfgVersion = vgCfgVersion;
-      pVnode->syncCfg = syncCfg;
-      pVnode->tsdbCfg = tsdbCfg;
-      return TSDB_CODE_SUCCESS;
-    }
+    if (syncCfgChanged) {
+      if (!vnodeSetUpdatingStatus(pVnode)) {
+        vDebug("vgId:%d, vnode is not ready, do alter operation later", pVnode->vgId);
+        pVnode->dbCfgVersion = dbCfgVersion;
+        pVnode->vgCfgVersion = vgCfgVersion;
+        pVnode->syncCfg = syncCfg;
+        pVnode->tsdbCfg = tsdbCfg;
+        return TSDB_CODE_SUCCESS;
+      }
 
-    code = syncReconfig(pVnode->sync, &pVnode->syncCfg);
-    if (code != TSDB_CODE_SUCCESS) {
-      pVnode->dbCfgVersion = dbCfgVersion;
-      pVnode->vgCfgVersion = vgCfgVersion;
-      pVnode->syncCfg = syncCfg;
-      pVnode->tsdbCfg = tsdbCfg;
-      vnodeSetReadyStatus(pVnode);
-      return code;
+      code = syncReconfig(pVnode->sync, &pVnode->syncCfg);
+      if (code != TSDB_CODE_SUCCESS) {
+        pVnode->dbCfgVersion = dbCfgVersion;
+        pVnode->vgCfgVersion = vgCfgVersion;
+        pVnode->syncCfg = syncCfg;
+        pVnode->tsdbCfg = tsdbCfg;
+        vnodeSetReadyStatus(pVnode);
+        return code;
+      }
     }
 
-    if (pVnode->tsdb) {
+    if (tsdbCfgChanged && pVnode->tsdb) {
       code = tsdbConfigRepo(pVnode->tsdb, &pVnode->tsdbCfg);
       if (code != TSDB_CODE_SUCCESS) {
         pVnode->dbCfgVersion = dbCfgVersion;

src/wal/src/walWrite.c

@@ -199,7 +199,7 @@ int32_t walRestore(void *handle, void *pVnode, FWalWrite writeFp) {
     snprintf(walName, sizeof(pWal->name), "%s/%s%" PRId64, pWal->path, WAL_PREFIX, fileId);
 
     wInfo("vgId:%d, file:%s, will be restored", pWal->vgId, walName);
-    int32_t code = walRestoreWalFile(pWal, pVnode, writeFp, walName, fileId);
+    code = walRestoreWalFile(pWal, pVnode, writeFp, walName, fileId);
     if (code != TSDB_CODE_SUCCESS) {
       wError("vgId:%d, file:%s, failed to restore since %s", pWal->vgId, walName, tstrerror(code));
       continue;
@@ -426,8 +426,8 @@ static int32_t walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp, ch
 #endif
     offset = offset + sizeof(SWalHead) + pHead->len;
 
-    wTrace("vgId:%d, restore wal, fileId:%" PRId64 " hver:%" PRIu64 " wver:%" PRIu64 " len:%d", pWal->vgId,
-           fileId, pHead->version, pWal->version, pHead->len);
+    wTrace("vgId:%d, restore wal, fileId:%" PRId64 " hver:%" PRIu64 " wver:%" PRIu64 " len:%d offset:%" PRId64,
+           pWal->vgId, fileId, pHead->version, pWal->version, pHead->len, offset);
 
     pWal->version = pHead->version;
     (*writeFp)(pVnode, pHead, TAOS_QTYPE_WAL, NULL);

tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md

@@ -8,8 +8,8 @@
 
 3.  mkdir debug; cd debug; cmake ..; make ; sudo make install
 
-4.  pip install ../src/connector/python/linux/python2 ; pip3 install
-    ../src/connector/python/linux/python3
+4.  pip install ../src/connector/python ; pip3 install
+    ../src/connector/python
 
 5.  pip install numpy; pip3 install numpy (numpy is required only if you need to run querySort.py)  
 

tests/Jenkinsfile

@@ -21,7 +21,7 @@ def pre_test(){
     cmake .. > /dev/null
     make > /dev/null
     make install > /dev/null
-    pip3 install ${WKC}/src/connector/python/linux/python3/
+    pip3 install ${WKC}/src/connector/python
     '''
     return 1
 }

tests/comparisonTest/tdengine/tdengineTest.c

@@ -189,8 +189,8 @@ void writeDataImp(void *param) {
       counter++;
 
       if (counter >= arguments.rowsPerRequest) {
-        TAOS_RES *result = taos_query(taos, sql);
-        int32_t   code = taos_errno(result);
+        result = taos_query(taos, sql);
+        code = taos_errno(result);
         if (code != 0) {
           printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
         }
@@ -207,8 +207,8 @@ void writeDataImp(void *param) {
   }
 
   if (counter > 0) {
-    TAOS_RES *result = taos_query(taos, sql);
-    int32_t   code = taos_errno(result);
+    result = taos_query(taos, sql);
+    code = taos_errno(result);
     if (code != 0) {
       printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
     }

tests/fuzz/sql-fuzzer.c

+#include "qSqlparser.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size){
+    char *new_str = (char *)malloc(size+1);
+    if (new_str == NULL){
+        return 0;
+    }
+    memcpy(new_str, data, size);
+    new_str[size] = '\0';
+
+    qSqlParse(new_str);
+
+    free(new_str);
+    return 0;
+}

tests/pytest/concurrent_inquiry.sh

@@ -48,7 +48,7 @@ fi
 PYTHON_EXEC=python3.8
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR

tests/pytest/crash_gen.sh

@@ -48,7 +48,7 @@ fi
 PYTHON_EXEC=python3.8
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR

tests/pytest/crash_gen/__init__.py

+# Helpful Ref: https://stackoverflow.com/questions/24100558/how-can-i-split-a-module-into-multiple-files-without-breaking-a-backwards-compa/24100645
+from crash_gen.service_manager import ServiceManager, TdeInstance, TdeSubProcess

tests/pytest/crash_gen/settings.py

-from __future__ import annotations
-import argparse
-
-gConfig:    argparse.Namespace 
-
-def init():
-    global gConfig
-    gConfig = []
\ No newline at end of file

tests/pytest/crash_gen/shared/config.py

+from __future__ import annotations
+import argparse
+
+from typing import Optional
+
+from .misc import CrashGenError
+
+# from crash_gen.misc import CrashGenError
+
+# gConfig:    Optional[argparse.Namespace]
+
+class Config:
+    _config = None # type Optional[argparse.Namespace]
+
+    @classmethod    
+    def init(cls, parser: argparse.ArgumentParser):
+        if cls._config is not None:
+            raise CrashGenError("Config can only be initialized once")
+        cls._config = parser.parse_args()
+        # print(cls._config)
+
+    @classmethod
+    def setConfig(cls, config: argparse.Namespace):
+        cls._config = config
+
+    @classmethod
+    # TODO: check items instead of exposing everything
+    def getConfig(cls) -> argparse.Namespace:
+        if cls._config is None:
+            raise CrashGenError("invalid state")
+        return cls._config
+
+    @classmethod
+    def clearConfig(cls):
+        cls._config = None
+
+    @classmethod
+    def isSet(cls, cfgKey):
+        cfg = cls.getConfig()
+        if cfgKey not in cfg:
+            return False
+        return cfg.__getattribute__(cfgKey)
\ No newline at end of file

tests/pytest/crash_gen/db.py → tests/pytest/crash_gen/shared/db.py

 from __future__ import annotations
 
 import sys
+import os
+import datetime
 import time
 import threading
 import requests
 from requests.auth import HTTPBasicAuth
 
+
 import taos
 from util.sql import *
 from util.cases import *
 from util.dnodes import *
 from util.log import *
 
-from .misc import Logging, CrashGenError, Helper, Dice
-import os
-import datetime
 import traceback
 # from .service_manager import TdeInstance
 
-import crash_gen.settings 
+from .config import Config
+from .misc import Logging, CrashGenError, Helper
+from .types import QueryResult
 
 class DbConn:
     TYPE_NATIVE = "native-c"
@@ -79,7 +81,7 @@ class DbConn:
             raise RuntimeError("Cannot query database until connection is open")
         nRows = self.query(sql)
         if nRows != 1:
-            raise taos.error.ProgrammingError(
+            raise CrashGenError(
                 "Unexpected result for query: {}, rows = {}".format(sql, nRows), 
                 (CrashGenError.INVALID_EMPTY_RESULT if nRows==0 else CrashGenError.INVALID_MULTIPLE_RESULT)
             )
@@ -115,7 +117,7 @@ class DbConn:
         try:
             self.execute(sql)
             return True # ignore num of results, return success
-        except taos.error.ProgrammingError as err:
+        except taos.error.Error as err:
             return False # failed, for whatever TAOS reason
         # Not possile to reach here, non-TAOS exception would have been thrown
 
@@ -126,7 +128,7 @@ class DbConn:
     def openByType(self):
         raise RuntimeError("Unexpected execution, should be overriden")
 
-    def getQueryResult(self):
+    def getQueryResult(self) -> QueryResult :
         raise RuntimeError("Unexpected execution, should be overriden")
 
     def getResultRows(self):
@@ -221,7 +223,7 @@ class DbConnRest(DbConn):
 class MyTDSql:
     # Class variables
     _clsLock = threading.Lock() # class wide locking
-    longestQuery = None # type: str
+    longestQuery = '' # type: str
     longestQueryTime = 0.0 # seconds
     lqStartTime = 0.0
     # lqEndTime = 0.0 # Not needed, as we have the two above already
@@ -249,7 +251,13 @@ class MyTDSql:
     def _execInternal(self, sql):        
         startTime = time.time() 
         # Logging.debug("Executing SQL: " + sql)
+        # ret = None # TODO: use strong type here
+        # try: # Let's not capture the error, and let taos.error.ProgrammingError pass through
         ret = self._cursor.execute(sql)
+        # except taos.error.ProgrammingError as err:
+        #     Logging.warning("Taos SQL execution error: {}, SQL: {}".format(err.msg, sql))
+        #     raise CrashGenError(err.msg)
+            
         # print("\nSQL success: {}".format(sql))
         queryTime =  time.time() - startTime
         # Record the query time
@@ -261,7 +269,7 @@ class MyTDSql:
                 cls.lqStartTime = startTime
 
         # Now write to the shadow database
-        if crash_gen.settings.gConfig.use_shadow_db:
+        if Config.isSet('use_shadow_db'):
             if sql[:11] == "INSERT INTO":
                 if sql[:16] == "INSERT INTO db_0":
                     sql2 = "INSERT INTO db_s" + sql[16:]
@@ -453,31 +461,11 @@ class DbManager():
         ''' Release the underlying DB connection upon deletion of DbManager '''
         self.cleanUp()
 
-    def getDbConn(self):
+    def getDbConn(self) -> DbConn :
+        if self._dbConn is None:
+            raise CrashGenError("Unexpected empty DbConn")
         return self._dbConn
 
-    # TODO: not used any more, to delete
-    def pickAndAllocateTable(self):  # pick any table, and "use" it
-        return self.tableNumQueue.pickAndAllocate()
-
-    # TODO: Not used any more, to delete
-    def addTable(self):
-        with self._lock:
-            tIndex = self.tableNumQueue.push()
-        return tIndex
-
-    # Not used any more, to delete
-    def releaseTable(self, i):  # return the table back, so others can use it
-        self.tableNumQueue.release(i)    
-
-    # TODO: not used any more, delete
-    def getTableNameToDelete(self):
-        tblNum = self.tableNumQueue.pop()  # TODO: race condition!
-        if (not tblNum):  # maybe false
-            return False
-
-        return "table_{}".format(tblNum)
-
     def cleanUp(self):
         if self._dbConn:
             self._dbConn.close()

tests/pytest/crash_gen/misc.py → tests/pytest/crash_gen/shared/misc.py

@@ -3,6 +3,7 @@ import random
 import logging
 import os
 import sys
+from typing import Optional
 
 import taos
 
@@ -39,14 +40,14 @@ class MyLoggingAdapter(logging.LoggerAdapter):
 
 
 class Logging:
-    logger = None
+    logger = None # type: Optional[MyLoggingAdapter]
 
     @classmethod
     def getLogger(cls):
-        return logger
+        return cls.logger
 
     @classmethod
-    def clsInit(cls, gConfig): # TODO: refactor away gConfig
+    def clsInit(cls, debugMode: bool):
         if cls.logger:
             return
         
@@ -60,13 +61,9 @@ class Logging:
         # Logging adapter, to be used as a logger
         # print("setting logger variable")
         # global logger
-        cls.logger = MyLoggingAdapter(_logger, [])
-
-        if (gConfig.debug):
-            cls.logger.setLevel(logging.DEBUG)  # default seems to be INFO
-        else:
-            cls.logger.setLevel(logging.INFO)
-
+        cls.logger = MyLoggingAdapter(_logger, {})
+        cls.logger.setLevel(logging.DEBUG if debugMode else logging.INFO)  # default seems to be INFO
+        
     @classmethod
     def info(cls, msg):
         cls.logger.info(msg)
@@ -84,6 +81,7 @@ class Logging:
         cls.logger.error(msg)
 
 class Status:
+    STATUS_EMPTY    = 99
     STATUS_STARTING = 1
     STATUS_RUNNING  = 2
     STATUS_STOPPING = 3
@@ -95,12 +93,16 @@ class Status:
     def __repr__(self):
         return "[Status: v={}]".format(self._status)
 
-    def set(self, status):
+    def set(self, status: int):
         self._status = status
 
     def get(self):
         return self._status
 
+    def isEmpty(self):
+        ''' Empty/Undefined '''
+        return self._status == Status.STATUS_EMPTY
+
     def isStarting(self):
         return self._status == Status.STATUS_STARTING
 
@@ -117,6 +119,9 @@ class Status:
     def isStable(self):
         return self.isRunning() or self.isStopped()
 
+    def isActive(self):
+        return self.isStarting() or self.isRunning() or self.isStopping()
+
 # Deterministic random number generator
 class Dice():
     seeded = False  # static, uninitialized

tests/pytest/crash_gen/shared/types.py

+from typing import Any, List, Dict, NewType
+from enum import Enum
+
+DirPath = NewType('DirPath', str)
+
+QueryResult = NewType('QueryResult', List[List[Any]])
+
+class TdDataType(Enum):
+    '''
+    Use a Python Enum types of represent all the data types in TDengine.
+
+    Ref: https://www.taosdata.com/cn/documentation/taos-sql#data-type
+    '''
+    TIMESTAMP = 'TIMESTAMP'
+    INT       = 'INT'
+    BIGINT    = 'BIGINT'
+    FLOAT     = 'FLOAT'
+    DOUBLE    = 'DOUBLE'
+    BINARY    = 'BINARY'
+    BINARY16  = 'BINARY(16)'  # TODO: get rid of this hack
+    BINARY200 = 'BINARY(200)'
+    SMALLINT  = 'SMALLINT'
+    TINYINT   = 'TINYINT'
+    BOOL      = 'BOOL'
+    NCHAR     = 'NCHAR'
+
+TdColumns = Dict[str, TdDataType]
+TdTags    = Dict[str, TdDataType]

tests/pytest/hivemq-extension-test.py

@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 import sys
 import os
 import os.path

tests/pytest/perf_gen.sh

+#!/bin/bash
+
+# This is the script for us to try to cause the TDengine server or client to crash
+#    
+# PREPARATION
+#
+# 1. Build an compile the TDengine source code that comes with this script, in the same directory tree
+# 2. Please follow the direction in our README.md, and build TDengine in the build/ directory
+# 3. Adjust the configuration file if needed under build/test/cfg/taos.cfg
+# 4. Run the TDengine server instance: cd build; ./build/bin/taosd -c test/cfg
+# 5. Make sure you have a working Python3 environment: run /usr/bin/python3 --version, and you should get 3.6 or above
+# 6. Make sure you have the proper Python packages: # sudo apt install python3-setuptools python3-pip python3-distutils
+#
+# RUNNING THIS SCRIPT
+# 
+# This script assumes the source code directory is intact, and that the binaries has been built in the
+# build/ directory, as such, will will load the Python libraries in the directory tree, and also load
+# the TDengine client shared library (so) file, in the build/directory, as evidenced in the env
+# variables below.
+#
+# Running the script is simple, no parameter is needed (for now, but will change in the future).
+#
+# Happy Crashing...
+
+
+# Due to the heavy path name assumptions/usage, let us require that the user be in the current directory
+EXEC_DIR=`dirname "$0"`
+if [[ $EXEC_DIR != "." ]]
+then
+    echo "ERROR: Please execute `basename "$0"` in its own directory (for now anyway, pardon the dust)"
+    exit -1
+fi
+
+CURR_DIR=`pwd`
+IN_TDINTERNAL="community"
+if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  TAOS_DIR=$CURR_DIR/../../..
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6,7|rev`/lib
+else
+  TAOS_DIR=$CURR_DIR/../..
+  TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+  LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
+fi
+
+# Now getting ready to execute Python
+# The following is the default of our standard dev env (Ubuntu 20.04), modify/adjust at your own risk
+PYTHON_EXEC=python3.8
+
+# First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
+
+# Then let us set up the library path so that our compiled SO file can be loaded by Python
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
+
+# Now we are all let, and let's see if we can find a crash. Note we pass all params
+PERF_GEN_EXEC=perf_gen.py
+$PYTHON_EXEC $PERF_GEN_EXEC $@
+
+