Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr

Conflicts:
	tests/pytest/tools/taosdemoAllTest/taosdemoTestInsertWithJsonSml.py

Jenkinsfile

@@ -38,7 +38,8 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    killall -9 taosd ||echo "no taosd running"
+    kill -9 $(pidof taosd) ||echo "no taosd running"
+    kill -9 $(pidof taosadapter) ||echo "no taosadapter running"
     killall -9 gdb || echo "no gdb running"
     killall -9 python3.8 || echo "no python program running"
     cd ${WKC}
@@ -104,7 +105,7 @@ def pre_test(){
     git clean -dfx
     mkdir debug
     cd debug
-    cmake .. > /dev/null
+    cmake .. -DBUILD_HTTP=false > /dev/null
     make > /dev/null
     make install > /dev/null
     cd ${WKC}/tests
@@ -178,7 +179,7 @@ def pre_test_noinstall(){
     git clean -dfx
     mkdir debug
     cd debug
-    cmake .. > /dev/null
+    cmake .. -DBUILD_HTTP=false > /dev/null
     make
     '''
     return 1
@@ -455,23 +456,42 @@ pipeline {
                 nohup taosd >/dev/null &
                 sleep 10
               '''
+
               sh '''
-              cd ${WKC}/tests/examples/nodejs
-              npm install td2.0-connector > /dev/null 2>&1
-              node nodejsChecker.js host=localhost
-              node test1970.js
-              cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
-              npm install td2.0-connector > /dev/null 2>&1
-              node nanosecondTest.js
+                cd ${WKC}/src/connector/python
+                export PYTHONPATH=$PWD/
+                export LD_LIBRARY_PATH=${WKC}/debug/build/lib
+                pip3 install pytest
+                pytest tests/
 
+                python3 examples/bind-multi.py
+                python3 examples/bind-row.py
+                python3 examples/demo.py
+                python3 examples/insert-lines.py
+                python3 examples/pep-249.py
+                python3 examples/query-async.py
+                python3 examples/query-objectively.py
+                python3 examples/subscribe-sync.py
+                python3 examples/subscribe-async.py
+              '''
+
+              sh '''
+                cd ${WKC}/tests/examples/nodejs
+                npm install td2.0-connector > /dev/null 2>&1
+                node nodejsChecker.js host=localhost
+                node test1970.js
+                cd ${WKC}/tests/connectorTest/nodejsTest/nanosupport
+                npm install td2.0-connector > /dev/null 2>&1
+                node nanosecondTest.js
               '''
               catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                 sh '''
                   cd ${WKC}/tests/examples/C#/taosdemo
-                  mcs -out:taosdemo *.cs > /dev/null 2>&1
-                  echo '' |./taosdemo -c /etc/taos
+                  dotnet build -c Release
+                  tree | true
+                  ./bin/Release/net5.0/taosdemo -c /etc/taos -y
                 '''
-              } 
+              }
               sh '''
                 cd ${WKC}/tests/gotest
                 bash batchtest.sh
@@ -583,10 +603,15 @@ pipeline {
             timeout(time: 55, unit: 'MINUTES'){       
               pre_test()
               sh '''
+              cd ${WKC}/tests
+              ./test-all.sh develop-test
+              '''
+              sh '''
               date
               cd ${WKC}/tests
               ./test-all.sh b6fq
               date'''
+              
             }
           }
         }
@@ -596,6 +621,10 @@ pipeline {
             timeout(time: 55, unit: 'MINUTES'){       
               pre_test()
               sh '''
+              cd ${WKC}/tests
+              ./test-all.sh system-test
+              '''
+              sh '''
               date
               cd ${WKC}/tests
               ./test-all.sh b7fq

README.md

