Merge remote-tracking branch 'origin/develop' into hotfix/TD-12275

cmake/version.inc

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

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

@@ -761,17 +761,16 @@ Query OK, 1 row(s) in set (0.000141s)
 you see sample code here: [JDBC example](https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC)
 
 ## FAQ
-
+- Why does not addBatch and executeBatch provide a performance benefit for executing "batch writes/updates"?
+  **Cause**:In TDengine's JDBC implementation, SQL statements submitted through the addBatch method are executed in the order in which they are added. This method does not reduce the number of interactions with the server and does not improve performance.
+  **Answer**：1. Concatenate multiple values in an INSERT statement; 2. Use multi-threaded concurrent insertion; 3. Use the parameter-binding to write
+  
 - java.lang.UnsatisfiedLinkError: no taos in java.library.path
-
   **Cause**：The application program cannot find Library function *taos*
-
   **Answer**：Copy `C:\TDengine\driver\taos.dll` to `C:\Windows\System32\` on Windows and make a soft link through `ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` on Linux.
 
 - java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform
-
   **Cause**：Currently TDengine only support 64bit JDK
-
   **Answer**：re-install 64bit JDK.
 
 - For other questions, please refer to [Issues](https://github.com/taosdata/TDengine/issues)

snap/snapcraft.yaml

 name: tdengine
 base: core20
-version: '2.3.2.0'
+version: '2.4.0.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |

src/client/src/tscSQLParser.c

@@ -6090,7 +6090,7 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
 
 // todo error !!!!
 int32_t tsRewriteFieldNameIfNecessary(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
-  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' '};
+  const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' ', '`'};
 
   for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     char* fieldName = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i)->name;

src/connector/node-red-contrib-tdengine/.gitignore

+node_modules
\ No newline at end of file

src/connector/node-red-contrib-tdengine/README.md

+This repositry create a custom Node-Red node for configing TDEngine server connection and execute SQL from preview node msg.payload
+## Design
+Use Taos data restful API to commit SQL, API call like
+```
+curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql/[db_name]
+```
+
+Input options:
+* DB Server: Setup server connection or select a exist server
+* DB Name: Database to execute SQL
+
+Use [axios](https://axios-http.com/) to call http request
+
+## Usage
+
+1. Start Node-Red
+2. Install TDEngine node
+3. Add "taos query" node to workspace from palette 
+4. Setup a TDEngine server and database name
+5. Add function or other node to create SQL, put SQL into msg.payload
+6. Link to "taos query" node
+
+### Demo
+1. Start Node-Red by docker
+```
+docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red
+```
+2. Import sample flow "demo/flow.json"
+![import-flow](demo/ImportFlow.png)
+3. Install TDEngine node by name "node-red-contrib-tdengine", current version is 0.0.2
+![alt](demo/InstallTDEngineNode.png)
+4. Modify your TDEngine server config
+![alt](demo/ModifyServerConfig.png)
+5. Edit test SQL
+![alt](demo/EditTestSQL.png)
+6. Start flow by click Inject node

src/connector/node-red-contrib-tdengine/demo/flow.json

+[
+    {
+        "id": "01ad89bea2c249f6",
+        "type": "tab",
+        "label": "流程 1",
+        "disabled": false,
+        "info": "",
+        "env": [
+            {
+                "name": "test",
+                "value": "abc",
+                "type": "str"
+            },
+            {
+                "name": "path",
+                "value": "{\"codes\":\"/usr/local/processing/codes\",\"parameters\":\"/usr/local/processing/parameters\"}",
+                "type": "json"
+            }
+        ]
+    },
+    {
+        "id": "0ab8aa0c7f1b7522",
+        "type": "taos-query",
+        "z": "01ad89bea2c249f6",
+        "server": "e385222cd91994dc",
+        "database": "demo",
+        "x": 780,
+        "y": 400,
+        "wires": [
+            [
+                "f9c4f70dc2d79548"
+            ]
+        ]
+    },
+    {
+        "id": "ba09b80a40b65780",
+        "type": "inject",
+        "z": "01ad89bea2c249f6",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "INSERT INTO t VALUES (NOW, 23)",
+        "payloadType": "str",
+        "x": 490,
+        "y": 400,
+        "wires": [
+            [
+                "0ab8aa0c7f1b7522"
+            ]
+        ]
+    },
+    {
+        "id": "f9c4f70dc2d79548",
+        "type": "debug",
+        "z": "01ad89bea2c249f6",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 1050,
+        "y": 400,
+        "wires": []
+    },
+    {
+        "id": "e385222cd91994dc",
+        "type": "taos-config",
+        "host": "localhost",
+        "port": "6030",
+        "username": "root",
+        "password": "taosdata"
+    }
+]
\ No newline at end of file

src/connector/node-red-contrib-tdengine/package.json

+{
+    "name": "node-red-contrib-tdengine",
+    "version": "0.0.2",
+    "description": "",
+    "main": "tdengine.js",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/kevinpan45/node-red-contrib-tdengine.git"
+    },
+    "author": "kevinpan45@163.com",
+    "license": "ISC",
+    "dependencies": {
+        "axios": "^0.24.0",
+        "mocha": "^9.1.3"
+    },
+    "node-red": {
+        "nodes": {
+            "tdengine": "tdengine.js"
+        }
+    },
+    "keywords": [
+        "node-red",
+        "tdengine"
+    ],
+    "devDependencies": {
+        "node-red": "^2.1.4",
+        "node-red-node-test-helper": "^0.2.7"
+    }
+}

