Merge branch 'develop' into feature/TS-272

README.md

@@ -129,6 +129,17 @@ mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
 
+Note TDengine 2.3.0.0 and later use a component named 'blm3' to play http daemon role by default instead of the http daemon embedded in the early version of TDengine. The blm3 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 blm3 source code. Please install go language 1.14 or above for compiling blm3. 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.
+```
+cmake .. -DBUILD_HTTP=true
+```
+
 You can use Jemalloc as memory allocator instead of glibc:
 ```
 apt install autoconf

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.2.0.5")
+  SET(TD_VER_NUMBER "2.3.0.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

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

@@ -1280,7 +1280,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
 
     适用于：**表、超级表**。
 
-    说明：*P*值有效取值范围0≤P≤100，为 0 的时候等同于 MIN，为 100 的时候等同于MAX；*algo_type*的有效输入：**default** 和 **t-digest**。 用于指定计算近似分位数的算法。可不提供第三个参数的输入，此时将使用 default 的算法进行计算，即 apercentile(column_name, 50, "default") 与 apercentile(column_name, 50) 等价。当使用“t-digest”参数的时候，将使用t-digest方式采样计算近似分位数。但该参数指定计算算法的功能从2.2.0.x版本开始支持，2.2.0.0之前的版本不支持指定使用算法的功能。
+    说明：<br/>**P**值有效取值范围0≤P≤100，为 0 的时候等同于 MIN，为 100 的时候等同于MAX；<br/>**algo_type**的有效输入：**default** 和 **t-digest**。 用于指定计算近似分位数的算法。可不提供第三个参数的输入，此时将使用 default 的算法进行计算，即 apercentile(column_name, 50, "default") 与 apercentile(column_name, 50) 等价。当使用“t-digest”参数的时候，将使用t-digest方式采样计算近似分位数。但该参数指定计算算法的功能从2.2.0.x版本开始支持，2.2.0.0之前的版本不支持指定使用算法的功能。<br/>
     
     嵌套子查询支持：适用于内层查询和外层查询。
     
@@ -1319,76 +1319,72 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     
 限制：LAST_ROW() 不能与 INTERVAL 一起使用。
     
-说明：在用于超级表时，时间戳完全一样且同为最大的数据行可能有多个，那么会从中随机返回一条，而并不保证多次运行所挑选的数据行必然一致。
-    
-    示例：
-    ```mysql
+说明：在用于超级表时，时间戳完全一样且同为最大的数据行可能有多个，那么会从中随机返回一条，而并不保证多次运行所挑选的数据行必然一致。<br/>
+   <br/>示例：
+
+   ```mysql
     taos> SELECT LAST_ROW(current) FROM meters;
     last_row(current)   |
     =======================
                 12.30000 |
-Query OK, 1 row(s) in set (0.001238s)
+    Query OK, 1 row(s) in set (0.001238s)
     
     taos> SELECT LAST_ROW(current) FROM d1002;
     last_row(current)   |
     =======================
                 10.30000 |
     Query OK, 1 row(s) in set (0.001042s)
-```
+   ```
+    
+
+- **INTERP** 
     
-- **INTERP**
     ```mysql
     SELECT INTERP(field_name) FROM { tb_name | stb_name } WHERE ts='timestamp' [FILL ({ VALUE | PREV | NULL | LINEAR | NEXT})];
     ```
-    功能说明：返回表/超级表的指定时间截面、指定字段的记录。
-
-    返回结果数据类型：同字段类型。
-
-    应用字段：数值型字段。
-
-    适用于：**表、超级表**。
 
-    说明：（从 2.0.15.0 版本开始新增此函数）
+功能说明：返回表/超级表的指定时间截面、指定字段的记录。
 
-    1）INTERP 必须指定时间断面，如果该时间断面不存在直接对应的数据，那么会根据 FILL 参数的设定进行插值。此外，条件语句里面可附带筛选条件，例如标签、tbname。
+返回结果数据类型：同字段类型。
 
-    2）INTERP 查询要求查询的时间区间必须位于数据集合（表）的所有记录的时间范围之内。如果给定的时间戳位于时间范围之外，即使有插值指令，仍然不返回结果。
+应用字段：数值型字段。
 
-    3）单个 INTERP 函数查询只能够针对一个时间点进行查询，如果需要返回等时间间隔的断面数据，可以通过 INTERP 配合 EVERY 的方式来进行查询处理（而不是使用 INTERVAL），其含义是每隔固定长度的时间进行插值。
+适用于：**表、超级表**。
 
+说明：（从 2.0.15.0 版本开始新增此函数） <br/>1）INTERP 必须指定时间断面，如果该时间断面不存在直接对应的数据，那么会根据 FILL 参数的设定进行插值。此外，条件语句里面可附带筛选条件，例如标签、tbname。<br/>2）INTERP 查询要求查询的时间区间必须位于数据集合（表）的所有记录的时间范围之内。如果给定的时间戳位于时间范围之外，即使有插值指令，仍然不返回结果。<br/>3）单个 INTERP 函数查询只能够针对一个时间点进行查询，如果需要返回等时间间隔的断面数据，可以通过 INTERP 配合 EVERY 的方式来进行查询处理（而不是使用 INTERVAL），其含义是每隔固定长度的时间进行插值。<br/>    
     示例：
-    ```sql
+    
+   ```mysql
     taos> SELECT INTERP(*) FROM meters WHERE ts='2017-7-14 18:40:00.004';
            interp(ts)        |   interp(current)    | interp(voltage) |    interp(phase)     |
     ==========================================================================================
      2017-07-14 18:40:00.004 |              9.84020 |             216 |              0.32222 |
     Query OK, 1 row(s) in set (0.002652s)
-    ```
-    
-    如果给定的时间戳无对应的数据，在不指定插值生成策略的情况下，不会返回结果，如果指定了插值策略，会根据插值策略返回结果。
-    
-    ```sql
+   ```
+
+如果给定的时间戳无对应的数据，在不指定插值生成策略的情况下，不会返回结果，如果指定了插值策略，会根据插值策略返回结果。
+
+   ```mysql
     taos> SELECT INTERP(*) FROM meters WHERE tbname IN ('d636') AND ts='2017-7-14 18:40:00.005';
     Query OK, 0 row(s) in set (0.004022s)
     
-    taos> SELECT INTERP(*) FROM meters WHERE tbname IN ('d636') AND ts='2017-7-14 18:40:00.005' FILL(PREV);;
+    taos> SELECT INTERP(*) FROM meters WHERE tbname IN ('d636') AND ts='2017-7-14 18:40:00.005' FILL(PREV);
            interp(ts)        |   interp(current)    | interp(voltage) |    interp(phase)     |
     ==========================================================================================
      2017-07-14 18:40:00.005 |              9.88150 |             217 |              0.32500 |
     Query OK, 1 row(s) in set (0.003056s)
-    ```
+   ```
 
-    如下所示代码表示在时间区间 `['2017-7-14 18:40:00', '2017-7-14 18:40:00.014']`  中每隔 5 毫秒 进行一次断面计算。
+如下所示代码表示在时间区间 `['2017-7-14 18:40:00', '2017-7-14 18:40:00.014']` 中每隔 5 毫秒 进行一次断面计算。
 
-    ```sql
+   ```mysql
     taos> SELECT INTERP(current) FROM d636 WHERE ts>='2017-7-14 18:40:00' AND ts<='2017-7-14 18:40:00.014' EVERY(5a);
                ts            |   interp(current)    |
     =================================================
      2017-07-14 18:40:00.000 |             10.04179 |
      2017-07-14 18:40:00.010 |             10.16123 |
     Query OK, 2 row(s) in set (0.003487s)
-    
-    ```
+   ```
 
 ### 计算函数
 

packaging/release.sh

@@ -213,7 +213,7 @@ else
   exit 1
 fi
 
-make
+make -j8
 
 cd ${curr_dir}
 

packaging/tools/make_install.sh

@@ -254,7 +254,10 @@ function install_lib() {
     fi
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${verNumber} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+        ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${verNumber} \
+            ${install_main_dir}/driver \
+            && ${csudo} chmod 777 ${install_main_dir}/driver/*
+
         ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
         ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
 
@@ -263,11 +266,28 @@ function install_lib() {
           ${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
         fi
     else
-        ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_dir}/driver || ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib ${install_main_2_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* || ${csudo} chmod 777 ${install_main_2_dir}/driver/*
+        ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
+            ${install_main_dir}/driver \
+            || ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \
+            ${install_main_2_dir}/driver \
+            && ${csudo} chmod 777 ${install_main_dir}/driver/* \
+            || ${csudo} chmod 777 ${install_main_2_dir}/driver/*
+
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* \
+            ${install_main_dir}/driver/libtaos.1.dylib \
+            || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.* \
+            ${install_main_2_dir}/driver/libtaos.1.dylib   || :
+
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.1.dylib \
+            ${install_main_dir}/driver/libtaos.dylib \
+            || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.1.dylib \
+            ${install_main_2_dir}/driver/libtaos.dylib   || :
+
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.${verNumber}.dylib \
+            ${lib_link_dir}/libtaos.1.dylib \
+            || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.${verNumber}.dylib \
+            ${lib_link_dir}/libtaos.1.dylib   || :
 
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${install_main_dir}/driver/libtaos.1.dylib || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.* ${install_main_2_dir}/driver/libtaos.1.dylib   || :
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.1.dylib ${install_main_dir}/driver/libtaos.dylib || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.1.dylib ${install_main_2_dir}/driver/libtaos.dylib   || :
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.${verNumber}.dylib ${lib_link_dir}/libtaos.1.dylib || ${csudo} ln -sf ${install_main_2_dir}/driver/libtaos.${verNumber}.dylib ${lib_link_dir}/libtaos.1.dylib   || :
         ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib   || :
     fi
 
@@ -282,11 +302,17 @@ function install_header() {
 
     if [ "$osType" != "Darwin" ]; then
         ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h     || :
-        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
+        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h \
+            ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
         ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
         ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
     else
-        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_dir}/include || ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${install_main_2_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/* || ${csudo} chmod 644 ${install_main_2_dir}/include/*
+        ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h \
+            ${install_main_dir}/include \
+            || ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h \
+            ${install_main_2_dir}/include \
+            && ${csudo} chmod 644 ${install_main_dir}/include/* \
+            || ${csudo} chmod 644 ${install_main_2_dir}/include/*
     fi
 }
 
@@ -301,7 +327,12 @@ function install_config() {
         ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
         ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg/taos.cfg
     else
-        ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org || ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_2_dir}/cfg/taos.cfg.org
+        if [ "$osType" != "Darwin" ]; then
+            ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+        else
+            ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org\
+                || ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_2_dir}/cfg/taos.cfg.org
+        fi
     fi
 }
 
@@ -312,14 +343,21 @@ function install_blm3_config() {
             ${csudo} cp ${binary_dir}/test/cfg/blm.toml ${cfg_install_dir}
         [ -f ${cfg_install_dir}/blm.toml ] &&
             ${csudo} chmod 644 ${cfg_install_dir}/blm.toml
-        [ -f ${binary_dir}/test/cfg//blm.toml ] &&
+        [ -f ${binary_dir}/test/cfg/blm.toml ] &&
             ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org
         [ -f ${cfg_install_dir}/blm.toml ] &&
             ${csudo} ln -s ${cfg_install_dir}/blm.toml ${install_main_dir}/cfg/blm.toml
     else
-        [ -f ${binary_dir}/test/cfg//blm.toml ] &&
-            ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org \
-                || ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_2_dir}/cfg/blm.toml.org
+        if [ -f "${binary_dir}/test/cfg/blm.toml" ]; then
+            if [ "$osType" != "Darwin" ]; then
+                ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
+                    ${install_main_dir}/cfg/blm.toml.org
+            else
+                ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org \
+                    || ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
+                    ${install_main_2_dir}/cfg/blm.toml.org
+            fi
+        fi
     fi
 }
 

snap/snapcraft.yaml

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

src/client/src/tscServer.c

@@ -2924,7 +2924,9 @@ int32_t getMultiTableMetaFromMnode(SSqlObj *pSql, SArray* pNameList, SArray* pVg
 }
 
 int32_t tscGetTableMetaImpl(SSqlObj* pSql, STableMetaInfo *pTableMetaInfo, bool autocreate, bool onlyLocal) {
-  assert(tIsValidName(&pTableMetaInfo->name));
+  if (!tIsValidName(&pTableMetaInfo->name)) {
+    return TSDB_CODE_TSC_APP_ERROR;
+  }
 
   char name[TSDB_TABLE_FNAME_LEN] = {0};
   tNameExtractFullName(&pTableMetaInfo->name, name);

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

@@ -392,7 +392,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         //true if the connection is valid, false otherwise
         if (isClosed())
             return false;
-        if (timeout < 0)    //SQLException - if the value supplied for timeout is less then 0
+        if (timeout < 0)    //SQLException - if the value supplied for timeout is less than 0
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
 
         ExecutorService executor = Executors.newCachedThreadPool();

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

@@ -562,25 +562,27 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
         try (Statement stmt = connection.createStatement()) {
             stmt.execute("use " + catalog);
-            ResultSet tables = stmt.executeQuery("show tables");
-            while (tables.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
-                rowData.setStringValue(1, catalog);                                     //TABLE_CAT
-                rowData.setStringValue(2, null);                                 //TABLE_SCHEM
-                rowData.setStringValue(3, tables.getString("table_name"));  //TABLE_NAME
-                rowData.setStringValue(4, "TABLE");                              //TABLE_TYPE
-                rowData.setStringValue(5, "");                                   //REMARKS
-                rowDataList.add(rowData);
+            try (ResultSet tables = stmt.executeQuery("show tables")) {
+                while (tables.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
+                    rowData.setStringValue(1, catalog);                                     //TABLE_CAT
+                    rowData.setStringValue(2, null);                                 //TABLE_SCHEM
+                    rowData.setStringValue(3, tables.getString("table_name"));  //TABLE_NAME
+                    rowData.setStringValue(4, "TABLE");                              //TABLE_TYPE
+                    rowData.setStringValue(5, "");                                   //REMARKS
+                    rowDataList.add(rowData);
+                }
             }
-            ResultSet stables = stmt.executeQuery("show stables");
-            while (stables.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
-                rowData.setStringValue(1, catalog);                                  //TABLE_CAT
-                rowData.setStringValue(2, null);                              //TABLE_SCHEM
-                rowData.setStringValue(3, stables.getString("name"));    //TABLE_NAME
-                rowData.setStringValue(4, "TABLE");                           //TABLE_TYPE
-                rowData.setStringValue(5, "STABLE");                          //REMARKS
-                rowDataList.add(rowData);
+            try (ResultSet stables = stmt.executeQuery("show stables")) {
+                while (stables.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(10);
+                    rowData.setStringValue(1, catalog);                                  //TABLE_CAT
+                    rowData.setStringValue(2, null);                              //TABLE_SCHEM
+                    rowData.setStringValue(3, stables.getString("name"));    //TABLE_NAME
+                    rowData.setStringValue(4, "TABLE");                           //TABLE_TYPE
+                    rowData.setStringValue(5, "STABLE");                          //REMARKS
+                    rowDataList.add(rowData);
+                }
             }
             resultSet.setRowDataList(rowDataList);
         }
@@ -638,8 +640,9 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         resultSet.setColumnMetaDataList(buildGetColumnsColumnMetaDataList());
         // set up rowDataList
         List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-        try (Statement stmt = conn.createStatement()) {
-            ResultSet rs = stmt.executeQuery("describe " + catalog + "." + tableNamePattern);
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("describe " + catalog + "." + tableNamePattern)) {
+
             int rowIndex = 0;
             while (rs.next()) {
                 TSDBResultSetRowData rowData = new TSDBResultSetRowData(24);
@@ -1147,9 +1150,9 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
         columnMetaDataList.add(buildTableCatalogMeta(1));       // 1. TABLE_CAT
         resultSet.setColumnMetaDataList(columnMetaDataList);
 
-        try (Statement stmt = conn.createStatement()) {
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("show databases")) {
             List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            ResultSet rs = stmt.executeQuery("show databases");
             while (rs.next()) {
                 TSDBResultSetRowData rowData = new TSDBResultSetRowData(1);
                 rowData.setStringValue(1, rs.getString("name"));
@@ -1168,12 +1171,13 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
             return new EmptyResultSet();
 
         DatabaseMetaDataResultSet resultSet = new DatabaseMetaDataResultSet();
-        try (Statement stmt = conn.createStatement()) {
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("describe " + catalog + "." + table)) {
             // set up ColumnMetaDataList
             resultSet.setColumnMetaDataList(buildGetPrimaryKeysMetadataList());
             // set rowData
             List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            ResultSet rs = stmt.executeQuery("describe " + catalog + "." + table);
+
             rs.next();
             TSDBResultSetRowData rowData = new TSDBResultSetRowData(6);
             rowData.setStringValue(1, catalog);
@@ -1217,15 +1221,14 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
     }
 
     private boolean isAvailableCatalog(Connection connection, String catalog) {
-        try (Statement stmt = connection.createStatement()) {
-            ResultSet databases = stmt.executeQuery("show databases");
+        try (Statement stmt = connection.createStatement();
+             ResultSet databases = stmt.executeQuery("show databases")) {
             while (databases.next()) {
                 String dbname = databases.getString("name");
                 this.precision = databases.getString("precision");
                 if (dbname.equalsIgnoreCase(catalog))
                     return true;
             }
-            databases.close();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -1246,17 +1249,18 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
             resultSet.setColumnMetaDataList(buildGetSuperTablesColumnMetaDataList());
             // set result set row data
             stmt.execute("use " + catalog);
-            ResultSet rs = stmt.executeQuery("show tables like '" + tableNamePattern + "'");
-            List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
-            while (rs.next()) {
-                TSDBResultSetRowData rowData = new TSDBResultSetRowData(4);
-                rowData.setStringValue(1, catalog);
-                rowData.setStringValue(2, null);
-                rowData.setStringValue(3, rs.getString("table_name"));
-                rowData.setStringValue(4, rs.getString("stable_name"));
-                rowDataList.add(rowData);
+            try (ResultSet rs = stmt.executeQuery("show tables like '" + tableNamePattern + "'")) {
+                List<TSDBResultSetRowData> rowDataList = new ArrayList<>();
+                while (rs.next()) {
+                    TSDBResultSetRowData rowData = new TSDBResultSetRowData(4);
+                    rowData.setStringValue(1, catalog);
+                    rowData.setStringValue(2, null);
+                    rowData.setStringValue(3, rs.getString("table_name"));
+                    rowData.setStringValue(4, rs.getString("stable_name"));
+                    rowDataList.add(rowData);
+                }
+                resultSet.setRowDataList(rowDataList);
             }
-            resultSet.setRowDataList(rowDataList);
         }
         return resultSet;
     }

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

@@ -189,7 +189,7 @@ public class TSDBResultSetRowData {
         long value = (long) obj;
         if (value < 0)
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_NUMERIC_VALUE_OUT_OF_RANGE);
-        return Long.valueOf(value).intValue();
+        return (int) value;
     }
 
 

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

@@ -64,9 +64,9 @@ public class RestfulDriver extends AbstractDriver {
 
         RestfulConnection conn = new RestfulConnection(host, port, props, database, url, token);
         if (database != null && !database.trim().replaceAll("\\s", "").isEmpty()) {
-            Statement stmt = conn.createStatement();
-            stmt.execute("use " + database);
-            stmt.close();
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute("use " + database);
+            }
         }
         return conn;
     }

src/inc/taoserror.h

@@ -287,8 +287,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW       TAOS_DEF_ERROR_CODE(0, 0x070A)  //"Too many time window in query")
 #define TSDB_CODE_QRY_NOT_ENOUGH_BUFFER         TAOS_DEF_ERROR_CODE(0, 0x070B)  //"Query buffer limit has reached")
 #define TSDB_CODE_QRY_INCONSISTAN               TAOS_DEF_ERROR_CODE(0, 0x070C)  //"File inconsistency in replica")
-#define TSDB_CODE_QRY_INVALID_TIME_CONDITION    TAOS_DEF_ERROR_CODE(0, 0x070D)  //"invalid time condition")
-#define TSDB_CODE_QRY_SYS_ERROR                 TAOS_DEF_ERROR_CODE(0, 0x070E)  //"System error")
+#define TSDB_CODE_QRY_SYS_ERROR                 TAOS_DEF_ERROR_CODE(0, 0x070D)  //"System error")
+#define TSDB_CODE_QRY_INVALID_TIME_CONDITION    TAOS_DEF_ERROR_CODE(0, 0x070E)  //"invalid time condition")
 
 
 // grant

src/kit/taosdump/taosdump.c

@@ -638,11 +638,6 @@ static int queryDbImpl(TAOS *taos, char *command) {
     TAOS_RES *res = NULL;
     int32_t   code = -1;
 
-    if (NULL != res) {
-        taos_free_result(res);
-        res = NULL;
-    }
-
     res = taos_query(taos, command);
     code = taos_errno(res);
 
@@ -1193,6 +1188,7 @@ static int64_t dumpNormalTable(
             jsonAvroSchema);
     }
 
+    tfree(jsonAvroSchema);
     freeTbDes(tableDes);
     return ret;
 }
@@ -1335,11 +1331,16 @@ static void *dumpNormalTablesOfStb(void *arg) {
     char tmpBuf[4096] = {0};
 
     if (g_args.outpath[0] != 0) {
-        sprintf(tmpBuf, "%s/%s.%d.sql",
-                g_args.outpath, pThreadInfo->dbName, pThreadInfo->threadIndex);
+        sprintf(tmpBuf, "%s/%s.%s.%d.sql",
+                g_args.outpath,
+                pThreadInfo->dbName,
+                pThreadInfo->stbName,
+                pThreadInfo->threadIndex);
     } else {
-        sprintf(tmpBuf, "%s.%d.sql",
-                pThreadInfo->dbName, pThreadInfo->threadIndex);
+        sprintf(tmpBuf, "%s.%s.%d.sql",
+                pThreadInfo->dbName,
+                pThreadInfo->stbName,
+                pThreadInfo->threadIndex);
     }
 
     fp = fopen(tmpBuf, "w");

tests/examples/c/makefile

@@ -29,7 +29,3 @@ clean:
 	rm $(ROOT)stream
 	rm $(ROOT)subscribe
 	rm $(ROOT)apitest
-
-
-	
-

tests/examples/c/stream.c

@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
     exit(1);
   }
 
-  printf("presss any key to exit\n");
+  printf("press any key to exit\n");
   getchar();
 
   taos_close_stream(pStream);

tests/pytest/query/unionAllTest.py

@@ -24,7 +24,7 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-        self.ts = 1500000000000
+        self.ts = 1600000000000
         self.num = 10
 
     def run(self):
@@ -84,6 +84,26 @@ class TDTestCase:
         tdSql.query("select 'dcs' as options from stb where col > 200 limit 1 union all select 'aaa' as options from stb limit 10")
         tdSql.checkData(0, 0, 'aaa')
 
+        # https://jira.taosdata.com:18080/browse/TS-444
+        tdLog.info("test case for TS-444")
+
+        tdSql.query("select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc")
+        tdSql.checkRows(6)
+
+        tdSql.query("select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc")
+        tdSql.checkRows(0)
+
+        tdSql.query(''' select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc
+                    union all
+                    select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc''')
+        tdSql.checkRows(6)
+
+        tdSql.query(''' select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc
+                    union all
+                    select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc''')
+        tdSql.checkRows(6)
+
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/table/create.py

@@ -52,7 +52,7 @@ class TDTestCase:
             tdLog.info("taosd found in %s" % buildPath)
         binPath = buildPath+ "/build/bin/"
 
-        os.system("rm -rf table/create1.py.sql")
+        os.system("rm -rf table/create.py.sql")
         tdSql.prepare()
 
         print("==============step1")

tests/script/sh/abs_max.c

@@ -17,7 +17,7 @@ typedef struct SUdfInit{
 void abs_max(char* data, short itype, short ibytes, int numOfRows, long long* ts, char* dataOutput, char* interBuf, char* tsOutput,
                         int* numOfOutput, short otype, short obytes, SUdfInit* buf) {
    int i;
-   int r = 0;
+   long r = 0;
    printf("abs_max input data:%p, type:%d, rows:%d, ts:%p,%lld, dataoutput:%p, tsOutput:%p, numOfOutput:%p, buf:%p\n", data, itype, numOfRows, ts, *ts, dataOutput, tsOutput, numOfOutput, buf);
    if (itype == 5) {
      r=*(long *)dataOutput;
@@ -29,7 +29,7 @@ void abs_max(char* data, short itype, short ibytes, int numOfRows, long long* ts
        }
 
        *numOfOutput=1;
-       long v = abs(*((long *)data + i));
+       long v = labs(*((long *)data + i));
        if (v > r) {
           r = v;
        }