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

.gitignore

@@ -68,6 +68,8 @@ CMakeError.log
 *.o
 version.c
 taos.rc
+src/connector/jdbc/.classpath
+src/connector/jdbc/.project
 src/connector/jdbc/.settings/
 tests/comparisonTest/cassandra/cassandratest/.classpath
 tests/comparisonTest/cassandra/cassandratest/.project

README-CN.md

@@ -185,9 +185,10 @@ cmake .. && cmake --build .
 
 # 安装
 
-如果你不想安装，可以直接在shell中运行。生成完成后，安装 TDengine：
+生成完成后，安装 TDengine（下文给出的指令以 Linux 为例，如果是在 Windows 下，那么对应的指令会是 `nmake install`）：
+
 ```bash
-make install
+sudo make install
 ```
 
 用户可以在[文件目录结构](https://www.taosdata.com/cn/documentation/administrator#directories)中了解更多在操作系统中生成的目录或文件。
@@ -195,7 +196,7 @@ make install
 安装成功后，在终端中启动 TDengine 服务：
 
 ```bash
-taosd
+sudo systemctl start taosd
 ```
 
 用户可以使用 TDengine Shell 来连接 TDengine 服务，在终端中，输入：
@@ -208,7 +209,7 @@ taos
 
 ## 快速运行
 
-TDengine 生成后，在终端执行以下命令：
+如果不希望以服务方式运行 TDengine，也可以在终端中直接运行它。也即在生成完成后，执行以下命令（在 Windows 下，生成的可执行文件会带有 .exe 后缀，例如会名为 taosd.exe ）：
 
 ```bash
 ./build/bin/taosd -c test/cfg

README.md

@@ -175,7 +175,7 @@ cmake .. && cmake --build .
 
 # Installing
 
-After building successfully, TDengine can be installed by:
+After building successfully, TDengine can be installed by: (On Windows platform, the following command should be `nmake install`)
 ```bash
 sudo make install
 ```
@@ -197,7 +197,7 @@ If TDengine shell connects the server successfully, welcome messages and version
 
 ## Quick Run
 
-If you don't want to run TDengine as a service, you can run it in current shell. For example, to quickly start a TDengine server after building, run the command below in terminal:
+If you don't want to run TDengine as a service, you can run it in current shell. For example, to quickly start a TDengine server after building, run the command below in terminal: (We take Linux as an example, command on Windows will be `taosd.exe`)
 ```bash
 ./build/bin/taosd -c test/cfg
 ```

documentation20/cn/11.administrator/docs.md

@@ -123,8 +123,8 @@ taosd -C
 - minRows：文件块中记录的最小条数。单位为条，默认值：100。
 - maxRows：文件块中记录的最大条数。单位为条，默认值：4096。
 - comp：文件压缩标志位。0：关闭；1：一阶段压缩；2：两阶段压缩。默认值：2。（可通过 alter database 修改）
-- wal：WAL级别。1：写wal，但不执行fsync；2：写wal, 而且执行fsync。默认值：1。（在 taos.cfg 中参数名需要写作 walLevel）（可通过 alter database 修改）
-- fsync：当wal设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。单位为毫秒，默认值：3000。（可通过 alter database 修改）
+- wal：WAL级别。1：写wal，但不执行fsync；2：写wal, 而且执行fsync。默认值：1。（在 taos.cfg 中参数名需要写作 walLevel）
+- fsync：当wal设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。单位为毫秒，默认值：3000。
 - cache：内存块的大小。单位为兆字节（MB），默认值：16。
 - blocks：每个VNODE（TSDB）中有多少cache大小的内存块。因此一个VNODE的用的内存大小粗略为（cache * blocks）。单位为块，默认值：4。（可通过 alter database 修改）
 - replica：副本个数。取值范围：1-3，单位为个，默认值：1。（可通过 alter database 修改）

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

@@ -129,16 +129,6 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
     CACHELAST 参数控制是否在内存中缓存子表的最近数据。缺省值为 0，取值范围 [0, 1, 2, 3]。其中 0 表示不缓存，1 表示缓存子表最近一行数据，2 表示缓存子表每一列的最近的非 NULL 值，3 表示同时打开缓存最近行和列功能。（从 2.0.11.0 版本开始支持参数值 [0, 1]，从 2.1.2.0 版本开始支持参数值 [0, 1, 2, 3]。）  
     说明：缓存最近行，将显著改善 LAST_ROW 函数的性能表现；缓存每列的最近非 NULL 值，将显著改善无特殊影响（WHERE、ORDER BY、GROUP BY、INTERVAL）下的 LAST 函数的性能表现。
 
-    ```mysql
-    ALTER DATABASE db_name WAL 1;
-    ```
-    WAL 参数控制 WAL 日志的落盘方式。缺省值为 1，取值范围为 [1, 2]。1 表示写 WAL，但不执行 fsync；2 表示写 WAL，而且执行 fsync。
-
-    ```mysql
-    ALTER DATABASE db_name FSYNC 3000;
-    ```
-    FSYNC 参数控制执行 fsync 操作的周期。缺省值为 3000，单位是毫秒，取值范围为 [0, 180000]。如果设置为 0，表示每次写入，立即执行 fsync。该设置项主要用于调节 WAL 参数设为 2 时的系统行为。
-
     **Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.3.0 版本开始，修改这些参数后无需重启服务器即可生效。
 
 - **显示系统所有数据库**

packaging/tools/makeclient.sh

@@ -69,6 +69,39 @@ mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
 mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
 
+if [ -f ${build_dir}/bin/jemalloc-config ]; then
+    mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+    cp ${build_dir}/bin/jemalloc-config ${install_dir}/jemalloc/bin
+    if [ -f ${build_dir}/bin/jemalloc.sh ]; then
+        cp ${build_dir}/bin/jemalloc.sh ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/bin/jeprof ]; then
+        cp ${build_dir}/bin/jeprof ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/include/jemalloc/jemalloc.h ]; then
+        cp ${build_dir}/include/jemalloc/jemalloc.h ${install_dir}/jemalloc/include/jemalloc
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.so.2 ]; then
+        cp ${build_dir}/lib/libjemalloc.so.2 ${install_dir}/jemalloc/lib
+        ln -sf libjemalloc.so.2 ${install_dir}/jemalloc/lib/libjemalloc.so
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.a ]; then
+        cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
+        cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/pkgconfig/jemalloc.pc ]; then
+        cp ${build_dir}/lib/pkgconfig/jemalloc.pc ${install_dir}/jemalloc/lib/pkgconfig
+    fi
+    if [ -f ${build_dir}/share/doc/jemalloc/jemalloc.html ]; then
+        cp ${build_dir}/share/doc/jemalloc/jemalloc.html ${install_dir}/jemalloc/share/doc/jemalloc
+    fi
+    if [ -f ${build_dir}/share/man/man3/jemalloc.3 ]; then
+        cp ${build_dir}/share/man/man3/jemalloc.3 ${install_dir}/jemalloc/share/man/man3
+    fi
+fi
+
 cd ${install_dir}
 
 if [ "$osType" != "Darwin" ]; then

packaging/tools/makeclient_power.sh

@@ -91,6 +91,39 @@ else
 fi
 chmod a+x ${install_dir}/bin/* || :
 
+if [ -f ${build_dir}/bin/jemalloc-config ]; then
+    mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+    cp ${build_dir}/bin/jemalloc-config ${install_dir}/jemalloc/bin
+    if [ -f ${build_dir}/bin/jemalloc.sh ]; then
+        cp ${build_dir}/bin/jemalloc.sh ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/bin/jeprof ]; then
+        cp ${build_dir}/bin/jeprof ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/include/jemalloc/jemalloc.h ]; then
+        cp ${build_dir}/include/jemalloc/jemalloc.h ${install_dir}/jemalloc/include/jemalloc
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.so.2 ]; then
+        cp ${build_dir}/lib/libjemalloc.so.2 ${install_dir}/jemalloc/lib
+        ln -sf libjemalloc.so.2 ${install_dir}/jemalloc/lib/libjemalloc.so
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.a ]; then
+        cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
+        cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/pkgconfig/jemalloc.pc ]; then
+        cp ${build_dir}/lib/pkgconfig/jemalloc.pc ${install_dir}/jemalloc/lib/pkgconfig
+    fi
+    if [ -f ${build_dir}/share/doc/jemalloc/jemalloc.html ]; then
+        cp ${build_dir}/share/doc/jemalloc/jemalloc.html ${install_dir}/jemalloc/share/doc/jemalloc
+    fi
+    if [ -f ${build_dir}/share/man/man3/jemalloc.3 ]; then
+        cp ${build_dir}/share/man/man3/jemalloc.3 ${install_dir}/jemalloc/share/man/man3
+    fi
+fi
+
 cd ${install_dir}
 
 if [ "$osType" != "Darwin" ]; then

packaging/tools/makeclient_tq.sh

@@ -91,6 +91,39 @@ else
 fi
 chmod a+x ${install_dir}/bin/* || :
 
+if [ -f ${build_dir}/bin/jemalloc-config ]; then
+    mkdir -p ${install_dir}/jemalloc/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
+    cp ${build_dir}/bin/jemalloc-config ${install_dir}/jemalloc/bin
+    if [ -f ${build_dir}/bin/jemalloc.sh ]; then
+        cp ${build_dir}/bin/jemalloc.sh ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/bin/jeprof ]; then
+        cp ${build_dir}/bin/jeprof ${install_dir}/jemalloc/bin
+    fi
+    if [ -f ${build_dir}/include/jemalloc/jemalloc.h ]; then
+        cp ${build_dir}/include/jemalloc/jemalloc.h ${install_dir}/jemalloc/include/jemalloc
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.so.2 ]; then
+        cp ${build_dir}/lib/libjemalloc.so.2 ${install_dir}/jemalloc/lib
+        ln -sf libjemalloc.so.2 ${install_dir}/jemalloc/lib/libjemalloc.so
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc.a ]; then
+        cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
+        cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
+    fi
+    if [ -f ${build_dir}/lib/pkgconfig/jemalloc.pc ]; then
+        cp ${build_dir}/lib/pkgconfig/jemalloc.pc ${install_dir}/jemalloc/lib/pkgconfig
+    fi
+    if [ -f ${build_dir}/share/doc/jemalloc/jemalloc.html ]; then
+        cp ${build_dir}/share/doc/jemalloc/jemalloc.html ${install_dir}/jemalloc/share/doc/jemalloc
+    fi
+    if [ -f ${build_dir}/share/man/man3/jemalloc.3 ]; then
+        cp ${build_dir}/share/man/man3/jemalloc.3 ${install_dir}/jemalloc/share/man/man3
+    fi
+fi
+
 cd ${install_dir}
 
 if [ "$osType" != "Darwin" ]; then

src/client/src/tscSQLParser.c

@@ -7802,14 +7802,16 @@ static int32_t doLoadAllTableMeta(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNod
 }
 
 static STableMeta* extractTempTableMetaFromSubquery(SQueryInfo* pUpstream) {
-  int32_t numOfColumns = pUpstream->fieldsInfo.numOfOutput;
+  STableMetaInfo* pUpstreamTableMetaInfo = tscGetMetaInfo(pUpstream, 0);
 
-  STableMeta* meta = calloc(1, sizeof(STableMeta) + sizeof(SSchema) * numOfColumns);
+  int32_t     numOfColumns = pUpstream->fieldsInfo.numOfOutput;
+  STableMeta *meta = calloc(1, sizeof(STableMeta) + sizeof(SSchema) * numOfColumns);
   meta->tableType = TSDB_TEMP_TABLE;
 
   STableComInfo *info = &meta->tableInfo;
   info->numOfColumns = numOfColumns;
-  info->numOfTags = 0;
+  info->precision    = pUpstreamTableMetaInfo->pTableMeta->tableInfo.precision;
+  info->numOfTags    = 0;
 
   int32_t n = 0;
   for(int32_t i = 0; i < numOfColumns; ++i) {

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

@@ -57,8 +57,8 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
                     parameterCnt++;
                 }
             }
-            parameters = new Object[parameterCnt];
         }
+        parameters = new Object[parameterCnt];
 
         if (parameterCnt > 1) {
             // the table name is also a parameter, so ignore it.

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

@@ -22,16 +22,16 @@ public class RestfulPreparedStatement extends RestfulStatement implements Prepar
         super(conn, database);
         this.rawSql = sql;
 
+        int parameterCnt = 0;
         if (sql.contains("?")) {
-            int parameterCnt = 0;
             for (int i = 0; i < sql.length(); i++) {
                 if ('?' == sql.charAt(i)) {
                     parameterCnt++;
                 }
             }
-            parameters = new Object[parameterCnt];
             this.isPrepared = true;
         }
+        parameters = new Object[parameterCnt];
 
         // build parameterMetaData
         this.parameterMetaData = new RestfulParameterMetaData(parameters);

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

@@ -15,6 +15,8 @@ public class RestfulPreparedStatementTest {
     private static PreparedStatement pstmt_insert;
     private static final String sql_select = "select * from t1 where ts > ? and ts <= ? and f1 >= ?";
     private static PreparedStatement pstmt_select;
+    private static final String sql_without_parameters = "select count(*) from t1";
+    private static PreparedStatement pstmt_without_parameters;
 
     @Test
     public void executeQuery() throws SQLException {
@@ -237,6 +239,7 @@ public class RestfulPreparedStatementTest {
     @Test
     public void clearParameters() throws SQLException {
         pstmt_insert.clearParameters();
+        pstmt_without_parameters.clearParameters();
     }
 
     @Test
@@ -382,6 +385,7 @@ public class RestfulPreparedStatementTest {
 
             pstmt_insert = conn.prepareStatement(sql_insert);
             pstmt_select = conn.prepareStatement(sql_select);
+            pstmt_without_parameters = conn.prepareStatement(sql_without_parameters);
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -394,6 +398,8 @@ public class RestfulPreparedStatementTest {
                 pstmt_insert.close();
             if (pstmt_select != null)
                 pstmt_select.close();
+            if (pstmt_without_parameters != null)
+                pstmt_without_parameters.close();
             if (conn != null)
                 conn.close();
         } catch (SQLException e) {

src/connector/nodejs/nodetaos/cinterface.js

@@ -15,36 +15,18 @@ const { NULL_POINTER } = require('ref-napi');
 
 module.exports = CTaosInterface;
 
-function convertMillisecondsToDatetime(time) {
-  return new TaosObjects.TaosTimestamp(time);
-}
-function convertMicrosecondsToDatetime(time) {
-  return new TaosObjects.TaosTimestamp(time * 0.001, true);
-}
-
-function convertTimestamp(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
-  timestampConverter = convertMillisecondsToDatetime;
-  if (micro == true) {
-    timestampConverter = convertMicrosecondsToDatetime;
-  }
+function convertTimestamp(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
   while (currOffset < data.length) {
-    let queue = [];
-    let time = 0;
-    for (let i = currOffset; i < currOffset + nbytes; i++) {
-      queue.push(data[i]);
-    }
-    for (let i = queue.length - 1; i >= 0; i--) {
-      time += queue[i] * Math.pow(16, i * 2);
-    }
+    let time = data.readInt64LE(currOffset);
     currOffset += nbytes;
-    res.push(timestampConverter(time));
+    res.push(new TaosObjects.TaosTimestamp(time, precision));
   }
   return res;
 }
-function convertBool(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertBool(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = new Array(data.length);
   for (let i = 0; i < data.length; i++) {
@@ -60,7 +42,7 @@ function convertBool(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
   }
   return res;
 }
-function convertTinyint(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertTinyint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -71,7 +53,7 @@ function convertTinyint(data, num_of_rows, nbytes = 0, offset = 0, micro = false
   }
   return res;
 }
-function convertSmallint(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertSmallint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -82,7 +64,7 @@ function convertSmallint(data, num_of_rows, nbytes = 0, offset = 0, micro = fals
   }
   return res;
 }
-function convertInt(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertInt(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -93,7 +75,7 @@ function convertInt(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
   }
   return res;
 }
-function convertBigint(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertBigint(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -104,7 +86,7 @@ function convertBigint(data, num_of_rows, nbytes = 0, offset = 0, micro = false)
   }
   return res;
 }
-function convertFloat(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertFloat(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -115,7 +97,7 @@ function convertFloat(data, num_of_rows, nbytes = 0, offset = 0, micro = false)
   }
   return res;
 }
-function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
   let currOffset = 0;
@@ -127,7 +109,7 @@ function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, micro = false)
   return res;
 }
 
-function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
+function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, precision = 0) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
 
@@ -272,7 +254,7 @@ CTaosInterface.prototype.config = function config() {
 CTaosInterface.prototype.connect = function connect(host = null, user = "root", password = "taosdata", db = null, port = 0) {
   let _host, _user, _password, _db, _port;
   try {
-    _host = host != null ? ref.allocCString(host) : ref.alloc(ref.types.char_ptr, ref.NULL);
+    _host = host != null ? ref.allocCString(host) : ref.NULL;
   }
   catch (err) {
     throw "Attribute Error: host is expected as a str";
@@ -290,7 +272,7 @@ CTaosInterface.prototype.connect = function connect(host = null, user = "root",
     throw "Attribute Error: password is expected as a str";
   }
   try {
-    _db = db != null ? ref.allocCString(db) : ref.alloc(ref.types.char_ptr, ref.NULL);
+    _db = db != null ? ref.allocCString(db) : ref.NULL;
   }
   catch (err) {
     throw "Attribute Error: db is expected as a str";
@@ -345,8 +327,7 @@ CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
   }
 
   var fieldL = this.libtaos.taos_fetch_lengths(result);
-
-  let isMicro = (this.libtaos.taos_result_precision(result) == FieldTypes.C_TIMESTAMP_MICRO);
+  let precision = this.libtaos.taos_result_precision(result);
 
   var fieldlens = [];
 
@@ -373,7 +354,7 @@ CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
       if (!convertFunctions[fields[i]['type']]) {
         throw new errors.DatabaseError("Invalid data type returned from database");
       }
-      blocks[i] = convertFunctions[fields[i]['type']](pdata, num_of_rows, fieldlens[i], offset, isMicro);
+      blocks[i] = convertFunctions[fields[i]['type']](pdata, num_of_rows, fieldlens[i], offset, precision);
     }
   }
   return { blocks: blocks, num_of_rows }
@@ -423,7 +404,7 @@ CTaosInterface.prototype.fetch_rows_a = function fetch_rows_a(result, callback,
     let row = cti.libtaos.taos_fetch_row(result2);
     let fields = cti.fetchFields_a(result2);
 
-    let isMicro = (cti.libtaos.taos_result_precision(result2) == FieldTypes.C_TIMESTAMP_MICRO);
+    let precision = cti.libtaos.taos_result_precision(result2);
     let blocks = new Array(fields.length);
     blocks.fill(null);
     numOfRows2 = Math.abs(numOfRows2);
@@ -449,7 +430,7 @@ CTaosInterface.prototype.fetch_rows_a = function fetch_rows_a(result, callback,
           let prow = ref.reinterpret(row, 8, i * 8);
           prow = prow.readPointer();
           prow = ref.ref(prow);
-          blocks[i] = convertFunctions[fields[i]['type']](prow, 1, fieldlens[i], offset, isMicro);
+          blocks[i] = convertFunctions[fields[i]['type']](prow, 1, fieldlens[i], offset, precision);
           //offset += fields[i]['bytes'] * numOfRows2;
         }
       }
@@ -572,7 +553,7 @@ CTaosInterface.prototype.openStream = function openStream(connection, sql, callb
   var cti = this;
   let asyncCallbackWrapper = function (param2, result2, row) {
     let fields = cti.fetchFields_a(result2);
-    let isMicro = (cti.libtaos.taos_result_precision(result2) == FieldTypes.C_TIMESTAMP_MICRO);
+    let precision = cti.libtaos.taos_result_precision(result2);
     let blocks = new Array(fields.length);
     blocks.fill(null);
     let numOfRows2 = 1;
@@ -582,7 +563,7 @@ CTaosInterface.prototype.openStream = function openStream(connection, sql, callb
         if (!convertFunctions[fields[i]['type']]) {
           throw new errors.DatabaseError("Invalid data type returned from database");
         }
-        blocks[i] = convertFunctions[fields[i]['type']](row, numOfRows2, fields[i]['bytes'], offset, isMicro);
+        blocks[i] = convertFunctions[fields[i]['type']](row, numOfRows2, fields[i]['bytes'], offset, precision);
         offset += fields[i]['bytes'] * numOfRows2;
       }
     }

src/connector/nodejs/nodetaos/taosobjects.js

 const FieldTypes = require('./constants');
-
+const util = require('util');
 /**
  * Various objects such as TaosRow and TaosColumn that help make parsing data easier
  * @module TaosObjects
@@ -14,7 +14,7 @@ const FieldTypes = require('./constants');
  * var trow = new TaosRow(row);
  * console.log(trow.data);
  */
-function TaosRow (row) {
+function TaosRow(row) {
   this.data = row;
   this.length = row.length;
   return this;
@@ -29,10 +29,10 @@ function TaosRow (row) {
  */
 
 function TaosField(field) {
- this._field = field;
- this.name = field.name;
- this.type = FieldTypes.getType(field.type);
- return this;
+  this._field = field;
+  this.name = field.name;
+  this.type = FieldTypes.getType(field.type);
+  return this;
 }
 
 /**
@@ -42,39 +42,110 @@ function TaosField(field) {
  * @param {Date} date - A Javascript date time object or the time in milliseconds past 1970-1-1 00:00:00.000
  */
 class TaosTimestamp extends Date {
-  constructor(date, micro = false) {
-    super(date);
-    this._type = 'TaosTimestamp';
-    if (micro) {
-      this.microTime = date - Math.floor(date);
+  constructor(date, precision = 0) {
+    if (precision === 1) {
+      super(Math.floor(date / 1000));
+      this.precisionExtras = date % 1000;
+    } else if (precision === 2) {
+      super(parseInt(date / 1000000));
+      // use BigInt to fix: 1625801548423914405 % 1000000 = 914496 which not expected (914405)
+      this.precisionExtras = parseInt(BigInt(date) % 1000000n);
+    } else {
+      super(parseInt(date));
+    }
+    this.precision = precision;
+  }
+
+  /**
+   * TDengine raw timestamp.
+   * @returns raw taos timestamp (int64)
+   */
+  taosTimestamp() {
+    if (this.precision == 1) {
+      return (this * 1000 + this.precisionExtras);
+    } else if (this.precision == 2) {
+      return (this * 1000000 + this.precisionExtras);
+    } else {
+      return Math.floor(this);
+    }
+  }
+
+  /**
+   * Gets the microseconds of a Date.
+   * @return {Int} A microseconds integer
+   */
+  getMicroseconds() {
+    if (this.precision == 1) {
+      return this.getMilliseconds() * 1000 + this.precisionExtras;
+    } else if (this.precision == 2) {
+      return this.getMilliseconds() * 1000 + this.precisionExtras / 1000;
+    } else {
+      return 0;
+    }
+  }
+  /**
+   * Gets the nanoseconds of a TaosTimestamp.
+   * @return {Int} A nanoseconds integer
+   */
+  getNanoseconds() {
+    if (this.precision == 1) {
+      return this.getMilliseconds() * 1000000 + this.precisionExtras * 1000;
+    } else if (this.precision == 2) {
+      return this.getMilliseconds() * 1000000 + this.precisionExtras;
+    } else {
+      return 0;
+    }
+  }
+
+  /**
+   * @returns {String} a string for timestamp string format
+   */
+  _precisionExtra() {
+    if (this.precision == 1) {
+      return String(this.precisionExtras).padStart(3, '0');
+    } else if (this.precision == 2) {
+      return String(this.precisionExtras).padStart(6, '0');
+    } else {
+      return '';
     }
   }
   /**
    * @function Returns the date into a string usable by TDengine
    * @return {string} A Taos Timestamp String
    */
-  toTaosString(){
+  toTaosString() {
     var tzo = -this.getTimezoneOffset(),
-        dif = tzo >= 0 ? '+' : '-',
-        pad = function(num) {
-            var norm = Math.floor(Math.abs(num));
-            return (norm < 10 ? '0' : '') + norm;
-        },
-        pad2 = function(num) {
-            var norm = Math.floor(Math.abs(num));
-            if (norm < 10) return '00' + norm;
-            if (norm < 100) return '0' + norm;
-            if (norm < 1000) return norm;
-        };
+      dif = tzo >= 0 ? '+' : '-',
+      pad = function (num) {
+        var norm = Math.floor(Math.abs(num));
+        return (norm < 10 ? '0' : '') + norm;
+      },
+      pad2 = function (num) {
+        var norm = Math.floor(Math.abs(num));
+        if (norm < 10) return '00' + norm;
+        if (norm < 100) return '0' + norm;
+        if (norm < 1000) return norm;
+      };
     return this.getFullYear() +
-        '-' + pad(this.getMonth() + 1) +
-        '-' + pad(this.getDate()) +
-        ' ' + pad(this.getHours()) +
-        ':' + pad(this.getMinutes()) +
-        ':' + pad(this.getSeconds()) +
-        '.' + pad2(this.getMilliseconds()) +
-        ''  + (this.microTime ? pad2(Math.round(this.microTime * 1000)) : '');
+      '-' + pad(this.getMonth() + 1) +
+      '-' + pad(this.getDate()) +
+      ' ' + pad(this.getHours()) +
+      ':' + pad(this.getMinutes()) +
+      ':' + pad(this.getSeconds()) +
+      '.' + pad2(this.getMilliseconds()) +
+      '' + this._precisionExtra();
+  }
+
+  /**
+   * Custom console.log
+   * @returns {String} string format for debug
+   */
+  [util.inspect.custom](depth, opts) {
+    return this.toTaosString() + JSON.stringify({ precision: this.precision, precisionExtras: this.precisionExtras }, opts);
+  }
+  toString() {
+    return this.toTaosString();
   }
 }
 
-module.exports = {TaosRow, TaosField, TaosTimestamp}
+module.exports = { TaosRow, TaosField, TaosTimestamp }

src/connector/nodejs/package.json

 {
   "name": "td2.0-connector",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "A Node.js connector for TDengine.",
   "main": "tdengine.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "node test/test.js"
+    "test": "node test/test.js && node test/testMicroseconds.js &&  node test/testNanoseconds.js"
   },
   "repository": {
     "type": "git",

src/connector/nodejs/tdengine.js

 var TDengineConnection = require('./nodetaos/connection.js')
-module.exports.connect = function (connection=null) {
+module.exports.connect = function (connection={}) {
   return new TDengineConnection(connection);
 }

src/connector/nodejs/test/test.js

 const taos = require('../tdengine');
-var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:10});
+var conn = taos.connect();
 var c1 = conn.cursor();
 let stime = new Date();
 let interval = 1000;

src/connector/nodejs/test/testMicroseconds.js

+const taos = require('../tdengine');
+var conn = taos.connect();
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+
+function convertDateToTS(date) {
+  let tsArr = date.toISOString().split("T")
+  return "\"" + tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length - 1) + "\"";
+}
+function R(l, r) {
+  return Math.random() * (r - l) - r;
+}
+function randomBool() {
+  if (Math.random() < 0.5) {
+    return true;
+  }
+  return false;
+}
+
+// Initialize
+//c1.execute('drop database td_connector_test;');
+const dbname = 'nodejs_test_us';
+c1.execute('create database if not exists ' + dbname + ' precision "us"');
+c1.execute('use ' + dbname)
+c1.execute('create table if not exists tstest (ts timestamp, _int int);');
+c1.execute('insert into tstest values(1625801548423914, 0)');
+// Select
+console.log('select * from tstest');
+c1.execute('select * from tstest');
+
+var d = c1.fetchall();
+console.log(c1.fields);
+let ts = d[0][0];
+console.log(ts);
+
+if (ts.taosTimestamp() != 1625801548423914) {
+  throw "microseconds not match!";
+}
+if (ts.getMicroseconds() % 1000 !== 914) {
+  throw "micronsecond precision error";
+}
+setTimeout(function () {
+  c1.query('drop database nodejs_us_test;');
+}, 200);
+
+setTimeout(function () {
+  conn.close();
+}, 2000);

src/connector/nodejs/test/testNanoseconds.js

+const taos = require('../tdengine');
+var conn = taos.connect();
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+
+function convertDateToTS(date) {
+  let tsArr = date.toISOString().split("T")
+  return "\"" + tsArr[0] + " " + tsArr[1].substring(0, tsArr[1].length - 1) + "\"";
+}
+function R(l, r) {
+  return Math.random() * (r - l) - r;
+}
+function randomBool() {
+  if (Math.random() < 0.5) {
+    return true;
+  }
+  return false;
+}
+
+// Initialize
+//c1.execute('drop database td_connector_test;');
+const dbname = 'nodejs_test_ns';
+c1.execute('create database if not exists ' + dbname + ' precision "ns"');
+c1.execute('use ' + dbname)
+c1.execute('create table if not exists tstest (ts timestamp, _int int);');
+c1.execute('insert into tstest values(1625801548423914405, 0)');
+// Select
+console.log('select * from tstest');
+c1.execute('select * from tstest');
+
+var d = c1.fetchall();
+console.log(c1.fields);
+let ts = d[0][0];
+console.log(ts);
+
+if (ts.taosTimestamp() != 1625801548423914405) {
+  throw "nanosecond not match!";
+}
+if (ts.getNanoseconds() % 1000000 !== 914405) {
+  throw "nanosecond precision error";
+}
+setTimeout(function () {
+  c1.query('drop database nodejs_ns_test;');
+}, 200);
+
+setTimeout(function () {
+  conn.close();
+}, 2000);

src/kit/taosdemo/taosdemo.c

@@ -6008,8 +6008,10 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
         errorPrint("[%d] %s() LN%d Failed to insert records of batch %d\n",
                 pThreadInfo->threadID, __func__, __LINE__,
                 batchPerTbl);
-        errorPrint("\tIf the batch is %d, the length of the SQL to insert a row must be less then %"PRId64"\n",
-                batchPerTbl, maxSqlLen / batchPerTbl);
+        if (batchPerTbl > 0) {
+          errorPrint("\tIf the batch is %d, the length of the SQL to insert a row must be less then %"PRId64"\n",
+              batchPerTbl, maxSqlLen / batchPerTbl);
+        }
         errorPrint("\tPlease check if the buffer length(%"PRId64") or batch(%d) is set with proper value!\n",
                 maxSqlLen, batchPerTbl);
         goto free_of_interlace;

src/kit/taosdump/taosdump.c

@@ -124,6 +124,9 @@ typedef struct {
 
 extern char version[];
 
+#define DB_PRECISION_LEN   8
+#define DB_STATUS_LEN      16
+
 typedef struct {
     char     name[TSDB_DB_NAME_LEN];
     char     create_time[32];
@@ -144,9 +147,9 @@ typedef struct {
     int32_t  fsync;
     int8_t   comp;
     int8_t   cachelast;
-    char     precision[8];   // time resolution
+    char     precision[DB_PRECISION_LEN];   // time resolution
     int8_t   update;
-    char     status[16];
+    char     status[DB_STATUS_LEN];
 } SDbInfo;
 
 typedef struct {
@@ -542,7 +545,8 @@ static void parse_precision_first(
                 free(tmp);
                 exit(-1);
             }
-            strncpy(g_args.precision, tmp, strlen(tmp));
+            strncpy(g_args.precision, tmp,
+                min(DB_PRECISION_LEN - 1, strlen(tmp)));
             free(tmp);
         }
     }
@@ -1596,6 +1600,7 @@ static void taosStartDumpOutWorkThreads(int32_t  numOfThread, char *dbName)
             NULL, g_args.port);
         if (pThread->taosCon == NULL) {
             errorPrint("Failed to connect to TDengine server %s\n", g_args.host);
+            free(threadObj);
             return;
         }
         pthread_attr_init(&thattr);
@@ -2607,6 +2612,7 @@ static void taosStartDumpInWorkThreads()
             NULL, g_args.port);
         if (pThread->taosCon == NULL) {
             errorPrint("Failed to connect to TDengine server %s\n", g_args.host);
+            free(threadObj);
             return;
         }
         pthread_attr_init(&thattr);

src/query/inc/qExecutor.h

@@ -105,8 +105,7 @@ typedef struct SResultRowInfo {
   int16_t      type:8;     // data type for hash key
   int32_t      size:24;    // number of result set
   int32_t      capacity;   // max capacity
-  SResultRow*  current;    // current start active index
-  int64_t      prevSKey;   // previous (not completed) sliding window start key
+  SResultRow*  current;    // current active result row
 } SResultRowInfo;
 
 typedef struct SColumnFilterElem {
@@ -277,6 +276,7 @@ typedef struct SQueryRuntimeEnv {
   bool                  enableGroupData;
   SDiskbasedResultBuf*  pResultBuf;       // query result buffer based on blocked-wised disk file
   SHashObj*             pResultRowHashTable; // quick locate the window object for each result
+  SHashObj*             pResultRowListSet;   // used to check if current ResultRowInfo has ResultRow object or not
   char*                 keyBuf;           // window key buffer
   SResultRowPool*       pool;             // window result object pool
   char**                prevRow;

src/query/src/qUtil.c

@@ -44,7 +44,7 @@ int32_t getOutputInterResultBufSize(SQueryAttr* pQueryAttr) {
 int32_t initResultRowInfo(SResultRowInfo *pResultRowInfo, int32_t size, int16_t type) {
   pResultRowInfo->type     = type;
   pResultRowInfo->size     = 0;
-  pResultRowInfo->prevSKey = TSKEY_INITIAL_VAL;
+//  pResultRowInfo->prevSKey = TSKEY_INITIAL_VAL;
   pResultRowInfo->current  = NULL;
   pResultRowInfo->capacity = size;
 
@@ -93,7 +93,7 @@ void resetResultRowInfo(SQueryRuntimeEnv *pRuntimeEnv, SResultRowInfo *pResultRo
 
   pResultRowInfo->size     = 0;
   pResultRowInfo->current  = NULL;
-  pResultRowInfo->prevSKey = TSKEY_INITIAL_VAL;
+//  pResultRowInfo->prevSKey = TSKEY_INITIAL_VAL;
 }
 
 int32_t numOfClosedResultRows(SResultRowInfo *pResultRowInfo) {

tests/script/general/parser/nestquery.sim

@@ -450,4 +450,44 @@ if $data11 != 1 then
   return -1
 endi
 
+print =====================>TD-5157
+sql select twa(c1) from nest_tb1 interval(19a);
+if $rows != 10000 then
+  return -1
+endi
+
+if $data00 != @20-09-14 23:59:59.992@ then
+  return -1
+endi
+
+if $data01 != 0.000083333 then
+  return -1
+endi
+
+print =================>us database interval query, TD-5039
+sql create database test precision 'us';
+sql use test;
+sql create table t1(ts timestamp, k int);
+sql insert into t1 values('2020-01-01 01:01:01.000', 1) ('2020-01-01 01:02:00.000', 2);
+sql select avg(k) from (select avg(k) k from t1 interval(1s)) interval(1m);
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != @20-01-01 01:01:00.000000@ then
+  return -1
+endi
+
+if $data01 != 1.000000000 then
+  return -1
+endi
+
+if $data10 != @20-01-01 01:02:00.000000@ then
+  return -1
+endi
+
+if $data11 != 2.000000000 then
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/parser/subInfrom.sim

-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-sleep 100
-sql connect
-sleep 100
-
-print ========== sub_in_from.sim
-$i = 0
-
-$dbPrefix = subdb
-$tbPrefix = sub_tb
-$stbPrefix = sub_stb
-$tbNum = 10
-$rowNum = 1000
-$totalNum = $tbNum * $rowNum
-$loops = 200000
-$log = 10000
-$ts0 = 1537146000000
-$delta = 600000
-$i = 0
-$db = $dbPrefix . $i
-$stb = $stbPrefix . $i
-
-sql drop database $db -x step1
-step1:
-sql create database $db cache 16 maxrows 4096 keep 36500
-print ====== create tables
-sql use $db
-sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
-
-$i = 0
-$ts = $ts0
-$halfNum = $tbNum / 2
-while $i < $halfNum
-  $tbId = $i + $halfNum
-  $tb = $tbPrefix . $i
-  $tb1 = $tbPrefix . $tbId
-  sql create table $tb using $stb tags( $i )
-  sql create table $tb1 using $stb tags( $tbId )
-
-  $x = 0
-  while $x < $rowNum
-    $xs = $x * $delta
-    $ts = $ts0 + $xs
-    $c = $x / 10
-    $c = $c * 10
-    $c = $x - $c
-    $binary = 'binary . $c
-    $binary = $binary . '
-    $nchar = 'nchar . $c
-    $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
-    $x = $x + 1
-  endw
-
-  $i = $i + 1
-endw
-print ====== tables created
-
-sql_error select count(*) from (select count(*) from abc.sub_stb0)
-sql_error select val + 20 from (select count(*) from sub_stb0 interval(10h))
-sql_error select abc+20 from (select count(*) from sub_stb0 interval(1s))
-
-sql select count(*) from (select count(*) from sub_stb0 interval(10h))
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 18 then
-  print expect 18, actual: $data00
-  return -1
-endi
-
-sql select ts from (select count(*) from sub_stb0 interval(10h))
-if $rows != 18 then
-  return -1
-endi
-
-if $data00 != @18-09-17 04:00:00.000@ then
-  return -1
-endi
-
-if $data01 != @18-09-17 14:00:00.000@ then
-  return -1
-endi
-
-sql select val + 20, val from (select count(*) as val from sub_stb0 interval(10h))
-if $rows != 18 then
-  return -1
-endi
-
-if $data00 != 320.000000 then
-  return -1
-endi
-
-if $data01 != 300 then
-  return -1
-endi
-
-if $data10 != 620 then
-  return -1
-endi
-
-if $data11 != 600 then
-  return -1
-endi
-
-if $data20 != 620 then
-  return -1
-endi
-
-if $data21 != 600 then
-  return -1
-endi
-
-sql select max(val), min(val), max(val) - min(val)  from (select count(*) val from sub_stb0 interval(10h))
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 600 then
-  return -1
-endi
-
-if $data01 != 100 then
-  return -1
-endi
-
-if $data02 != 500.000000 then
-  return -1
-endi
-
-sql select first(ts,val),last(ts,val) from (select count(*) val from sub_stb0 interval(10h))
-sql select top(val, 5) from (select count(*) val from sub_stb0 interval(10h))
-sql select diff(val) from (select count(*) val from sub_stb0 interval(10h))
-sql select apercentile(val, 50) from (select count(*) val from sub_stb0 interval(10h))
-
-# not support yet
-sql select percentile(val, 50) from (select count(*) val from sub_stb0 interval(10h))
-sql select stddev(val) from (select count(*) val from sub_stb0 interval(10h))
-
-print ====================>complex query
-