src/connector/node-red-contrib-tdengine/tdengine.html

+<script type="text/javascript">
+    "use strict";
+    /*global RED*/
+    RED.nodes.registerType('taos-config', {
+        category: 'config',
+        defaults: {
+            host: {
+                value: "localhost",
+                required: true
+            },
+            port: {
+                value: "6030",
+                required: true
+            },
+            username: {
+                value: "",
+                required: false
+            },
+            password: {
+                value: "",
+                required: false
+            }
+        },
+        label: function () {
+            return this.host || "TDEngine host";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="taos-config">
+    <div class="form-row">
+        <label for="node-config-input-host"><i class="fa fa-server"></i> Host</label>
+        <input type="text" id="node-config-input-host">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-port"><i class="fa fa-server"></i> Port</label>
+        <input type="text" id="node-config-input-port">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-username"><i class="fa fa-server"></i> User Name</label>
+        <input type="text" id="node-config-input-username">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-server"></i> Password</label>
+        <input type="text" id="node-config-input-password">
+    </div>
+</script>
+
+<script type="text/javascript">
+    /*global RED*/
+    RED.nodes.registerType('taos-query', {
+        category: 'TDEngine',
+        inputs: 1,
+        outputs: 1,
+        color: "#ffffff",
+        paletteLabel: "taos query",
+        defaults: {
+            server: {
+                value: "",
+                type: "taos-config"
+            },
+            database: {
+                value: ""
+            },
+            sql: {
+                value: ""
+            }
+        },
+        label: function () {
+            return this.name || "taos " + this.database;
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="taos-query">
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
+        <input type="text" id="node-input-server" placeholder="Server">
+    </div>
+    <div class="form-row">
+        <label for="node-input-database"><i class="fa fa-tag"></i> Database</label>
+        <input type="text" id="node-input-database" placeholder="Database">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="taos-query">
+    <p>TDEngine Query</p>
+    <p>Execute SQL on remote TDEngine server by restful API</p>
+</script>
\ No newline at end of file

src/connector/node-red-contrib-tdengine/tdengine.js

+module.exports = function (RED) {
+  "use strict";
+  const axios = require('axios');
+
+  function TaosConfig(n) {
+    RED.nodes.createNode(this, n);
+    this.host = n.host;
+    this.port = n.port;
+    this.username = n.username;
+    this.password = n.password;
+  }
+  RED.nodes.registerType("taos-config", TaosConfig);
+
+  function TaosQuery(n) {
+    RED.nodes.createNode(this, n);
+    this.server = RED.nodes.getNode(n.server);
+    this.database = n.database;
+    var node = this;
+
+    node.on("close", function (done) {
+      node.status({});
+      client = null;
+      done();
+    });
+
+    node.on("input", async function (msg, send, done) {
+      send = send || function () { node.send.apply(node, arguments) }
+      done = done || function (err) { if (err) node.error(err, msg); }
+
+      let sql = msg.payload;
+
+      if (!msg.payload || msg.payload == "") {
+        throw new Error("Execute SQL must be set.");
+      }
+
+      try {
+        msg.payload = await query(this.server, sql);
+        send(msg);
+        done();
+      } catch (error) {
+        done(error);
+      }
+
+    });
+  }
+  RED.nodes.registerType("taos-query", TaosQuery);
+
+  function query(server, sql) {
+    console.log("Start to execute SQL : " + sql);
+    let url = generateUrl(server);
+    return axios.post(url, sql, {
+      headers: { 'Authorization': token(server) }
+    }).then(function (response) {
+      console.log('Get http response from taos : ' + response.data.data);
+      return response.data.data;
+    }).catch(function (error) {
+      console.error("Request Failed " + e);
+      throw new Error(response.desc);
+    });
+  }
+
+
+
+  function generateUrl(server) {
+    return "http://" + server.host + ":" + server.port + '/rest/sql';
+  }
+
+  function token(server) {
+    return 'Basic ' + Buffer.from(server.username + ":" + server.password).toString('base64')
+  }
+};

src/kit/shell/src/shellEngine.c

@@ -448,9 +448,29 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
     tt = 0;
   }
   */
-
 #ifdef WINDOWS
-  if (tt < 0) tt = 0;
+  if (tt < 0) {
+    SYSTEMTIME a={1970,1,5,1,0,0,0,0}; // SYSTEMTIME struct support 1601-01-01. set 1970 to compatible with Epoch time.
+    FILETIME b; // unit is 100ns
+    ULARGE_INTEGER c;
+    SystemTimeToFileTime(&a,&b);
+    c.LowPart = b.dwLowDateTime;  
+    c.HighPart = b.dwHighDateTime;  
+    c.QuadPart+=tt*10000000;
+    b.dwLowDateTime=c.LowPart;  
+    b.dwHighDateTime=c.HighPart;  
+    FileTimeToLocalFileTime(&b,&b);
+    FileTimeToSystemTime(&b,&a);
+    int pos = sprintf(buf,"%02d-%02d-%02d %02d:%02d:%02d", a.wYear, a.wMonth,a.wDay, a.wHour, a.wMinute, a.wSecond);   
+    if (precision == TSDB_TIME_PRECISION_NANO) {
+      sprintf(buf + pos, ".%09d", ms);
+    } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+      sprintf(buf + pos, ".%06d", ms);
+    } else {
+      sprintf(buf + pos, ".%03d", ms);
+    }
+    return buf;
+  }
 #endif
   if (tt <= 0 && ms < 0) {
     tt--;

src/util/src/tlosertree.c

@@ -96,6 +96,11 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) {
       return;
     }
 
+    /* there is a risk
+     * there should be  pTree->comparFn(&pCur->index, &kLeaf.index, pTree->param)
+     * but the first element in SLoserTreeNode is int32_t
+     * and the comparFn get data as *(int32_t*)(void *), so it is just ok.
+    */
     int32_t ret = pTree->comparFn(pCur, &kLeaf, pTree->param);
     if (ret < 0) {
       SLoserTreeNode t = pTree->pNode[parentId];

tests/develop-test/0-others/TD-12435.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, db_test.stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+import json
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1: [TD-12435] fix ` identifier in table column name if using create table as subquery
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("============== STEP 1 ===== prepare data & validate json string")
+        tdSql.execute("create table if not exists st(ts timestamp, dataInt int)")
+        tdSql.execute("create table st_from_sub as select avg(`dataInt`) from st interval(1m)")
+        tdSql.query("describe st_from_sub")
+        tdSql.checkData(1, 0, 'avg__dataInt__')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+

tests/develop-test/3-connectors/go/test.sh

@@ -18,3 +18,6 @@ sleep 10
 cd ../../
 WKC=`pwd`
 
+git clone git@github.com:taosdata/driver-go.git --branch develop --single-branch --depth 1 
+cd driver-go 
+go test -v ./...
\ No newline at end of file

tests/develop-test/fulltest-others.sh

-python3 ./test.py -f 0-others/json_tag.py
\ No newline at end of file
+python3 ./test.py -f 0-others/json_tag.py
+python3 ./test.py -f 0-others/TD-12435.py
\ No newline at end of file

tests/examples/JDBC/taosdemo/src/main/resources/insert.json

@@ -16,7 +16,7 @@
         "cache": 16,
         "blocks": 8,
         "precision": "ms",
-        "keep": 365,
+        "keep": 36500,
         "minRows": 100,
         "maxRows": 4096,
         "comp": 2,

tests/pytest/dockerCluster/insert.json

@@ -18,7 +18,7 @@
 			"cache": 16,
 			"blocks": 8,
 			"precision": "ms",
-			"keep": 365,
+			"keep": 36500,
 			"minRows": 100,
 			"maxRows": 4096,
 			"comp":2,

tests/pytest/manualTest/TD-5114/insertDataDb3Replica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/query/nestedQuery/insertData.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb1.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb1Replica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb2Newstab.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb2NewstabReplica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tsdb/insertDataDb2Replica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb1.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb1Replica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb2Newstab.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb2NewstabReplica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/wal/insertDataDb2Replica2.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/system-test/1-insert/Null_tag_Line_insert.py

+###################################################################
+#           Copyright (c) 2021 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys,os
+import time
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+from util.types import TDSmlProtocolType, TDSmlTimestampType
+
+class TDTestCase():
+    updatecfgDict = {"smlTagNullName","setname"}  # add extra client params
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self._conn = conn
+
+    def caseDescription(self):
+
+        '''
+        case1 <wenzhouwww>: [TD-11436] : this is an test case for line proto no tag insert into TDengine .
+        '''
+        return
+
+    def getBuildPath(self, tool="taosd"):
+        buildPath = ""
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ((tool) in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def no_tag_single_line_insert(self,name):
+        self.name = name 
+
+        lines3 = [  "sti c1=4i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000",
+            "sti c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000"
+        ]
+ 
+        code = self._conn.schemaless_insert(lines3, TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        tdSql.query('select * from sti')
+        tdSql.checkRows(2)
+        
+        tdSql.query('select tbname from sti')
+        tdSql.checkRows(1)
+
+        col_names = tdSql.getResult("describe sti")
+        if col_names[-1][0]==self.name:
+            tdLog.info(" ====================get expected tag name ===============")
+        else:
+            tdLog.exit("======================error occured for null tag==================")
+    
+    def no_tag_mulit_line_insert(self,name):
+
+        lines3 = [  "sti c1=4i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000",
+            "sti c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000"
+        ]
+ 
+        code = self._conn.schemaless_insert(lines3, TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        tdSql.query('select * from sti')
+        tdSql.checkRows(2)
+        
+        tdSql.query('select tbname from sti')
+        tdSql.checkRows(1)
+
+        col_names = tdSql.getResult("describe sti")
+        if col_names[-1][0]==self.name:
+            tdLog.info(" ====================get expected tag name ===============")
+        else:
+            tdLog.exit("======================error occured for null tag==================")
+        
+
+
+    def part_tag_single_insert(self,name):
+        lines5 = [  "sti,t3=1 c1=4i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639050000",
+            "sti,t1=abc c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640050000",
+            "sti,t2=abc c1=3i64,c3=L\"passitagin\",c4=5f64,c5=5f64,c6=true 1626006833640050000"
+        ]
+        code = self._conn.schemaless_insert([ lines5[0] ], TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        code = self._conn.schemaless_insert([ lines5[1] ], TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        code = self._conn.schemaless_insert([ lines5[2] ], TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        tdSql.query('select * from sti')
+        tdSql.checkRows(5)
+        tdSql.checkData(4,3,None)
+        tdSql.checkData(4,6,True)
+        tdSql.checkData(2,8,"1")
+        tdSql.checkData(3,9,"abc")
+        
+        tdSql.query('select tbname from sti')
+        tdSql.checkRows(4)
+
+        col_names = tdSql.getResult("describe sti")
+        
+        if col_names[-4][0]==self.name and col_names[-3][0]=="t3" and col_names[-2][0]=="t1" and col_names[-1][0]=="t2": 
+            tdLog.info(" ====================get expected tag name ===============")
+        else:
+            tdLog.exit("======================error occured for null tag==================")
+        
+
+    def part_tag_multi_insert(self,name):
+
+        lines6 = [  "str c1=4i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000",
+            "str,t1=abc c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000",
+            "str,t2=abc c1=3i64,c3=L\"passitagin\",c4=5f64,c5=5f64,c6=true 1626006833640000000"                                                                                                                                                      
+        ]
+        code = self._conn.schemaless_insert(lines6, TDSmlProtocolType.LINE.value, TDSmlTimestampType.NANO_SECOND.value)
+        print("schemaless_insert result {}".format(code))
+        
+        tdSql.query('select * from str')
+        tdSql.checkRows(3)
+        tdSql.checkData(0,3,True)
+        tdSql.checkData(1,3,None)
+        tdSql.checkData(1,6,True)
+        tdSql.checkData(0,8,"abc")
+        tdSql.checkData(1,9,"abc")
+        
+        tdSql.query('select tbname from str')
+        tdSql.checkRows(3)
+
+        col_names = tdSql.getResult("describe str")
+        
+        if col_names[-3][0]==self.name and col_names[-2][0]=="t1" and col_names[-1][0]=="t2" : 
+            tdLog.info(" ====================get expected tag name ===============")
+        else:
+            tdLog.exit("======================error occured for null tag==================")
+        
+
+    def run(self):
+        print("running {}".format(__file__))
+        tdSql.execute("drop database if exists test")
+        tdSql.execute("create database if not exists test precision 'us'")
+        tdSql.execute('use test')
+        self.no_tag_single_line_insert("_tag_null")
+        self.no_tag_mulit_line_insert("_tag_null")
+        self.part_tag_single_insert("_tag_null")
+        self.part_tag_multi_insert("_tag_null")
+
+       
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/system-test/3-connectors/c#/TDengineDriver/TDengineDriver.csproj

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

tests/system-test/3-connectors/c#/stmtfunction/stmtfunction.csproj

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

tests/system-test/3-connectors/c#/test.sh

@@ -26,6 +26,9 @@ dotnet run --project C#checker/C#checker.csproj
 dotnet run --project TDengineTest/TDengineTest.csproj
 dotnet run --project schemaless/schemaless.csproj
 
+cd ${WKC}/tests/system-test/3-connectors/c#/stmtfunction
+dotnet run || exit 1
+
 cd ${WKC}/tests/examples/C#/taosdemo
 dotnet build -c Release
 tree | true

tests/system-test/3-connectors/go/test.sh

@@ -17,4 +17,3 @@ nohup taosd -c /etc/taos/ > /dev/null 2>&1 &
 sleep 10
 cd ../../
 WKC=`pwd`
-

tests/system-test/fulltest-insert.sh

 python3 test.py -f 1-insert/TD-11970.py
 python3 test.py -f 1-insert/stmt_error.py  
-
+python3 test.py -f 1-insert/Null_tag_Line_insert.py

tests/system-test/fulltest-query.sh

@@ -2,3 +2,4 @@ python3 ./test.py -f 2-query/TD-11256.py
 # python3 ./test.py -f 2-query/TD-11389.py
 python3 ./test.py -f 2-query/TD-11945_crash.py
 python3 ./test.py -f 2-query/TD-12340-12342.py
+python3 ./test.py -f 2-query/TD-12204.py

tests/system-test/fulltest-tools.sh

 python3 ./test.py -f 5-taos-tools/basic.py
+python3 ./test.py -f 5-taos-tools/TD-12478.py

tests/test-CI.sh

@@ -124,11 +124,9 @@ function runPyCaseOneByOnefq() {
     else
     echo $line
       if [[ $line =~ ^bash.* ]]; then
-        # $line > case.log 2>&1 || cat case.log && exit 8
-        # cat case.log
         $line > case.log 2>&1  
+        cat case.log
         if [ $? -ne 0 ];then
-          cat case.log
           exit 8
         fi
       fi

tests/test-all.sh

@@ -139,17 +139,17 @@ function runPyCaseOneByOne {
           case=`echo $line|awk '{print $NF}'`
         fi
         start_time=`date +%s`
-        date +%F\ %T | tee -a pytest-out.log
+        date +%F\ %T | tee -a $tests_dir/pytest-out.log
         echo -n $case
         $line > /dev/null 2>&1 && \
-          echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \
-          echo -e "${RED} failed${NC}" | tee -a pytest-out.log
+          echo -e "${GREEN} success${NC}" | tee -a $tests_dir/pytest-out.log || \
+          echo -e "${RED} failed${NC}" | tee -a $tests_dir/pytest-out.log
         end_time=`date +%s`
         out_log=`tail -1 pytest-out.log  `
         # if [[ $out_log =~ 'failed' ]];then
         #   exit 8
         # fi
-        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $tests_dir/pytest-out.log
       else
         $line > /dev/null 2>&1
       fi
@@ -339,10 +339,9 @@ if [ "$2" != "sim" ] && [ "$2" != "jdbc" ] && [ "$2" != "unit" ]  && [ "$2" != "
 
   export LD_LIBRARY_PATH=$TOP_DIR/$LIB_DIR:$LD_LIBRARY_PATH
 
+  [ -f $tests_dir/pytest-out.log ] && rm -f $tests_dir/pytest-out.log
   cd $tests_dir/pytest
 
-  [ -f pytest-out.log ] && rm -f pytest-out.log
-
   if [ "$1" == "cron" ]; then
     echo "### run Python regression test ###"
     runPyCaseOneByOne regressiontest.sh