@@ -100,7 +100,7 @@ sudo dnf install -y maven
 #### Install build dependencies for taos-tools 
 To build the [taos-tools](https://github.com/taosdata/taos-tools) on CentOS, the following packages need to be installed.
 ```bash
-sudo yum install libz-devel xz-devel snappy-devel jansson-devel pkgconfig libatomic
+sudo yum install zlib-devel xz-devel snappy-devel jansson-devel pkgconfig libatomic
 ```
 Note: Since snappy lacks pkg-config support (refer to [link](https://github.com/google/snappy/pull/86)), it lead a cmake prompt libsnappy not found. But snappy will works well.
 
@@ -142,15 +142,15 @@ mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
 
-Note TDengine 2.3.x.0 and later use a component named 'taosadapter' to play http daemon role by default instead of the http daemon embedded in the early version of TDengine. The taosadapter is programmed by go language. If you pull TDengine source code to the latest from an existing codebase, please execute 'git submodule update --init --recursive' to pull taosadapter source code. Please install go language 1.14 or above for compiling taosadapter. If you meet difficulties regarding 'go mod', especially you are from China, you can use a proxy to solve the problem.
+Note TDengine 2.3.x.0 and later use a component named 'taosAdapter' to play http daemon role by default instead of the http daemon embedded in the early version of TDengine. The taosAdapter is programmed by go language. If you pull TDengine source code to the latest from an existing codebase, please execute 'git submodule update --init --recursive' to pull taosAdapter source code. Please install go language 1.14 or above for compiling taosAdapter. If you meet difficulties regarding 'go mod', especially you are from China, you can use a proxy to solve the problem.
 ```
 go env -w GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 ```
 
-Or you can use the following command to choose to embed old httpd too.
+The embedded http daemon still be built from TDengine source code by default. Or you can use the following command to choose to build taosAdapter.
 ```
-cmake .. -DBUILD_HTTP=true
+cmake .. -DBUILD_HTTP=false
 ```
 
 You can use Jemalloc as memory allocator instead of glibc:

cmake/define.inc

@@ -136,24 +136,25 @@ IF (TD_ALPINE)
   MESSAGE(STATUS "aplhine is defined")
 ENDIF ()
 
+
 IF ("${BUILD_HTTP}" STREQUAL "")
   IF (TD_LINUX)
     IF (TD_ARM_32)
-      SET(BUILD_HTTP "true")
+      SET(TD_BUILD_HTTP TRUE)
     ELSE ()
-      SET(BUILD_HTTP "false")
+      SET(TD_BUILD_HTTP TRUE)
     ENDIF ()
   ELSEIF (TD_DARWIN)
-    SET(BUILD_HTTP "false")
+    SET(TD_BUILD_HTTP TRUE)
   ELSE ()
-    SET(BUILD_HTTP "true")
+    SET(TD_BUILD_HTTP TRUE)
   ENDIF ()
-ENDIF ()
-
-IF (${BUILD_HTTP} MATCHES "true")
-  SET(TD_BUILD_HTTP TRUE)
 ELSEIF (${BUILD_HTTP} MATCHES "false")
   SET(TD_BUILD_HTTP FALSE)
+ELSEIF (${BUILD_HTTP} MATCHES "true")
+  SET(TD_BUILD_HTTP TRUE)
+ELSE ()
+  SET(TD_BUILD_HTTP TRUE)
 ENDIF ()
 
 IF (TD_BUILD_HTTP)

cmake/input.inc

@@ -96,7 +96,7 @@ IF (${BUILD_JDBC} MATCHES "false")
   SET(TD_BUILD_JDBC FALSE)
 ENDIF ()
 
-SET(TD_BUILD_HTTP FALSE)
+SET(TD_BUILD_HTTP TRUE)
 
 SET(TD_TAOS_TOOLS TRUE)
 

documentation20/cn/08.connector/docs.md

@@ -145,7 +145,7 @@ taos>
 | **CPU类型**  | x64（64bit） |          |          | ARM64    | ARM32      |
 | ------------ | ------------ | -------- | -------- | -------- | ---------- |
 | **OS类型**   | Linux        | Win64    | Win32    | Linux    | Linux      |
-| **支持与否** | **支持**     | **支持** | **支持** | **支持** | **开发中** |
+| **支持与否** | **支持**     | **支持** | **支持** | **支持** | **支持** |
 
 C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine头文件 *taos.h*，里面列出了提供的API的函数原型。安装后，taos.h位于：
 

documentation20/cn/11.administrator/docs.md

@@ -557,7 +557,7 @@ KILL STREAM <stream-id>;
 
 TDengine启动后，会自动创建一个监测数据库log，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在log库里。系统管理员可以从CLI直接查看这个数据库，也可以在WEB通过图形化界面查看这些监测信息。
 
-这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
+这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项monitor将其关闭或打开。
 
 ### TDinsight - 使用监控数据库 + Grafana 对 TDengine 进行监控的解决方案
 

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

@@ -834,7 +834,7 @@ UNION ALL SELECT ...
 [UNION ALL SELECT ...]
 ```
 
-TDengine 支持 UNION ALL 操作符。也就是说，如果多个 SELECT 子句返回结果集的结构完全相同（列名、列类型、列数、顺序），那么可以通过 UNION ALL 把这些结果集合并到一起。目前只支持 UNION ALL 模式，也即在结果集的合并过程中是不去重的。
+TDengine 支持 UNION ALL 操作符。也就是说，如果多个 SELECT 子句返回结果集的结构完全相同（列名、列类型、列数、顺序），那么可以通过 UNION ALL 把这些结果集合并到一起。目前只支持 UNION ALL 模式，也即在结果集的合并过程中是不去重的。在同一个sql语句中，UNION ALL 最多支持100个。
 
 ### SQL 示例 
 

documentation20/en/00.index/docs.md

@@ -113,7 +113,7 @@ TDengine is a highly efficient platform to store, query, and analyze time-series
 - [System Connection and Task Query Management](/administrator#status): show the system connections, queries, streaming calculation and others
 - [System Monitor](/administrator#monitoring): monitor TDengine cluster with log database and TDinsight.
 - [File Directory Structure](/administrator#directories): directories where TDengine data files and configuration files located
-- [Parameter Limitss and Reserved Keywords](/administrator#keywords): TDengine’s list of parameter limits and reserved keywords
+- [Parameter Limits and Reserved Keywords](/administrator#keywords): TDengine’s list of parameter limits and reserved keywords
 
 ## Performance: TDengine vs Others
 

documentation20/en/02.getting-started/02.taosdemo/docs.md

-Since TDengine was open sourced in July 2019, it has gained a lot of popularity among time-series database developers with its innovative data modeling design, simple installation mehtod, easy programming interface, and powerful data insertion and query performance. The insertion and querying performance is often astonishing to users who are new to TDengine. In order to help users to experience the high performance and functions of TDengine in the shortest time, we developed an application called taosdemo for insertion and querying performance testing of TDengine. Then user can easily simulate the scenario of a large number of devices generating a very large amount of data. User can easily maniplate the number of columns, data types, disorder ratio, and number of concurrent threads with taosdemo customized parameters.
+Since TDengine was open sourced in July 2019, it has gained a lot of popularity among time-series database developers with its innovative data modeling design, simple installation method, easy programming interface, and powerful data insertion and query performance. The insertion and querying performance is often astonishing to users who are new to TDengine. In order to help users to experience the high performance and functions of TDengine in the shortest time, we developed an application called taosdemo for insertion and querying performance testing of TDengine. Then user can easily simulate the scenario of a large number of devices generating a very large amount of data. User can easily  manipulate the number of columns, data types, disorder ratio, and number of concurrent threads with taosdemo customized parameters.
 
 
 Running taosdemo is very simple. Just download the TDengine installation package (https://www.taosdata.com/cn/all-downloads/) or compiling the TDengine code yourself (https://github.com/taosdata/TDengine). It can be found and run in the installation directory or in the compiled results directory.
@@ -221,7 +221,7 @@ To reach TDengine performance limits, data insertion can be executed by using mu
 ```
 -t, --tables=NUMBER           The number of tables. Default is 10000.
 -n, --records=NUMBER          The number of records per table. Default is 10000.
--M, --random                  The value of records generated are totally random. The default is to simulate power equipment senario.
+-M, --random                  The value of records generated are totally random. The default is to simulate power equipment scenario.
 ```
 As mentioned earlier, taosdemo creates 10,000 tables by default, and each table writes 10,000 records. taosdemo can set the number of tables and the number of records in each table by -t and -n. The data generated by default without parameters are simulated real scenarios, and the simulated data are current and voltage phase values with certain jitter, which can more realistically show TDengine's efficient data compression ability. If you need to simulate the generation of completely random data, you can pass the -M parameter.
 ```

documentation20/en/03.architecture/docs.md

@@ -193,7 +193,7 @@ A complete TDengine system runs on one or more physical nodes. Logically, it inc
 
 **Redirection**: No matter about dnode or TAOSC, the connection to the mnode shall be initiated first, but the mnode is automatically created and maintained by the system, so the user does not know which dnode is running the mnode. TDengine only requires a connection to any working dnode in the system. Because any running dnode maintains the currently running mnode EP List, when receiving a connecting request from the newly started dnode or TAOSC, if it’s not a mnode by self, it will reply to the mnode EP List back. After receiving this list, TAOSC or the newly started dnode will try to establish the connection again. When the mnode EP List changes, each data node quickly obtains the latest list and notifies TAOSC through messaging interaction among nodes.
 
-### A Typical Data Writinfg Process
+### A Typical Data Writing Process
 
 To explain the relationship between vnode, mnode, TAOSC and application and their respective roles, the following is an analysis of a typical data writing process.
 
@@ -244,7 +244,7 @@ The meta data of each table (including schema, tags, etc.) is also stored in vno
 
 ### Data Partitioning
 
-In addition to vnode sharding, TDengine partitions the time-series data by time range. Each data file contains only one time range of time-series data, and the length of the time range is determined by DB's configuration parameter `“days”`. This method of partitioning by time rang is also convenient to efficiently implement the data retention policy. As long as the data file exceeds the specified number of days (system configuration parameter `“keep”`), it will be automatically deleted. Moreover, different time ranges can be stored in different paths and storage media, so as to facilitate the tiered-storage. Cold/hot data can be stored in different storage meida to reduce the storage cost.
+In addition to vnode sharding, TDengine partitions the time-series data by time range. Each data file contains only one time range of time-series data, and the length of the time range is determined by DB's configuration parameter `“days”`. This method of partitioning by time rang is also convenient to efficiently implement the data retention policy. As long as the data file exceeds the specified number of days (system configuration parameter `“keep”`), it will be automatically deleted. Moreover, different time ranges can be stored in different paths and storage media, so as to facilitate the tiered-storage. Cold/hot data can be stored in different storage media to reduce the storage cost.
 
 In general, **TDengine splits big data by vnode and time range in two dimensions** to manage the data efficiently with horizontal scalability.
 

documentation20/en/05.insert/docs.md

@@ -107,11 +107,10 @@ Launch an API service for blm_prometheus with the following command:
 
 Assuming that the IP address of the server where blm_prometheus located is "10.1.2. 3", the URL shall be added to the configuration file of Prometheus as:
 
+```yaml
 remote_write:
-
-\- url: "http://10.1.2.3:8088/receive"
-
-
+  - url: "http://10.1.2.3:8088/receive"
+```
 
 ### Query written data of prometheus
 
@@ -183,7 +182,7 @@ In the output plugins section, add the [[outputs.http]] configuration:
 In agent section:
 
 - hostname: The machine name that distinguishes different collection devices, and it is necessary to ensure its uniqueness
-- metric_batch_size: 100, which is the max number of records per batch wriiten by Telegraf allowed. Increasing the number can reduce the request sending frequency of Telegraf.
+- metric_batch_size: 100, which is the max number of records per batch written by Telegraf allowed. Increasing the number can reduce the request sending frequency of Telegraf.
 
 For information on how to use Telegraf to collect data and more about using Telegraf, please refer to the official [document](https://docs.influxdata.com/telegraf/v1.11/) of Telegraf.
 

documentation20/en/06.queries/docs.md

@@ -11,7 +11,7 @@ TDengine uses SQL as the query language. Applications can send SQL statements th
 - Time stamp aligned join query (implicit join) operations
 - Multiple aggregation/calculation functions: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff, etc
 
-For example, in TAOS shell, the records with vlotage > 215 are queried from table d1001, sorted in descending order by timestamps, and only two records are outputted.
+For example, in TAOS shell, the records with voltage > 215 are queried from table d1001, sorted in descending order by timestamps, and only two records are outputted.
 
 ```mysql
 taos> select * from d1001 where voltage > 215 order by ts desc limit 2;

documentation20/en/07.advanced-features/docs.md

@@ -110,10 +110,10 @@ First, use `taos_subscribe` to create a subscription:
 ```c
 TAOS_SUB* tsub = NULL;
 if (async) {
-　　// create an asynchronized subscription, the callback function will be called every 1s
+　　// create an asynchronous subscription, the callback function will be called every 1s
 　　tsub = taos_subscribe(taos, restart, topic, sql, subscribe_callback, &blockFetch, 1000);
 } else {
-　　// create an synchronized subscription, need to call 'taos_consume' manually
+　　// create an synchronous subscription, need to call 'taos_consume' manually
 　　tsub = taos_subscribe(taos, restart, topic, sql, NULL, NULL, 0);
 }
 ```
@@ -201,7 +201,7 @@ taos_unsubscribe(tsub, keep);
 
 Its second parameter is used to decide whether to keep the progress information of subscription on the client. If this parameter is **false** (zero), the subscription can only be restarted no matter what the `restart` parameter is when `taos_subscribe` is called next time. In addition, progress information is saved in the directory {DataDir}/subscribe/. Each subscription has a file with the same name as its `topic`. Deleting a file will also lead to a new start when the corresponding subscription is created next time.
 
-After introducing the code, let's take a look at the actual running effect. For exmaple:
+After introducing the code, let's take a look at the actual running effect. For example:
 
 - Sample code has been downloaded locally
 - TDengine has been installed on the same machine

documentation20/en/08.connector/01.java/docs.md

@@ -54,33 +54,33 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(
 
 ## JDBC driver version and supported TDengine and JDK versions
 
-| taos-jdbcdriver | TDengine     | JDK |
-| -------------------- | ----------------- | -------- |
-| 2.0.33 - 2.0.34      | 2.0.3.0 and above      | 1.8.x    |
-| 2.0.31 - 2.0.32      | 2.1.3.0 and above      | 1.8.x    |
-| 2.0.22 - 2.0.30    | 2.0.18.0 - 2.1.2.x | 1.8.x    |
-| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.x | 1.8.x    |
-| 2.0.4 - 2.0.11       | 2.0.0.0 - 2.0.7.x | 1.8.x    |
-| 1.0.3                | 1.6.1.x and above    | 1.8.x    |
-| 1.0.2                | 1.6.1.x and above    | 1.8.x    |
-| 1.0.1                | 1.6.1.x and above    | 1.8.x    |
+| taos-jdbcdriver | TDengine           | JDK   |
+| --------------- | ------------------ | ----- |
+| 2.0.33 - 2.0.34 | 2.0.3.0 and above  | 1.8.x |
+| 2.0.31 - 2.0.32 | 2.1.3.0 and above  | 1.8.x |
+| 2.0.22 - 2.0.30 | 2.0.18.0 - 2.1.2.x | 1.8.x |
+| 2.0.12 - 2.0.21 | 2.0.8.0 - 2.0.17.x | 1.8.x |
+| 2.0.4 - 2.0.11  | 2.0.0.0 - 2.0.7.x  | 1.8.x |
+| 1.0.3           | 1.6.1.x and above  | 1.8.x |
+| 1.0.2           | 1.6.1.x and above  | 1.8.x |
+| 1.0.1           | 1.6.1.x and above  | 1.8.x |
 
 ## DataType in TDengine and Java connector
 
 The TDengine supports the following data types and Java data types:
 
 | TDengine DataType | JDBCType (driver version < 2.0.24) | JDBCType (driver version >= 2.0.24) |
-| ----------------- | ------------------ | ------------------ |
-| TIMESTAMP         | java.lang.Long     | java.sql.Timestamp |
-| INT               | java.lang.Integer  | java.lang.Integer  |
-| BIGINT            | java.lang.Long     | java.lang.Long     |
-| FLOAT             | java.lang.Float    | java.lang.Float    |
-| DOUBLE            | java.lang.Double   | java.lang.Double   |
-| SMALLINT          | java.lang.Short    | java.lang.Short    |
-| TINYINT           | java.lang.Byte     | java.lang.Byte     |
-| BOOL              | java.lang.Boolean  | java.lang.Boolean  |
-| BINARY            | java.lang.String   | byte array         |
-| NCHAR             | java.lang.String   | java.lang.String   |
+| ----------------- | ---------------------------------- | ----------------------------------- |
+| TIMESTAMP         | java.lang.Long                     | java.sql.Timestamp                  |
+| INT               | java.lang.Integer                  | java.lang.Integer                   |
+| BIGINT            | java.lang.Long                     | java.lang.Long                      |
+| FLOAT             | java.lang.Float                    | java.lang.Float                     |
+| DOUBLE            | java.lang.Double                   | java.lang.Double                    |
+| SMALLINT          | java.lang.Short                    | java.lang.Short                     |
+| TINYINT           | java.lang.Byte                     | java.lang.Byte                      |
+| BOOL              | java.lang.Boolean                  | java.lang.Boolean                   |
+| BINARY            | java.lang.String                   | byte array                          |
+| NCHAR             | java.lang.String                   | java.lang.String                    |
 
 ## Install Java connector
 
@@ -448,7 +448,7 @@ public static void main(String[] args) throws SQLException {
     config.setMinimumIdle(10);           //minimum number of idle connection
     config.setMaximumPoolSize(10);      //maximum number of connection in the pool
     config.setConnectionTimeout(30000); //maximum wait milliseconds for get connection from pool
-    config.setMaxLifetime(0);       // maximum life time for each connection
+    config.setMaxLifetime(0);       // maximum lifetime for each connection
     config.setIdleTimeout(0);       // max idle time for recycle idle connection
     config.setConnectionTestQuery("select server_status()"); //validation query
     HikariDataSource ds = new HikariDataSource(config); //create datasource
@@ -456,7 +456,7 @@ public static void main(String[] args) throws SQLException {
     Statement statement = connection.createStatement(); // get statement
     //query or insert
     // ...
-    connection.close(); // put back to conneciton pool
+    connection.close(); // put back to connection pool
 }
 ```
 
@@ -480,7 +480,7 @@ public static void main(String[] args) throws Exception {
     Statement statement = connection.createStatement(); // get statement
     //query or insert 
     // ...
-    connection.close(); // put back to conneciton pool
+    connection.close(); // put back to connection pool
 }
 ```
 

documentation20/en/08.connector/02.rust/docs.md

@@ -15,7 +15,7 @@ if you use the default features, it'll depend on:
 - [TDengine Client](https://www.taosdata.com/cn/getting-started/#%E9%80%9A%E8%BF%87%E5%AE%89%E8%A3%85%E5%8C%85%E5%AE%89%E8%A3%85)  library and headers.
 - clang because bindgen will requires the clang AST library.
 
-## Fetures
+## Features
 
 In-design features:
 

documentation20/en/08.connector/docs.md

@@ -154,7 +154,7 @@ Under cmd, enter the c:\TDengine directory and directly execute taos.exe, and yo
 | **CPU Type**         | **x64****（****64bit****）** |         |         | **ARM64** | **ARM32**          |
 | -------------------- | ---------------------------- | ------- | ------- | --------- | ------------------ |
 | **OS Type**          | Linux                        | Win64   | Win32   | Linux     | Linux              |
-| **Supported or Not** | Yes                          | **Yes** | **Yes** | **Yes**   | **In development** |
+| **Supported or Not** | Yes                          | **Yes** | **Yes** | **Yes**   | **Yes** |
 
 The C/C++ API is similar to MySQL's C API. When application use it, it needs to include the TDengine header file taos.h (after installed, it is located in/usr/local/taos/include):
 
@@ -884,7 +884,7 @@ dotnet new console
 ``` cmd
 dotnet add package TDengine.Connector
 ```
-* inlucde the TDnengineDriver in you application's namespace 
+* include the TDnengineDriver in you application's namespace 
 ```C#
 using TDengineDriver;
 ```

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

@@ -228,7 +228,7 @@ Note: In 2.0.15.0 and later versions, STABLE reserved words are supported. That
     ```mysql
     CREATE STABLE [IF NOT EXISTS] stb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]) TAGS (tag1_name tag_type1, tag2_name tag_type2 [, tag3_name tag_type3]);
     ```
-    Similiar to a standard table creation SQL, but you need to specify name and type of TAGS field.
+    Similar to a standard table creation SQL, but you need to specify name and type of TAGS field.
     
     Note:
     
@@ -673,7 +673,7 @@ Query OK, 1 row(s) in set (0.001091s)
     SELECT * FROM tb1 WHERE ts >= NOW - 1h;
     ```
 
-- Look up table tb1 from 2018-06-01 08:00:00. 000 to 2018-06-02 08:00:00. 000, and col3 string is a record ending in'nny ', and the result is in descending order of timestamp:
+- Look up table tb1 from 2018-06-01 08:00:00. 000 to 2018-06-02 08:00:00. 000, and col3 string is a record ending in 'nny ', and the result is in descending order of timestamp:
 
     ```mysql
     SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC;
@@ -782,7 +782,7 @@ TDengine supports aggregations over data, they are listed below:
   
   Function: return the sum of a statistics/STable.
   
-  Return Data Type: long integer INMT64 and Double.
+  Return Data Type: INT64 and Double.
   
   Applicable Fields: All types except timestamp, binary, nchar, bool.
   
@@ -1196,7 +1196,7 @@ SELECT function_list FROM stb_name
 
 - FILL statement specifies a filling mode when data missed in a certain interval. Applicable filling modes include the following:
   
-  1. Do not fill: NONE (default filingl mode).
+  1. Do not fill: NONE (default filing mode).
   2. VALUE filling: Fixed value filling, where the filled value needs to be specified. For example: fill (VALUE, 1.23).
   3. NULL filling: Fill the data with NULL. For example: fill (NULL).
   4. PREV filling: Filling data with the previous non-NULL value. For example: fill (PREV).

documentation20/en/14.devops/03.immigrate/docs.md

@@ -28,7 +28,7 @@ The overall system architecture of a typical DevOps application scenario is show
 
 In this application scenario, there are Agent tools deployed in the application environment to collect machine metrics, network metrics, and application metrics, data collectors to aggregate information collected by agents, systems for data persistence storage and management, and tools for monitoring data visualization (e.g., Grafana, etc.).
 
-Among them, Agents deployed in application nodes are responsible for providing operational metrics from different sources to collectd/Statsd, and collectd/StatsD is responsible for pushing the aggregated data to the OpenTSDB cluster system and then visualizing the data using the visualization kanban board Grafana.
+Among them, Agents deployed in application nodes are responsible for providing operational metrics from different sources to collectd/Statsd, and collectd/StatsD is responsible for pushing the aggregated data to the OpenTSDB cluster system and then visualizing the data using the visualization board of Grafana.
 
 ### 2. Migration Service
 
@@ -127,11 +127,11 @@ On the one hand, TDengine requires a strict schema definition for its incoming d
 
 Now let's assume a DevOps scenario where we use collectd to collect base metrics of devices, including memory, swap, disk, etc. The schema in OpenTSDB is as follows:
 
-| No.  | metric         | value  | type   | tag1 | tag2        | tag3                 | tag4      | tag5   |
-| ---- | -------------- | ------ | ------ | ---- | ----------- | -------------------- | --------- | ------ |
-| 1    | memory         | value  | double | host | memory_type | memory_type_instance | source    |        |
-| 2    | swap           | value  | double | host | swap_type   | swap_type_instance   | source    |        |
-| 3    | disk           | value  | double | host | disk_point  | disk_instance        | disk_type | source |
+| No. | metric | value | type   | tag1 | tag2        | tag3                 | tag4      | tag5   |
+| --- | ------ | ----- | ------ | ---- | ----------- | -------------------- | --------- | ------ |
+| 1   | memory | value | double | host | memory_type | memory_type_instance | source    |        |
+| 2   | swap   | value | double | host | swap_type   | swap_type_instance   | source    |        |
+| 3   | disk   | value | double | host | disk_point  | disk_instance        | disk_type | source |
 
 
 

packaging/cfg/taosd.service

 [Unit]
 Description=TDengine server service
-After=network-online.target
-Wants=network-online.target
+After=network-online.target taosadapter.service
+Wants=network-online.target taosadapter.service
 
 [Service]
 Type=simple

packaging/deb/makedeb.sh

@@ -58,7 +58,6 @@ cp ${compile_dir}/../packaging/tools/startPre.sh    ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../packaging/tools/set_core.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_home_path}/bin
 
-cp ${compile_dir}/build/bin/taosdemo                ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 
 if [ -f "${compile_dir}/build/bin/taosadapter" ]; then

packaging/docker/Dockerfile

@@ -18,5 +18,5 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
     LC_ALL=en_US.UTF-8
 
 EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-CMD ["taosd"]
-VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
+CMD ["run_taosd.sh"]
+VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
\ No newline at end of file

packaging/release.sh

@@ -3,7 +3,7 @@
 # Generate the deb package for ubuntu, or rpm package for centos, or tar.gz package for other linux os
 
 set -e
-#set -x
+set -x
 
 # release.sh  -v [cluster | edge]
 #             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...]
@@ -414,10 +414,14 @@ fi
 
 if [[ "$httpdBuild" == "true" ]]; then
     BUILD_HTTP=true
-    BUILD_TOOLS=false
 else
     BUILD_HTTP=false
+fi
+
+if [[ "$pagMode" == "full" ]]; then
     BUILD_TOOLS=true
+else
+    BUILD_TOOLS=false
 fi
 
 # check support cpu type
@@ -514,15 +518,17 @@ if [ "$osType" != "Darwin" ]; then
       cd ${script_dir}/deb
       ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
-      if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
-          cd ${top_dir}/src/kit/taos-tools/packaging/deb
-          [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
+      if [[ "$pagMode" == "full" ]]; then
+          if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
+              cd ${top_dir}/src/kit/taos-tools/packaging/deb
+              [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-          taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g')
-          ${csudo} ./make-taos-tools-deb.sh ${top_dir} \
-              ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
+              taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}')
+              ${csudo} ./make-taos-tools-deb.sh ${top_dir} \
+                  ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
+          fi
       fi
-    else
+  else
       echo "==========dpkg command not exist, so not release deb package!!!"
     fi
     ret='0'
@@ -537,15 +543,17 @@ if [ "$osType" != "Darwin" ]; then
       cd ${script_dir}/rpm
       ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
-      if [ -d ${top_dir}/src/kit/taos-tools/packaging/rpm ]; then
-          cd ${top_dir}/src/kit/taos-tools/packaging/rpm
-          [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
+      if [[ "$pagMode" == "full" ]]; then
+          if [ -d ${top_dir}/src/kit/taos-tools/packaging/rpm ]; then
+              cd ${top_dir}/src/kit/taos-tools/packaging/rpm
+              [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
-          taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g'|sed -e 's/-/_/g')
-          ${csudo} ./make-taos-tools-rpm.sh ${top_dir} \
-              ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
+              taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}'|sed -e 's/-/_/g')
+              ${csudo} ./make-taos-tools-rpm.sh ${top_dir} \
+                  ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
+          fi
       fi
-    else
+  else
       echo "==========rpmbuild command not exist, so not release rpm package!!!"
     fi
   fi

packaging/rpm/tdengine.spec

@@ -71,7 +71,6 @@ cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
 if [ -f %{_compiledir}/build/bin/taosadapter ]; then
     cp %{_compiledir}/build/bin/taosadapter                    %{buildroot}%{homepath}/bin ||:
 fi
-cp %{_compiledir}/build/bin/taosdemo                %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 cp %{_compiledir}/../src/inc/taos.h                 %{buildroot}%{homepath}/include
 cp %{_compiledir}/../src/inc/taosdef.h              %{buildroot}%{homepath}/include
@@ -196,7 +195,6 @@ if [ $1 -eq 0 ];then
     ${csudo} rm -f ${bin_link_dir}/taos       || :
     ${csudo} rm -f ${bin_link_dir}/taosd      || :
     ${csudo} rm -f ${bin_link_dir}/taosadapter       || :
-    ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
     ${csudo} rm -f ${cfg_link_dir}/*          || :
     ${csudo} rm -f ${inc_link_dir}/taos.h     || :
     ${csudo} rm -f ${inc_link_dir}/taosdef.h     || :

packaging/tools/install.sh

@@ -185,23 +185,25 @@ function install_bin() {
     # Remove links
     ${csudo} rm -f ${bin_link_dir}/taos     || :
     ${csudo} rm -f ${bin_link_dir}/taosd    || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter     || :
+    ${csudo} rm -f ${bin_link_dir}/taosadapter  || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo || :
     ${csudo} rm -f ${bin_link_dir}/taosdump || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
+    ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
     [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                      || :
     [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd                   || :
-    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo} ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter                      || :
+    [ -x ${install_main_dir}/bin/taosadapter ] && ${csudo} ln -s ${install_main_dir}/bin/taosadapter ${bin_link_dir}/taosadapter || :
     [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo          || :
     [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump          || :
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos          || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core    || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 
     if [ "$verMode" == "cluster" ]; then
@@ -887,8 +889,8 @@ function update_TDengine() {
     fi
     tar -zxf taos.tar.gz
     install_jemalloc
-    install_avro lib
-    install_avro lib64
+    #install_avro lib
+    #install_avro lib64
 
     echo -e "${GREEN}Start to update TDengine...${NC}"
     # Stop the service if running
@@ -1001,8 +1003,8 @@ function install_TDengine() {
     install_header
     install_lib
     install_jemalloc
-    install_avro lib
-    install_avro lib64
+    #install_avro lib
+    #install_avro lib64
 
     if [ "$pagMode" != "lite" ]; then
       install_connector

packaging/tools/install_client_jh.sh

@@ -188,9 +188,6 @@ function update() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -215,9 +212,6 @@ function install() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config

packaging/tools/install_client_kh.sh

@@ -189,9 +189,6 @@ function update() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -216,9 +213,6 @@ function install() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config

packaging/tools/install_client_power.sh

@@ -247,9 +247,6 @@ function update_PowerDB() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -275,9 +272,6 @@ function install_PowerDB() {
     install_header
     install_lib
     install_jemalloc
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config

packaging/tools/install_client_pro.sh

@@ -189,9 +189,6 @@ function update_prodb() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -216,9 +213,6 @@ function install_prodb() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config

packaging/tools/install_client_tq.sh

@@ -193,9 +193,6 @@ function update_tq() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config
@@ -220,9 +217,6 @@ function install_tq() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
     install_examples
     install_bin
     install_config

packaging/tools/install_jh.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmjh        || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/jhdemo ] && ${csudo} ln -s ${install_main_dir}/bin/jhdemo ${bin_link_dir}/jhdemo            || :
     [ -x ${install_main_dir}/bin/remove_jh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_jh.sh ${bin_link_dir}/rmjh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_kh.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmkh        || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/khdemo ] && ${csudo} ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo            || :
     [ -x ${install_main_dir}/bin/remove_kh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_kh.sh ${bin_link_dir}/rmkh  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_power.sh

@@ -177,6 +177,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmpower   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -186,6 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo} ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo            || :
     [ -x ${install_main_dir}/bin/remove_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_power.sh ${bin_link_dir}/rmpower  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_pro.sh

@@ -172,6 +172,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmprodb   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -181,6 +182,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/prodemo ] && ${csudo} ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo            || :
     [ -x ${install_main_dir}/bin/remove_pro.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_pro.sh ${bin_link_dir}/rmprodb  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/install_tq.sh

@@ -177,6 +177,7 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmtq   || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core   || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 
     ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
@@ -186,6 +187,7 @@ function install_bin() {
     [ -x ${install_main_dir}/bin/tqdemo ] && ${csudo} ln -s ${install_main_dir}/bin/tqdemo ${bin_link_dir}/tqdemo            || :
     [ -x ${install_main_dir}/bin/remove_tq.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_tq.sh ${bin_link_dir}/rmtq  || :
     [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/run_taosd.sh ] && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh     || :
     [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
 
     if [ "$verMode" == "cluster" ]; then

packaging/tools/make_install.sh

@@ -165,6 +165,7 @@ function install_bin() {
     if [ "$osType" != "Darwin" ]; then
         ${csudo} rm -f ${bin_link_dir}/perfMonitor || :
         ${csudo} rm -f ${bin_link_dir}/set_core || :
+        ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
         ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
 
         ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin
@@ -172,6 +173,7 @@ function install_bin() {
 
         ${csudo} cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
+        ${csudo} cp -r ${script_dir}/run_taosd.sh   ${install_main_dir}/bin
         ${csudo} cp -r ${script_dir}/startPre.sh   ${install_main_dir}/bin
 
         ${csudo} chmod 0555 ${install_main_dir}/bin/*
@@ -183,6 +185,7 @@ function install_bin() {
         [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
         [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo} ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
         [ -x ${install_main_dir}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+        [ -x ${install_main_dir}/run_taosd.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/run_taosd.sh ${bin_link_dir}/run_taosd.sh || :
         [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
    else
 

packaging/tools/makeclient.sh

@@ -45,8 +45,9 @@ if [ "$osType" != "Darwin" ]; then
     strip ${build_dir}/bin/taos
     bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
   else
-    bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdemo \
-               ${script_dir}/remove_client.sh ${script_dir}/set_core.sh ${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
+    bin_files="${script_dir}/remove_client.sh \
+        ${script_dir}/set_core.sh \
+        ${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
   fi
   lib_files="${build_dir}/lib/libtaos.so.${version}"
 else

packaging/tools/makeclient_jh.sh

@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/jh_taos
-    cp ${script_dir}/remove_jh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_jh.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/jh_taos
-    cp ${script_dir}/remove_jh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_jh.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/jhdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/jh_taosdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin

packaging/tools/makeclient_kh.sh

@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/khclient
-    cp ${script_dir}/remove_kh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_kh.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/khclient
-    cp ${script_dir}/remove_kh.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_kh.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/khdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/khdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin

packaging/tools/makeclient_power.sh

@@ -109,10 +109,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/power
-    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_power.sh  ${install_dir}/bin
   else
     cp ${build_dir}/bin/taos          ${install_dir}/bin/power
-    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_power.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/powerdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin

packaging/tools/makeclient_pro.sh

@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/prodbc
-    cp ${script_dir}/remove_pro.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_pro.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/prodbc
-    cp ${script_dir}/remove_pro.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_pro.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/prodemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/prodump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin

packaging/tools/makeclient_tq.sh

@@ -69,10 +69,10 @@ if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
     strip ${build_dir}/bin/taos
     cp ${build_dir}/bin/taos          ${install_dir}/bin/tq
-    cp ${script_dir}/remove_tq.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_tq.sh  ${install_dir}/bin
   else 
     cp ${build_dir}/bin/taos          ${install_dir}/bin/tq
-    cp ${script_dir}/remove_tq.sh  ${install_dir}/bin
+    cp ${script_dir}/remove_client_tq.sh  ${install_dir}/bin
     cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/tqdemo
     cp ${build_dir}/bin/taosdump      ${install_dir}/bin/tqdump
     cp ${script_dir}/set_core.sh      ${install_dir}/bin

packaging/tools/makepkg.sh

@@ -31,23 +31,38 @@ else
     install_dir="${release_dir}/TDengine-server-${version}"
 fi
 
+if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
+    cd ${top_dir}/src/kit/taos-tools/packaging/deb
+    [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
+
+    taostools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}')
+    taostools_install_dir="${release_dir}/taos-tools-${taostools_ver}"
+
+    cd ${curr_dir}
+else
+    taostools_install_dir="${release_dir}/taos-tools-${version}"
+fi
+
 # Directories and files
 if [ "$pagMode" == "lite" ]; then
   strip ${build_dir}/bin/taosd
   strip ${build_dir}/bin/taos
   # lite version doesn't include taosadapter,  which will lead to no restful interface
   bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh ${script_dir}/startPre.sh"
+  taostools_bin_files=""
 else
   bin_files="${build_dir}/bin/taosd \
       ${build_dir}/bin/taos \
       ${build_dir}/bin/taosadapter \
-      ${build_dir}/bin/taosdump \
-      ${build_dir}/bin/taosdemo \
       ${build_dir}/bin/tarbitrator\
       ${script_dir}/remove.sh \
       ${script_dir}/set_core.sh \
+      ${script_dir}/run_taosd.sh \
       ${script_dir}/startPre.sh \
       ${script_dir}/taosd-dump-cfg.gdb"
+
+  taostools_bin_files=" ${build_dir}/bin/taosdump \
+      ${build_dir}/bin/taosBenchmark"
 fi
 
 lib_files="${build_dir}/lib/libtaos.so.${version}"
@@ -78,6 +93,7 @@ mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
 
+
 if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
     cp ${compile_dir}/test/cfg/taosadapter.toml                 ${install_dir}/cfg || :
 fi
@@ -102,10 +118,29 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taos
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
 
-if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
-    mkdir -p ${install_dir}/avro/{lib,lib/pkgconfig}
-    cp ${build_dir}/lib/libavro.* ${install_dir}/avro/lib
-    cp ${build_dir}/lib/pkgconfig/avro-c.pc ${install_dir}/avro/lib/pkgconfig
+if [ -n "${taostools_bin_files}" ]; then
+    mkdir -p ${taostools_install_dir} || echo -e "failed to create ${taostools_install_dir}"
+    mkdir -p ${taostools_install_dir}/bin \
+        && cp ${taostools_bin_files} ${taostools_install_dir}/bin \
+        && chmod a+x ${taostools_install_dir}/bin/* || :
+    [ -f ${taostools_install_dir}/bin/taosBenchmark ] && \
+        ln -sf ${taostools_install_dir}/bin/taosBenchmark \
+        ${taostools_install_dir}/bin/taosdemo
+
+    if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh ]; then
+        cp ${top_dir}/src/kit/taos-tools/packaging/tools/install-taostools.sh \
+            ${taostools_install_dir}/ > /dev/null \
+            && chmod a+x ${taostools_install_dir}/install-taostools.sh \
+            || echo -e "failed to copy install-taostools.sh"
+    else
+        echo -e "install-taostools.sh not found"
+    fi
+
+    if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then
+        mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro"
+        cp ${build_dir}/lib/libavro.* ${taostools_install_dir}/avro/lib
+        cp ${build_dir}/lib/pkgconfig/avro-c.pc ${taostools_install_dir}/avro/lib/pkgconfig
+    fi
 fi
 
 if [ -f ${build_dir}/bin/jemalloc-config ]; then
@@ -235,6 +270,8 @@ cd ${release_dir}
 #  install_dir has been distinguishes  cluster from  edege, so comments this code
 pkg_name=${install_dir}-${osType}-${cpuType}
 
+taostools_pkg_name=${taostools_install_dir}-${osType}-${cpuType}
+
 # if [ "$verMode" == "cluster" ]; then
 #   pkg_name=${install_dir}-${osType}-${cpuType}
 # elif [ "$verMode" == "edge" ]; then
@@ -246,8 +283,10 @@ pkg_name=${install_dir}-${osType}-${cpuType}
 
 if [[ "$verType" == "beta" ]] || [[ "$verType" == "preRelease" ]]; then
   pkg_name=${install_dir}-${verType}-${osType}-${cpuType}
+  taostools_pkg_name=${taostools_install_dir}-${verType}-${osType}-${cpuType}
 elif [ "$verType" == "stable" ]; then
   pkg_name=${pkg_name}
+  taostools_pkg_name=${taostools_pkg_name}
 else
   echo "unknow verType, nor stabel or beta"
   exit 1
@@ -257,11 +296,20 @@ if [ "$pagMode" == "lite" ]; then
   pkg_name=${pkg_name}-Lite
 fi
 
-tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" "$(basename ${install_dir})" --remove-files || :
 exitcode=$?
 if [ "$exitcode" != "0" ]; then
     echo "tar ${pkg_name}.tar.gz error !!!"
     exit $exitcode
 fi
 
+if [ -n "${taostools_bin_files}" ]; then
+    tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || :
+    exitcode=$?
+    if [ "$exitcode" != "0" ]; then
+        echo "tar ${taostools_pkg_name}.tar.gz error !!!"
+        exit $exitcode
+    fi
+fi
+
 cd ${curr_dir}

packaging/tools/makepkg_jh.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/jh_taosdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_kh.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/khdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_power.sh

@@ -64,12 +64,13 @@ else
 #  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${build_dir}/bin/powerdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove_power.sh ${script_dir}/set_core.sh"
   cp ${build_dir}/bin/taos          ${install_dir}/bin/power
   cp ${build_dir}/bin/taosd         ${install_dir}/bin/powerd
-  cp ${build_dir}/bin/taosadapter          ${install_dir}/bin/taosadapter ||:
+  cp ${build_dir}/bin/taosadapter   ${install_dir}/bin/taosadapter ||:
   cp ${script_dir}/remove_power.sh  ${install_dir}/bin
   cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/powerdump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_pro.sh

@@ -56,6 +56,7 @@ else
   cp ${build_dir}/bin/taosdump      ${install_dir}/bin/prodump
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh     ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/makepkg_tq.sh

@@ -61,6 +61,7 @@ else
   cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/tqdemo
   cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
   cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  cp ${script_dir}/run_taosd.sh      ${install_dir}/bin
   cp ${script_dir}/get_client.sh    ${install_dir}/bin
   cp ${script_dir}/startPre.sh      ${install_dir}/bin
   cp ${script_dir}/taosd-dump-cfg.gdb  ${install_dir}/bin

packaging/tools/remove.sh

@@ -79,12 +79,13 @@ function clean_bin() {
     # Remove link
     ${csudo} rm -f ${bin_link_dir}/taos        || :
     ${csudo} rm -f ${bin_link_dir}/taosd       || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter        || :
+    ${csudo} rm -f ${bin_link_dir}/taosadapter || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo    || :
     ${csudo} rm -f ${bin_link_dir}/taosdump    || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
     ${csudo} rm -f ${bin_link_dir}/set_core    || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_jh.sh

@@ -70,10 +70,11 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/jh_taos      || :
     ${csudo} rm -f ${bin_link_dir}/jh_taosd      || :
     ${csudo} rm -f ${bin_link_dir}/jhdemo        || :
-    ${csudo} rm -f ${bin_link_dir}/jh_taosdump        || :
+    ${csudo} rm -f ${bin_link_dir}/jh_taosdump   || :
     ${csudo} rm -f ${bin_link_dir}/rmjh          || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core      || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh  || :
 }
 
 function clean_lib() {

packaging/tools/remove_kh.sh

@@ -74,6 +74,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmkh          || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
     ${csudo} rm -f ${bin_link_dir}/set_core      || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh     || :
 }
 
 function clean_lib() {

packaging/tools/remove_power.sh

@@ -76,6 +76,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmpower      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_pro.sh

@@ -74,6 +74,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmprodb      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/remove_tq.sh

@@ -76,6 +76,7 @@ function clean_bin() {
     ${csudo} rm -f ${bin_link_dir}/rmtq      || :
     ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
     ${csudo} rm -f ${bin_link_dir}/set_core     || :
+    ${csudo} rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {

packaging/tools/run_taosd.sh

+#!/bin/bash
+[[ -x /usr/bin/taosadapter ]] && /usr/bin/taosadapter &
+taosd

src/client/src/tscLocal.c

@@ -636,9 +636,9 @@ static int32_t tscRebuildDDLForNormalTable(SSqlObj *pSql, const char *tableName,
       if (type == TSDB_DATA_TYPE_NCHAR) {
         bytes =  bytes/TSDB_NCHAR_SIZE;
       }
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s(%d),", pSchema[i].name, tDataTypes[pSchema[i].type].name, bytes);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "`%s` %s(%d),", pSchema[i].name, tDataTypes[pSchema[i].type].name, bytes);
     } else {
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypes[pSchema[i].type].name);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "`%s` %s,", pSchema[i].name, tDataTypes[pSchema[i].type].name);
     }
   }
   sprintf(result + strlen(result) - 1, "%s", ")");
@@ -663,9 +663,9 @@ static int32_t tscRebuildDDLForSuperTable(SSqlObj *pSql, const char *tableName,
       if (type == TSDB_DATA_TYPE_NCHAR) {
         bytes =  bytes/TSDB_NCHAR_SIZE;
       }
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result),"%s %s(%d),", pSchema[i].name,tDataTypes[pSchema[i].type].name, bytes);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result),"`%s` %s(%d),", pSchema[i].name,tDataTypes[pSchema[i].type].name, bytes);
     } else {
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypes[type].name);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "`%s` %s,", pSchema[i].name, tDataTypes[type].name);
     }
   }
   snprintf(result + strlen(result) - 1, TSDB_MAX_BINARY_LEN - strlen(result), "%s %s", ")", "TAGS (");
@@ -677,9 +677,9 @@ static int32_t tscRebuildDDLForSuperTable(SSqlObj *pSql, const char *tableName,
       if (type == TSDB_DATA_TYPE_NCHAR) {
         bytes =  bytes/TSDB_NCHAR_SIZE;
       }
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s(%d),", pSchema[i].name,tDataTypes[pSchema[i].type].name, bytes);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "`%s` %s(%d),", pSchema[i].name,tDataTypes[pSchema[i].type].name, bytes);
     } else {
-      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypes[type].name);
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "`%s` %s,", pSchema[i].name, tDataTypes[type].name);
     }
   }
   sprintf(result + strlen(result) - 1, "%s", ")");

src/client/src/tscParseOpenTSDB.c

@@ -125,8 +125,9 @@ static int32_t parseTelnetTimeStamp(TAOS_SML_KV **pTS, int *num_kvs, const char
   }
   tfree(value);
 
-  (*pTS)->key = tcalloc(sizeof(key), 1);
+  (*pTS)->key = tcalloc(sizeof(key) + TS_ESCAPE_CHAR_SIZE, 1);
   memcpy((*pTS)->key, key, sizeof(key));
+  addEscapeCharToString((*pTS)->key, (int32_t)strlen(key));
 
   *num_kvs += 1;
   *index = cur + 1;

src/client/src/tscPrepare.c

@@ -1533,6 +1533,41 @@ int stmtGenInsertStatement(SSqlObj* pSql, STscStmt* pStmt, const char* name, TAO
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t stmtValidateValuesFields(SSqlCmd *pCmd, char * sql) {
+  int32_t loopCont = 1, index0 = 0, values = 0;
+  SStrToken sToken;
+  
+  while (loopCont) {
+    sToken = tStrGetToken(sql, &index0, false);
+    if (sToken.n <= 0) {
+      return TSDB_CODE_SUCCESS;
+    }
+  
+    switch (sToken.type) {
+      case TK_RP:
+        if (values) {
+         return TSDB_CODE_SUCCESS;
+        }
+        break;
+      case TK_VALUES:
+        values = 1;
+        break;
+      case TK_QUESTION:  
+      case TK_LP:
+        break;
+      default:
+        if (values) {
+          tscError("only ? allowed in values");
+          return tscInvalidOperationMsg(pCmd->payload, "only ? allowed in values", NULL);
+        }
+        break;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // interface functions
 
@@ -1637,6 +1672,11 @@ int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
       STMT_RET(ret);
     }
 
+    ret = stmtValidateValuesFields(&pSql->cmd, pSql->sqlstr);
+    if (ret != TSDB_CODE_SUCCESS) {
+      STMT_RET(ret);
+    }
+
     if (pStmt->multiTbInsert) {
       STMT_RET(TSDB_CODE_SUCCESS);
     }

src/client/src/tscSQLParser.c

@@ -3457,7 +3457,9 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
 
-  strncpy(pCmd->payload, idStr->z, idStr->n);
+  SKillQueryMsg* msg = (SKillQueryMsg*)pCmd->payload;
+
+  strncpy(msg->queryId, idStr->z, idStr->n);
 
   const char delim = ':';
   char* connIdStr = strtok(idStr->z, &delim);
@@ -3465,7 +3467,7 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) {
 
   int32_t connId = (int32_t)strtol(connIdStr, NULL, 10);
   if (connId <= 0) {
-    memset(pCmd->payload, 0, strlen(pCmd->payload));
+    memset(msg, 0, sizeof(*msg));
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
@@ -3475,7 +3477,7 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) {
 
   int32_t queryId = (int32_t)strtol(queryIdStr, NULL, 10);
   if (queryId <= 0) {
-    memset(pCmd->payload, 0, strlen(pCmd->payload));
+    memset(msg, 0, sizeof(*msg));
     if (killType == TSDB_SQL_KILL_QUERY) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
     } else {
@@ -6898,17 +6900,15 @@ int32_t validateLimitNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlN
 
   // todo refactor
   if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-    if (!tscQueryTags(pQueryInfo)) {  // local handle the super table tag query
-      if (tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
-        if (pQueryInfo->slimit.limit > 0 || pQueryInfo->slimit.offset > 0) {
-          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
-        }
+    if (tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
+      if (pQueryInfo->slimit.limit > 0 || pQueryInfo->slimit.offset > 0) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
 
-        // for projection query on super table, all queries are subqueries
-        if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) &&
-            !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_QUERY)) {
-          pQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;
-        }
+      // for projection query on super table, all queries are subqueries
+      if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) &&
+          !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_QUERY)) {
+        pQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;
       }
     }
 
@@ -7950,6 +7950,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   const char* msg3 = "tag value too long";
   const char* msg4 = "illegal value or data overflow";
   const char* msg5 = "tags number not matched";
+  const char* msg6 = "create table only from super table is allowed";
 
   SSqlCmd* pCmd = &pSql->cmd;
 
@@ -7997,6 +7998,10 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       return code;
     }
 
+    if (!UTIL_TABLE_IS_SUPER_TABLE(pStableMetaInfo)) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+    }
+
     size_t valSize = taosArrayGetSize(pValList);
 
     // too long tag values will return invalid sql, not be truncated automatically
@@ -9226,7 +9231,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
         SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
 
         int32_t f = pExpr->base.functionId;
-        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || f == TSDB_FUNC_RATE || f== TSDB_FUNC_DIFF) {
+        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || 
+            f == TSDB_FUNC_RATE       || f == TSDB_FUNC_DIFF) {
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
         }
       }

src/client/src/tscServer.c

@@ -506,7 +506,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
     }
   }
 
-  if (pRes->code == TSDB_CODE_SUCCESS && tscProcessMsgRsp[pCmd->command]) {
+  if (pRes->code == TSDB_CODE_SUCCESS && pCmd->command < TSDB_SQL_MAX && tscProcessMsgRsp[pCmd->command]) {
     rpcMsg->code = (*tscProcessMsgRsp[pCmd->command])(pSql);
   }
 
@@ -906,6 +906,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SArray* queryOperator = createExecOperatorPlan(&query);
 
   SQueryTableMsg *pQueryMsg = (SQueryTableMsg *)pCmd->payload;
+
   tstrncpy(pQueryMsg->version, version, tListLen(pQueryMsg->version));
 
   int32_t numOfTags = query.numOfTags;
@@ -1146,6 +1147,23 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   memcpy(pMsg, pSql->sqlstr, sqlLen);
   pMsg += sqlLen;
 
+
+/*
+  //MSG EXTEND DEMO
+  pQueryMsg->extend = 1;
+  
+  STLV *tlv = (STLV *)pMsg;
+  tlv->type = htons(TLV_TYPE_DUMMY);
+  tlv->len  = htonl(sizeof(int16_t));
+  *(int16_t *)tlv->value = htons(12345);
+  pMsg += sizeof(*tlv) + ntohl(tlv->len);
+
+  tlv = (STLV *)pMsg;
+  tlv->len = 0;
+  pMsg += sizeof(*tlv);
+
+*/
+
   int32_t msgLen = (int32_t)(pMsg - pCmd->payload);
 
   tscDebug("0x%"PRIx64" msg built success, len:%d bytes", pSql->self, msgLen);
@@ -2813,7 +2831,11 @@ static int32_t getTableMetaFromMnode(SSqlObj *pSql, STableMetaInfo *pTableMetaIn
   tscAddQueryInfo(&pNew->cmd);
 
   SQueryInfo *pNewQueryInfo = tscGetQueryInfoS(&pNew->cmd);
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE + pSql->cmd.payloadLen)) {
+  int payLoadLen = TSDB_DEFAULT_PAYLOAD_SIZE + pSql->cmd.payloadLen;
+  if (autocreate && pSql->cmd.insertParam.tagData.dataLen != 0) {
+    payLoadLen += pSql->cmd.insertParam.tagData.dataLen;
+  }
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pNew->cmd, payLoadLen)) {
     tscError("0x%"PRIx64" malloc failed for payload to get table meta", pSql->self);
 
     tscFreeSqlObj(pNew);

src/client/src/tscUtil.c

@@ -81,23 +81,42 @@ int32_t converToStr(char *str, int type, void *buf, int32_t bufSize, int32_t *le
       break;
 
     case TSDB_DATA_TYPE_FLOAT:
-      n = sprintf(str, "%e", GET_FLOAT_VAL(buf));
+      n = sprintf(str, "%.*e", DECIMAL_DIG, GET_FLOAT_VAL(buf));
       break;
 
     case TSDB_DATA_TYPE_DOUBLE:
-      n = sprintf(str, "%e", GET_DOUBLE_VAL(buf));
+      n = sprintf(str, "%.*e", DECIMAL_DIG, GET_DOUBLE_VAL(buf));
       break;
 
     case TSDB_DATA_TYPE_BINARY:
+      if (bufSize < 0) {
+        tscError("invalid buf size");
+        return TSDB_CODE_TSC_INVALID_VALUE;
+      }
+      int32_t escapeSize = 0;
+      *str++ = '\'';
+      ++escapeSize;
+      char* data = buf;
+      for (int32_t i = 0; i < bufSize; ++i) {
+        if (data[i] == '\'' || data[i] == '"') {
+          *str++ = '\\';
+          ++escapeSize;
+        }
+        *str++ = data[i];
+      }
+      *str = '\'';
+      ++escapeSize;
+      n = bufSize + escapeSize;
+      break;
     case TSDB_DATA_TYPE_NCHAR:
       if (bufSize < 0) {
         tscError("invalid buf size");
         return TSDB_CODE_TSC_INVALID_VALUE;
       }
 
-      *str = '"';
+      *str = '\'';
       memcpy(str + 1, buf, bufSize);
-      *(str + bufSize + 1) = '"';
+      *(str + bufSize + 1) = '\'';
       n = bufSize + 2;
       break;
 

src/common/inc/tdataformat.h

@@ -448,13 +448,14 @@ typedef struct {
 #define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
 #define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
 #define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
+#define kvRowKeys(r) POINTER_SHIFT(r, *(uint16_t *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(int16_t)))
 #define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
 #define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
 #define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
 #define kvRowFree(r) tfree(r)
 #define kvRowEnd(r) POINTER_SHIFT(r, kvRowLen(r))
 #define kvRowValLen(r) (kvRowLen(r) - TD_KV_ROW_HEAD_SIZE - sizeof(SColIdx) * kvRowNCols(r))
-#define kvRowTKey(r) (*(TKEY *)(kvRowValues(r)))
+#define kvRowTKey(r) (*(TKEY *)(kvRowKeys(r)))
 #define kvRowKey(r) tdGetKey(kvRowTKey(r))
 #define kvRowDeleted(r) TKEY_IS_DELETED(kvRowTKey(r))
 
@@ -652,7 +653,7 @@ static FORCE_INLINE char *memRowEnd(SMemRow row) {
 #define memRowKvVersion(r) (*(int16_t *)POINTER_SHIFT(r, TD_MEM_ROW_TYPE_SIZE))
 #define memRowVersion(r) (isDataRow(r) ? memRowDataVersion(r) : memRowKvVersion(r))  // schema version
 #define memRowSetKvVersion(r, v) (memRowKvVersion(r) = (v))
-#define memRowTuple(r) (isDataRow(r) ? dataRowTuple(memRowDataBody(r)) : kvRowValues(memRowKvBody(r)))
+#define memRowKeys(r) (isDataRow(r) ? dataRowTuple(memRowDataBody(r)) : kvRowKeys(memRowKvBody(r)))
 
 #define memRowTKey(r) (isDataRow(r) ? dataRowTKey(memRowDataBody(r)) : kvRowTKey(memRowKvBody(r)))
 #define memRowKey(r) (isDataRow(r) ? dataRowKey(memRowDataBody(r)) : kvRowKey(memRowKvBody(r)))

src/common/src/tglobal.c

@@ -1332,7 +1332,7 @@ static void doInitGlobalConfig(void) {
   cfg.option = "httpDbNameMandatory";
   cfg.ptr = &tsHttpDbNameMandatory;
   cfg.valType = TAOS_CFG_VTYPE_INT8;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
   cfg.minValue = 0;
   cfg.maxValue = 1;
   cfg.ptrLength = 0;

src/connector/C#/csharpTaos.sln

+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1FB5B66-E32F-4789-9BE9-042E5BD21087}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDengineDriver", "src\TDengineDriver\TDengineDriver.csproj", "{5BED7402-0A65-4ED9-A491-C56BFB518045}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CB8E6458-31E1-4351-B704-1B918E998654}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XUnitTest", "src\test\XUnitTest\XUnitTest.csproj", "{64C0A478-2591-4459-9F8F-A70F37976A41}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cases", "src\test\Cases\Cases.csproj", "{19A69D26-66BF-4227-97BE-9B087BC76B2F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|x64.Build.0 = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|x64.Build.0 = Release|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BED7402-0A65-4ED9-A491-C56BFB518045}.Release|x86.Build.0 = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|x64.Build.0 = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Debug|x86.Build.0 = Debug|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|x64.ActiveCfg = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|x64.Build.0 = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|x86.ActiveCfg = Release|Any CPU
+		{64C0A478-2591-4459-9F8F-A70F37976A41}.Release|x86.Build.0 = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|x64.Build.0 = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|x64.ActiveCfg = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|x64.Build.0 = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|x86.ActiveCfg = Release|Any CPU
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5BED7402-0A65-4ED9-A491-C56BFB518045} = {A1FB5B66-E32F-4789-9BE9-042E5BD21087}
+		{CB8E6458-31E1-4351-B704-1B918E998654} = {A1FB5B66-E32F-4789-9BE9-042E5BD21087}
+		{64C0A478-2591-4459-9F8F-A70F37976A41} = {CB8E6458-31E1-4351-B704-1B918E998654}
+		{19A69D26-66BF-4227-97BE-9B087BC76B2F} = {CB8E6458-31E1-4351-B704-1B918E998654}
+	EndGlobalSection
+EndGlobal

src/connector/C#/TDengineDriver.cs → src/connector/C#/src/TDengineDriver/TDengineDriver.cs

@@ -47,6 +47,14 @@ namespace TDengineDriver
         TDDB_OPTION_SHELL_ACTIVITY_TIMER = 4
     }
 
+    enum TaosField
+    {
+        STRUCT_SIZE = 68,
+        NAME_LENGTH = 65,
+        TYPE_OFFSET = 65,
+        BYTES_OFFSET = 66,
+
+    }
     public class TDengineMeta
     {
         public string name;
@@ -90,6 +98,51 @@ namespace TDengineDriver
         }
     }
 
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public struct TAOS_BIND
+    {
+        // column type
+        public int buffer_type;
+        // one column value           
+        public IntPtr buffer;
+        // unused               
+        public Int32 buffer_length;
+        // actual value length in buffer   
+        public IntPtr length;
+        // indicates the column value is null or not      
+        public IntPtr is_null;
+        // unused            
+        public int is_unsigned;
+        // unused           
+        public IntPtr error;
+        public Int64 u;
+        public uint allocated;
+    }
+
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct TAOS_MULTI_BIND
+    {
+        // column type
+        public int buffer_type;
+
+        // array, one or more lines column value
+        public IntPtr buffer;
+
+        //length of element in TAOS_MULTI_BIND.buffer (for binary and nchar it is the longest element's length)
+        public ulong buffer_length;
+
+        //array, actual data length for each value
+        public IntPtr length;
+
+        //array, indicates each column value is null or not
+        public IntPtr is_null;
+
+        // line number, or the values number in buffer 
+        public int num;
+    }
+
+
     public class TDengine
     {
         public const int TSDB_CODE_SUCCESS = 0;
@@ -130,7 +183,7 @@ namespace TDengineDriver
         static extern private IntPtr taos_fetch_fields(IntPtr res);
         static public List<TDengineMeta> FetchFields(IntPtr res)
         {
-            const int fieldSize = 68;
+            // const int fieldSize = 68;
 
             List<TDengineMeta> metas = new List<TDengineMeta>();
             if (res == IntPtr.Zero)
@@ -143,12 +196,11 @@ namespace TDengineDriver
 
             for (int i = 0; i < fieldCount; ++i)
             {
-                int offset = i * fieldSize;
-
+                int offset = i * (int)TaosField.STRUCT_SIZE;
                 TDengineMeta meta = new TDengineMeta();
                 meta.name = Marshal.PtrToStringAnsi(fieldsPtr + offset);
-                meta.type = Marshal.ReadByte(fieldsPtr + offset + 65);
-                meta.size = Marshal.ReadInt16(fieldsPtr + offset + 66);
+                meta.type = Marshal.ReadByte(fieldsPtr + offset + (int)TaosField.TYPE_OFFSET);
+                meta.size = Marshal.ReadInt16(fieldsPtr + offset + (int)TaosField.BYTES_OFFSET);
                 metas.Add(meta);
             }
 
@@ -163,12 +215,185 @@ namespace TDengineDriver
 
         [DllImport("taos", EntryPoint = "taos_close", CallingConvention = CallingConvention.Cdecl)]
         static extern public int Close(IntPtr taos);
-         //get precision in  restultset
+
+        //get precision of restultset
         [DllImport("taos", EntryPoint = "taos_result_precision", CallingConvention = CallingConvention.Cdecl)]
         static extern public int ResultPrecision(IntPtr taos);
 
-        //schemaless API 
-        [DllImport("taos",SetLastError = true, EntryPoint = "taos_schemaless_insert", CallingConvention = CallingConvention.Cdecl)]
-        static extern public IntPtr SchemalessInsert(IntPtr taos, string[] lines, int numLines, int protocol, int precision);
+
+
+        //stmt APIs:
+        /// <summary>
+        /// init a TAOS_STMT object for later use.
+        /// </summary>
+        /// <param name="taos">a valid taos connection</param>
+        /// <returns>
+        /// Not NULL returned for success, NULL for failure. And it should be freed with taos_stmt_close. 
+        /// </returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_init", CallingConvention = CallingConvention.Cdecl)]
+        static extern public IntPtr StmtInit(IntPtr taos);
+
+        /// <summary>
+        /// prepare a sql statement，'sql' should be a valid INSERT/SELECT statement.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="sql">sql string,used to bind parameters with</param>
+        /// <param name="length">no used</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_prepare", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtPrepare(IntPtr stmt, string sql);
+
+        /// <summary>
+        /// For INSERT only. Used to bind table name as a parmeter for the input stmt object.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="name">table name you want to  bind</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_set_tbname", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtSetTbname(IntPtr stmt, string name);
+
+        /// <summary>
+        /// For INSERT only. 
+        /// Set a table name for binding table name as parameter. Only used for binding all tables 
+        /// in one stable, user application must call 'loadTableInfo' API to load all table 
+        /// meta before calling this API. If the table meta is not cached locally, it will return error.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="name">table name which is belong to an stable</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_set_sub_tbname", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtSetSubTbname(IntPtr stmt, string name);
+
+        /// <summary>
+        /// For INSERT only.
+        /// set a table name for binding table name as parameter and tag values for all  tag parameters. 
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="name">use to set table name</param>
+        /// <param name="tags">
+        /// is an array contains all tag values,each item in the array represents a tag column's value.
+        ///  the item number and sequence should keep consistence with that in stable tag definition.
+        /// </param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_set_tbname_tags", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtSetTbnameTags(IntPtr stmt, string name, TAOS_BIND[] tags);
+
+        /// <summary>
+        /// For both INSERT and SELECT.
+        /// bind a whole line data.  
+        /// The usage of structure TAOS_BIND is the same with MYSQL_BIND in MySQL.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="bind">
+        /// points to an array contains the whole line data.
+        /// the item number and sequence should keep consistence with columns in sql statement.
+        /// </param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_bind_param", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
+        static extern public int StmtBindParam(IntPtr stmt, TAOS_BIND[] bind);
+
+        /// <summary>
+        /// bind a single column's data, INTERNAL used and for INSERT only. 
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="bind">points to a column's data which could be the one or more lines. </param>
+        /// <param name="colIdx">the column's index in prepared sql statement, it starts from 0.</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_bind_single_param_batch", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtBindSingleParamBatch(IntPtr stmt, ref TAOS_MULTI_BIND bind, int colIdx);
+
+        /// <summary>
+        /// for INSERT only
+        /// bind one or multiple lines data. The parameter 'bind'  
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <param name="bind">
+        /// points to an array contains one or more lines data.Each item in array represents a column's value(s),
+        /// the item number and sequence should keep consistence with columns in sql statement. 
+        /// </param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_bind_param_batch", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtBindParamBatch(IntPtr stmt, [In, Out] TAOS_MULTI_BIND[] bind);
+
+        /// <summary>
+        /// For INSERT only.
+        /// add all current bound parameters to batch process. Must be called after each call to 
+        /// StmtBindParam/StmtBindSingleParamBatch, or all columns binds for one or more lines 
+        /// with StmtBindSingleParamBatch. User application can call any bind parameter 
+        /// API again to bind more data lines after calling to this API.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_add_batch", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtAddBatch(IntPtr stmt);
+
+        /// <summary>
+        /// actually execute the INSERT/SELECT sql statement. 
+        /// User application can continue to bind new data after calling to this API.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns></returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_execute", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtExecute(IntPtr stmt);
+
+        /// <summary>
+        /// For SELECT only,getting the query result. User application should free it with API 'FreeResult' at the end.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns>Not NULL for success, NULL for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_use_result", CallingConvention = CallingConvention.Cdecl)]
+        static extern public IntPtr StmtUseResult(IntPtr stmt);
+
+        /// <summary>
+        /// close STMT object and free resources.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns>0 for success, non-zero for failure.</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_close", CallingConvention = CallingConvention.Cdecl)]
+        static extern public int StmtClose(IntPtr stmt);
+
+        [DllImport("taos", EntryPoint = "taos_load_table_info", CallingConvention = CallingConvention.Cdecl)]
+        /// <summary>
+        /// user application must call this API to  load all tables meta,
+        /// </summary>
+        /// <param name="taos">taos connection</param>
+        /// <param name="tableList">tablelist</param>
+        /// <returns></returns>
+        static extern private int LoadTableInfoDll(IntPtr taos, string tableList);
+
+        /// <summary>
+        /// user application  call this API to load all tables meta,this method call the native
+        /// method LoadTableInfoDll.
+        /// this method must be called before StmtSetSubTbname(IntPtr stmt, string name);
+        /// </summary>
+        /// <param name="taos">taos connection</param>
+        /// <param name="tableList">tables need to load meta info are form in an array</param>
+        /// <returns></returns>
+        static public int LoadTableInfo(IntPtr taos, string[] tableList)
+        {
+            string listStr = string.Join(",", tableList);
+            return LoadTableInfoDll(taos, listStr);
+        }
+
+        /// <summary>
+        /// get detail error message when got failure for any stmt API call. If not failure, the result 
+        /// returned in this API is unknown.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns>piont the error message</returns>
+        [DllImport("taos", EntryPoint = "taos_stmt_errstr", CallingConvention = CallingConvention.Cdecl)]
+        static extern private IntPtr StmtErrPtr(IntPtr stmt);
+
+        /// <summary>
+        /// get detail error message when got failure for any stmt API call. If not failure, the result 
+        /// returned in this API is unknown.
+        /// </summary>
+        /// <param name="stmt">could be the value returned by 'StmtInit', that may be a valid object or NULL.</param>
+        /// <returns>error string</returns>
+        static public string StmtErrorStr(IntPtr stmt)
+        {
+            IntPtr stmtErrPrt = StmtErrPtr(stmt);
+            return Marshal.PtrToStringAnsi(stmtErrPrt);
+        }
     }
 }

src/connector/C#/src/TDengineDriver/TDengineDriver.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

src/connector/C#/src/TDengineDriver/TaosBind.cs

+using System;
+using System.Runtime.InteropServices;
+
+
+namespace TDengineDriver
+{
+    /// <summary>
+    /// this class used to get an instance of struct of TAO_BIND or TAOS_MULTI_BIND
+    /// And the instance is corresponding with TDengine data type. For example, calling 
+    /// "bindBinary"  will return a TAOS_BIND object that is corresponding with TDengine's
+    /// binary type.
+    /// </summary>
+    public class TaosBind
+    {
+        public static TAOS_BIND BindBool(bool val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+            byte[] boolByteArr = BitConverter.GetBytes(val);
+            int boolByteArrSize = Marshal.SizeOf(boolByteArr[0]) * boolByteArr.Length;
+            IntPtr bo = Marshal.AllocHGlobal(1);
+            Marshal.Copy(boolByteArr, 0, bo, boolByteArr.Length);
+
+            int length = sizeof(Boolean);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BOOL;
+            bind.buffer = bo;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+        public static TAOS_BIND BindTinyInt(sbyte val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] tinyIntByteArr = BitConverter.GetBytes(val);
+            int tinyIntByteArrSize = Marshal.SizeOf(tinyIntByteArr[0]) * tinyIntByteArr.Length;
+            IntPtr uManageTinyInt = Marshal.AllocHGlobal(tinyIntByteArrSize);
+            Marshal.Copy(tinyIntByteArr, 0, uManageTinyInt, tinyIntByteArr.Length);
+
+            int length = sizeof(sbyte);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TINYINT;
+            bind.buffer = uManageTinyInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+            return bind;
+
+        }
+
+        public static TAOS_BIND BindSmallInt(short val)
+        {
+
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr uManageSmallInt = Marshal.AllocHGlobal(sizeof(short));
+            Marshal.WriteInt16(uManageSmallInt, val);
+
+            int length = sizeof(short);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_SMALLINT;
+            bind.buffer = uManageSmallInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindInt(int val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr uManageInt = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(uManageInt, val);
+
+            int length = sizeof(int);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_INT;
+            bind.buffer = uManageInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindBigInt(long val)
+        {
+
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr uManageBigInt = Marshal.AllocHGlobal(sizeof(long));
+            Marshal.WriteInt64(uManageBigInt, val);
+
+            int length = sizeof(long);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BIGINT;
+            bind.buffer = uManageBigInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindUTinyInt(byte val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            IntPtr uManageTinyInt = Marshal.AllocHGlobal(sizeof(byte));
+            Marshal.WriteByte(uManageTinyInt, val);
+
+            int length = sizeof(byte);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UTINYINT;
+            bind.buffer = uManageTinyInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindUSmallInt(UInt16 val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] uSmallIntByteArr = BitConverter.GetBytes(val);
+            int usmallSize = Marshal.SizeOf(uSmallIntByteArr[0]) * uSmallIntByteArr.Length;
+            IntPtr uManageUnsignSmallInt = Marshal.AllocHGlobal(usmallSize);
+            Marshal.Copy(uSmallIntByteArr, 0, uManageUnsignSmallInt, uSmallIntByteArr.Length);
+
+            int length = sizeof(UInt16);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_USMALLINT;
+            bind.buffer = uManageUnsignSmallInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindUInt(uint val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] uManageIntByteArr = BitConverter.GetBytes(val);
+            int usmallSize = Marshal.SizeOf(uManageIntByteArr[0]) * uManageIntByteArr.Length;
+            IntPtr uManageInt = Marshal.AllocHGlobal(usmallSize);
+            Marshal.Copy(uManageIntByteArr, 0, uManageInt, uManageIntByteArr.Length);
+
+            int length = sizeof(uint);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UINT;
+            bind.buffer = uManageInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindUBigInt(ulong val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] uManageBigIntByteArr = BitConverter.GetBytes(val);
+            int usmallSize = Marshal.SizeOf(uManageBigIntByteArr[0]) * uManageBigIntByteArr.Length;
+            IntPtr uManageBigInt = Marshal.AllocHGlobal(usmallSize);
+            Marshal.Copy(uManageBigIntByteArr, 0, uManageBigInt, uManageBigIntByteArr.Length);
+
+            int length = sizeof(ulong);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_UBIGINT;
+            bind.buffer = uManageBigInt;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindFloat(float val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] floatByteArr = BitConverter.GetBytes(val);
+            int floatByteArrSize = Marshal.SizeOf(floatByteArr[0]) * floatByteArr.Length;
+            IntPtr uManageFloat = Marshal.AllocHGlobal(floatByteArrSize);
+            Marshal.Copy(floatByteArr, 0, uManageFloat, floatByteArr.Length);
+
+            int length = sizeof(float);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_FLOAT;
+            bind.buffer = uManageFloat;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindDouble(Double val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            byte[] doubleByteArr = BitConverter.GetBytes(val);
+            int doubleByteArrSize = Marshal.SizeOf(doubleByteArr[0]) * doubleByteArr.Length;
+            IntPtr uManageDouble = Marshal.AllocHGlobal(doubleByteArrSize);
+            Marshal.Copy(doubleByteArr, 0, uManageDouble, doubleByteArr.Length);
+
+            int length = sizeof(Double);
+            IntPtr lengPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_DOUBLE;
+            bind.buffer = uManageDouble;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindBinary(String val)
+        {
+
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr umanageBinary = Marshal.StringToHGlobalAnsi(val);
+
+            int leng = val.Length;
+            IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong));
+            Marshal.WriteInt64(lenPtr, leng);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_BINARY;
+            bind.buffer = umanageBinary;
+            bind.buffer_length = leng;
+            bind.length = lenPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+        public static TAOS_BIND BindNchar(String val)
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr umanageNchar = (IntPtr)Marshal.StringToHGlobalAnsi(val);
+
+            int leng = val.Length;
+            IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(ulong));
+            Marshal.WriteInt64(lenPtr, leng);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_NCHAR;
+            bind.buffer = umanageNchar;
+            bind.buffer_length = leng;
+            bind.length = lenPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+        }
+
+        public static TAOS_BIND BindNil()
+        {
+            TAOS_BIND bind = new TAOS_BIND();
+
+            int isNull = 1;//IntPtr.Size;
+            IntPtr lenPtr = Marshal.AllocHGlobal(sizeof(int));
+            Marshal.WriteInt32(lenPtr, isNull);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_NULL;
+            bind.is_null = lenPtr;
+            return bind;
+        }
+
+        public static TAOS_BIND BindTimestamp(long ts)
+        {
+
+            TAOS_BIND bind = new TAOS_BIND();
+            IntPtr uManageTs = Marshal.AllocHGlobal(sizeof(long));
+            Marshal.WriteInt64(uManageTs, ts);
+
+            int length = sizeof(long);
+            IntPtr lengPtr = Marshal.AllocHGlobal(4);
+            Marshal.WriteInt32(lengPtr, length);
+
+            bind.buffer_type = (int)TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP;
+            bind.buffer = uManageTs;
+            bind.buffer_length = length;
+            bind.length = lengPtr;
+            bind.is_null = IntPtr.Zero;
+
+            return bind;
+
+        }
+
+        public static void FreeTaosBind(TAOS_BIND[] binds)
+        {
+            foreach (TAOS_BIND bind in binds)
+            {
+                Marshal.FreeHGlobal(bind.buffer);
+                Marshal.FreeHGlobal(bind.length);
+                if (bind.is_null != IntPtr.Zero)
+                {
+                    // Console.WriteLine(bind.is_null);
+                    Marshal.FreeHGlobal(bind.is_null);
+                }
+
+            }
+        }
+    }
+
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/Cases.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\TDengineDriver\TDengineDriver.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

src/connector/C#/src/test/Cases/DataSource.cs

+using System;
+using Test.UtilsTools;
+using TDengineDriver;
+
+namespace Test.UtilsTools.DataSource
+{
+    public class DataSource
+    {
+        public static long[] tsArr = new long[5] { 1637064040000, 1637064041000, 1637064042000, 1637064043000, 1637064044000 };
+        public static bool?[] boolArr = new bool?[5] { true, false, null, true, true };
+        public static sbyte?[] tinyIntArr = new sbyte?[5] { -127, 0, null, 8, 127 };
+        public static short?[] shortArr = new short?[5] { short.MinValue + 1, -200, null, 100, short.MaxValue };
+        public static int?[] intArr = new int?[5] { -200, -100, null, 0, 300 };
+        public static long?[] longArr = new long?[5] { long.MinValue + 1, -2000, null, 1000, long.MaxValue };
+        public static float?[] floatArr = new float?[5] { float.MinValue + 1, -12.1F, null, 0F, float.MaxValue };
+        public static double?[] doubleArr = new double?[5] { double.MinValue + 1, -19.112D, null, 0D, double.MaxValue };
+        public static byte?[] uTinyIntArr = new byte?[5] { byte.MinValue, 12, null, 89, byte.MaxValue - 1 };
+        public static ushort?[] uShortArr = new ushort?[5] { ushort.MinValue, 200, null, 400, ushort.MaxValue - 1 };
+        public static uint?[] uIntArr = new uint?[5] { uint.MinValue, 100, null, 2, uint.MaxValue - 1 };
+        public static ulong?[] uLongArr = new ulong?[5] { ulong.MinValue, 2000, null, 1000, long.MaxValue - 1 };
+        public static string[] binaryArr = new string[5] { "1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", String.Empty, null, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM", "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890~!@#$%^&*()_+=-`[]{}:,./<>?" };
+        public static string[] ncharArr = new string[5] { "1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", null, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM", "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890~!@#$%^&*()_+=-`[]{}:,./<>?", string.Empty };
+
+
+        public static TAOS_BIND[] getTags()
+        {
+            TAOS_BIND[] binds = new TAOS_BIND[13];
+            binds[0] = TaosBind.BindBool(true);
+            binds[1] = TaosBind.BindTinyInt(-2);
+            binds[2] = TaosBind.BindSmallInt(short.MaxValue);
+            binds[3] = TaosBind.BindInt(int.MaxValue);
+            binds[4] = TaosBind.BindBigInt(Int64.MaxValue);
+            binds[5] = TaosBind.BindUTinyInt(byte.MaxValue - 1);
+            binds[6] = TaosBind.BindUSmallInt(UInt16.MaxValue - 1);
+            binds[7] = TaosBind.BindUInt(uint.MinValue + 1);
+            binds[8] = TaosBind.BindUBigInt(UInt64.MinValue + 1);
+            binds[9] = TaosBind.BindFloat(11.11F);
+            binds[10] = TaosBind.BindDouble(22.22D);
+            binds[11] = TaosBind.BindBinary("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKZXCVBNM`1234567890-=+_)(*&^%$#@!~[];,./<>?:{}");
+            binds[12] = TaosBind.BindNchar("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKZXCVBNM`1234567890-=+_)(*&^%$#@!~[];,./<>?:{}");
+            return binds;
+        }
+        public static TAOS_BIND[] getNtableRow()
+        {
+            TAOS_BIND[] binds = new TAOS_BIND[15];
+            binds[0] = TaosBind.BindTimestamp(1637064040000);
+            binds[1] = TaosBind.BindTinyInt(-2);
+            binds[2] = TaosBind.BindSmallInt(short.MaxValue);
+            binds[3] = TaosBind.BindInt(int.MaxValue);
+            binds[4] = TaosBind.BindBigInt(Int64.MaxValue);
+            binds[5] = TaosBind.BindUTinyInt(byte.MaxValue - 1);
+            binds[6] = TaosBind.BindUSmallInt(UInt16.MaxValue - 1);
+            binds[7] = TaosBind.BindUInt(uint.MinValue + 1);
+            binds[8] = TaosBind.BindUBigInt(UInt64.MinValue + 1);
+            binds[9] = TaosBind.BindFloat(11.11F);
+            binds[10] = TaosBind.BindDouble(22.22D);
+            binds[11] = TaosBind.BindBinary("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKZXCVBNM`1234567890-=+_)(*&^%$#@!~[];,./<>?:{}");
+            binds[12] = TaosBind.BindNchar("qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKZXCVBNM`1234567890-=+_)(*&^%$#@!~[];,./<>?:{}");
+            binds[13] = TaosBind.BindBool(true);
+            binds[14] = TaosBind.BindNil();
+            return binds;
+        }
+
+        public static TAOS_MULTI_BIND[] GetMultiBindArr()
+        {
+            TAOS_MULTI_BIND[] mBinds = new TAOS_MULTI_BIND[14];
+            mBinds[0] = TaosMultiBind.MultiBindTimestamp(tsArr);
+            mBinds[1] = TaosMultiBind.MultiBindBool(boolArr);
+            mBinds[2] = TaosMultiBind.MultiBindTinyInt(tinyIntArr);
+            mBinds[3] = TaosMultiBind.MultiBindSmallInt(shortArr);
+            mBinds[4] = TaosMultiBind.MultiBindInt(intArr);
+            mBinds[5] = TaosMultiBind.MultiBindBigint(longArr);
+            mBinds[6] = TaosMultiBind.MultiBindFloat(floatArr);
+            mBinds[7] = TaosMultiBind.MultiBindDouble(doubleArr);
+            mBinds[8] = TaosMultiBind.MultiBindUTinyInt(uTinyIntArr);
+            mBinds[9] = TaosMultiBind.MultiBindUSmallInt(uShortArr);
+            mBinds[10] = TaosMultiBind.MultiBindUInt(uIntArr);
+            mBinds[11] = TaosMultiBind.MultiBindUBigInt(uLongArr);
+            mBinds[12] = TaosMultiBind.MultiBindBinary(binaryArr);
+            mBinds[13] = TaosMultiBind.MultiBindNchar(ncharArr);
+            return mBinds;
+        }
+        public static TAOS_BIND[] GetQueryCondition()
+        {
+            TAOS_BIND[] queryCondition = new TAOS_BIND[2];
+            queryCondition[0] = TaosBind.BindTinyInt(0);
+            queryCondition[1] = TaosBind.BindInt(1000);
+            return queryCondition;
+
+        }
+        public static void FreeTaosBind(TAOS_BIND[] binds)
+        {
+            TaosBind.FreeTaosBind(binds);
+        }
+
+        public static void FreeTaosMBind(TAOS_MULTI_BIND[] mbinds)
+        {
+            TaosMultiBind.FreeTaosBind(mbinds);
+        }
+
+
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/Program.cs

+using System;
+using Test.UtilsTools;
+using Cases;
+
+namespace Cases.EntryPoint
+{
+    class Program
+    {
+
+        static void Main(string[] args)
+        {
+            IntPtr conn = IntPtr.Zero;
+            IntPtr stmt = IntPtr.Zero;
+            IntPtr res = IntPtr.Zero;
+
+            conn = UtilsTools.TDConnection("127.0.0.1", "root", "taosdata", "", 0);
+            UtilsTools.ExecuteQuery(conn, "drop database if  exists csharp");
+            UtilsTools.ExecuteQuery(conn, "create database if not exists csharp keep 3650");
+            UtilsTools.ExecuteQuery(conn, "use csharp");
+
+            Console.WriteLine("====================StableColumnByColumn===================");
+            StableColumnByColumn columnByColumn = new StableColumnByColumn();
+            columnByColumn.Test(conn, "stablecolumnbycolumn");
+            Console.WriteLine("====================StmtStableQuery===================");
+            StmtStableQuery stmtStableQuery = new StmtStableQuery();
+            stmtStableQuery.Test(conn, "stablecolumnbycolumn");
+
+            Console.WriteLine("====================StableMutipleLine===================");
+            StableMutipleLine mutipleLine = new StableMutipleLine();
+            mutipleLine.Test(conn, "stablemutipleline");
+
+            //================================================================================
+
+            Console.WriteLine("====================NtableSingleLine===================");
+            NtableSingleLine ntableSingleLine = new NtableSingleLine();
+            ntableSingleLine.Test(conn, "stablesingleline");
+
+            Console.WriteLine("====================NtableMutipleLine===================");
+            NtableMutipleLine ntableMutipleLine = new NtableMutipleLine();
+            ntableMutipleLine.Test(conn, "ntablemutipleline");
+            Console.WriteLine("====================StmtNtableQuery===================");
+            StmtNtableQuery stmtNtableQuery = new StmtNtableQuery();
+            stmtNtableQuery.Test(conn, "ntablemutipleline");
+
+            Console.WriteLine("====================NtableColumnByColumn===================");
+            NtableColumnByColumn ntableColumnByColumn = new NtableColumnByColumn();
+            ntableColumnByColumn.Test(conn, "ntablecolumnbycolumn");
+
+            Console.WriteLine("====================fetchfeilds===================");
+            FetchFields fetchFields = new FetchFields();
+            fetchFields.Test(conn, "fetchfeilds");
+
+            UtilsTools.ExecuteQuery(conn, "drop database if  exists csharp");
+            UtilsTools.CloseConnection(conn);
+            UtilsTools.ExitProgram();
+
+        }
+    }
+}

src/connector/C#/src/test/Cases/StmtNormalTable.cs

+using System;
+using Test.UtilsTools;
+using TDengineDriver;
+using Test.UtilsTools.DataSource;
+
+namespace Cases
+{
+    public class NtableSingleLine
+    {
+
+        public void Test(IntPtr conn, string tableName)
+        {
+            String createTb = "create table " + tableName + "(ts timestamp,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200),bo bool,nullVal int);";
+            String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            TAOS_BIND[] valuesRow = DataSource.getNtableRow();
+            UtilsTools.ExecuteQuery(conn, createTb);
+
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindParam(stmt, valuesRow);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(valuesRow);
+        }
+    }
+
+    public class NtableMutipleLine
+    {
+        TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
+        public void Test(IntPtr conn, string tableName)
+        {
+            String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
+            String insertSql = "insert into ? values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            UtilsTools.ExecuteQuery(conn, createTb);
+            String[] loadList = { tableName };
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.loadTableInfo(conn, loadList);
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindParamBatch(stmt, mbind);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosMBind(mbind);
+        }
+    }
+    public class NtableColumnByColumn
+    {
+        DataSource data = new DataSource();
+        TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
+        public void Test(IntPtr conn, string tableName)
+        {
+            String createTb = "create table " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200));";
+            String insertSql = "insert into ?  values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+
+            UtilsTools.ExecuteQuery(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+
+            StmtUtilTools.SetTableName(stmt, tableName);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13);
+
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+
+            DataSource.FreeTaosMBind(mbind);
+
+        }
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/StmtQuery.cs

+using System;
+using Test.UtilsTools;
+using TDengineDriver;
+using Test.UtilsTools.DataSource;
+
+namespace Cases
+{
+    public class StmtStableQuery
+    {
+        public void Test(IntPtr conn, string tableName)
+        {
+            string selectSql = "SELECT * FROM " + tableName + " WHERE v1 > ? AND v4 < ?";
+            TAOS_BIND[] queryCondition = DataSource.GetQueryCondition();
+
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, selectSql);
+
+            StmtUtilTools.BindParam(stmt, queryCondition);
+            StmtUtilTools.StmtExecute(stmt);
+            IntPtr res = StmtUtilTools.StmtUseResult(stmt);
+            UtilsTools.DisplayRes(res);
+
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(queryCondition);
+
+        }
+    }
+
+    public class StmtNtableQuery
+    {
+        public void Test(IntPtr conn, string tableName)
+        {
+            string selectSql = "SELECT * FROM " + tableName + " WHERE v1 > ? AND v4 < ?";
+            TAOS_BIND[] queryCondition = DataSource.GetQueryCondition();
+
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.StmtPrepare(stmt, selectSql);
+
+            StmtUtilTools.BindParam(stmt, queryCondition);
+            StmtUtilTools.StmtExecute(stmt);
+            IntPtr res = StmtUtilTools.StmtUseResult(stmt);
+            UtilsTools.DisplayRes(res);
+
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(queryCondition);
+
+        }
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/StmtStable.cs

+using System;
+using Test.UtilsTools;
+using TDengineDriver;
+using Test.UtilsTools.DataSource;
+
+namespace Cases
+{
+
+    public class StableMutipleLine
+    {
+        TAOS_BIND[] tags = DataSource.getTags();
+        TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
+        public void Test(IntPtr conn, string tableName)
+        {
+            String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
+            String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+            UtilsTools.ExecuteQuery(conn, createTb);
+            String[] loadList = { tableName };
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+            StmtUtilTools.loadTableInfo(conn, loadList);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+            StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+            StmtUtilTools.BindParamBatch(stmt, mbind);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+
+            StmtUtilTools.StmtClose(stmt);
+            DataSource.FreeTaosBind(tags);
+            DataSource.FreeTaosMBind(mbind);
+        }
+    }
+    public class StableColumnByColumn
+    {
+        DataSource data = new DataSource();
+
+        TAOS_BIND[] tags = DataSource.getTags();
+        TAOS_MULTI_BIND[] mbind = DataSource.GetMultiBindArr();
+        public void Test(IntPtr conn, string tableName)
+        {
+            String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(bo bool,tt tinyint,si smallint,ii int,bi bigint,tu tinyint unsigned,su smallint unsigned,iu int unsigned,bu bigint unsigned,ff float ,dd double ,bb binary(200),nc nchar(200));";
+            String insertSql = "insert into ? using " + tableName + " tags(?,?,?,?,?,?,?,?,?,?,?,?,?) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+
+            UtilsTools.ExecuteQuery(conn, createTb);
+            IntPtr stmt = StmtUtilTools.StmtInit(conn);
+
+            StmtUtilTools.StmtPrepare(stmt, insertSql);
+
+            StmtUtilTools.SetTableNameTags(stmt, tableName + "_t1", tags);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[0], 0);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[1], 1);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[2], 2);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[3], 3);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[4], 4);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[5], 5);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[6], 6);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[7], 7);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[8], 8);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[9], 9);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[10], 10);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[11], 11);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[12], 12);
+            StmtUtilTools.BindSingleParamBatch(stmt, mbind[13], 13);
+            StmtUtilTools.AddBatch(stmt);
+            StmtUtilTools.StmtExecute(stmt);
+            StmtUtilTools.StmtClose(stmt);
+
+            DataSource.FreeTaosBind(tags);
+            DataSource.FreeTaosMBind(mbind);
+
+        }
+    }
+
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/StmtUtil.cs

