Merge pull request #15069 from taosdata/fix/TS-1686-V24

fix: resolve a segmentation fault issue of taos on alter table... set tag with a number as key

src/client/src/tscSQLParser.c

@@ -3466,10 +3466,6 @@ int32_t doGetColumnIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColum
   const char* msg0 = "ambiguous column name";
   const char* msg1 = "invalid column name";
 
-  if (pToken->n == 0) {
-    return TSDB_CODE_TSC_INVALID_OPERATION;
-  }
-
   if (isTablenameToken(pToken)) {
     pIndex->columnIndex = TSDB_TBNAME_COLUMN_INDEX;
   } else if (strlen(DEFAULT_PRIMARY_TIMESTAMP_COL_NAME) == pToken->n &&
@@ -3549,6 +3545,12 @@ int32_t getTableIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIn
 }
 
 int32_t getColumnIndexByName(const SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex, char* msg) {
+  const char* msg0 = "invalid column name";
+
+  if (pToken->n == 0) {
+    return invalidOperationMsg(msg, msg0);
+  }
+
   if (pQueryInfo->pTableMetaInfo == NULL || pQueryInfo->numOfTables == 0) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
@@ -6941,6 +6943,9 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     SColumnIndex idx = COLUMN_INDEX_INITIALIZER;
+    if (pItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
+        return invalidOperationMsg(pMsg, msg17);
+    }
     SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen};
 
     if (getColumnIndexByName(&name, pQueryInfo, &idx, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
@@ -7014,6 +7019,9 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     int16_t       numOfTags = tscGetNumOfTags(pTableMeta);
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
+    if (item->pVar.nType != TSDB_DATA_TYPE_BINARY) {
+        return invalidOperationMsg(pMsg, msg17);
+    }
     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;
@@ -7159,6 +7167,9 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     tVariantListItem* pItem = taosArrayGet(pAlterSQL->varList, 0);
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
+    if (pItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
+        return invalidOperationMsg(pMsg, msg17);
+    }
     SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen};
 
     if (getColumnIndexByName(&name, pQueryInfo, &columnIndex, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
@@ -9145,7 +9156,9 @@ int32_t tscGetExprFilters(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pSelect
     SStrToken* pToken = &pParam->pNode->columnName;
 
     SColumnIndex idx = COLUMN_INDEX_INITIALIZER;
-    getColumnIndexByName(pToken, pQueryInfo, &idx, tscGetErrorMsgPayload(pCmd));
+    if (getColumnIndexByName(pToken, pQueryInfo, &idx, tscGetErrorMsgPayload(pCmd)) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_TSC_INVALID_OPERATION;
+    }
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, idx.tableIndex);
     schema = *tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, idx.columnIndex);
   } else {

tests/pytest/table/tagNameCaseSensitive.py

@@ -51,10 +51,15 @@ class TDTestCase:
         tdSql.query("describe `STB5`")
         tdSql.checkRows(5)
 
+        tdSql.execute("alter table `STB5` add tag `1` int")
+        tdSql.execute("create table t2 using `STB5`(`1`) tags(2)")
+        tdSql.error("alter table t2 set tag 1=2222")
+
+
     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
+tdCases.addLinux(__file__, TDTestCase())