Merge branch 'develop' into test/testcase

.gitignore

@@ -27,7 +27,6 @@ tests/hdfs/
 nmake/
 sln/
 hdfs/
-c/
 taoshebei/
 taosdalipu/
 Target/

Jenkinsfile

@@ -227,6 +227,8 @@ pipeline {
               ./test-all.sh p4
               cd ${WKC}/tests
               ./test-all.sh full jdbc
+              cd ${WKC}/tests
+              ./test-all.sh full unit
               date'''
             }
           }

cmake/install.inc

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

documentation20/cn/00.index/docs.md

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

documentation20/cn/03.architecture/docs.md

@@ -178,11 +178,11 @@ TDengine 分布式架构的逻辑结构图如下：
 
 **FQDN配置**：一个数据节点有一个或多个FQDN，可以在系统配置文件taos.cfg通过参数“fqdn"进行指定，如果没有指定，系统将自动获取计算机的hostname作为其FQDN。如果节点没有配置FQDN，可以直接将该节点的配置参数fqdn设置为它的IP地址。但不建议使用IP，因为IP地址可变，一旦变化，将让集群无法正常工作。一个数据节点的EP(End Point)由FQDN + Port组成。采用FQDN，需要保证DNS服务正常工作，或者在节点以及应用所在的节点配置好hosts文件。
 
-**端口配置：**一个数据节点对外的端口由TDengine的系统配置参数serverPort决定，对集群内部通讯的端口是serverPort+5。集群内数据节点之间的数据复制操作还占有一个TCP端口，是serverPort+10. 为支持多线程高效的处理UDP数据，每个对内和对外的UDP连接，都需要占用5个连续的端口。因此一个数据节点总的端口范围为serverPort到serverPort + 10，总共11个TCP/UDP端口。使用时，需要确保防火墙将这些端口打开。每个数据节点可以配置不同的serverPort。
+**端口配置：**一个数据节点对外的端口由TDengine的系统配置参数serverPort决定，对集群内部通讯的端口是serverPort+5。集群内数据节点之间的数据复制操作还占有一个TCP端口，是serverPort+10. 为支持多线程高效的处理UDP数据，每个对内和对外的UDP连接，都需要占用5个连续的端口。因此一个数据节点总的端口范围为serverPort到serverPort + 10，总共11个TCP/UDP端口。（另外还可能有 RESTful、Arbitrator 所使用的端口，那样的话就一共是 13 个。）使用时，需要确保防火墙将这些端口打开，以备使用。每个数据节点可以配置不同的serverPort。
 
 **集群对外连接:** TDengine集群可以容纳单个、多个甚至几千个数据节点。应用只需要向集群中任何一个数据节点发起连接即可，连接需要提供的网络参数是一数据节点的End Point(FQDN加配置的端口号）。通过命令行CLI启动应用taos时，可以通过选项-h来指定数据节点的FQDN, -P来指定其配置的端口号，如果端口不配置，将采用TDengine的系统配置参数serverPort。
 
-**集群内部通讯**: 各个数据节点之间通过TCP/UDP进行连接。一个数据节点启动时，将获取mnode所在的dnode的EP信息，然后与系统中的mnode建立起连接，交换信息。获取mnode的EP信息有三步，1：检查mnodeEpList文件是否存在，如果不存在或不能正常打开获得mnode EP信息，进入第二步；2：检查系统配置文件taos.cfg, 获取节点配置参数firstEp, secondEp，（这两个参数指定的节点可以是不带mnode的普通节点，这样的话，节点被连接时会尝试重定向到mnode节点）如果不存在或者taos.cfg里没有这两个配置参数，或无效，进入第三步；3：将自己的EP设为mnode EP, 并独立运行起来。获取mnode EP列表后，数据节点发起连接，如果连接成功，则成功加入进工作的集群，如果不成功，则尝试mnode EP列表中的下一个。如果都尝试了，但连接都仍然失败，则休眠几秒后，再进行尝试。
+**集群内部通讯**: 各个数据节点之间通过TCP/UDP进行连接。一个数据节点启动时，将获取mnode所在的dnode的EP信息，然后与系统中的mnode建立起连接，交换信息。获取mnode的EP信息有三步，1：检查mnodeEpSet文件是否存在，如果不存在或不能正常打开获得mnode EP信息，进入第二步；2：检查系统配置文件taos.cfg, 获取节点配置参数firstEp, secondEp，（这两个参数指定的节点可以是不带mnode的普通节点，这样的话，节点被连接时会尝试重定向到mnode节点）如果不存在或者taos.cfg里没有这两个配置参数，或无效，进入第三步；3：将自己的EP设为mnode EP, 并独立运行起来。获取mnode EP列表后，数据节点发起连接，如果连接成功，则成功加入进工作的集群，如果不成功，则尝试mnode EP列表中的下一个。如果都尝试了，但连接都仍然失败，则休眠几秒后，再进行尝试。
 
 **MNODE的选择:** TDengine逻辑上有管理节点，但没有单独的执行代码，服务器侧只有一套执行代码taosd。那么哪个数据节点会是管理节点呢？这是系统自动决定的，无需任何人工干预。原则如下：一个数据节点启动时，会检查自己的End Point, 并与获取的mnode EP List进行比对，如果在其中，该数据节点认为自己应该启动mnode模块，成为mnode。如果自己的EP不在mnode EP List里，则不启动mnode模块。在系统的运行过程中，由于负载均衡、宕机等原因，mnode有可能迁移至新的dnode，但一切都是透明的，无需人工干预，配置参数的修改，是mnode自己根据资源做出的决定。
 

documentation20/cn/08.connector/docs.md

@@ -209,7 +209,7 @@ C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine
 
 - `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
 
-  该API用来执行SQL语句，可以是DQL、DML或DDL语句。 其中的`taos`参数是通过`taos_connect`获得的指针。返回值 NULL 表示失败。
+  该API用来执行SQL语句，可以是DQL、DML或DDL语句。 其中的`taos`参数是通过`taos_connect`获得的指针。不能通过返回值是否是 NULL 来判断执行结果是否失败，而是需要用`taos_errno`函数解析结果集中的错误代码来进行判断。
 
 - `int taos_result_precision(TAOS_RES *res)`
 
@@ -591,7 +591,8 @@ curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
 ```json
 {
     "status": "succ",
-    "head": ["Time Stamp","current", …],
+    "head": ["ts","current", …],
+    "column_meta": [["ts",9,8],["current",6,4], …],
     "data": [
         ["2018-10-03 14:38:05.000", 10.3, …],
         ["2018-10-03 14:38:15.000", 12.6, …]
@@ -602,10 +603,23 @@ curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
 
 说明：
 
-- status: 告知操作结果是成功还是失败
-- head: 表的定义，如果不返回结果集，仅有一列“affected_rows”
-- data: 具体返回的数据，一排一排的呈现，如果不返回结果集，仅[[affected_rows]]
-- rows: 表明总共多少行数据
+- status: 告知操作结果是成功还是失败。
+- head: 表的定义，如果不返回结果集，则仅有一列“affected_rows”。（从 2.0.17 版本开始，建议不要依赖 head 返回值来判断数据列类型，而推荐使用 column_meta。在未来版本中，有可能会从返回值中去掉 head 这一项。）
+- column_meta: 从 2.0.17 版本开始，返回值中增加这一项来说明 data 里每一列的数据类型。具体每个列会用三个值来说明，分别为：列名、列类型、类型长度。例如`["current",6,4]`表示列名为“current”；列类型为 6，也即 float 类型；类型长度为 4，也即对应 4 个字节表示的 float。如果列类型为 binary 或 nchar，则类型长度表示该列最多可以保存的内容长度，而不是本次返回值中的具体数据长度。当列类型是 nchar 的时候，其类型长度表示可以保存的 unicode 字符数量，而不是 bytes。
+- data: 具体返回的数据，一行一行的呈现，如果不返回结果集，那么就仅有[[affected_rows]]。data 中每一行的数据列顺序，与 column_meta 中描述数据列的顺序完全一致。
+- rows: 表明总共多少行数据。
+
+column_meta 中的列类型说明：
+* 1：BOOL
+* 2：TINYINT
+* 3：SMALLINT
+* 4：INT
+* 5：BIGINT
+* 6：FLOAT
+* 7：DOUBLE
+* 8：BINARY
+* 9：TIMESTAMP
+* 10：NCHAR
 
 ### 自定义授权码
 
@@ -651,7 +665,8 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001
 ```json
 {
     "status": "succ",
-    "head": ["Time Stamp","current","voltage","phase"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
     "data": [
         ["2018-10-03 14:38:05.000",10.3,219,0.31],
         ["2018-10-03 14:38:15.000",12.6,218,0.33]
@@ -671,8 +686,9 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 19
 {
     "status": "succ",
     "head": ["affected_rows"],
+    "column_meta": [["affected_rows",4,4]],
     "data": [[1]],
-    "rows": 1,
+    "rows": 1
 }
 ```
 
@@ -691,7 +707,8 @@ curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001
 ```json
 {
     "status": "succ",
-    "head": ["column1","column2","column3"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
     "data": [
         [1538548685000,10.3,219,0.31],
         [1538548695000,12.6,218,0.33]
@@ -712,7 +729,8 @@ HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间
 ```json
 {
     "status": "succ",
-    "head": ["column1","column2","column3"],
+    "head": ["ts","current","voltage","phase"],
+    "column_meta": [["ts",9,8],["current",6,4],["voltage",4,4],["phase",6,4]],
     "data": [
         ["2018-10-03T14:38:05.000+0800",10.3,219,0.31],
         ["2018-10-03T14:38:15.000+0800",12.6,218,0.33]

documentation20/cn/09.connections/docs.md

@@ -155,11 +155,3 @@ TDengine客户端暂不支持如下函数：
 - dbExistsTable(conn, "test")：是否存在表test
 - dbListTables(conn)：显示连接中的所有表
 
-
-## <a class="anchor" id="datax"></a>DataX
-
-[DataX](https://github.com/alibaba/DataX) 是阿里巴巴集团开源的一款通用离线数据采集/同步工具，能够简单、高效地接入 TDengine 进行数据写入和读取。
-
-* 数据读取集成的方法请参见 [TSDBReader 插件文档](https://github.com/alibaba/DataX/blob/master/tsdbreader/doc/tsdbreader.md)
-* 数据写入集成的方法请参见 [TSDBWriter 插件文档](https://github.com/alibaba/DataX/blob/master/tsdbwriter/doc/tsdbhttpwriter.md)
-

documentation20/cn/10.cluster/docs.md

@@ -13,7 +13,7 @@ TDengine的集群管理极其简单，除添加和删除节点需要人工干预
 **第零步**：规划集群所有物理节点的FQDN，将规划好的FQDN分别添加到每个物理节点的/etc/hostname；修改每个物理节点的/etc/hosts，将所有集群物理节点的IP与FQDN的对应添加好。【如部署了DNS，请联系网络管理员在DNS上做好相关配置】
 
 **第一步**：如果搭建集群的物理节点中，存有之前的测试数据、装过1.X的版本，或者装过其他版本的TDengine，请先将其删除，并清空所有数据，具体步骤请参考博客[《TDengine多种安装包的安装和卸载》](https://www.taosdata.com/blog/2019/08/09/566.html )   
-**注意1：**因为FQDN的信息会写进文件，如果之前没有配置或者更改FQDN，且启动了TDengine。请一定在确保数据无用或者备份的前提下，清理一下之前的数据（rm -rf /var/lib/taos/）；  
+**注意1：**因为FQDN的信息会写进文件，如果之前没有配置或者更改FQDN，且启动了TDengine。请一定在确保数据无用或者备份的前提下，清理一下之前的数据（`rm -rf /var/lib/taos/*`）；  
 **注意2：**客户端也需要配置，确保它可以正确解析每个节点的FQDN配置，不管是通过DNS服务，还是 Host 文件。
 
 **第二步**：建议关闭所有物理节点的防火墙，至少保证端口：6030 - 6042的TCP和UDP端口都是开放的。**强烈建议**先关闭防火墙，集群搭建完毕之后，再来配置端口；

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

@@ -627,19 +627,21 @@ Query OK, 1 row(s) in set (0.001091s)
 
 ### 支持的条件过滤操作
 
-| Operation | Note                          | Applicable Data Types                 |
-| --------- | ----------------------------- | ------------------------------------- |
-| >         | larger than                   | **`timestamp`** and all numeric types |
-| <         | smaller than                  | **`timestamp`** and all numeric types |
-| >=        | larger than or equal to       | **`timestamp`** and all numeric types |
-| <=        | smaller than or equal to      | **`timestamp`** and all numeric types |
-| =         | equal to                      | all types                             |
-| <>        | not equal to                  | all types                             |
-| %         | match with any char sequences | **`binary`** **`nchar`**              |
-| _         | match with a single char      | **`binary`** **`nchar`**              |
+| Operation   | Note                          | Applicable Data Types                 |
+| ----------- | ----------------------------- | ------------------------------------- |
+| >           | larger than                   | **`timestamp`** and all numeric types |
+| <           | smaller than                  | **`timestamp`** and all numeric types |
+| >=          | larger than or equal to       | **`timestamp`** and all numeric types |
+| <=          | smaller than or equal to      | **`timestamp`** and all numeric types |
+| =           | equal to                      | all types                             |
+| <>          | not equal to                  | all types                             |
+| between and | within a certain range        | **`timestamp`** and all numeric types |
+| %           | match with any char sequences | **`binary`** **`nchar`**              |
+| _           | match with a single char      | **`binary`** **`nchar`**              |
 
 1. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。
-2. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用``` OR``` 关键字进行组合条件的查询过滤。例如：((value > 20 and value < 30) OR (value < 12)) 。
+2. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如：((value > 20 AND value < 30) OR (value < 12)) 。
+3. 从 2.0.17 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
 
 ### SQL 示例 
 

packaging/docker/Dockerfile

@@ -13,9 +13,8 @@ WORKDIR /root/${dirName}/
 RUN /bin/bash install.sh -e no
 
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
-ENV LANG=en_US.UTF-8
-ENV LANGUAGE=en_US:en
-ENV LC_ALL=en_US.UTF-8
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.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/" ]

src/client/inc/tscUtil.h

@@ -270,7 +270,7 @@ void tscPrintSelectClause(SSqlObj* pSql, int32_t subClauseIndex);
 bool hasMoreVnodesToTry(SSqlObj *pSql);
 bool hasMoreClauseToTry(SSqlObj* pSql);
 
-void tscFreeQueryInfo(SSqlCmd* pCmd);
+void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta);
 
 void tscTryQueryNextVnode(SSqlObj *pSql, __async_cb_func_t fp);
 void tscAsyncQuerySingleRowForNextVnode(void *param, TAOS_RES *tres, int numOfRows);

src/client/inc/tsclient.h

@@ -442,6 +442,8 @@ void tscCloseTscObj(void *pObj);
 TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                      void *param, TAOS **taos);
 TAOS_RES* taos_query_h(TAOS* taos, const char *sqlstr, int64_t* res);
+TAOS_RES * taos_query_ra(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param);
+
 void waitForQueryRsp(void *param, TAOS_RES *tres, int code);
 
 void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, __async_cb_func_t fp, void *param, const char *sqlstr, size_t sqlLen);

src/client/src/tscAsync.c

@@ -74,12 +74,16 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, __async_cb_func_t fp, void* para
 
 // TODO return the correct error code to client in tscQueueAsyncError
 void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param) {
+  taos_query_ra(taos, sqlstr, fp, param);
+}
+
+TAOS_RES * taos_query_ra(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     tscError("bug!!! pObj:%p", pObj);
     terrno = TSDB_CODE_TSC_DISCONNECTED;
     tscQueueAsyncError(fp, param, TSDB_CODE_TSC_DISCONNECTED);
-    return;
+    return NULL;
   }
   
   int32_t sqlLen = (int32_t)strlen(sqlstr);
@@ -87,7 +91,7 @@ void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *pa
     tscError("sql string exceeds max length:%d", tsMaxSQLStringLen);
     terrno = TSDB_CODE_TSC_EXCEED_SQL_LIMIT;
     tscQueueAsyncError(fp, param, terrno);
-    return;
+    return NULL;
   }
   
   nPrintTsc("%s", sqlstr);
@@ -96,12 +100,15 @@ void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *pa
   if (pSql == NULL) {
     tscError("failed to malloc sqlObj");
     tscQueueAsyncError(fp, param, TSDB_CODE_TSC_OUT_OF_MEMORY);
-    return;
+    return NULL;
   }
   
   doAsyncQuery(pObj, pSql, fp, param, sqlstr, sqlLen);
+
+  return pSql;
 }
 
+
 static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows) {
   if (tres == NULL) {
     return;

src/client/src/tscSubquery.c

@@ -2802,7 +2802,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
         numOfFailed += 1;
 
         // clean up tableMeta in cache
-        tscFreeQueryInfo(&pSql->cmd);
+        tscFreeQueryInfo(&pSql->cmd, false);
         SQueryInfo* pQueryInfo = tscGetQueryInfoDetailSafely(&pSql->cmd, 0);
         STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pParentObj->cmd, pSql->cmd.clauseIndex, 0);
         tscAddTableMetaInfo(pQueryInfo, &pMasterTableMetaInfo->name, NULL, NULL, NULL, NULL);

src/client/src/tscUtil.c

@@ -30,7 +30,7 @@
 #include "ttokendef.h"
 
 static void freeQueryInfoImpl(SQueryInfo* pQueryInfo);
-static void clearAllTableMetaInfo(SQueryInfo* pQueryInfo);
+static void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, bool removeMeta);
 
 static void tscStrToLower(char *str, int32_t n) {
   if (str == NULL || n <= 0) { return;}
@@ -367,7 +367,7 @@ static void tscDestroyResPointerInfo(SSqlRes* pRes) {
   pRes->data = NULL;  // pRes->data points to the buffer of pRsp, no need to free
 }
 
-void tscFreeQueryInfo(SSqlCmd* pCmd) {
+void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeMeta) {
   if (pCmd == NULL || pCmd->numOfClause == 0) {
     return;
   }
@@ -376,7 +376,7 @@ void tscFreeQueryInfo(SSqlCmd* pCmd) {
     SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, i);
     
     freeQueryInfoImpl(pQueryInfo);
-    clearAllTableMetaInfo(pQueryInfo);
+    clearAllTableMetaInfo(pQueryInfo, removeMeta);
     tfree(pQueryInfo);
   }
   
@@ -404,7 +404,7 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool removeMeta) {
 
   pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList, removeMeta);
   pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-  tscFreeQueryInfo(pCmd);
+  tscFreeQueryInfo(pCmd, removeMeta);
 }
 
 void tscFreeSqlResult(SSqlObj* pSql) {
@@ -1847,10 +1847,17 @@ SArray* tscVgroupTableInfoDup(SArray* pVgroupTables) {
   return pa;
 }
 
-void clearAllTableMetaInfo(SQueryInfo* pQueryInfo) {
+void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, bool removeMeta) {
   for(int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
 
+    if (removeMeta) {  
+      char name[TSDB_TABLE_FNAME_LEN] = {0};
+      tNameExtractFullName(&pTableMetaInfo->name, name);
+    
+      taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN));
+    }
+    
     tscFreeVgroupTableInfo(pTableMetaInfo->pVgroupTables);
     tscClearTableMetaInfo(pTableMetaInfo);
     free(pTableMetaInfo);
@@ -2714,7 +2721,11 @@ STableMeta* createSuperTableMeta(STableMetaMsg* pChild) {
 uint32_t tscGetTableMetaSize(STableMeta* pTableMeta) {
   assert(pTableMeta != NULL);
 
-  int32_t totalCols = pTableMeta->tableInfo.numOfColumns + pTableMeta->tableInfo.numOfTags;
+  int32_t totalCols = 0;
+  if (pTableMeta->tableInfo.numOfColumns >= 0 && pTableMeta->tableInfo.numOfTags >= 0) {
+    totalCols = pTableMeta->tableInfo.numOfColumns + pTableMeta->tableInfo.numOfTags;
+  }
+  
   return sizeof(STableMeta) + totalCols * sizeof(SSchema);
 }
 

src/common/src/tglobal.c

@@ -430,10 +430,10 @@ static void doInitGlobalConfig(void) {
   // port
   cfg.option = "serverPort";
   cfg.ptr = &tsServerPort;
-  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.valType = TAOS_CFG_VTYPE_UINT16;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 1;
-  cfg.maxValue = 65535;
+  cfg.maxValue = 65056;
   cfg.ptrLength = 0;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);

src/connector/jdbc/CMakeLists.txt

@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.20-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.21-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

src/connector/jdbc/deploy-pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.20</version>
+  <version>2.0.21</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>

src/connector/jdbc/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>2.0.20</version>
+    <version>2.0.21</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>

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

@@ -308,7 +308,7 @@ public class DatabaseMetaDataResultSet implements ResultSet {
                 return colMetaData.getColIndex() + 1;
             }
         }
-        throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
     }
 
     @Override

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

@@ -14,16 +14,13 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
 public abstract class TSDBConstants {
 
-    public static final String STATEMENT_CLOSED = "statement is closed";
-    public static final String UNSUPPORTED_METHOD_EXCEPTION_MSG = "this operation is NOT supported currently!";
-    public static final String INVALID_VARIABLES = "invalid variables";
-    public static final String RESULT_SET_IS_CLOSED = "resultSet is closed";
-
     public static final String DEFAULT_PORT = "6200";
     public static Map<Integer, String> DATATYPE_MAP = null;
 
@@ -77,8 +74,65 @@ public abstract class TSDBConstants {
         return WrapErrMsg("unkown error!");
     }
 
+    public static int taosType2JdbcType(int taosType) throws SQLException {
+        switch (taosType) {
+            case TSDBConstants.TSDB_DATA_TYPE_NULL:
+                return Types.NULL;
+            case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+                return Types.BOOLEAN;
+            case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+                return Types.TINYINT;
+            case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+                return Types.SMALLINT;
+            case TSDBConstants.TSDB_DATA_TYPE_INT:
+                return Types.INTEGER;
+            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+                return Types.BIGINT;
+            case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+                return Types.FLOAT;
+            case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
+                return Types.DOUBLE;
+            case TSDBConstants.TSDB_DATA_TYPE_BINARY:
+                return Types.BINARY;
+            case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+                return Types.TIMESTAMP;
+            case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+                return Types.NCHAR;
+        }
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+    }
+
+    public static int jdbcType2TaosType(int jdbcType) throws SQLException {
+        switch (jdbcType){
+            case Types.NULL:
+                return TSDBConstants.TSDB_DATA_TYPE_NULL;
+            case Types.BOOLEAN:
+                return TSDBConstants.TSDB_DATA_TYPE_BOOL;
+            case Types.TINYINT:
+                return TSDBConstants.TSDB_DATA_TYPE_TINYINT;
+            case Types.SMALLINT:
+                return TSDBConstants.TSDB_DATA_TYPE_SMALLINT;
+            case Types.INTEGER:
+                return TSDBConstants.TSDB_DATA_TYPE_INT;
+            case Types.BIGINT:
+                return TSDBConstants.TSDB_DATA_TYPE_BIGINT;
+            case Types.FLOAT:
+                return TSDBConstants.TSDB_DATA_TYPE_FLOAT;
+            case Types.DOUBLE:
+                return TSDBConstants.TSDB_DATA_TYPE_DOUBLE;
+            case Types.BINARY:
+                return TSDBConstants.TSDB_DATA_TYPE_BINARY;
+            case Types.TIMESTAMP:
+                return TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP;
+            case Types.NCHAR:
+                return TSDBConstants.TSDB_DATA_TYPE_NCHAR;
+        }
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
+    }
+
     static {
         DATATYPE_MAP = new HashMap<>();
+        DATATYPE_MAP.put(0, "NULL");
         DATATYPE_MAP.put(1, "BOOL");
         DATATYPE_MAP.put(2, "TINYINT");
         DATATYPE_MAP.put(3, "SMALLINT");
@@ -90,4 +144,8 @@ public abstract class TSDBConstants {
         DATATYPE_MAP.put(9, "TIMESTAMP");
         DATATYPE_MAP.put(10, "NCHAR");
     }
+
+    public static String jdbcType2TaosTypeName(int type) throws SQLException {
+        return DATATYPE_MAP.get(jdbcType2TaosType(type));
+    }
 }

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

@@ -18,6 +18,7 @@ public class TSDBErrorNumbers {
     public static final int ERROR_INVALID_FOR_EXECUTE = 0x230c;         //not a valid sql for execute: (SQL)
     public static final int ERROR_PARAMETER_INDEX_OUT_RANGE = 0x230d; // parameter index out of range
     public static final int ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED = 0x230e;    // connection already closed
+    public static final int ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE = 0x230f;        //unknown sql type in tdengine
 
     public static final int ERROR_UNKNOWN = 0x2350;    //unknown error
 
@@ -49,6 +50,7 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_INVALID_FOR_EXECUTE);
         errorNumbers.add(ERROR_PARAMETER_INDEX_OUT_RANGE);
         errorNumbers.add(ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED);
+        errorNumbers.add(ERROR_UNKNOWN_SQL_TYPE_IN_TDENGINE);
 
         /*****************************************************/
         errorNumbers.add(ERROR_SUBSCRIBE_FAILED);

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

@@ -20,7 +20,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.List;
 
-public class TSDBResultSetMetaData implements ResultSetMetaData {
+public class TSDBResultSetMetaData extends WrapperImpl implements ResultSetMetaData {
 
 	List<ColumnMetaData> colMetaDataList = null;
 
@@ -28,14 +28,6 @@ public class TSDBResultSetMetaData implements ResultSetMetaData {
 		this.colMetaDataList = metaDataList;
 	}
 
-	public <T> T unwrap(Class<T> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
-	}
-
-	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
-	}
-
 	public int getColumnCount() throws SQLException {
 		return colMetaDataList.size();
 	}
@@ -94,7 +86,7 @@ public class TSDBResultSetMetaData implements ResultSetMetaData {
 	}
 
 	public String getSchemaName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public int getPrecision(int column) throws SQLException {
@@ -125,18 +117,18 @@ public class TSDBResultSetMetaData implements ResultSetMetaData {
 	}
 
 	public String getTableName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public String getCatalogName(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public int getColumnType(int column) throws SQLException {
 		ColumnMetaData meta = this.colMetaDataList.get(column - 1);
 		switch (meta.getColType()) {
 		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
-			return java.sql.Types.BIT;
+			return Types.BOOLEAN;
 		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
 			return java.sql.Types.TINYINT;
 		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
@@ -150,13 +142,13 @@ public class TSDBResultSetMetaData implements ResultSetMetaData {
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
 			return java.sql.Types.DOUBLE;
 		case TSDBConstants.TSDB_DATA_TYPE_BINARY:
-			return java.sql.Types.CHAR;
+			return Types.BINARY;
 		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-			return java.sql.Types.BIGINT;
+			return java.sql.Types.TIMESTAMP;
 		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
-			return java.sql.Types.CHAR;
+			return Types.NCHAR;
 		}
-		throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
 	}
 
 	public String getColumnTypeName(int column) throws SQLException {
@@ -173,7 +165,7 @@ public class TSDBResultSetMetaData implements ResultSetMetaData {
 	}
 
 	public boolean isDefinitelyWritable(int column) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+		throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
 	}
 
 	public String getColumnClassName(int column) throws SQLException {

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

@@ -1153,11 +1153,11 @@ public class TSDBResultSetWrapper implements ResultSet {
     }
 
     public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
     }
 
     public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-        throw new SQLException(TSDBConstants.UNSUPPORTED_METHOD_EXCEPTION_MSG);
+        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
     }
 
     @Override

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

@@ -14,12 +14,11 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
-import javax.management.OperationsException;
 import java.sql.SQLException;
 
 public class TSDBSubscribe {
-    private TSDBJNIConnector connecter = null;
-    private long id = 0;
+    private final TSDBJNIConnector connecter;
+    private final long id;
 
     TSDBSubscribe(TSDBJNIConnector connecter, long id) throws SQLException {
         if (null != connecter) {

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

@@ -18,10 +18,10 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
     private final String database;
     private final Statement statement;
     // data
-    private ArrayList<ArrayList<Object>> resultSet = new ArrayList<>();
+    private ArrayList<ArrayList<Object>> resultSet;
     // meta
-    private ArrayList<String> columnNames = new ArrayList<>();
-    private ArrayList<Field> columns = new ArrayList<>();
+    private ArrayList<String> columnNames;
+    private ArrayList<Field> columns;
     private RestfulResultSetMetaData metaData;
 
     /**
@@ -29,11 +29,36 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
      *
      * @param resultJson: 包含data信息的结果集，有sql返回的结果集
      ***/
-    public RestfulResultSet(String database, Statement statement, JSONObject resultJson) {
+    public RestfulResultSet(String database, Statement statement, JSONObject resultJson) throws SQLException {
         this.database = database;
         this.statement = statement;
+        // column metadata
+        JSONArray columnMeta = resultJson.getJSONArray("column_meta");
+        columnNames = new ArrayList<>();
+        columns = new ArrayList<>();
+        for (int colIndex = 0; colIndex < columnMeta.size(); colIndex++) {
+            JSONArray col = columnMeta.getJSONArray(colIndex);
+            String col_name = col.getString(0);
+            int col_type = TSDBConstants.taosType2JdbcType(col.getInteger(1));
+            int col_length = col.getInteger(2);
+            columnNames.add(col_name);
+            columns.add(new Field(col_name, col_type, col_length, ""));
+        }
+        this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
+
         // row data
         JSONArray data = resultJson.getJSONArray("data");
+        resultSet = new ArrayList<>();
+        for (int rowIndex = 0; rowIndex < data.size(); rowIndex++) {
+            ArrayList row = new ArrayList();
+            JSONArray jsonRow = data.getJSONArray(rowIndex);
+            for (int colIndex = 0; colIndex < jsonRow.size(); colIndex++) {
+                row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).type));
+            }
+            resultSet.add(row);
+        }
+
+        /*
         int columnIndex = 0;
         for (; columnIndex < data.size(); columnIndex++) {
             ArrayList oneRow = new ArrayList<>();
@@ -52,50 +77,77 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             columns.add(new Field(name, "", 0, ""));
         }
         this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
-    }
-
-    /**
-     * 由多个resultSet的JSON构造结果集
-     *
-     * @param resultJson: 包含data信息的结果集，有sql返回的结果集
-     * @param fieldJson:  包含多个（最多2个）meta信息的结果集，有describe xxx
-     **/
-    public RestfulResultSet(String database, Statement statement, JSONObject resultJson, List<JSONObject> fieldJson) {
-        this(database, statement, resultJson);
-        ArrayList<Field> newColumns = new ArrayList<>();
-
-        for (Field column : columns) {
-            Field field = findField(column.name, fieldJson);
-            if (field != null) {
-                newColumns.add(field);
-            } else {
-                newColumns.add(column);
-            }
-        }
-        this.columns = newColumns;
-        this.metaData = new RestfulResultSetMetaData(this.database, this.columns, this);
-    }
-
-    public Field findField(String columnName, List<JSONObject> fieldJsonList) {
-        for (JSONObject fieldJSON : fieldJsonList) {
-            JSONArray fieldDataJson = fieldJSON.getJSONArray("data");
-            for (int i = 0; i < fieldDataJson.size(); i++) {
-                JSONArray field = fieldDataJson.getJSONArray(i);
-                if (columnName.equalsIgnoreCase(field.getString(0))) {
-                    return new Field(field.getString(0), field.getString(1), field.getInteger(2), field.getString(3));
-                }
-            }
+         */
+    }
+
+    private Object parseColumnData(JSONArray row, int colIndex, int sqlType) {
+        switch (sqlType) {
+            case Types.NULL:
+                return null;
+            case Types.BOOLEAN:
+                return row.getBoolean(colIndex);
+            case Types.TINYINT:
+            case Types.SMALLINT:
+                return row.getShort(colIndex);
+            case Types.INTEGER:
+                return row.getInteger(colIndex);
+            case Types.BIGINT:
+                return row.getBigInteger(colIndex);
+            case Types.FLOAT:
+                return row.getFloat(colIndex);
+            case Types.DOUBLE:
+                return row.getDouble(colIndex);
+            case Types.TIMESTAMP:
+                return new Timestamp(row.getDate(colIndex).getTime());
+            case Types.BINARY:
+            case Types.NCHAR:
+            default:
+                return row.getString(colIndex);
         }
-        return null;
     }
 
+//    /**
+//     * 由多个resultSet的JSON构造结果集
+//     *
+//     * @param resultJson: 包含data信息的结果集，有sql返回的结果集
+//     * @param fieldJson:  包含多个（最多2个）meta信息的结果集，有describe xxx
+//     **/
+//    public RestfulResultSet(String database, Statement statement, JSONObject resultJson, List<JSONObject> fieldJson) throws SQLException {
+//        this(database, statement, resultJson);
+//        ArrayList<Field> newColumns = new ArrayList<>();
+//
+//        for (Field column : columns) {
+//            Field field = findField(column.name, fieldJson);
+//            if (field != null) {
+//                newColumns.add(field);
+//            } else {
+//                newColumns.add(column);
+//            }
+//        }
+//        this.columns = newColumns;
+//        this.metaData = new RestfulResultSetMetaData(this.database, this.columns, this);
+//    }
+
+//    public Field findField(String columnName, List<JSONObject> fieldJsonList) {
+//        for (JSONObject fieldJSON : fieldJsonList) {
+//            JSONArray fieldDataJson = fieldJSON.getJSONArray("data");
+//            for (int i = 0; i < fieldDataJson.size(); i++) {
+//                JSONArray field = fieldDataJson.getJSONArray(i);
+//                if (columnName.equalsIgnoreCase(field.getString(0))) {
+//                    return new Field(field.getString(0), field.getString(1), field.getInteger(2), field.getString(3));
+//                }
+//            }
+//        }
+//        return null;
+//    }
+
     public class Field {
         String name;
-        String type;
+        int type;
         int length;
         String note;
 
-        public Field(String name, String type, int length, String note) {
+        public Field(String name, int type, int length, String note) {
             this.name = name;
             this.type = type;
             this.length = length;

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

@@ -5,6 +5,7 @@ import com.taosdata.jdbc.TSDBConstants;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.util.ArrayList;
 
 public class RestfulResultSetMetaData implements ResultSetMetaData {
@@ -53,14 +54,14 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public boolean isSigned(int column) throws SQLException {
-        String type = this.fields.get(column - 1).type.toUpperCase();
+        int type = this.fields.get(column - 1).type;
         switch (type) {
-            case "TINYINT":
-            case "SMALLINT":
-            case "INT":
-            case "BIGINT":
-            case "FLOAT":
-            case "DOUBLE":
+            case Types.TINYINT:
+            case Types.SMALLINT:
+            case Types.INTEGER:
+            case Types.BIGINT:
+            case Types.FLOAT:
+            case Types.DOUBLE:
                 return true;
             default:
                 return false;
@@ -89,14 +90,14 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public int getPrecision(int column) throws SQLException {
-        String type = this.fields.get(column - 1).type.toUpperCase();
+        int type = this.fields.get(column - 1).type;
         switch (type) {
-            case "FLOAT":
+            case Types.FLOAT:
                 return 5;
-            case "DOUBLE":
+            case Types.DOUBLE:
                 return 9;
-            case "BINARY":
-            case "NCHAR":
+            case Types.BINARY:
+            case Types.NCHAR:
                 return this.fields.get(column - 1).length;
             default:
                 return 0;
@@ -105,11 +106,11 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public int getScale(int column) throws SQLException {
-        String type = this.fields.get(column - 1).type.toUpperCase();
+        int type = this.fields.get(column - 1).type;
         switch (type) {
-            case "FLOAT":
+            case Types.FLOAT:
                 return 5;
-            case "DOUBLE":
+            case Types.DOUBLE:
                 return 9;
             default:
                 return 0;
@@ -128,36 +129,13 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public int getColumnType(int column) throws SQLException {
-        String type = this.fields.get(column - 1).type.toUpperCase();
-        switch (type) {
-            case "BOOL":
-                return java.sql.Types.BOOLEAN;
-            case "TINYINT":
-                return java.sql.Types.TINYINT;
-            case "SMALLINT":
-                return java.sql.Types.SMALLINT;
-            case "INT":
-                return java.sql.Types.INTEGER;
-            case "BIGINT":
-                return java.sql.Types.BIGINT;
-            case "FLOAT":
-                return java.sql.Types.FLOAT;
-            case "DOUBLE":
-                return java.sql.Types.DOUBLE;
-            case "BINARY":
-                return java.sql.Types.BINARY;
-            case "TIMESTAMP":
-                return java.sql.Types.TIMESTAMP;
-            case "NCHAR":
-                return java.sql.Types.NCHAR;
-        }
-        throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+        return this.fields.get(column - 1).type;
     }
 
     @Override
     public String getColumnTypeName(int column) throws SQLException {
-        String type = fields.get(column - 1).type;
-        return type.toUpperCase();
+        int type = fields.get(column - 1).type;
+        return TSDBConstants.jdbcType2TaosTypeName(type);
     }
 
     @Override
@@ -177,26 +155,26 @@ public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     @Override
     public String getColumnClassName(int column) throws SQLException {
-        String type = this.fields.get(column - 1).type;
+        int type = this.fields.get(column - 1).type;
         String columnClassName = "";
         switch (type) {
-            case "BOOL":
+            case Types.BOOLEAN:
                 return Boolean.class.getName();
-            case "TINYINT":
-            case "SMALLINT":
+            case Types.TINYINT:
+            case Types.SMALLINT:
                 return Short.class.getName();
-            case "INT":
+            case Types.INTEGER:
                 return Integer.class.getName();
-            case "BIGINT":
+            case Types.BIGINT:
                 return Long.class.getName();
-            case "FLOAT":
+            case Types.FLOAT:
                 return Float.class.getName();
-            case "DOUBLE":
+            case Types.DOUBLE:
                 return Double.class.getName();
-            case "TIMESTAMP":
+            case Types.TIMESTAMP:
                 return Timestamp.class.getName();
-            case "BINARY":
-            case "NCHAR":
+            case Types.BINARY:
+            case Types.NCHAR:
                 return String.class.getName();
         }
         return columnClassName;

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

@@ -151,22 +151,21 @@ public class RestfulStatement extends AbstractStatement {
             throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + resultJson.getString("desc") + "\n" + "error code: " + resultJson.getString("code")));
         }
         // parse table name from sql
-        String[] tableIdentifiers = parseTableIdentifier(sql);
-        if (tableIdentifiers != null) {
-            List<JSONObject> fieldJsonList = new ArrayList<>();
-            for (String tableIdentifier : tableIdentifiers) {
-                // field meta
-                String fields = HttpClientPoolUtil.execute(url, "DESCRIBE " + tableIdentifier);
-                JSONObject fieldJson = JSON.parseObject(fields);
-                if (fieldJson.getString("status").equals("error")) {
-                    throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + fieldJson.getString("desc") + "\n" + "error code: " + fieldJson.getString("code")));
-                }
-                fieldJsonList.add(fieldJson);
-            }
-            this.resultSet = new RestfulResultSet(database, this, resultJson, fieldJsonList);
-        } else {
-            this.resultSet = new RestfulResultSet(database, this, resultJson);
-        }
+//        String[] tableIdentifiers = parseTableIdentifier(sql);
+//        if (tableIdentifiers != null) {
+//            List<JSONObject> fieldJsonList = new ArrayList<>();
+//            for (String tableIdentifier : tableIdentifiers) {
+//                String fields = HttpClientPoolUtil.execute(url, "DESCRIBE " + tableIdentifier);
+//                JSONObject fieldJson = JSON.parseObject(fields);
+//                if (fieldJson.getString("status").equals("error")) {
+//                    throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " + fieldJson.getString("desc") + "\n" + "error code: " + fieldJson.getString("code")));
+//                }
+//                fieldJsonList.add(fieldJson);
+//            }
+//            this.resultSet = new RestfulResultSet(database, this, resultJson, fieldJsonList);
+//        } else {
+        this.resultSet = new RestfulResultSet(database, this, resultJson);
+//        }
         this.affectedRows = 0;
         return resultSet;
     }
@@ -201,7 +200,7 @@ public class RestfulStatement extends AbstractStatement {
     @Override
     public ResultSet getResultSet() throws SQLException {
         if (isClosed())
-            throw new SQLException(TSDBConstants.STATEMENT_CLOSED);
+            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_STATEMENT_CLOSED);
         return resultSet;
     }
 

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

@@ -13,7 +13,6 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class ResultSetTest {
     static Connection connection;

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

@@ -48,29 +48,28 @@ public class SubscribeTest {
     @Test
     public void subscribe() {
         try {
-
             String rawSql = "select * from " + dbName + "." + tName + ";";
             System.out.println(rawSql);
-            TSDBSubscribe subscribe = ((TSDBConnection) connection).subscribe(topic, rawSql, false);
+//            TSDBSubscribe subscribe = ((TSDBConnection) connection).subscribe(topic, rawSql, false);
 
-            int a = 0;
-            while (true) {
-                TimeUnit.MILLISECONDS.sleep(1000);
-                TSDBResultSet resSet = subscribe.consume();
-                while (resSet.next()) {
-                    for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
-                        System.out.printf(i + ": " + resSet.getString(i) + "\t");
-                    }
-                    System.out.println("\n======" + a + "==========");
-                }
-                a++;
-                if (a >= 2) {
-                    break;
-                }
+//            int a = 0;
+//            while (true) {
+//                TimeUnit.MILLISECONDS.sleep(1000);
+//                TSDBResultSet resSet = subscribe.consume();
+//                while (resSet.next()) {
+//                    for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
+//                        System.out.printf(i + ": " + resSet.getString(i) + "\t");
+//                    }
+//                    System.out.println("\n======" + a + "==========");
+//                }
+//                a++;
+//                if (a >= 2) {
+//                    break;
+//                }
 //                resSet.close();
-            }
-
-            subscribe.close(true);
+//            }
+//
+//            subscribe.close(true);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -10,7 +10,7 @@ import java.util.Random;
 public class RestfulJDBCTest {
 
     private static final String host = "127.0.0.1";
-    //    private static final String host = "master";
+//        private static final String host = "master";
     private static Connection connection;
     private Random random = new Random(System.currentTimeMillis());
 

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

@@ -12,7 +12,7 @@ import java.sql.*;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class SQLTest {
     private static final String host = "127.0.0.1";
-    //    private static final String host = "master";
+//        private static final String host = "master";
     private static Connection connection;
 
     @Test
@@ -323,6 +323,18 @@ public class SQLTest {
         SQLExecutor.executeQuery(connection, sql);
     }
 
+    @Test
+    public void testCase052() {
+        String sql = "select server_status()";
+        SQLExecutor.executeQuery(connection, sql);
+    }
+
+    @Test
+    public void testCase053() {
+        String sql = "select avg(cpu_taosd), avg(cpu_system), max(cpu_cores), avg(mem_taosd), avg(mem_system), max(mem_total), avg(disk_used), max(disk_total), avg(band_speed), avg(io_read), avg(io_write), sum(req_http), sum(req_select), sum(req_insert) from log.dn1 where ts> now - 60m and ts<= now interval(1m) fill(value, 0)";
+        SQLExecutor.executeQuery(connection, sql);
+    }
+
     @BeforeClass
     public static void before() throws ClassNotFoundException, SQLException {
         Class.forName("com.taosdata.jdbc.rs.RestfulDriver");

src/dnode/src/dnodeCheck.c

@@ -29,7 +29,7 @@ typedef struct {
 static  SCheckItem  tsCheckItem[TSDB_CHECK_ITEM_MAX] = {{0}};
 int64_t tsMinFreeMemSizeForStart = 0;
 
-static int32_t bindTcpPort(int16_t port) {
+static int32_t bindTcpPort(uint16_t port) {
   SOCKET serverSocket;
   struct sockaddr_in server_addr;
 
@@ -85,9 +85,9 @@ static int32_t bindUdpPort(int16_t port) {
 
 static int32_t dnodeCheckNetwork() {
   int32_t ret;
-  int16_t startPort = tsServerPort;
+  uint16_t startPort = tsServerPort;
 
-  for (int16_t port = startPort; port < startPort + 12; port++) {
+  for (uint16_t port = startPort; port < startPort + 12; port++) {
     ret = bindTcpPort(port);
     if (0 != ret) {
       dError("failed to tcp bind port %d, quit", port);

src/inc/taosdef.h

@@ -286,7 +286,7 @@ do { \
 #define TSDB_MAX_COMP_LEVEL             2
 #define TSDB_DEFAULT_COMP_LEVEL         2
 
-#define TSDB_MIN_WAL_LEVEL              1
+#define TSDB_MIN_WAL_LEVEL              0
 #define TSDB_MAX_WAL_LEVEL              2
 #define TSDB_DEFAULT_WAL_LEVEL          1
 

src/kit/taosdemo/insert.json

@@ -8,10 +8,12 @@
 	"thread_count": 4,
 	"thread_count_create_tbl": 4,
 	"result_file": "./insert_res.txt",
-  "confirm_parameter_prompt": "no",
+    "confirm_parameter_prompt": "no",
+    "insert_interval": 0,
+    "num_of_records_per_req": 100,
 	"databases": [{
 		"dbinfo": {
-			"name": "dbx",
+			"name": "db",
 			"drop": "yes",
 			"replica": 1,
 			"days": 10,
@@ -30,14 +32,13 @@
 		},
 		"super_tables": [{
 			"name": "stb",
-      "child_table_exists":"no",
+            "child_table_exists":"no",
 			"childtable_count": 100,
 			"childtable_prefix": "stb_",
 			"auto_create_table": "no",
 			"data_source": "rand",
 			"insert_mode": "taosc",
-			"insert_rate": 0,
-			"insert_rows": 1000,
+			"insert_rows": 100000,
 			"multi_thread_write_one_tbl": "no",
 			"number_of_tbl_in_one_sql": 0,
 			"rows_per_tbl": 100,

src/mnode/src/mnodeTable.c

@@ -832,12 +832,13 @@ static int32_t mnodeProcessBatchCreateTableMsg(SMnodeMsg *pMsg) {
         return code;
       } else if (code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
         ++pMsg->pBatchMasterMsg->received;
+        pMsg->pBatchMasterMsg->code = code;
         mnodeDestroySubMsg(pMsg);
       }
 
       if (pMsg->pBatchMasterMsg->successed + pMsg->pBatchMasterMsg->received
 	  >= pMsg->pBatchMasterMsg->expected) {
-        dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, TSDB_CODE_SUCCESS);
+        dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, pMsg->pBatchMasterMsg->code);
       }
 
       return TSDB_CODE_MND_ACTION_IN_PROGRESS;
@@ -916,11 +917,13 @@ static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
     return TSDB_CODE_MND_DB_IN_DROPPING;
   }
 
+#if 0
   if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
     mError("msg:%p, app:%p table:%s, failed to drop table, in monitor database", pMsg, pMsg->rpcMsg.ahandle,
            pDrop->name);
     return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
   }
+#endif
 
   if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pDrop->name);
   if (pMsg->pTable == NULL) {
@@ -1906,7 +1909,8 @@ static int32_t mnodeDoCreateChildTableCb(SMnodeMsg *pMsg, int32_t code) {
     sdbDeleteRow(&desc);
 
     if (pMsg->pBatchMasterMsg) {
-      ++pMsg->pBatchMasterMsg->successed;
+      ++pMsg->pBatchMasterMsg->received;
+      pMsg->pBatchMasterMsg->code = code;
       if (pMsg->pBatchMasterMsg->successed + pMsg->pBatchMasterMsg->received
 	  >= pMsg->pBatchMasterMsg->expected) {
 	dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, code);
@@ -2688,6 +2692,7 @@ static void mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
 
       if (pMsg->pBatchMasterMsg) {
 	++pMsg->pBatchMasterMsg->received;
+	pMsg->pBatchMasterMsg->code = code;
 	if (pMsg->pBatchMasterMsg->successed + pMsg->pBatchMasterMsg->received
 	    >= pMsg->pBatchMasterMsg->expected) {
 	  dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, code);
@@ -2726,6 +2731,7 @@ static void mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
 
       if (pMsg->pBatchMasterMsg) {
 	++pMsg->pBatchMasterMsg->received;
+	pMsg->pBatchMasterMsg->code = rpcMsg->code;
 	if (pMsg->pBatchMasterMsg->successed + pMsg->pBatchMasterMsg->received
 	    >= pMsg->pBatchMasterMsg->expected) {
 	  dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, rpcMsg->code);
@@ -3020,10 +3026,12 @@ static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
     return TSDB_CODE_MND_DB_IN_DROPPING;
   }
 
+#if 0
   if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
     mError("msg:%p, app:%p table:%s, failed to alter table, its log db", pMsg, pMsg->rpcMsg.ahandle, pAlter->tableFname);
     return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
   }
+#endif
 
   if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pAlter->tableFname);
   if (pMsg->pTable == NULL) {

src/mnode/src/mnodeVgroup.c

@@ -537,6 +537,7 @@ static int32_t mnodeCreateVgroupCb(SMnodeMsg *pMsg, int32_t code) {
 
     if (pMsg->pBatchMasterMsg) {
       ++pMsg->pBatchMasterMsg->received;
+      pMsg->pBatchMasterMsg->code = pMsg->code;
       if (pMsg->pBatchMasterMsg->successed + pMsg->pBatchMasterMsg->received
           >= pMsg->pBatchMasterMsg->expected) {
         dnodeSendRpcMWriteRsp(pMsg->pBatchMasterMsg, pMsg->code);
@@ -1002,6 +1003,7 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
 
       if (mnodeMsg->pBatchMasterMsg) {
         ++mnodeMsg->pBatchMasterMsg->received;
+        mnodeMsg->pBatchMasterMsg->code = code;
         if (mnodeMsg->pBatchMasterMsg->successed + mnodeMsg->pBatchMasterMsg->received
             >= mnodeMsg->pBatchMasterMsg->expected) {
           dnodeSendRpcMWriteRsp(mnodeMsg->pBatchMasterMsg, code);
@@ -1024,6 +1026,7 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
 
     if (mnodeMsg->pBatchMasterMsg) {
       ++mnodeMsg->pBatchMasterMsg->received;
+      mnodeMsg->pBatchMasterMsg->code = mnodeMsg->code;
       if (mnodeMsg->pBatchMasterMsg->successed + mnodeMsg->pBatchMasterMsg->received
           >= mnodeMsg->pBatchMasterMsg->expected) {
         dnodeSendRpcMWriteRsp(mnodeMsg->pBatchMasterMsg, mnodeMsg->code);

src/os/inc/osDef.h

@@ -83,6 +83,20 @@ extern "C" {
     }                            \
   } while (0)
 
+#define DEFAULT_DOUBLE_COMP(x, y)           \
+  do {                                      \
+    if (isnan(x) && isnan(y)) { return 0; } \
+    if (isnan(x)) { return -1; }            \
+    if (isnan(y)) { return 1; }             \
+    if ((x) == (y)) {                       \
+      return 0;                             \
+    } else {                                \
+      return (x) < (y) ? -1 : 1;            \
+    }                                       \
+  } while (0)
+
+#define DEFAULT_FLOAT_COMP(x, y) DEFAULT_DOUBLE_COMP(x, y)
+
 #define ALIGN_NUM(n, align) (((n) + ((align)-1)) & (~((align)-1)))
 
 // align to 8bytes

src/plugins/http/inc/httpRestJson.h

@@ -34,6 +34,8 @@
 #define REST_JSON_DATA_LEN       4
 #define REST_JSON_HEAD           "head"
 #define REST_JSON_HEAD_LEN       4
+#define REST_JSON_HEAD_INFO      "column_meta"
+#define REST_JSON_HEAD_INFO_LEN  11
 #define REST_JSON_ROWS           "rows"
 #define REST_JSON_ROWS_LEN       4
 #define REST_JSON_AFFECT_ROWS    "affected_rows"
@@ -51,4 +53,4 @@ bool restBuildSqlLocalTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAO
 bool restBuildSqlUtcTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows);
 void restStopSqlJson(HttpContext *pContext, HttpSqlCmd *cmd);
 
-#endif
\ No newline at end of file
+#endif

src/plugins/http/src/httpQueue.c

@@ -59,7 +59,9 @@ void httpDispatchToResultQueue(void *param, TAOS_RES *result, int32_t code, int3
     pMsg->fp = fp;
     taosWriteQitem(tsHttpQueue, TAOS_QTYPE_RPC, pMsg);
   } else {
-    (*fp)(param, result, code, rows);
+    taos_stop_query(result);
+    taos_free_result(result);
+    //(*fp)(param, result, code, rows);
   }
 }
 

src/plugins/http/src/httpRestJson.c

@@ -75,6 +75,44 @@ void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result)
   // head array end
   httpJsonToken(jsonBuf, JsonArrEnd);
 
+  // column_meta begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonPairHead(jsonBuf, REST_JSON_HEAD_INFO, REST_JSON_HEAD_INFO_LEN);
+  // column_meta array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+
+  if (num_fields == 0) {
+    httpJsonItemToken(jsonBuf);
+    httpJsonToken(jsonBuf, JsonArrStt);
+
+    httpJsonItemToken(jsonBuf);
+    httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+    httpJsonItemToken(jsonBuf);
+    httpJsonInt(jsonBuf, TSDB_DATA_TYPE_INT);
+    httpJsonItemToken(jsonBuf);
+    httpJsonInt(jsonBuf, 4);
+
+    httpJsonToken(jsonBuf, JsonArrEnd);
+  } else {
+    for (int32_t i = 0; i < num_fields; ++i) {
+      httpJsonItemToken(jsonBuf);
+      httpJsonToken(jsonBuf, JsonArrStt);
+
+      httpJsonItemToken(jsonBuf);
+      httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+      httpJsonItemToken(jsonBuf);
+      httpJsonInt(jsonBuf, fields[i].type);
+      httpJsonItemToken(jsonBuf);
+      httpJsonInt(jsonBuf, fields[i].bytes);
+
+      httpJsonToken(jsonBuf, JsonArrEnd);
+    }
+  }
+
+  // column_meta array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
   // data begin
   httpJsonItemToken(jsonBuf);
   httpJsonPairHead(jsonBuf, REST_JSON_DATA, REST_JSON_DATA_LEN);

src/query/src/qExtbuffer.c

@@ -362,20 +362,10 @@ static FORCE_INLINE int32_t columnValueAscendingComparator(char *f1, char *f2, i
       return (first < second) ? -1 : 1;
     };
     case TSDB_DATA_TYPE_DOUBLE: {
-      double first  = GET_DOUBLE_VAL(f1);
-      double second = GET_DOUBLE_VAL(f2);
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
+      DEFAULT_DOUBLE_COMP(GET_DOUBLE_VAL(f1), GET_DOUBLE_VAL(f2));
     };
     case TSDB_DATA_TYPE_FLOAT: {
-      float first  = GET_FLOAT_VAL(f1);
-      float second = GET_FLOAT_VAL(f2);
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
+      DEFAULT_FLOAT_COMP(GET_FLOAT_VAL(f1), GET_FLOAT_VAL(f2));
     };
     case TSDB_DATA_TYPE_BIGINT: {
       int64_t first = *(int64_t *)f1;

src/query/src/qParserImpl.c

@@ -58,6 +58,15 @@ SSqlInfo qSQLParse(const char *pStr) {
         sqlInfo.valid = false;
         goto abort_parse;
       }
+      
+      case TK_HEX:
+      case TK_OCT:
+      case TK_BIN:{
+        snprintf(sqlInfo.msg, tListLen(sqlInfo.msg), "unsupported token: \"%s\"", t0.z);
+        sqlInfo.valid = false;
+        goto abort_parse;
+      }
+        
       default:
         Parse(pParser, t0.type, t0, &sqlInfo);
         if (sqlInfo.valid == false) {

src/query/tests/percentileTest.cpp

@@ -48,7 +48,7 @@ tMemBucket *createUnsignedDataBucket(int32_t start, int32_t end, int32_t type) {
     uint64_t k = i;
     int32_t ret = tMemBucketPut(pBucket, &k, 1);
     if (ret != 0) {
-      printf("value out of range:%f", k);
+      printf("value out of range:%" PRId64, k);
     }
   }
 
@@ -245,7 +245,7 @@ void unsignedDataTest() {
 }  // namespace
 
 TEST(testCase, percentileTest) {
-  //  qsortTest();
+//  qsortTest();
   intDataTest();
   bigintDataTest();
   doubleDataTest();

src/query/tests/unitTest.cpp

@@ -227,10 +227,10 @@ TEST(testCase, db_table_name) {
   EXPECT_EQ(testValidateName(t60_1), TSDB_CODE_TSC_INVALID_SQL);
 
   char t61[] = "' ABC '";
-  EXPECT_EQ(testValidateName(t61), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(testValidateName(t61), TSDB_CODE_TSC_INVALID_SQL);
 
   char t61_1[] = "'  ABC '";
-  EXPECT_EQ(testValidateName(t61_1), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(testValidateName(t61_1), TSDB_CODE_TSC_INVALID_SQL);
 
   char t62[] = " ABC . def ";
   EXPECT_EQ(testValidateName(t62), TSDB_CODE_TSC_INVALID_SQL);
@@ -249,13 +249,13 @@ TEST(testCase, db_table_name) {
   EXPECT_EQ(testValidateName(t65), TSDB_CODE_TSC_INVALID_SQL);
 
   char t66[] = "' ABC '.'  DEF '";
-  EXPECT_EQ(testValidateName(t66), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(testValidateName(t66), TSDB_CODE_TSC_INVALID_SQL);
 
   char t67[] = "abc . '  DEF  '";
   EXPECT_EQ(testValidateName(t67), TSDB_CODE_TSC_INVALID_SQL);
 
   char t68[] = "'  abc '.'   DEF '";
-  EXPECT_EQ(testValidateName(t68), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(testValidateName(t68), TSDB_CODE_TSC_INVALID_SQL);
 
   // do not use key words 
   char t69[] = "table.'DEF'";
@@ -265,7 +265,7 @@ TEST(testCase, db_table_name) {
   EXPECT_EQ(testValidateName(t70), TSDB_CODE_TSC_INVALID_SQL);
 
   char t71[] = "'_abXYZ1234  '.' deFF  '";
-  EXPECT_EQ(testValidateName(t71), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(testValidateName(t71), TSDB_CODE_TSC_INVALID_SQL);
 
   char t72[] = "'_abDEF&^%1234'.'  DIef'";
   EXPECT_EQ(testValidateName(t72), TSDB_CODE_TSC_INVALID_SQL);

src/rpc/src/rpcMain.c

@@ -1281,7 +1281,7 @@ static void rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext) {
   SRpcConn *pConn = rpcSetupConnToServer(pContext);
   if (pConn == NULL) {
     pContext->code = terrno;
-    taosTmrStart(rpcProcessConnError, 0, pContext, pRpc->tmrCtrl);
+    taosTmrStart(rpcProcessConnError, 1, pContext, pRpc->tmrCtrl);
     return;
   }
 

src/tsdb/inc/tsdbMemTable.h

@@ -37,6 +37,7 @@ typedef struct {
   TSKEY      keyLast;
   int64_t    numOfRows;
   SSkipList* pData;
+  T_REF_DECLARE()
 } STableData;
 
 typedef struct {
@@ -76,7 +77,7 @@ typedef struct {
 
 int   tsdbRefMemTable(STsdbRepo* pRepo, SMemTable* pMemTable);
 int   tsdbUnRefMemTable(STsdbRepo* pRepo, SMemTable* pMemTable);
-int   tsdbTakeMemSnapshot(STsdbRepo* pRepo, SMemTable** pMem, SMemTable** pIMem);
+int   tsdbTakeMemSnapshot(STsdbRepo* pRepo, SMemTable** pMem, SMemTable** pIMem, SArray* pATable);
 void  tsdbUnTakeMemSnapShot(STsdbRepo* pRepo, SMemTable* pMem, SMemTable* pIMem);
 void* tsdbAllocBytes(STsdbRepo* pRepo, int bytes);
 int   tsdbAsyncCommit(STsdbRepo* pRepo);

src/tsdb/src/tsdbMain.c

@@ -597,7 +597,7 @@ int tsdbRestoreInfo(STsdbRepo *pRepo) {
           // Get the data in row
           ASSERT(pTable->lastRow == NULL);
           STSchema *pSchema = tsdbGetTableSchema(pTable);
-          pTable->lastRow = taosTMalloc(schemaTLen(pSchema));
+          pTable->lastRow = taosTMalloc(dataRowMaxBytesFromSchema(pSchema));
           if (pTable->lastRow == NULL) {
             terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
             tsdbDestroyReadH(&readh);

src/tsdb/src/tsdbMemTable.c

@@ -124,17 +124,66 @@ int tsdbUnRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
   return 0;
 }
 
-int tsdbTakeMemSnapshot(STsdbRepo *pRepo, SMemTable **pMem, SMemTable **pIMem) {
+int tsdbTakeMemSnapshot(STsdbRepo *pRepo, SMemTable **pMem, SMemTable **pIMem, SArray *pATable) {
+  SMemTable *tmem;
+
+  // Get snap object
   if (tsdbLockRepo(pRepo) < 0) return -1;
 
-  *pMem = pRepo->mem;
+  tmem = pRepo->mem;
   *pIMem = pRepo->imem;
-  tsdbRefMemTable(pRepo, *pMem);
+  tsdbRefMemTable(pRepo, tmem);
   tsdbRefMemTable(pRepo, *pIMem);
 
   if (tsdbUnlockRepo(pRepo) < 0) return -1;
 
-  if (*pMem != NULL) taosRLockLatch(&((*pMem)->latch));
+  // Copy mem objects and ref needed STableData
+  if (tmem) {
+    taosRLockLatch(&(tmem->latch));
+
+    *pMem = (SMemTable *)calloc(1, sizeof(**pMem));
+    if (*pMem == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      taosRUnLockLatch(&(tmem->latch));
+      tsdbUnRefMemTable(pRepo, tmem);
+      tsdbUnRefMemTable(pRepo, *pIMem);
+      *pMem = NULL;
+      *pIMem = NULL;
+      return -1;
+    }
+
+    (*pMem)->tData = (STableData **)calloc(tmem->maxTables, sizeof(STableData *));
+    if ((*pMem)->tData == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      taosRUnLockLatch(&(tmem->latch));
+      free(*pMem);
+      tsdbUnRefMemTable(pRepo, tmem);
+      tsdbUnRefMemTable(pRepo, *pIMem);
+      *pMem = NULL;
+      *pIMem = NULL;
+      return -1;
+    }
+
+    (*pMem)->keyFirst = tmem->keyFirst;
+    (*pMem)->keyLast = tmem->keyLast;
+    (*pMem)->numOfRows = tmem->numOfRows;
+    (*pMem)->maxTables = tmem->maxTables;
+
+    for (size_t i = 0; i < taosArrayGetSize(pATable); i++) {
+      STable *    pTable = *(STable **)taosArrayGet(pATable, i);
+      int32_t     tid = TABLE_TID(pTable);
+      STableData *pTableData = (tid < tmem->maxTables) ? tmem->tData[tid] : NULL;
+
+      if ((pTableData == NULL) || (TABLE_UID(pTable) != pTableData->uid)) continue;
+
+      (*pMem)->tData[tid] = tmem->tData[tid];
+      T_REF_INC(tmem->tData[tid]);
+    }
+
+    taosRUnLockLatch(&(tmem->latch));
+  }
+
+  tsdbUnRefMemTable(pRepo, tmem);
 
   tsdbDebug("vgId:%d take memory snapshot, pMem %p pIMem %p", REPO_ID(pRepo), *pMem, *pIMem);
   return 0;
@@ -144,8 +193,14 @@ void tsdbUnTakeMemSnapShot(STsdbRepo *pRepo, SMemTable *pMem, SMemTable *pIMem)
   tsdbDebug("vgId:%d untake memory snapshot, pMem %p pIMem %p", REPO_ID(pRepo), pMem, pIMem);
 
   if (pMem != NULL) {
-    taosRUnLockLatch(&(pMem->latch));
-    tsdbUnRefMemTable(pRepo, pMem);
+    for (size_t i = 0; i < pMem->maxTables; i++) {
+      STableData *pTableData = pMem->tData[i];
+      if (pTableData) {
+        tsdbFreeTableData(pTableData);
+      }
+    }
+    free(pMem->tData);
+    free(pMem);
   }
 
   if (pIMem != NULL) {
@@ -436,7 +491,7 @@ static STableData *tsdbNewTableData(STsdbCfg *pCfg, STable *pTable) {
   STableData *pTableData = (STableData *)calloc(1, sizeof(*pTableData));
   if (pTableData == NULL) {
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-    goto _err;
+    return NULL;
   }
 
   pTableData->uid = TABLE_UID(pTable);
@@ -449,20 +504,22 @@ static STableData *tsdbNewTableData(STsdbCfg *pCfg, STable *pTable) {
                       tkeyComparFn, pCfg->update ? SL_UPDATE_DUP_KEY : SL_DISCARD_DUP_KEY, tsdbGetTsTupleKey);
   if (pTableData->pData == NULL) {
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-    goto _err;
+    free(pTableData);
+    return NULL;
   }
 
-  return pTableData;
+  T_REF_INC(pTableData);
 
-_err:
-  tsdbFreeTableData(pTableData);
-  return NULL;
+  return pTableData;
 }
 
 static void tsdbFreeTableData(STableData *pTableData) {
   if (pTableData) {
-    tSkipListDestroy(pTableData->pData);
-    free(pTableData);
+    int32_t ref = T_REF_DEC(pTableData);
+    if (ref == 0) {
+      tSkipListDestroy(pTableData->pData);
+      free(pTableData);
+    }
   }
 }
 

src/tsdb/src/tsdbRead.c

@@ -187,13 +187,15 @@ static SArray* getDefaultLoadColumns(STsdbQueryHandle* pQueryHandle, bool loadTS
   return pLocalIdList;
 }
 
-static void tsdbMayTakeMemSnapshot(STsdbQueryHandle* pQueryHandle) {
+static void tsdbMayTakeMemSnapshot(STsdbQueryHandle* pQueryHandle, SArray* psTable) {
   assert(pQueryHandle != NULL && pQueryHandle->pMemRef != NULL);
 
   SMemRef* pMemRef = pQueryHandle->pMemRef;
   if (pQueryHandle->pMemRef->ref++ == 0) {
-    tsdbTakeMemSnapshot(pQueryHandle->pTsdb, (SMemTable**)&(pMemRef->mem), (SMemTable**)&(pMemRef->imem));
+    tsdbTakeMemSnapshot(pQueryHandle->pTsdb, (SMemTable**)&(pMemRef->mem), (SMemTable**)&(pMemRef->imem), psTable);
   }
+
+  taosArrayDestroy(psTable);
 }
 
 static void tsdbMayUnTakeMemSnapshot(STsdbQueryHandle* pQueryHandle) {
@@ -242,7 +244,7 @@ int64_t tsdbGetNumOfRowsInMemTable(TsdbQueryHandleT* pHandle) {
   return rows;
 }
 
-static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STableGroupInfo* pGroupList, STsdbMeta* pMeta) {
+static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STableGroupInfo* pGroupList, STsdbMeta* pMeta, SArray** psTable) {
   size_t sizeOfGroup = taosArrayGetSize(pGroupList->pGroupList);
   assert(sizeOfGroup >= 1 && pMeta != NULL);
 
@@ -252,6 +254,12 @@ static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STa
     return NULL;
   }
 
+  SArray* pTable = taosArrayInit(4, sizeof(STable*));
+  if (pTable == NULL) {
+    taosArrayDestroy(pTableCheckInfo);
+    return NULL;
+  }
+
   // todo apply the lastkey of table check to avoid to load header file
   for (int32_t i = 0; i < sizeOfGroup; ++i) {
     SArray* group = *(SArray**) taosArrayGet(pGroupList->pGroupList, i);
@@ -284,24 +292,40 @@ static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STa
   }
 
   taosArraySort(pTableCheckInfo, tsdbCheckInfoCompar);
+
+  size_t gsize = taosArrayGetSize(pTableCheckInfo);
+  
+  for (int32_t i = 0; i < gsize; ++i) {
+    STableCheckInfo* pInfo = (STableCheckInfo*) taosArrayGet(pTableCheckInfo, i);
+    
+    taosArrayPush(pTable, &pInfo->pTableObj);
+  }
+
+  *psTable = pTable;
+  
   return pTableCheckInfo;
 }
 
-static SArray* createCheckInfoFromCheckInfo(SArray* pTableCheckInfo, TSKEY skey) {
+static SArray* createCheckInfoFromCheckInfo(SArray* pTableCheckInfo, TSKEY skey, SArray** psTable) {
   size_t si = taosArrayGetSize(pTableCheckInfo);
   SArray* pNew = taosArrayInit(si, sizeof(STableCheckInfo));
   if (pNew == NULL) {
     return NULL;
   }
 
+  SArray* pTable = taosArrayInit(si, sizeof(STable*));
+
   for (int32_t j = 0; j < si; ++j) {
     STableCheckInfo* pCheckInfo = (STableCheckInfo*) taosArrayGet(pTableCheckInfo, j);
     STableCheckInfo info = { .lastKey = skey, .pTableObj = pCheckInfo->pTableObj};
 
     info.tableId = pCheckInfo->tableId;
     taosArrayPush(pNew, &info);
+    taosArrayPush(pTable, &pCheckInfo->pTableObj);
   }
 
+  *psTable = pTable;
+
   // it is ordered already, no need to sort again.
   taosArraySort(pNew, tsdbCheckInfoCompar);
   return pNew;
@@ -332,7 +356,7 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
     goto out_of_memory;
   }
 
-  tsdbMayTakeMemSnapshot(pQueryHandle);
+  //tsdbMayTakeMemSnapshot(pQueryHandle);
   assert(pCond != NULL && pCond->numOfCols > 0 && pMemRef != NULL);
 
   if (ASCENDING_TRAVERSE(pCond->order)) {
@@ -393,14 +417,18 @@ TsdbQueryHandleT* tsdbQueryTables(STsdbRepo* tsdb, STsdbQueryCond* pCond, STable
   STsdbMeta* pMeta = tsdbGetMeta(tsdb);
   assert(pMeta != NULL);
 
+  SArray* psTable = NULL;
+
   // todo apply the lastkey of table check to avoid to load header file
-  pQueryHandle->pTableCheckInfo = createCheckInfoFromTableGroup(pQueryHandle, groupList, pMeta);
+  pQueryHandle->pTableCheckInfo = createCheckInfoFromTableGroup(pQueryHandle, groupList, pMeta, &psTable);
   if (pQueryHandle->pTableCheckInfo == NULL) {
     tsdbCleanupQueryHandle(pQueryHandle);
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
     return NULL;
   }
 
+  tsdbMayTakeMemSnapshot(pQueryHandle, psTable);
+
   tsdbDebug("%p total numOfTable:%" PRIzu " in query, %p", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo), pQueryHandle->qinfo);
   return (TsdbQueryHandleT) pQueryHandle;
 }
@@ -2337,12 +2365,18 @@ static int32_t doGetExternalRow(STsdbQueryHandle* pQueryHandle, int16_t type, SM
   pSecQueryHandle = tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pMemRef);
 
   tfree(cond.colList);
-  pSecQueryHandle->pTableCheckInfo = createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey);
+
+  SArray* psTable = NULL;
+  
+  pSecQueryHandle->pTableCheckInfo = createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey, &psTable);
   if (pSecQueryHandle->pTableCheckInfo == NULL) {
     terrno = TSDB_CODE_QRY_OUT_OF_MEMORY;
     goto out_of_memory;
   }
 
+  
+  tsdbMayTakeMemSnapshot(pSecQueryHandle, psTable);
+
   if (!tsdbNextDataBlock((void*)pSecQueryHandle)) {
     // no result in current query, free the corresponding result rows structure
     if (type == TSDB_PREV_ROW) {

src/util/inc/tconfig.h

@@ -44,6 +44,7 @@ enum {
   TAOS_CFG_VTYPE_INT8,
   TAOS_CFG_VTYPE_INT16,
   TAOS_CFG_VTYPE_INT32,
+  TAOS_CFG_VTYPE_UINT16,
   TAOS_CFG_VTYPE_FLOAT,
   TAOS_CFG_VTYPE_STRING,
   TAOS_CFG_VTYPE_IPSTR,

src/util/src/tcompare.c

@@ -392,8 +392,8 @@ __compar_fn_t getKeyComparFunc(int32_t keyType) {
 int32_t doCompare(const char* f1, const char* f2, int32_t type, size_t size) {
   switch (type) {
     case TSDB_DATA_TYPE_INT:        DEFAULT_COMP(GET_INT32_VAL(f1), GET_INT32_VAL(f2));
-    case TSDB_DATA_TYPE_DOUBLE:     DEFAULT_COMP(GET_DOUBLE_VAL(f1), GET_DOUBLE_VAL(f2));
-    case TSDB_DATA_TYPE_FLOAT:      DEFAULT_COMP(GET_FLOAT_VAL(f1), GET_FLOAT_VAL(f2));
+    case TSDB_DATA_TYPE_DOUBLE:     DEFAULT_DOUBLE_COMP(GET_DOUBLE_VAL(f1), GET_DOUBLE_VAL(f2));
+    case TSDB_DATA_TYPE_FLOAT:      DEFAULT_FLOAT_COMP(GET_FLOAT_VAL(f1), GET_FLOAT_VAL(f2));
     case TSDB_DATA_TYPE_BIGINT:     DEFAULT_COMP(GET_INT64_VAL(f1), GET_INT64_VAL(f2));
     case TSDB_DATA_TYPE_SMALLINT:   DEFAULT_COMP(GET_INT16_VAL(f1), GET_INT16_VAL(f2));
     case TSDB_DATA_TYPE_TINYINT:

src/util/src/tconfig.c

@@ -95,6 +95,23 @@ static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
   }
 }
 
+static void taosReadUInt16Config(SGlobalCfg *cfg, char *input_value) {
+  int32_t  value = atoi(input_value);
+  uint16_t *option = (uint16_t *)cfg->ptr;
+  if (value < cfg->minValue || value > cfg->maxValue) {
+    uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
+           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      *option = (uint16_t)value;
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], *option);
+    }
+  }
+}
+
 static void taosReadInt8Config(SGlobalCfg *cfg, char *input_value) {
   int32_t  value = atoi(input_value);
   int8_t *option = (int8_t *)cfg->ptr;
@@ -239,6 +256,9 @@ static void taosReadConfigOption(const char *option, char *value, char *value2,
       case TAOS_CFG_VTYPE_INT32:
         taosReadInt32Config(cfg, value);
         break;
+      case TAOS_CFG_VTYPE_UINT16:
+        taosReadUInt16Config(cfg, value);
+        break;
       case TAOS_CFG_VTYPE_FLOAT:
         taosReadFloatConfig(cfg, value);
         break;
@@ -422,6 +442,9 @@ void taosPrintGlobalCfg() {
       case TAOS_CFG_VTYPE_INT32:
         uInfo(" %s:%s%d%s", cfg->option, blank, *((int32_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
         break;
+      case TAOS_CFG_VTYPE_UINT16:
+        uInfo(" %s:%s%d%s", cfg->option, blank, *((uint16_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
       case TAOS_CFG_VTYPE_FLOAT:
         uInfo(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
         break;
@@ -459,6 +482,9 @@ static void taosDumpCfg(SGlobalCfg *cfg) {
       case TAOS_CFG_VTYPE_INT32:
         printf(" %s:%s%d%s\n", cfg->option, blank, *((int32_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
         break;
+      case TAOS_CFG_VTYPE_UINT16:
+        printf(" %s:%s%d%s\n", cfg->option, blank, *((uint16_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
       case TAOS_CFG_VTYPE_FLOAT:
         printf(" %s:%s%f%s\n", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
         break;

tests/Jenkinsfile

@@ -55,9 +55,15 @@ pipeline {
             sh '''
             cd ${WKC}/tests
             ./test-all.sh b1
+            date'''
+            sh '''
             cd ${WKC}/tests
             ./test-all.sh full jdbc
             date'''
+            sh '''
+            cd ${WKC}/tests
+            ./test-all.sh full unit
+            date'''
           }
         }
 

tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/SpringbootdemoApplication.java

@@ -10,4 +10,4 @@ public class SpringbootdemoApplication {
     public static void main(String[] args) {
         SpringApplication.run(SpringbootdemoApplication.class, args);
     }
-}
+}
\ No newline at end of file