[TD-13246]<fix>(query): Coredump when parentheses appear before the insert_sql

documentation20/cn/00.index/docs.md

 # TDengine文档
 
-TDengine是一个高效的存储、查询、分析时序大数据的平台，专为物联网、车联网、工业互联网、运维监测等优化而设计。您可以像使用关系型数据库MySQL一样来使用它，但建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](/architecture) 与 [数据建模](/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。如需查阅TDengine 1.6 文档，请点击 [这里](https://www.taosdata.com/cn/documentation16/) 访问。
+TDengine是一个高效的存储、查询、分析时序大数据的平台，专为物联网、车联网、工业互联网、运维监测等优化而设计。您可以像使用关系型数据库MySQL一样来使用它，但建议您在使用前仔细阅读一遍下面的文档，特别是 [数据模型](/architecture) 与 [数据建模](/model)。除本文档之外，欢迎 [下载产品白皮书](https://www.taosdata.com/downloads/TDengine%20White%20Paper.pdf)。
 
 ## [TDengine介绍](/evaluation)
 
@@ -84,11 +84,10 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 
 ## TDengine 组件与工具
 
-* [taosAdapter 用户手册](/tools/adapter)
-* [TDinsight 用户手册](/tools/insight)
-* [taosTools 安装手册](/tools/taos-tools)
-* [taosdump 用户手册](/tools/taosdump)
-* [taosbenchmark 用户手册](/tools/taosbenchmark)
+* [taosAdapter](/tools/adapter): TDengine 集群和应用之间的 RESTful 接口适配服务。
+* [TDinsight](/tools/insight): 监控 TDengine 集群的 Grafana 面板集合。
+* [taosdump](/tools/taosdump): TDengine 数据备份工具。使用 taosdump 请安装 taosTools。
+* [taosBenchmark](/tools/taosbenchmark): TDengine 压力测试工具。使用 taosBenchmark 请安装 taosTools。
 
 ## [与其他工具的连接](/connections)
 

documentation20/cn/02.getting-started/docs.md

@@ -178,7 +178,7 @@ taos> select avg(current), max(voltage), min(phase) from test.d10 interval(10s);
 ## <a class="anchor" id="taosBenchmark"></a> taosBenchmark 详细功能列表
 
 taosBenchmark 命令本身带有很多选项，配置表的数目、记录条数等等，请执行 `taosBenchmark --help` 详细列出。您可以设置不同参数进行体验。
-taosBenchmark 详细使用方法请参照 [如何使用taosBenchmark对TDengine进行性能测试](https://www.taosdata.com/cn/documentation/getting-started/taosBenchmark )。
+taosBenchmark 详细使用方法请参照 [如何使用taosBenchmark对TDengine进行性能测试](https://www.taosdata.com/2021/10/09/3111.html)。
 
 ## 客户端
 

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

@@ -58,9 +58,9 @@ INSERT INTO test.t1 USING test.weather (ts, temperature) TAGS('beijing') VALUES(
 | taos-jdbcdriver 版本 | TDengine 2.0.x.x 版本 | TDengine 2.2.x.x 版本 | TDengine 2.4.x.x 版本 | JDK 版本 |
 |---------------------| ----------------------| ----------------------| ----------------------| -------- |
 | 2.0.37              |            X          |            X          | 2.4.0.4               | 1.8.x    |
-| 2.0.36              |            X          |            X          | 2.4.0.0 - 2.4.0.3     | 1.8.x    |
-| 2.0.35              |            X          |            X          | 2.3.0.0 - 2.4.0.3     | 1.8.x    |
-| 2.0.33 - 2.0.34     | 2.0.3.0 - 2.2.2.16    | 2.2.0.0 - 2.2.2.16    | 2.4.0.0 - 2.4.0.3     | 1.8.x    |
+| 2.0.36              |            X          | 2.2.2.11 以上          | 2.4.0.0 - 2.4.0.3     | 1.8.x    |
+| 2.0.35              |            X          | 2.2.2.11 以上          | 2.3.0.0 - 2.4.0.3     | 1.8.x    |
+| 2.0.33 - 2.0.34     | 2.0.3.0 以上           | 2.2.0.0 以上           | 2.4.0.0 - 2.4.0.3     | 1.8.x    |
 | 2.0.31 - 2.0.32     | 2.1.3.0 - 2.1.7.7     |            X          |            X          | 1.8.x    |
 | 2.0.22 - 2.0.30     | 2.0.18.0 - 2.1.2.1    |            X          |            X          | 1.8.x    |
 | 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.4    |            X          |            X          | 1.8.x    |

documentation20/en/00.index/docs.md

 # TDengine Documentation
 
-TDengine is a highly efficient platform to store, query, and analyze time-series data. It is specially designed and optimized for IoT, Internet of Vehicles, Industrial IoT, IT Infrastructure and Application Monitoring, etc. It works like a relational database, such as MySQL, but you are strongly encouraged to read through the following documentation before you experience it, especially the Data Modeling sections. In addition to this document, you should also download and read the technology white paper. For the older TDengine version 1.6 documentation, please click [here](https://www.taosdata.com/en/documentation16/).
-
+TDengine is a highly efficient platform to store, query, and analyze time-series data. It is specially designed and optimized for IoT, Internet of Vehicles, Industrial IoT, IT Infrastructure and Application Monitoring, etc. It works like a relational database, such as MySQL, but you are strongly encouraged to read through the following documentation before you experience it, especially the Data Modeling sections. In addition to this document, you should also download and read the technology white paper. 
 ## [TDengine Introduction](/evaluation)
 
 * [TDengine Introduction and Features](/evaluation#intro)
@@ -82,11 +81,10 @@ TDengine is a highly efficient platform to store, query, and analyze time-series
 
 ## [Components and Tools](/cn/documentation/)
 
-* [taosAdapter User Manual](/tools/adapter)
-* [TDinsight User Manual](/tools/insight)
-* [taosTools Install Manual](/tools/taos-tools)
-* [taosdump User Manual](/tools/taosdump)
-* [taosbenchmark User Manual](/tools/taosbenchmark)
+* [taosAdapter](/tools/adapter): a bridge/adapter between TDengine cluster and applications.
+* [TDinsight](/tools/insight): monitoring TDengine cluster with Grafana.
+* [taosdump](/tools/taosdump): backup tool for TDengine. Please install `taosTools` package for it.
+* [taosBenchmark](tools/taosbenchmark): stress test tool for TDengine. Please install `taosTools` package for it.
 
 ## [Connections with Other Tools](/connections)
 

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

@@ -183,7 +183,7 @@ taos> select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
 ## <a class="anchor" id="taosBenchmark"></a> Using taosBenchmark in detail
 
 you can run command `taosBenchmark` with many options, like number of tables, rows of records and so on. To know more about these options, you can execute `taosBenchmark --help` and then take a try using different options.
-Please refer to [How to use taosBenchmark to test the performance of TDengine](https://www.taosdata.com/en/documentation/getting-started/taosBenchmark) for detail.
+Please refer to [How to use taosBenchmark to test the performance of TDengine](https://tdengine.com/2021/10/09/3114.html) for detail.
 
 ## Client and Alarm Module
 

packaging/tools/make_install.sh

@@ -507,8 +507,8 @@ function install_service_on_systemd() {
 
   ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
   ${csudo}bash -c "echo 'Description=${productName} server service' >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-  ${csudo}bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
+  ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
   ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
   ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
   ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"

packaging/tools/post.sh

@@ -427,8 +427,8 @@ function install_service_on_systemd() {
 
     ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo}bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-    ${csudo}bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'        >> ${taosd_service_config}"
     ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
     ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
     ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"

src/client/src/tscAsync.c

@@ -313,7 +313,12 @@ static void tscAsyncResultCallback(SSchedMsg *pMsg) {
   }
 
   assert(pSql->res.code != TSDB_CODE_SUCCESS);
-  tscError("0x%"PRIx64" async result callback, code:%s", pSql->self, tstrerror(pSql->res.code));
+  if (tsShortcutFlag) {
+    tscDebug("0x%" PRIx64 " async result callback, code:%s", pSql->self, tstrerror(pSql->res.code));
+    pSql->res.code = TSDB_CODE_SUCCESS;
+  } else {
+    tscError("0x%" PRIx64 " async result callback, code:%s", pSql->self, tstrerror(pSql->res.code));
+  }
 
   SSqlRes *pRes = &pSql->res;
   if (pSql->fp == NULL || pSql->fetchFp == NULL){

src/client/src/tscSQLParser.c

@@ -3458,10 +3458,7 @@ static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SStrToken
   strncpy(tmpTokenBuf, pToken->z, pToken->n);
   
   pToken->z = tmpTokenBuf;
-
-  if (pToken->type == TK_ID) {
   pToken->n = stringProcess(pToken->z, pToken->n);
-  }
 
   for (int16_t i = 0; i < numOfCols; ++i) {
     if (pToken->n != strlen(pSchema[i].name)) {
@@ -3554,7 +3551,10 @@ int32_t getTableIndexImpl(SStrToken* pTableToken, SQueryInfo* pQueryInfo, SColum
 
 int32_t getTableIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
   SStrToken tableToken = {0};
+
+  if (pToken->z && (pToken->z[0] != TS_BACKQUOTE_CHAR || pToken->z[pToken->n - 1] != TS_BACKQUOTE_CHAR)) {
     extractTableNameFromToken(pToken, &tableToken);
+  }
 
   if (getTableIndexImpl(&tableToken, pQueryInfo, pIndex) != TSDB_CODE_SUCCESS) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -6849,7 +6849,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen, .type = TK_STRING};
+    SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen};
 
     if (getColumnIndexByName(&name, pQueryInfo, &index, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -6864,7 +6864,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     char name1[128] = {0};
     strncpy(name1, pItem->pVar.pz, pItem->pVar.nLen);
-
+    stringProcess(name1, (int32_t)strlen(name1));
     TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
@@ -6887,12 +6887,12 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     SColumnIndex srcIndex = COLUMN_INDEX_INITIALIZER;
     SColumnIndex destIndex = COLUMN_INDEX_INITIALIZER;
 
-    SStrToken srcToken = {.z = pSrcItem->pVar.pz, .n = pSrcItem->pVar.nLen, .type = TK_STRING};
+    SStrToken srcToken = {.z = pSrcItem->pVar.pz, .n = pSrcItem->pVar.nLen};
     if (getColumnIndexByName(&srcToken, pQueryInfo, &srcIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg17);
     }
 
-    SStrToken destToken = {.z = pDstItem->pVar.pz, .n = pDstItem->pVar.nLen, .type = TK_STRING};
+    SStrToken destToken = {.z = pDstItem->pVar.pz, .n = pDstItem->pVar.nLen};
     if (getColumnIndexByName(&destToken, pQueryInfo, &destIndex, tscGetErrorMsgPayload(pCmd)) == TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg19);
     }
@@ -6901,6 +6901,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     char name[TSDB_COL_NAME_LEN] = {0};
     strncpy(name, pItem->pVar.pz, pItem->pVar.nLen);
+    stringProcess(name, (int32_t)strlen(name));
     TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
 
@@ -6908,6 +6909,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     memset(name, 0, tListLen(name));
 
     strncpy(name, pItem->pVar.pz, pItem->pVar.nLen);
+    stringProcess(name, (int32_t)strlen(name));
     f = tscCreateField(TSDB_DATA_TYPE_INT, name, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
@@ -6920,7 +6922,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     int16_t       numOfTags = tscGetNumOfTags(pTableMeta);
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.type = TK_STRING, .z = item->pVar.pz, .n = item->pVar.nLen};
+    SStrToken    name = {.z = item->pVar.pz, .n = item->pVar.nLen};
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
@@ -7053,14 +7055,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     tVariantListItem* pItem = taosArrayGet(pAlterSQL->varList, 0);
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.type = TK_STRING, .z = pItem->pVar.pz, .n = pItem->pVar.nLen};
-
-    //handle Escape character backstick
-    bool inEscape = false;
-    if (name.z[0] == TS_BACKQUOTE_CHAR && name.z[name.n - 1] == TS_BACKQUOTE_CHAR) {
-      inEscape = true;
-      name.type = TK_ID;
-    }
+    SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen};
 
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg17);
@@ -7072,12 +7067,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     char name1[TSDB_COL_NAME_LEN] = {0};
     tstrncpy(name1, pItem->pVar.pz, sizeof(name1));
-
-    int32_t nameLen = pItem->pVar.nLen;
-    if (inEscape) {
-      memmove(name1, name1 + 1, nameLen);
-      name1[nameLen - TS_BACKQUOTE_CHAR_SIZE] = '\0';
-    }
+    stringProcess(name1, (int32_t)strlen(name1));
 
     TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypes[TSDB_DATA_TYPE_INT].bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
@@ -7086,21 +7076,13 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidOperationMsg(pMsg, msg16);
     }
 
-
     TAOS_FIELD* pItem = taosArrayGet(pAlterSQL->pAddColumns, 0);
     if (pItem->type != TSDB_DATA_TYPE_BINARY && pItem->type != TSDB_DATA_TYPE_NCHAR) {
       return invalidOperationMsg(pMsg, msg21);
     }
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.type = TK_STRING, .z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
-
-    //handle Escape character backstick
-    bool inEscape = false;
-    if (name.z[0] == TS_BACKQUOTE_CHAR && name.z[name.n - 1] == TS_BACKQUOTE_CHAR) {
-      inEscape = true;
-      name.type = TK_ID;
-    }
+    SStrToken    name = {.z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
 
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg17);
@@ -7136,12 +7118,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidOperationMsg(pMsg, msg24);
     }
 
-    if (inEscape) {
-      memmove(name.z, name.z + 1, name.n);
-      name.z[name.n - TS_BACKQUOTE_CHAR_SIZE] = '\0';
-      name.n -= TS_BACKQUOTE_CHAR_SIZE;
-    }
-
+    stringProcess(name.z, name.n);
     TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   }else if (pAlterSQL->type == TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN) {
@@ -7155,13 +7132,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SStrToken    name = {.type = TK_STRING, .z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
-    //handle Escape character backstick
-    if (name.z[0] == TS_BACKQUOTE_CHAR && name.z[name.n - 1] == TS_BACKQUOTE_CHAR) {
-      memmove(name.z, name.z + 1, name.n);
-      name.z[name.n - TS_BACKQUOTE_CHAR_SIZE] = '\0';
-      name.n -= TS_BACKQUOTE_CHAR_SIZE;
-    }
+    SStrToken    name = {.z = pItem->name, .n = (uint32_t)strlen(pItem->name)};
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(pMsg, msg17);
     }
@@ -7202,6 +7173,8 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidOperationMsg(pMsg, msg24);
     }
 
+    stringProcess(name.z, name.n);
+
     TAOS_FIELD f = tscCreateField(pColSchema->type, name.z, pItem->bytes);
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   }

src/client/src/tscServer.c

@@ -333,6 +333,11 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       .code    = 0
   };
 
+  if ((rpcMsg.msgType == TSDB_MSG_TYPE_SUBMIT) && (tsShortcutFlag & TSDB_SHORTCUT_RB_RPC_SEND_SUBMIT)) {
+    rpcFreeCont(rpcMsg.pCont);
+    return TSDB_CODE_FAILED;
+  }
+
   rpcSendRequest(pObj->pRpcObj->pDnodeConn, &pSql->epSet, &rpcMsg, &pSql->rpcRid);
   return TSDB_CODE_SUCCESS;
 }

src/common/inc/tglobal.h

@@ -64,6 +64,7 @@ extern int32_t  tsCompressMsgSize;
 extern int32_t  tsCompressColData;
 extern int32_t  tsMaxNumOfDistinctResults;
 extern char     tsTempDir[];
+extern int32_t  tsShortcutFlag;
 
 // query buffer management
 extern int32_t tsQueryBufferSize;  // maximum allowed usage buffer size in MB for each data node during query processing

src/common/src/tglobal.c

@@ -65,6 +65,7 @@ char    tsLocale[TSDB_LOCALE_LEN] = {0};
 char    tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
 int8_t  tsEnableCoreFile = 0;
 int32_t tsMaxBinaryDisplayWidth = 30;
+int32_t tsShortcutFlag = 0;  // shortcut flag to facilitate debugging
 
 /*
  * denote if the server needs to compress response message at the application layer to client, including query rsp,
@@ -1749,6 +1750,17 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_MB;
   taosInitConfigOption(cfg);
 
+  // shortcut flag to facilitate debugging
+  cfg.option = "shortcutFlag";
+  cfg.ptr = &tsShortcutFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = (1 << 24);
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
 #ifdef TD_TSZ
   // lossy compress
   cfg.option = "lossyColumns";

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

 {
     "name": "node-red-contrib-tdengine",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "",
     "main": "tdengine.js",
     "repository": {
@@ -10,8 +10,7 @@
     "author": "kevinpan45@163.com",
     "license": "ISC",
     "dependencies": {
-        "axios": "^0.24.0",
-        "mocha": "^9.1.3"
+        "axios": "^0.24.0"
     },
     "node-red": {
         "nodes": {
@@ -23,7 +22,6 @@
         "tdengine"
     ],
     "devDependencies": {
-        "node-red": "^2.1.4",
-        "node-red-node-test-helper": "^0.2.7"
+        "node-red": "^2.1.4"
     }
 }

src/inc/taosdef.h

@@ -402,6 +402,11 @@ do { \
 #define TSDB_DEFAULT_STABLES_HASH_SIZE         100
 #define TSDB_DEFAULT_CTABLES_HASH_SIZE         20000
 
+#define TSDB_SHORTCUT_RB_RPC_SEND_SUBMIT       0x01u  // RB: return before(global shortcut)
+#define TSDB_SHORTCUT_RA_RPC_RECV_SUBMIT       0x02u  // RA: return after(global shortcut)
+#define TSDB_SHORTCUT_NR_VNODE_WAL_WRITE       0x04u  // NR: no return and go on following actions(local shortcut)
+#define TSDB_SHORTCUT_RB_TSDB_COMMIT           0x08u
+
 #define TSDB_PORT_DNODESHELL                   0
 #define TSDB_PORT_DNODEDNODE                   5
 #define TSDB_PORT_SYNC                         10

taos-tools @ d6baa486

-Subproject commit 18916a1719fdfcefe1ed1d4ce0049f36c3ac4796
+Subproject commit d6baa48620fcbff857642c4ec10e3c48226ca97c

src/query/inc/sql.y

@@ -859,7 +859,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
     X.n += Z.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -869,10 +869,10 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     X.n += F.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
 
     toTSDBType(Z.type);
-    A = tVariantListAppendToken(A, &Z, -1, true);
+    A = tVariantListAppendToken(A, &Z, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -882,7 +882,7 @@ cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
     X.n += F.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
     A = tVariantListAppend(A, &Z, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
@@ -906,7 +906,7 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
     X.n += F.n;
 
     toTSDBType(A.type);
-    SArray* K = tVariantListAppendToken(NULL, &A, -1, true);
+    SArray* K = tVariantListAppendToken(NULL, &A, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -928,7 +928,7 @@ cmd ::= ALTER STABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
     X.n += Z.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -938,10 +938,10 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
     X.n += F.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
 
     toTSDBType(Z.type);
-    A = tVariantListAppendToken(A, &Z, -1, true);
+    A = tVariantListAppendToken(A, &Z, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -951,7 +951,7 @@ cmd ::= ALTER STABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
     X.n += F.n;
 
     toTSDBType(Y.type);
-    SArray* A = tVariantListAppendToken(NULL, &Y, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &Y, -1, false);
     A = tVariantListAppend(A, &Z, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);

src/query/src/sql.c

@@ -3840,7 +3840,7 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
     toTSDBType(yymsp[0].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -3851,10 +3851,10 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
 
     toTSDBType(yymsp[-1].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1, false);
 
     toTSDBType(yymsp[0].minor.yy0.type);
-    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1, true);
+    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, -1);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -3865,7 +3865,7 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
 
     toTSDBType(yymsp[-2].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1, false);
     A = tVariantListAppend(A, &yymsp[0].minor.yy162, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
@@ -3891,7 +3891,7 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
     toTSDBType(yymsp[0].minor.yy0.type);
-    SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, true);
+    SArray* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -3916,7 +3916,7 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
 
     toTSDBType(yymsp[0].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -3927,10 +3927,10 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
 
     toTSDBType(yymsp[-1].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1, false);
 
     toTSDBType(yymsp[0].minor.yy0.type);
-    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1, true);
+    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1, false);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN, TSDB_SUPER_TABLE);
     setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
@@ -3941,7 +3941,7 @@ static YYACTIONTYPE yy_reduce(
     yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
 
     toTSDBType(yymsp[-2].minor.yy0.type);
-    SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1, true);
+    SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1, false);
     A = tVariantListAppend(A, &yymsp[0].minor.yy162, -1);
 
     SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);

src/rpc/src/rpcMain.c

@@ -1165,6 +1165,19 @@ static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead, SRpcReqConte
     rpcMsg.handle = pConn;
     rpcAddRef(pRpc);  // add the refCount for requests
 
+    switch (rpcMsg.msgType) {
+      case TSDB_MSG_TYPE_SUBMIT:
+        if (tsShortcutFlag & TSDB_SHORTCUT_RA_RPC_RECV_SUBMIT) {
+          SRpcMsg rMsg = {.handle = rpcMsg.handle, .pCont = NULL, .contLen = 0};
+          rpcSendResponse(&rMsg);
+          rpcFreeCont(rpcMsg.pCont);
+          return;
+        }
+        break;
+      default:
+        break;
+    }
+
     // notify the server app
     (*(pRpc->cfp))(&rpcMsg, NULL);
   } else {

src/rpc/src/rpcUdp.c

@@ -186,9 +186,11 @@ static void *taosRecvUdpData(void *param) {
   SUdpConn          *pConn = param;
   struct sockaddr_in sourceAdd;
   ssize_t            dataLen;
+  int32_t            msgLen;
   unsigned int       addLen;
   uint16_t           port;
   SRecvInfo          recvInfo;
+  SRpcHead          *pHead;
 
   memset(&sourceAdd, 0, sizeof(sourceAdd));
   addLen = sizeof(sourceAdd);
@@ -218,6 +220,13 @@ static void *taosRecvUdpData(void *param) {
       continue;
     }
 
+    pHead = (SRpcHead *)msg;
+    msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
+    if (dataLen < msgLen) {
+      tError("%s recvfrom failed(%s): dataLen: %ld, msgLen: %d", pConn->label, strerror(errno), (long)dataLen, msgLen);
+      continue;
+    }
+
     int32_t size = dataLen + tsRpcOverhead;
     char *tmsg = malloc(size);
     if (NULL == tmsg) {

src/tsdb/src/tsdbCommit.c

@@ -98,6 +98,11 @@ void *tsdbCommitData(STsdbRepo *pRepo) {
   }
   tsdbStartCommit(pRepo);
 
+  if (tsShortcutFlag & TSDB_SHORTCUT_RB_TSDB_COMMIT) {
+    tsdbEndCommit(pRepo, terrno);
+    return NULL;
+  }
+
   // Commit to update meta file
   if (tsdbCommitMeta(pRepo) < 0) {
     tsdbError("vgId:%d error occurs while committing META data since %s", REPO_ID(pRepo), tstrerror(terrno));

src/util/inc/tconfig.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define TSDB_CFG_MAX_NUM    131
+#define TSDB_CFG_MAX_NUM    132
 #define TSDB_CFG_PRINT_LEN  23
 #define TSDB_CFG_OPTION_LEN 24
 #define TSDB_CFG_VALUE_LEN  41

src/vnode/src/vnodeWrite.c

@@ -103,7 +103,9 @@ int32_t vnodeProcessWrite(void *vparam, void *wparam, int32_t qtype, void *rpara
   }
 
   // write into WAL
+  if (!(tsShortcutFlag & TSDB_SHORTCUT_NR_VNODE_WAL_WRITE)) {
     code = walWrite(pVnode->wal, pHead);
+  }
   if (code < 0) {
     if (syncCode > 0) atomic_sub_fetch_32(&pWrite->processedCount, 1);
     vError("vgId:%d, hver:%" PRIu64 " vver:%" PRIu64 " code:0x%x", pVnode->vgId, pHead->version, pVnode->version, code);

tests/develop-test/5-taos-tools/taosbenchmark/telnet_tcp.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 import os
+import time
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -32,6 +33,7 @@ class TDTestCase:
         cmd = "taosBenchmark -f ./5-taos-tools/taosbenchmark/json/sml_telnet_tcp.json"
         tdLog.info("%s" % cmd)
         os.system("%s" % cmd)
+        time.sleep(5)
         tdSql.execute("reset query cache")
         tdSql.query("select count(tbname) from opentsdb_telnet.stb1")
         tdSql.checkData(0, 0, 8)

tests/develop-test/fulltest-query.sh

@@ -11,3 +11,4 @@ python3 ./test.py -f 2-query/diff_ignore_negative.py
 python3 ./test.py -f 2-query/diff_funcs.py
 python3 ./test.py -f 2-query/TD-13246.py
 python3 ./test.py -f 2-query/TD-6347.py
+python3 ./test.py -f 2-query/math_funcs.py

tests/pytest/alter/alterBackQuoteCol.py

+
+# -*- coding: utf-8 -*-
+
+import random
+import string
+import subprocess
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+    def run(self):
+        tdLog.debug("check databases")
+        tdSql.prepare()
+
+        ### test normal table
+        tdSql.execute("create database if not exists db")
+        tdSql.execute("use db")
+        tdSql.execute("create stable `sch.job.create` (`ts` TIMESTAMP, `tint` int, `node.value` NCHAR(7)) TAGS (`endpoint` NCHAR(7),`task.type` NCHAR(3))")
+        tdSql.execute("alter table `sch.job.create` modify tag `task.type` NCHAR(4)")
+        tdSql.execute("alter table `sch.job.create` change tag `task.type` `chan.type`")
+        tdSql.execute("alter table `sch.job.create` drop tag `chan.type`")
+        tdSql.execute("alter table `sch.job.create` add tag `add.type` NCHAR(6)")
+        tdSql.query("describe `sch.job.create`")
+        tdSql.checkData(4, 0, "add.type")
+
+        tdSql.execute("alter table `sch.job.create` modify column `node.value` NCHAR(8)")
+        tdSql.execute("alter table `sch.job.create` drop column `node.value`")
+        tdSql.execute("alter table `sch.job.create` add column `add.value` NCHAR(6)")
+
+        tdSql.query("describe `sch.job.create`")
+        tdSql.checkData(2, 0, "add.value")
+
+        tdSql.execute("insert into `tsch.job.create` using `sch.job.create`(`add.type`) TAGS('tag1') values(now, 1, 'here')")
+        tdSql.execute("alter table `tsch.job.create` set tag `add.type` = 'tag2'")
+        tdSql.query("select `add.type` from `tsch.job.create`")
+        tdSql.checkData(0, 0, "tag2")
+
+        ### test stable
+        tdSql.execute("create stable `ssch.job.create` (`ts` TIMESTAMP, `tint` int, `node.value` NCHAR(7)) TAGS (`endpoint` NCHAR(7),`task.type` NCHAR(3))")
+        tdSql.execute("alter stable `ssch.job.create` modify tag `task.type` NCHAR(4)")
+        tdSql.execute("alter stable `ssch.job.create` change tag `task.type` `chan.type`")
+        tdSql.execute("alter stable `ssch.job.create` drop tag `chan.type`")
+        tdSql.execute("alter stable `ssch.job.create` add tag `add.type` NCHAR(6)")
+        tdSql.query("describe `ssch.job.create`")
+        tdSql.checkData(4, 0, "add.type")
+
+        tdSql.execute("alter stable `ssch.job.create` modify column `node.value` NCHAR(8)")
+        tdSql.execute("alter stable `ssch.job.create` drop column `node.value`")
+        tdSql.execute("alter stable `ssch.job.create` add column `add.value` NCHAR(6)")
+
+        tdSql.query("describe `ssch.job.create`")
+        tdSql.checkData(2, 0, "add.value")
+
+        tdSql.execute("insert into `tssch.job.create` using `ssch.job.create`(`add.type`) TAGS('tag1') values(now, 1, 'here')")
+        tdSql.error("alter stable `tssch.job.create` set tag `add.type` = 'tag2'")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/fulltest.sh

@@ -417,6 +417,7 @@ python3 ./test.py -f insert/flushwhiledrop.py
 python3 ./test.py -f alter/alterColMultiTimes.py
 python3 ./test.py -f query/queryWildcardLength.py
 python3 ./test.py -f query/queryTbnameUpperLower.py
+python3 ./test.py -f alter/alterBackQuoteCol.py
 
 python3 ./test.py -f query/query.py
 python3 ./test.py -f query/queryDiffColsTagsAndOr.py

tests/pytest/functions/variable_httpDbNameMandatory.py

@@ -130,9 +130,16 @@ class TDTestCase:
         if 'httpDbNameMandatory' not in rj:
             tdLog.info('has no httpDbNameMandatory shown')
             tdLog.exit(1)
-        if rj['httpDbNameMandatory'] != '1':
+        val = None
+        pname = 'taosadapter' #httpDbNameMandatory doesn't work in taosadapter
+        cmd =  'ps -ef|grep %s|grep -v "grep"' % pname
+        p = subprocess.Popen(cmd,shell=True, stdout=subprocess.PIPE)
+        if p.wait() == 0:
+            val = p.stdout.read()
+        if rj['httpDbNameMandatory'] != '1' and pname not in str(val):
             tdLog.info('httpDbNameMandatory data:%s == expect:0'%rj['httpDbNameMandatory'])
             tdLog.exit(1)
+        if pname not in str(val):
             tdLog.info("httpDbNameMandatory by restful query data:%s == expect:1" % (rj['httpDbNameMandatory']))
 
     def run(self):