+using System;
+using TDengineDriver;
+using System.Runtime.InteropServices;
+
+namespace Test.UtilsTools
+{
+    public class StmtUtilTools
+    {
+        public static IntPtr StmtInit(IntPtr conn)
+        {
+            IntPtr stmt = TDengine.StmtInit(conn);
+            if (stmt == IntPtr.Zero)
+            {
+                Console.WriteLine("Init stmt failed");
+                UtilsTools.CloseConnection(conn);
+                UtilsTools.ExitProgram();
+            }
+            else
+            {
+                Console.WriteLine("Init stmt success");
+            }
+            return stmt;
+        }
+
+        public static void StmtPrepare(IntPtr stmt, string sql)
+        {
+            int res = TDengine.StmtPrepare(stmt, sql);
+            if (res == 0)
+            {
+                Console.WriteLine("stmt prepare success");
+            }
+            else
+            {
+                Console.WriteLine("stmt prepare failed " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void SetTableName(IntPtr stmt, String tableName)
+        {
+            int res = TDengine.StmtSetTbname(stmt, tableName);
+            if (res == 0)
+            {
+                Console.WriteLine("set_tbname success");
+            }
+            else
+            {
+                Console.Write("set_tbname failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void SetTableNameTags(IntPtr stmt, String tableName, TAOS_BIND[] tags)
+        {
+            int res = TDengine.StmtSetTbnameTags(stmt, tableName, tags);
+            if (res == 0)
+            {
+                Console.WriteLine("set tbname && tags success");
+
+            }
+            else
+            {
+                Console.Write("set tbname && tags failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void SetSubTableName(IntPtr stmt, string name)
+        {
+            int res = TDengine.StmtSetSubTbname(stmt, name);
+            if (res == 0)
+            {
+                Console.WriteLine("set subtable name success");
+            }
+            else
+            {
+                Console.Write("set subtable name failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+
+        }
+
+        public static void BindParam(IntPtr stmt, TAOS_BIND[] binds)
+        {
+            int res = TDengine.StmtBindParam(stmt, binds);
+            if (res == 0)
+            {
+                Console.WriteLine("bind  para success");
+            }
+            else
+            {
+                Console.Write("bind  para failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void BindSingleParamBatch(IntPtr stmt, TAOS_MULTI_BIND bind, int index)
+        {
+            int res = TDengine.StmtBindSingleParamBatch(stmt, ref bind, index);
+            if (res == 0)
+            {
+                Console.WriteLine("single bind  batch success");
+            }
+            else
+            {
+                Console.Write("single bind  batch failed: " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void BindParamBatch(IntPtr stmt, TAOS_MULTI_BIND[] bind)
+        {
+            int res = TDengine.StmtBindParamBatch(stmt, bind);
+            if (res == 0)
+            {
+                Console.WriteLine("bind  parameter batch success");
+            }
+            else
+            {
+                Console.WriteLine("bind  parameter batch failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static void AddBatch(IntPtr stmt)
+        {
+            int res = TDengine.StmtAddBatch(stmt);
+            if (res == 0)
+            {
+                Console.WriteLine("stmt add batch success");
+            }
+            else
+            {
+                Console.Write("stmt add batch failed,reason: " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+        public static void StmtExecute(IntPtr stmt)
+        {
+            int res = TDengine.StmtExecute(stmt);
+            if (res == 0)
+            {
+                Console.WriteLine("Execute stmt success");
+            }
+            else
+            {
+                Console.Write("Execute stmt failed,reason: " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+        public static void StmtClose(IntPtr stmt)
+        {
+            int res = TDengine.StmtClose(stmt);
+            if (res == 0)
+            {
+                Console.WriteLine("close stmt success");
+            }
+            else
+            {
+                Console.WriteLine("close stmt failed, " + TDengine.StmtErrorStr(stmt));
+                StmtClose(stmt);
+            }
+        }
+
+        public static IntPtr StmtUseResult(IntPtr stmt)
+        {
+            IntPtr res = TDengine.StmtUseResult(stmt);
+            if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+            {
+                if (res != IntPtr.Zero)
+                {
+                    Console.Write("reason: " + TDengine.Error(res));
+                }
+                Console.WriteLine("");
+                StmtClose(stmt);
+            }
+            else
+            {
+                Console.WriteLine("StmtUseResult success");
+
+            }
+            return res;
+        }
+
+        public static void loadTableInfo(IntPtr conn, string[] arr)
+        {
+            if (TDengine.LoadTableInfo(conn, arr) == 0)
+            {
+                Console.WriteLine("load table info success");
+            }
+            else
+            {
+                Console.WriteLine("load table info failed");
+            }
+        }
+
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/TaosFeild.cs

+using System;
+using Test.UtilsTools;
+using TDengineDriver;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+namespace Cases
+{
+    public class FetchFields
+    {
+        public void Test(IntPtr conn, string tableName)
+        {
+            IntPtr res = IntPtr.Zero;
+            String createTb = "create stable " + tableName + " (ts timestamp ,b bool,v1 tinyint,v2 smallint,v4 int,v8 bigint,f4 float,f8 double,u1 tinyint unsigned,u2 smallint unsigned,u4 int unsigned,u8 bigint unsigned,bin binary(200),blob nchar(200))tags(id int);";
+            String insertSql = "insert into " + tableName + "_t1 using " + tableName + " tags(1) values(1637064040000,true,1,2,3,4,5,6,7,8,9,10,'XI','XII')";
+            String selectSql = "select * from " + tableName;
+            String dropSql = "drop table " + tableName;
+            UtilsTools.ExecuteQuery(conn, createTb);
+            UtilsTools.ExecuteQuery(conn, insertSql);
+            res = UtilsTools.ExecuteQuery(conn, selectSql);
+            UtilsTools.ExecuteQuery(conn, dropSql);
+
+            List<TDengineMeta> metas = new List<TDengineMeta>();
+            metas = TDengine.FetchFields(res);
+            if (metas.Capacity == 0)
+            {
+                Console.WriteLine("empty result");
+            }
+            else
+            {
+                foreach(TDengineMeta meta in metas){
+                    Console.WriteLine("col_name:{0},col_type_code:{1},col_type:{2}({3})",meta.name,meta.type,meta.TypeName(),meta.size);
+                }
+            }
+
+        }
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/Cases/Utils.cs

+using System;
+using TDengineDriver;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Collections.Generic;
+namespace Test.UtilsTools
+{
+    public class UtilsTools
+    {
+
+        static string configDir = "C:/TDengine/cfg";
+
+        public static IntPtr TDConnection(string ip, string user, string password, string db, short port)
+        {
+            TDengine.Options((int)TDengineInitOption.TDDB_OPTION_CONFIGDIR, configDir);
+            TDengine.Options((int)TDengineInitOption.TDDB_OPTION_SHELL_ACTIVITY_TIMER, "60");
+            TDengine.Init();
+            return TDengine.Connect(ip, user, password, db, port);
+        }
+
+        public static IntPtr ExecuteQuery(IntPtr conn, String sql)
+        {
+            IntPtr res = TDengine.Query(conn, sql);
+            if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+            {
+                Console.Write(sql.ToString() + " failure, ");
+                if (res != IntPtr.Zero)
+                {
+                    Console.Write("reason: " + TDengine.Error(res));
+
+                }
+                Console.WriteLine("");
+                ExitProgram();
+            }
+            else
+            {
+                Console.WriteLine(sql.ToString() + " success");
+
+            }
+            return res;
+        }
+        public static void DisplayRes(IntPtr res)
+        {
+            long queryRows = 0;
+            if ((res == IntPtr.Zero) || (TDengine.ErrorNo(res) != 0))
+            {
+                if (res != IntPtr.Zero)
+                {
+                    Console.Write("reason: " + TDengine.Error(res));
+                }
+                Console.WriteLine("");
+                ExitProgram();
+            }
+
+            int fieldCount = TDengine.FieldCount(res);
+            List<TDengineMeta> metas = TDengine.FetchFields(res);
+            for (int j = 0; j < metas.Count; j++)
+            {
+                TDengineMeta meta = (TDengineMeta)metas[j];
+            }
+
+            IntPtr rowdata;
+            StringBuilder builder = new StringBuilder();
+            while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
+            {
+                queryRows++;
+                for (int fields = 0; fields < fieldCount; ++fields)
+                {
+                    TDengineMeta meta = metas[fields];
+                    int offset = IntPtr.Size * fields;
+                    IntPtr data = Marshal.ReadIntPtr(rowdata, offset);
+
+                    builder.Append("---");
+
+                    if (data == IntPtr.Zero)
+                    {
+                        builder.Append("NULL");
+                        continue;
+                    }
+
+                    switch ((TDengineDataType)meta.type)
+                    {
+                        case TDengineDataType.TSDB_DATA_TYPE_BOOL:
+                            bool v1 = Marshal.ReadByte(data) == 0 ? false : true;
+                            builder.Append(v1);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
+                            byte v2 = Marshal.ReadByte(data);
+                            builder.Append(v2);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
+                            short v3 = Marshal.ReadInt16(data);
+                            builder.Append(v3);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_INT:
+                            int v4 = Marshal.ReadInt32(data);
+                            builder.Append(v4);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
+                            long v5 = Marshal.ReadInt64(data);
+                            builder.Append(v5);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
+                            float v6 = (float)Marshal.PtrToStructure(data, typeof(float));
+                            builder.Append(v6);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
+                            double v7 = (double)Marshal.PtrToStructure(data, typeof(double));
+                            builder.Append(v7);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_BINARY:
+                            string v8 = Marshal.PtrToStringAnsi(data);
+                            builder.Append(v8);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
+                            long v9 = Marshal.ReadInt64(data);
+                            builder.Append(v9);
+                            break;
+                        case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
+                            string v10 = Marshal.PtrToStringAnsi(data);
+                            builder.Append(v10);
+                            break;
+                    }
+                }
+                builder.Append("---");
+
+                if (queryRows <= 10)
+                {
+                    Console.WriteLine(builder.ToString());
+                }
+                builder.Clear();
+            }
+
+            if (TDengine.ErrorNo(res) != 0)
+            {
+                Console.Write("Query is not complete, Error {0:G}", TDengine.ErrorNo(res), TDengine.Error(res));
+            }
+            TDengine.FreeResult(res); Console.WriteLine("");
+        }
+
+        public static void CloseConnection(IntPtr conn)
+        {
+            if (conn != IntPtr.Zero)
+            {
+                if (TDengine.Close(conn) == 0)
+                {
+                    Console.WriteLine("close connection sucess");
+                }
+                else
+                {
+                    Console.WriteLine("close Connection failed");
+                }
+            }
+        }
+        public static List<TDengineMeta> getField(IntPtr res)
+        {
+            List<TDengineMeta> metas = TDengine.FetchFields(res);
+            return metas;
+        }
+        public static void ExitProgram()
+        {
+            TDengine.Cleanup();
+            System.Environment.Exit(0);
+        }
+    }
+}
\ No newline at end of file

src/connector/C#/src/test/XUnitTest/TestTDengineMeta.cs

+using System;
+using Xunit;
+using TDengineDriver;
+
+namespace TDengineDriver.Test
+{
+    public class TestTDengineMeta
+    {
+        [Fact]
+        public void TestTypeNameBool()
+        {
+            string typeName = "BOOL";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 1;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+
+        [Fact]
+        public void TestTypeNameTINYINT()
+        {
+            string typeName = "TINYINT";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 2;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameSMALLINT()
+        {
+            string typeName = "SMALLINT";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 3;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameINT()
+        {
+            string typeName = "INT";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 4;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameBIGINT()
+        {
+            string typeName = "BIGINT";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 5;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameUTINYINT()
+        {
+            string typeName = "TINYINT UNSIGNED";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 11;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameUSMALLINT()
+        {
+            string typeName = "SMALLINT UNSIGNED";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 12;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameUINT()
+        {
+            string typeName = "INT UNSIGNED";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 13;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameUBIGINT()
+        {
+            string typeName = "BIGINT UNSIGNED";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 14;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+
+        [Fact]
+        public void TestTypeNameFLOAT()
+        {
+            string typeName = "FLOAT";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 6;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameDOUBLE()
+        {
+            string typeName = "DOUBLE";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 7;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameSTRING()
+        {
+            string typeName = "STRING";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 8;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameTIMESTAMP()
+        {
+            string typeName = "TIMESTAMP";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 9;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameNCHAR()
+        {
+            string typeName = "NCHAR";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+            meta.type = 10;
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+        [Fact]
+        public void TestTypeNameUndefined()
+        {
+            string typeName = "undefine";
+            TDengineDriver.TDengineMeta meta = new TDengineDriver.TDengineMeta();
+
+            string metaTypeName = meta.TypeName();
+
+            Assert.Equal(metaTypeName, typeName);
+
+        }
+    }
+}

src/connector/C#/src/test/XUnitTest/XUnitTest.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.0.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\TDengineDriver\TDengineDriver.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -11,6 +11,11 @@ import java.util.Map;
 public abstract class AbstractResultSet extends WrapperImpl implements ResultSet {
     private int fetchSize;
     protected boolean wasNull;
+    protected int timestampPrecision;
+
+    public void setTimestampPrecision(int timestampPrecision) {
+        this.timestampPrecision = timestampPrecision;
+    }
 
     protected void checkAvailability(int columnIndex, int bounds) throws SQLException {
         if (isClosed())

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

@@ -74,9 +74,8 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
 
     public boolean next() throws SQLException {
         if (this.getBatchFetch()) {
-            if (this.blockData.forward()) {
+            if (this.blockData.forward())
                 return true;
-            }
 
             int code = this.jniConnector.fetchBlock(this.resultSetPointer, this.blockData);
             this.blockData.reset();
@@ -214,7 +213,18 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
         if (!lastWasNull) {
             Object value = this.rowData.getObject(columnIndex);
             if (value instanceof Timestamp) {
-                res = ((Timestamp) value).getTime();
+                Timestamp ts = (Timestamp) value;
+                long epochSec = ts.getTime() / 1000;
+                long nanoAdjustment = ts.getNanos();
+                switch (this.timestampPrecision) {
+                    case 0:
+                    default:                        // ms
+                        return ts.getTime();
+                    case 1:                         // us
+                        return epochSec * 1000_000L + nanoAdjustment / 1000L;
+                    case 2:                         // ns
+                        return epochSec * 1000_000_000L + nanoAdjustment;
+                }
             } else {
                 int nativeType = this.columnMetaDataList.get(columnIndex - 1).getColType();
                 res = this.rowData.getLong(columnIndex, nativeType);

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

@@ -47,6 +47,8 @@ public class TSDBStatement extends AbstractStatement {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_WITH_EXECUTEQUERY);
         }
         TSDBResultSet res = new TSDBResultSet(this, this.connection.getConnector(), pSql);
+        int timestampPrecision = this.connection.getConnector().getResultTimePrecision(pSql);
+        res.setTimestampPrecision(timestampPrecision);
         res.setBatchFetch(this.connection.getBatchFetch());
         return res;
     }

src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampPrecision.java

 package com.taosdata.jdbc.enums;
 
-public enum TimestampPrecision {
-    MS,
-    US,
-    NS,
-    UNKNOWN
+public class TimestampPrecision {
+    public static final int MS = 0;
+    public static final int US = 1;
+    public static final int NS = 2;
 }

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

@@ -168,11 +168,22 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             case TIMESTAMP: {
                 Long value = row.getLong(colIndex);
                 //TODO: this implementation has bug if the timestamp bigger than 9999_9999_9999_9
-                if (value < 1_0000_0000_0000_0L)
+                if (value < 1_0000_0000_0000_0L) {
+                    this.timestampPrecision = TimestampPrecision.MS;
                     return new Timestamp(value);
-                long epochSec = value / 1000_000L;
-                long nanoAdjustment = value % 1000_000L * 1000L;
-                return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
+                }
+                if (value >= 1_0000_0000_0000_0L && value < 1_000_000_000_000_000_0l) {
+                    this.timestampPrecision = TimestampPrecision.US;
+                    long epochSec = value / 1000_000L;
+                    long nanoAdjustment = value % 1000_000L * 1000L;
+                    return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
+                }
+                if (value >= 1_000_000_000_000_000_0l) {
+                    this.timestampPrecision = TimestampPrecision.NS;
+                    long epochSec = value / 1000_000_000L;
+                    long nanoAdjustment = value % 1000_000_000L;
+                    return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
+                }
             }
             case UTC: {
                 String value = row.getString(colIndex);
@@ -182,12 +193,15 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
                 if (value.length() > 31) {
                     // ns timestamp: yyyy-MM-ddTHH:mm:ss.SSSSSSSSS+0x00
                     nanoAdjustment = fractionalSec;
+                    this.timestampPrecision = TimestampPrecision.NS;
                 } else if (value.length() > 28) {
                     // ms timestamp: yyyy-MM-ddTHH:mm:ss.SSSSSS+0x00
                     nanoAdjustment = fractionalSec * 1000L;
+                    this.timestampPrecision = TimestampPrecision.US;
                 } else {
                     // ms timestamp: yyyy-MM-ddTHH:mm:ss.SSS+0x00
                     nanoAdjustment = fractionalSec * 1000_000L;
+                    this.timestampPrecision = TimestampPrecision.MS;
                 }
                 ZoneOffset zoneOffset = ZoneOffset.of(value.substring(value.length() - 5));
                 Instant instant = Instant.ofEpochSecond(epochSec, nanoAdjustment).atOffset(zoneOffset).toInstant();
@@ -196,7 +210,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             case STRING:
             default: {
                 String value = row.getString(colIndex);
-                TimestampPrecision precision = Utils.guessTimestampPrecision(value);
+                int precision = Utils.guessTimestampPrecision(value);
+                this.timestampPrecision = precision;
+
                 if (precision == TimestampPrecision.MS) {
                     // ms timestamp: yyyy-MM-dd HH:mm:ss.SSS
                     return row.getTimestamp(colIndex);
@@ -338,8 +354,18 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         wasNull = value == null;
         if (value == null)
             return 0;
-        if (value instanceof Timestamp)
-            return ((Timestamp) value).getTime();
+        if (value instanceof Timestamp) {
+            Timestamp ts = (Timestamp) value;
+            switch (this.timestampPrecision) {
+                case TimestampPrecision.MS:
+                default:
+                    return ts.getTime();
+                case TimestampPrecision.US:
+                    return ts.getTime() * 1000 + ts.getNanos() / 1000 % 1000;
+                case TimestampPrecision.NS:
+                    return ts.getTime() * 1000_000 + ts.getNanos() % 1000_000;
+            }
+        }
         long valueAsLong = 0;
         try {
             valueAsLong = Long.parseLong(value.toString());

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

@@ -194,14 +194,14 @@ public class Utils {
         return timestamp.toLocalDateTime().format(milliSecFormatter);
     }
 
-    public static TimestampPrecision guessTimestampPrecision(String value) {
+    public static int guessTimestampPrecision(String value) {
         if (isMilliSecFormat(value))
             return TimestampPrecision.MS;
         if (isMicroSecFormat(value))
             return TimestampPrecision.US;
         if (isNanoSecFormat(value))
             return TimestampPrecision.NS;
-        return TimestampPrecision.UNKNOWN;
+        return TimestampPrecision.MS;
     }
 
     private static boolean isMilliSecFormat(String timestampStr) {

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

+package com.taosdata.jdbc.cases;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.*;
+import java.text.SimpleDateFormat;
+
+public class GetLongWithDifferentTimestampPrecision {
+
+    private final String host = "127.0.0.1";
+
+    @Test
+    public void testRestful() throws SQLException {
+        // given
+        String url = "jdbc:TAOS-RS://" + host + ":6041/";
+        Connection conn = DriverManager.getConnection(url, "root", "taosdata");
+        long ts = System.currentTimeMillis();
+
+        // when and then
+        assertResultSet(conn, "ms", ts, ts);
+        assertResultSet(conn, "us", ts, ts * 1000);
+        assertResultSet(conn, "ns", ts, ts * 1000_000);
+    }
+
+    @Test
+    public void testJni() throws SQLException {
+        // given
+        String url = "jdbc:TAOS://" + host + ":6030/";
+        Connection conn = DriverManager.getConnection(url, "root", "taosdata");
+        long ts = System.currentTimeMillis();
+
+        // when and then
+        assertResultSet(conn, "ms", ts, ts);
+        assertResultSet(conn, "us", ts, ts * 1000);
+        assertResultSet(conn, "ns", ts, ts * 1000_000);
+    }
+
+    private void assertResultSet(Connection conn, String precision, long timestamp, long expect) throws SQLException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists test");
+            stmt.execute("create database if not exists test precision '" + precision + "'");
+            stmt.execute("create table test.weather(ts timestamp, f1 int)");
+
+            String dateTimeStr = sdf.format(new Date(timestamp));
+            stmt.execute("insert into test.weather values('" + dateTimeStr + "', 1)");
+
+            ResultSet rs = stmt.executeQuery("select * from test.weather");
+            rs.next();
+            long actual = rs.getLong("ts");
+            Assert.assertEquals(expect, actual);
+            stmt.execute("drop database if exists test");
+        }
+    }
+
+
+}

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

@@ -9,29 +9,29 @@ import java.util.Random;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class RestfulJDBCTest {
 
-    //    private static final String host = "127.0.0.1";
-    private static final String host = "master";
+    private static final String host = "127.0.0.1";
     private static final Random random = new Random(System.currentTimeMillis());
     private static Connection connection;
+    private static final String dbname = "restful_test";
 
     @Test
     public void testCase001() throws SQLException {
         // given
-        String sql = "drop database if exists restful_test";
+        String sql = "drop database if exists " + dbname;
         // when
         boolean execute = execute(connection, sql);
         // then
         Assert.assertFalse(execute);
 
         // given
-        sql = "create database if not exists restful_test";
+        sql = "create database if not exists " + dbname;
         // when
         execute = execute(connection, sql);
         // then
         Assert.assertFalse(execute);
 
         // given
-        sql = "use restful_test";
+        sql = "use " + dbname;
         // when
         execute = execute(connection, sql);
         // then
@@ -41,7 +41,7 @@ public class RestfulJDBCTest {
     @Test
     public void testCase002() throws SQLException {
         // given
-        String sql = "create table weather(ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)";
+        String sql = "create table " + dbname + ".weather(ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)";
         // when
         boolean execute = execute(connection, sql);
         // then
@@ -52,7 +52,7 @@ public class RestfulJDBCTest {
     public void testCase004() throws SQLException {
         for (int i = 1; i <= 100; i++) {
             // given
-            String sql = "create table t" + i + " using weather tags('beijing', '" + i + "')";
+            String sql = "create table " + dbname + ".t" + i + " using " + dbname + ".weather tags('beijing', '" + i + "')";
             // when
             boolean execute = execute(connection, sql);
             // then
@@ -68,7 +68,7 @@ public class RestfulJDBCTest {
 
                 // given
                 long currentTimeMillis = System.currentTimeMillis();
-                String sql = "insert into t" + j + " values(" + currentTimeMillis + "," + (random.nextFloat() * 50) + "," + random.nextInt(100) + ")";
+                String sql = "insert into " + dbname + ".t" + j + " values(" + currentTimeMillis + "," + (random.nextFloat() * 50) + "," + random.nextInt(100) + ")";
                 // when
                 int affectRows = executeUpdate(connection, sql);
                 // then
@@ -83,7 +83,7 @@ public class RestfulJDBCTest {
     @Test
     public void testCase006() throws SQLException {
         // given
-        String sql = "select * from weather";
+        String sql = "select * from " + dbname + ".weather";
         // when
         ResultSet rs = executeQuery(connection, sql);
         ResultSetMetaData meta = rs.getMetaData();
@@ -102,7 +102,7 @@ public class RestfulJDBCTest {
     @Test
     public void testCase007() throws SQLException {
         // given
-        String sql = "drop database restful_test";
+        String sql = "drop database " + dbname;
 
         // when
         boolean execute = execute(connection, sql);
@@ -143,7 +143,7 @@ public class RestfulJDBCTest {
     public static void afterClass() throws SQLException {
         if (connection != null) {
             Statement stmt = connection.createStatement();
-            stmt.execute("drop database if exists restful_test");
+            stmt.execute("drop database if exists " + dbname);
             stmt.close();
             connection.close();
         }

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

@@ -17,12 +17,25 @@ import java.text.SimpleDateFormat;
 
 public class RestfulResultSetTest {
 
-    //    private static final String host = "127.0.0.1";
-    private static final String host = "master";
+    private static final String host = "127.0.0.1";
     private static Connection conn;
     private static Statement stmt;
     private static ResultSet rs;
 
+    @BeforeClass
+    public static void beforeClass() throws SQLException {
+        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
+        stmt = conn.createStatement();
+        stmt.execute("drop database if exists restful_test");
+        stmt.execute("create database if not exists restful_test");
+        stmt.execute("use restful_test");
+        stmt.execute("drop table if exists weather");
+        stmt.execute("create table if not exists weather(f1 timestamp, f2 int, f3 bigint, f4 float, f5 double, f6 binary(64), f7 smallint, f8 tinyint, f9 bool, f10 nchar(64))");
+        stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
+        rs = stmt.executeQuery("select * from restful_test.weather");
+        rs.next();
+    }
+
     @Test
     public void wasNull() throws SQLException {
         Assert.assertFalse(rs.wasNull());
@@ -658,20 +671,6 @@ public class RestfulResultSetTest {
         Assert.assertTrue(rs.isWrapperFor(RestfulResultSet.class));
     }
 
-    @BeforeClass
-    public static void beforeClass() throws SQLException {
-        conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
-        stmt = conn.createStatement();
-        stmt.execute("drop database if exists restful_test");
-        stmt.execute("create database if not exists restful_test");
-        stmt.execute("use restful_test");
-        stmt.execute("drop table if exists weather");
-        stmt.execute("create table if not exists weather(f1 timestamp, f2 int, f3 bigint, f4 float, f5 double, f6 binary(64), f7 smallint, f8 tinyint, f9 bool, f10 nchar(64))");
-        stmt.execute("insert into restful_test.weather values('2021-01-01 00:00:00.000', 1, 100, 3.1415, 3.1415926, 'abc', 10, 10, true, '涛思数据')");
-        rs = stmt.executeQuery("select * from restful_test.weather");
-        rs.next();
-    }
-
     @AfterClass
     public static void afterClass() throws SQLException {
         if (rs != null)

src/connector/python/examples/subscribe-async.py

@@ -7,7 +7,7 @@ import time
 def subscribe_callback(p_sub, p_result, p_param, errno):
     # type: (c_void_p, c_void_p, c_void_p, c_int) -> None
     print("# fetch in callback")
-    result = TaosResult(p_result)
+    result = TaosResult(c_void_p(p_result))
     result.check_error(errno)
     for row in result.rows_iter():
         ts, n = row()
@@ -18,18 +18,21 @@ def test_subscribe_callback(conn):
     # type: (TaosConnection) -> None
     dbname = "pytest_taos_subscribe_callback"
     try:
+        print("drop if exists")
         conn.execute("drop database if exists %s" % dbname)
+        print("create database")
         conn.execute("create database if not exists %s" % dbname)
-        conn.select_db(dbname)
-        conn.execute("create table if not exists log(ts timestamp, n int)")
+        print("create table")
+        # conn.execute("use %s" % dbname)
+        conn.execute("create table if not exists %s.log(ts timestamp, n int)" % dbname)
 
         print("# subscribe with callback")
-        sub = conn.subscribe(False, "test", "select * from log", 1000, subscribe_callback)
+        sub = conn.subscribe(False, "test", "select * from %s.log" % dbname, 1000, subscribe_callback)
 
         for i in range(10):
-            conn.execute("insert into log values(now, %d)" % i)
+            conn.execute("insert into %s.log values(now, %d)" % (dbname, i))
             time.sleep(0.7)
-        # sub.close()
+        sub.close()
 
         conn.execute("drop database if exists %s" % dbname)
         # conn.close()

src/connector/python/taos/cinterface.py

@@ -110,7 +110,7 @@ _libtaos.taos_get_client_info.restype = c_char_p
 def taos_get_client_info():
     # type: () -> str
     """Get client version info."""
-    return _libtaos.taos_get_client_info().decode()
+    return _libtaos.taos_get_client_info().decode("utf-8")
 
 
 _libtaos.taos_get_server_info.restype = c_char_p
@@ -120,7 +120,7 @@ _libtaos.taos_get_server_info.argtypes = (c_void_p,)
 def taos_get_server_info(connection):
     # type: (c_void_p) -> str
     """Get server version as string."""
-    return _libtaos.taos_get_server_info(connection).decode()
+    return _libtaos.taos_get_server_info(connection).decode("utf-8")
 
 
 _libtaos.taos_close.restype = None
@@ -308,16 +308,14 @@ def taos_subscribe(connection, restart, topic, sql, interval, callback=None, par
     """
     if callback != None:
         callback = subscribe_callback_type(callback)
-    if param != None:
-        param = c_void_p(param)
     return c_void_p(
         _libtaos.taos_subscribe(
             connection,
             1 if restart else 0,
             c_char_p(topic.encode("utf-8")),
             c_char_p(sql.encode("utf-8")),
-            callback or None,
-            param,
+            callback,
+            c_void_p(param),
             interval,
         )
     )

src/connector/python/taos/field.py

@@ -144,7 +144,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, precision=FieldType.C_
         try:
             if num_of_rows >= 0:
                 tmpstr = ctypes.c_char_p(data)
-                res.append(tmpstr.value.decode())
+                res.append(tmpstr.value.decode("utf-8"))
             else:
                 res.append(
                     (
@@ -172,7 +172,7 @@ def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, precision=Field
         if rbyte == 1 and buffer[0] == b'\xff':
             res.append(None)
         else:
-            res.append(cast(buffer, c_char_p).value.decode())
+            res.append(cast(buffer, c_char_p).value.decode("utf-8"))
     return res
 
 
@@ -188,7 +188,7 @@ def _crow_nchar_to_python_block(data, num_of_rows, nbytes=None, precision=FieldT
         if rbyte == 4 and buffer[:4] == b'\xff'*4:
             res.append(None)
         else:
-            res.append(cast(buffer, c_char_p).value.decode())
+            res.append(cast(buffer, c_char_p).value.decode("utf-8"))
     return res
 
 

src/connector/python/taos/result.py

@@ -3,6 +3,8 @@ from .cinterface import *
 # from .connection import TaosConnection
 from .error import *
 
+from ctypes import c_void_p
+
 
 class TaosResult(object):
     """TDengine result interface"""
@@ -12,7 +14,11 @@ class TaosResult(object):
         # to make the __del__ order right
         self._conn = conn
         self._close_after = close_after
-        self._result = result
+        if isinstance(result, c_void_p):
+            self._result = result
+        else:
+            self._result = c_void_p(result)
+
         self._fields = None
         self._field_count = None
         self._precision = None

src/connector/python/tests/test_stream.py

@@ -20,7 +20,8 @@ def stream_callback(p_param, p_result, p_row):
     result = TaosResult(p_result)
     row = TaosRow(result, p_row)
     try:
-        ts, count = row()
+        ts, count = row.as_tuple()
+        print(ts, count)
         p = cast(p_param, POINTER(Counter))
         p.contents.count += count
         print("[%s] inserted %d in 5s, total count: %d" % (ts.strftime("%Y-%m-%d %H:%M:%S"), count, p.contents.count))

src/connector/python/tests/test_subscribe.py

@@ -63,7 +63,7 @@ def test_subscribe(conn):
 def subscribe_callback(p_sub, p_result, p_param, errno):
     # type: (c_void_p, c_void_p, c_void_p, c_int) -> None
     print("callback")
-    result = TaosResult(p_result)
+    result = TaosResult(c_void_p(p_result))
     result.check_error(errno)
     for row in result.rows_iter():
         ts, n = row()
@@ -76,7 +76,7 @@ def test_subscribe_callback(conn):
     try:
         conn.execute("drop database if exists %s" % dbname)
         conn.execute("create database if not exists %s" % dbname)
-        conn.select_db(dbname)
+        conn.execute("use %s" % dbname)
         conn.execute("create table if not exists log(ts timestamp, n int)")
 
         print("# subscribe with callback")