Merge remote-tracking branch 'origin/3.0' into fix/mnode

docs-en/14-reference/03-connector/rust.mdx

@@ -45,15 +45,15 @@ Add the [libtaos][libtaos] dependency to the [Rust](https://rust-lang.org) proje
 <Tabs defaultValue="native">
 <TabItem value="native" label="native connection">
 
-Add [libtaos][libtaos] to the ``Cargo.toml`'' file.
+Add [libtaos][libtaos] to the `Cargo.toml` file.
 
-``toml
+```toml
 [dependencies]
 # use default feature
 libtaos = "*"
 ```
 
-</TabItem
+</TabItem>
 <TabItem value="rest" label="REST connection">
 
 Add [libtaos][libtaos] to the `Cargo.toml` file and enable the `rest` feature.

include/libs/parser/parser.h

@@ -63,7 +63,7 @@ int32_t qAnalyseSqlSemantic(SParseContext* pCxt, const struct SCatalogReq* pCata
 void qDestroyQuery(SQuery* pQueryNode);
 
 int32_t qExtractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pSchema);
-int32_t qSetSTableIdForRSma(SNode* pStmt, int64_t uid);
+int32_t qSetSTableIdForRsma(SNode* pStmt, int64_t uid);
 
 int32_t     qBuildStmtOutput(SQuery* pQuery, SHashObj* pVgHash, SHashObj* pBlockHash);
 int32_t     qResetStmtDataBlock(void* block, bool keepBuf);

source/dnode/mnode/impl/inc/mndScheduler.h

@@ -27,10 +27,10 @@ void    mndCleanupScheduler(SMnode* pMnode);
 
 int32_t mndSchedInitSubEp(SMnode* pMnode, const SMqTopicObj* pTopic, SMqSubscribeObj* pSub);
 
-int32_t mndScheduleStream1(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream);
+int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream);
 
-int32_t mndConvertRSmaTask(const char* ast, int64_t uid, int8_t triggerType, int64_t watermark, char** pStr,
-                           int32_t* pLen, double filesFactor);
+int32_t mndConvertRsmaTask(char** pDst, int32_t* pDstLen, const char* ast, int64_t uid, int8_t triggerType,
+                           int64_t watermark, double filesFactor);
 
 #ifdef __cplusplus
 }

source/dnode/mnode/impl/src/mndConsumer.c

@@ -447,6 +447,8 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) {
 
   pConsumerOld = mndAcquireConsumer(pMnode, consumerId);
   if (pConsumerOld == NULL) {
+    mInfo("receive subscribe request from new consumer: %ld", consumerId);
+
     pConsumerNew = tNewSMqConsumerObj(consumerId, cgroup);
     tstrncpy(pConsumerNew->clientId, subscribe.clientId, 256);
     pConsumerNew->updateType = CONSUMER_UPDATE__MODIFY;
@@ -463,7 +465,12 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) {
 
   } else {
     /*taosRLockLatch(&pConsumerOld->lock);*/
+
     int32_t status = atomic_load_32(&pConsumerOld->status);
+
+    mInfo("receive subscribe request from old consumer: %ld, current status: %s", consumerId,
+          mndConsumerStatusName(status));
+
     if (status != MQ_CONSUMER_STATUS__READY) {
       terrno = TSDB_CODE_MND_CONSUMER_NOT_READY;
       goto SUBSCRIBE_OVER;

source/dnode/mnode/impl/src/mndOffset.c

@@ -183,7 +183,10 @@ static int32_t mndProcessCommitOffsetReq(SRpcMsg *pMsg) {
 
   for (int32_t i = 0; i < commitOffsetReq.num; i++) {
     SMqOffset *pOffset = &commitOffsetReq.offsets[i];
+    mInfo("commit offset %ld to vg %d of consumer group %s on topic %s", pOffset->offset, pOffset->vgId,
+          pOffset->cgroup, pOffset->topicName);
     if (mndMakePartitionKey(key, pOffset->cgroup, pOffset->topicName, pOffset->vgId) < 0) {
+      mError("submit offset to topic %s failed", pOffset->topicName);
       return -1;
     }
     bool          create = false;
@@ -192,7 +195,7 @@ static int32_t mndProcessCommitOffsetReq(SRpcMsg *pMsg) {
       SMqTopicObj *pTopic = mndAcquireTopic(pMnode, pOffset->topicName);
       if (pTopic == NULL) {
         terrno = TSDB_CODE_MND_TOPIC_NOT_EXIST;
-        mError("submit offset to topic %s failed since  %s", pOffset->topicName, terrstr());
+        mError("submit offset to topic %s failed since %s", pOffset->topicName, terrstr());
         continue;
       }
       pOffsetObj = taosMemoryMalloc(sizeof(SMqOffsetObj));

source/dnode/mnode/impl/src/mndScheduler.c

@@ -42,8 +42,8 @@ static int32_t mndAddTaskToTaskSet(SArray* pArray, SStreamTask* pTask) {
   return 0;
 }
 
-int32_t mndConvertRSmaTask(const char* ast, int64_t uid, int8_t triggerType, int64_t watermark, char** pStr,
-                           int32_t* pLen, double filesFactor) {
+int32_t mndConvertRsmaTask(char** pDst, int32_t* pDstLen, const char* ast, int64_t uid, int8_t triggerType,
+                           int64_t watermark, double filesFactor) {
   SNode*      pAst = NULL;
   SQueryPlan* pPlan = NULL;
   terrno = TSDB_CODE_SUCCESS;
@@ -53,7 +53,7 @@ int32_t mndConvertRSmaTask(const char* ast, int64_t uid, int8_t triggerType, int
     goto END;
   }
 
-  if (qSetSTableIdForRSma(pAst, uid) < 0) {
+  if (qSetSTableIdForRsma(pAst, uid) < 0) {
     terrno = TSDB_CODE_QRY_INVALID_INPUT;
     goto END;
   }
@@ -86,7 +86,7 @@ int32_t mndConvertRSmaTask(const char* ast, int64_t uid, int8_t triggerType, int
   }
 
   SSubplan* plan = nodesListGetNode(inner->pNodeList, 0);
-  if (qSubPlanToString(plan, pStr, pLen) < 0) {
+  if (qSubPlanToString(plan, pDst, pDstLen) < 0) {
     terrno = TSDB_CODE_QRY_INVALID_INPUT;
     goto END;
   }
@@ -335,7 +335,7 @@ int32_t mndAddFixedSinkTaskToStream(SMnode* pMnode, STrans* pTrans, SStreamObj*
   return 0;
 }
 
-int32_t mndScheduleStream1(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
+int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
   SSdb*       pSdb = pMnode->pSdb;
   SQueryPlan* pPlan = qStringToQueryPlan(pStream->physicalPlan);
   if (pPlan == NULL) {
@@ -361,6 +361,7 @@ int32_t mndScheduleStream1(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream)
       mndAddFixedSinkTaskToStream(pMnode, pTrans, pStream);
     }
   }
+
   if (totLevel > 1) {
     SStreamTask* pFinalTask;
     // inner plan
@@ -472,229 +473,7 @@ int32_t mndScheduleStream1(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream)
       }
     }
   }
-  return 0;
-}
-
-int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
-  SSdb*       pSdb = pMnode->pSdb;
-  SQueryPlan* pPlan = qStringToQueryPlan(pStream->physicalPlan);
-  if (pPlan == NULL) {
-    terrno = TSDB_CODE_QRY_INVALID_INPUT;
-    return -1;
-  }
-  ASSERT(pStream->vgNum == 0);
-
-  int32_t totLevel = LIST_LENGTH(pPlan->pSubplans);
-  ASSERT(totLevel <= 2);
-  pStream->tasks = taosArrayInit(totLevel, sizeof(void*));
-
-  bool hasExtraSink = false;
-  bool externalTargetDB = strcmp(pStream->sourceDb, pStream->targetDb) != 0;
-  if (totLevel == 2 || externalTargetDB) {
-    SArray* taskOneLevel = taosArrayInit(0, sizeof(void*));
-    taosArrayPush(pStream->tasks, &taskOneLevel);
-    // add extra sink
-    hasExtraSink = true;
-    if (pStream->fixedSinkVgId == 0) {
-      mndAddShuffleSinkTasksToStream(pMnode, pTrans, pStream);
-    } else {
-      mndAddFixedSinkTaskToStream(pMnode, pTrans, pStream);
-    }
-  }
-
-  for (int32_t level = 0; level < totLevel; level++) {
-    SArray* taskOneLevel = taosArrayInit(0, sizeof(void*));
-    taosArrayPush(pStream->tasks, &taskOneLevel);
-    SNodeListNode* inner = nodesListGetNode(pPlan->pSubplans, level);
-    ASSERT(LIST_LENGTH(inner->pNodeList) == 1);
-
-    SSubplan* plan = nodesListGetNode(inner->pNodeList, 0);
-
-    // if (level == totLevel - 1 /* or no snode */) {
-    if (level == totLevel - 1) {
-      // last level, source, must assign to vnode
-      // must be scan type
-      ASSERT(plan->subplanType == SUBPLAN_TYPE_SCAN);
-
-      // replicate task to each vnode
-      void* pIter = NULL;
-      while (1) {
-        SVgObj* pVgroup;
-        pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void**)&pVgroup);
-        if (pIter == NULL) break;
-        if (pVgroup->dbUid != pStream->dbUid) {
-          sdbRelease(pSdb, pVgroup);
-          continue;
-        }
-        SStreamTask* pTask = tNewSStreamTask(pStream->uid);
-        mndAddTaskToTaskSet(taskOneLevel, pTask);
-        // source part
-        pTask->sourceType = TASK_SOURCE__SCAN;
-        pTask->inputType = TASK_INPUT_TYPE__SUMBIT_BLOCK;
-
-        // sink part
-        if (level == 0) {
-          // only for inplace
-          pTask->sinkType = TASK_SINK__NONE;
-          if (!hasExtraSink) {
-#if 1
-            if (pStream->createdBy == STREAM_CREATED_BY__SMA) {
-              pTask->sinkType = TASK_SINK__SMA;
-              pTask->smaSink.smaId = pStream->smaId;
-            } else {
-              pTask->sinkType = TASK_SINK__TABLE;
-              pTask->tbSink.stbUid = pStream->targetStbUid;
-              memcpy(pTask->tbSink.stbFullName, pStream->targetSTbName, TSDB_TABLE_FNAME_LEN);
-              pTask->tbSink.pSchemaWrapper = tCloneSSchemaWrapper(&pStream->outputSchema);
-            }
-#endif
-          }
-        } else {
-          pTask->sinkType = TASK_SINK__NONE;
-        }
-
-        // dispatch part
-        if (level == 0 && !hasExtraSink) {
-          pTask->dispatchType = TASK_DISPATCH__NONE;
-        } else {
-          // add fixed ep dispatcher
-          int32_t lastLevel = level - 1;
-          if (hasExtraSink) lastLevel++;
-          ASSERT(lastLevel == 0);
-          SArray* pArray = taosArrayGetP(pStream->tasks, lastLevel);
-          // one merge only
-          ASSERT(taosArrayGetSize(pArray) == 1);
-          SStreamTask* lastLevelTask = taosArrayGetP(pArray, 0);
-          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
-          pTask->dispatchType = TASK_DISPATCH__FIXED;
-
-          pTask->fixedEpDispatcher.taskId = lastLevelTask->taskId;
-          pTask->fixedEpDispatcher.nodeId = lastLevelTask->nodeId;
-          pTask->fixedEpDispatcher.epSet = lastLevelTask->epSet;
-        }
-
-        // exec part
-        pTask->execType = TASK_EXEC__PIPE;
-        if (mndAssignTaskToVg(pMnode, pTrans, pTask, plan, pVgroup) < 0) {
-          sdbRelease(pSdb, pVgroup);
-          qDestroyQueryPlan(pPlan);
-          return -1;
-        }
-        sdbRelease(pSdb, pVgroup);
-      }
-    } else {
-      // merge plan
-
-      // TODO if has snode, assign to snode
-
-      // else, assign to vnode
-      ASSERT(plan->subplanType == SUBPLAN_TYPE_MERGE);
-      SStreamTask* pTask = tNewSStreamTask(pStream->uid);
-      mndAddTaskToTaskSet(taskOneLevel, pTask);
-
-      // source part, currently only support multi source
-      pTask->sourceType = TASK_SOURCE__PIPE;
-      pTask->inputType = TASK_INPUT_TYPE__DATA_BLOCK;
-
-      // sink part
-      pTask->sinkType = TASK_SINK__NONE;
-
-      // dispatch part
-      ASSERT(hasExtraSink);
-      /*pTask->dispatchType = TASK_DISPATCH__NONE;*/
-#if 1
-
-      if (hasExtraSink) {
-        // add dispatcher
-        if (pStream->fixedSinkVgId == 0) {
-          pTask->dispatchType = TASK_DISPATCH__SHUFFLE;
-
-          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
-          SDbObj* pDb = mndAcquireDb(pMnode, pStream->targetDb);
-          ASSERT(pDb);
-          if (mndExtractDbInfo(pMnode, pDb, &pTask->shuffleDispatcher.dbInfo, NULL) < 0) {
-            sdbRelease(pSdb, pDb);
-            qDestroyQueryPlan(pPlan);
-            return -1;
-          }
-          sdbRelease(pSdb, pDb);
-
-          // put taskId to useDbRsp
-          // TODO: optimize
-          SArray* pVgs = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
-          int32_t sz = taosArrayGetSize(pVgs);
-          SArray* sinkLv = taosArrayGetP(pStream->tasks, 0);
-          int32_t sinkLvSize = taosArrayGetSize(sinkLv);
-          for (int32_t i = 0; i < sz; i++) {
-            SVgroupInfo* pVgInfo = taosArrayGet(pVgs, i);
-            for (int32_t j = 0; j < sinkLvSize; j++) {
-              SStreamTask* pLastLevelTask = taosArrayGetP(sinkLv, j);
-              if (pLastLevelTask->nodeId == pVgInfo->vgId) {
-                pVgInfo->taskId = pLastLevelTask->taskId;
-                break;
-              }
-            }
-          }
-        } else {
-          pTask->dispatchType = TASK_DISPATCH__FIXED;
-          /*pTask->dispatchMsgType = TDMT_VND_TASK_WRITE_EXEC;*/
-          pTask->dispatchMsgType = TDMT_STREAM_TASK_DISPATCH;
-          SArray* pArray = taosArrayGetP(pStream->tasks, 0);
-          // one sink only
-          ASSERT(taosArrayGetSize(pArray) == 1);
-          SStreamTask* lastLevelTask = taosArrayGetP(pArray, 0);
-          pTask->fixedEpDispatcher.taskId = lastLevelTask->taskId;
-          pTask->fixedEpDispatcher.nodeId = lastLevelTask->nodeId;
-          pTask->fixedEpDispatcher.epSet = lastLevelTask->epSet;
-        }
-      }
-#endif
-
-      // exec part
-      pTask->execType = TASK_EXEC__MERGE;
-      SVgObj* pVgroup = mndSchedFetchOneVg(pMnode, pStream->dbUid);
-      ASSERT(pVgroup);
-      if (mndAssignTaskToVg(pMnode, pTrans, pTask, plan, pVgroup) < 0) {
-        sdbRelease(pSdb, pVgroup);
-        qDestroyQueryPlan(pPlan);
-        return -1;
-      }
-      sdbRelease(pSdb, pVgroup);
-    }
-  }
-
-#if 0
-  if (totLevel == 2) {
-    void* pIter = NULL;
-    while (1) {
-      SVgObj* pVgroup;
-      pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void**)&pVgroup);
-      if (pIter == NULL) break;
-      if (pVgroup->dbUid != pStream->dbUid) {
-        sdbRelease(pSdb, pVgroup);
-        continue;
-      }
-      SStreamTask* pTask = tNewSStreamTask(pStream->uid);
-
-      // source part
-      pTask->sourceType = TASK_SOURCE__MERGE;
-      pTask->inputType = TASK_INPUT_TYPE__DATA_BLOCK;
-
-      // sink part
-      pTask->sinkType = TASK_SINK__NONE;
-
-      // dispatch part
-      pTask->dispatchType = TASK_DISPATCH__NONE;
-
-      // exec part
-      pTask->execType = TASK_EXEC__NONE;
-    }
-  }
-#endif
-
-  // free memory
   qDestroyQueryPlan(pPlan);
-
   return 0;
 }
 

source/dnode/mnode/impl/src/mndStb.c

@@ -395,13 +395,13 @@ static void *mndBuildVCreateStbReq(SMnode *pMnode, SVgObj *pVgroup, SStbObj *pSt
     req.pRSmaParam.xFilesFactor = pStb->xFilesFactor;
     req.pRSmaParam.delay = pStb->delay;
     if (pStb->ast1Len > 0) {
-      if (mndConvertRSmaTask(pStb->pAst1, pStb->uid, STREAM_TRIGGER_AT_ONCE, 0, &req.pRSmaParam.qmsg1, &req.pRSmaParam.qmsg1Len,
+      if (mndConvertRsmaTask(&req.pRSmaParam.qmsg1, &req.pRSmaParam.qmsg1Len, pStb->pAst1, pStb->uid, STREAM_TRIGGER_AT_ONCE, 0,
                              req.pRSmaParam.xFilesFactor) != TSDB_CODE_SUCCESS) {
         return NULL;
       }
     }
     if (pStb->ast2Len > 0) {
-      if (mndConvertRSmaTask(pStb->pAst2, pStb->uid, STREAM_TRIGGER_AT_ONCE, 0, &req.pRSmaParam.qmsg2, &req.pRSmaParam.qmsg2Len,
+      if (mndConvertRsmaTask(&req.pRSmaParam.qmsg2, &req.pRSmaParam.qmsg2Len, pStb->pAst2, pStb->uid, STREAM_TRIGGER_AT_ONCE, 0,
                              req.pRSmaParam.xFilesFactor) != TSDB_CODE_SUCCESS) {
         return NULL;
       }

source/dnode/mnode/impl/src/mndStream.c

@@ -269,7 +269,7 @@ int32_t mndAddStreamToTrans(SMnode *pMnode, SStreamObj *pStream, const char *ast
     return -1;
   }
 
-  if (mndScheduleStream1(pMnode, pTrans, pStream) < 0) {
+  if (mndScheduleStream(pMnode, pTrans, pStream) < 0) {
     mError("stream:%ld, schedule stream since %s", pStream->uid, terrstr());
     return -1;
   }

source/dnode/vnode/src/tq/tq.c

@@ -130,7 +130,17 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg, int32_t workerId) {
           TD_VID(pTq->pVnode), pReq->currentOffset, fetchOffset);
 
   STqHandle* pHandle = taosHashGet(pTq->handles, pReq->subKey, strlen(pReq->subKey));
-  ASSERT(pHandle);
+  /*ASSERT(pHandle);*/
+  if (pHandle == NULL) {
+    tqError("tmq poll: no consumer handle for consumer %ld in vg %d, subkey %s", consumerId, pTq->pVnode->config.vgId,
+            pReq->subKey);
+    return -1;
+  }
+  if (pHandle->consumerId != consumerId) {
+    tqError("tmq poll: consumer handle mismatch for consumer %ld in vg %d, subkey %s, handle consumer id %ld",
+            consumerId, pTq->pVnode->config.vgId, pReq->subKey, pHandle->consumerId);
+    return -1;
+  }
 
   int32_t consumerEpoch = atomic_load_32(&pHandle->epoch);
   while (consumerEpoch < reqEpoch) {

source/libs/parser/src/parser.c

@@ -76,7 +76,7 @@ static int32_t setValueByBindParam(SValueNode* pVal, TAOS_MULTI_BIND* pParam) {
   int32_t inputSize = (NULL != pParam->length ? *(pParam->length) : tDataTypes[pParam->buffer_type].bytes);
   pVal->node.resType.type = pParam->buffer_type;
   pVal->node.resType.bytes = inputSize;
-  
+
   switch (pParam->buffer_type) {
     case TSDB_DATA_TYPE_VARCHAR:
     case TSDB_DATA_TYPE_VARBINARY:
@@ -186,7 +186,7 @@ int32_t qExtractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** p
   return extractResultSchema(pRoot, numOfCols, pSchema);
 }
 
-int32_t qSetSTableIdForRSma(SNode* pStmt, int64_t uid) {
+int32_t qSetSTableIdForRsma(SNode* pStmt, int64_t uid) {
   if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
     SNode* pTable = ((SSelectStmt*)pStmt)->pFromTable;
     if (QUERY_NODE_REAL_TABLE == nodeType(pTable)) {

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

@@ -122,10 +122,10 @@ class TDTestCase:
 
         for i in ['bigint','unsigned int','float','double','binary(10)','nchar(10)']:
             for j in [1,2,3]:
-                tdSql.error(f'alter table {stbname} modify tag t{j} {i}')
+                tdSql.error(f'alter stable {stbname} modify tag t{j} {i}')
         for i in ['int','unsigned int','float','binary(10)','nchar(10)']:
-            tdSql.error(f'alter table {stbname} modify tag t8 {i}')
-        tdSql.error(f'alter table {stbname} modify tag t4 int')
+            tdSql.error(f'alter stable {stbname} modify tag t8 {i}')
+        tdSql.error(f'alter stable {stbname} modify tag t4 int')
         tdSql.execute(f'drop database {dbname}')
 
     def run(self):

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

@@ -145,10 +145,17 @@ class TDTestCase:
         tdSql.execute(f'alter table {dbname}.{tbname} rename column c1 c21')
         tdSql.query(f'describe {dbname}.{tbname}')
         tdSql.checkData(1,0,'c21')
+        # !bug TD-16423
+        # tdSql.error(f'select c1 from {dbname}.{tbname}')
+        # tdSql.query(f'select c21 from {dbname}.{tbname}')
+        # tdSql.checkData(0,1,1)
         tdSql.execute(f'alter table {dbname}.{tbname} rename column `c21` c1')
         tdSql.query(f'describe {dbname}.{tbname}')
         tdSql.checkData(1,0,'c1')
-
+        # !bug TD-16423
+        # tdSql.error(f'select c1 from {dbname}.{tbname}')
+        # tdSql.query(f'select c1 from {dbname}.{tbname}')
+        # tdSql.checkData(0,1,1)
         tdSql.error(f'alter table {dbname}.{tbname} modify column c1 bigint')
         tdSql.error(f'alter table {dbname}.{tbname} modify column c1 double')
         tdSql.error(f'alter table {dbname}.{tbname} modify column c4 int')
@@ -158,9 +165,109 @@ class TDTestCase:
         tdSql.error(f'alter table {dbname}.{tbname} modify column c1 bool')
         tdSql.error(f'alter table {dbname}.{tbname} modify column c1 binary(10)')
         tdSql.execute(f'drop database {dbname}')
+    def alter_stb_column_check(self):
+        dbname = self.get_long_name(length=10, mode="letters")
+        tdSql.execute(f'create database if not exists {dbname}')
+        stbname = self.get_long_name(length=3, mode="letters")
+        tbname = self.get_long_name(length=3, mode="letters")
+        tdSql.execute(f'create database if not exists {dbname}')
+        tdSql.execute(f'use {dbname}')
+        tdSql.execute(
+            f'create table {stbname} (ts timestamp, c1 tinyint, c2 smallint, c3 int, \
+                c4 bigint, c5 tinyint unsigned, c6 smallint unsigned, c7 int unsigned, c8 bigint unsigned, c9 float, c10 double, c11 bool,c12 binary(20),c13 nchar(20)) tags(t0 int) ')
+        tdSql.execute(f'create table {tbname} using {stbname} tags(1)')
+        tdSql.execute(f'insert into {tbname} values (now,1,2,3,4,5,6,7,8,9.9,10.1,true,"abcd","涛思数据")')
+        tdSql.execute(f'alter table {stbname} add column c14 int')
+        tdSql.query(f'select c14 from {stbname}')
+        tdSql.checkRows(1)
+        tdSql.execute(f'alter table {stbname} add column `c15` int')
+        tdSql.query(f'select c15 from {stbname}')
+        tdSql.checkRows(1)
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(17)
+        tdSql.execute(f'alter table {stbname} drop column c14')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(16)
+        tdSql.execute(f'alter table {stbname} drop column `c15`')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(15)
+        tdSql.execute(f'alter table {stbname} modify column c12 binary(30)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(12,2,30)
+        tdSql.execute(f'alter table {stbname} modify column `c12` binary(35)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(12,2,35)
+        tdSql.error(f'alter table {stbname} modify column `c12` binary(34)')
+        tdSql.execute(f'alter table {stbname} modify column c13 nchar(30)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(13,2,30)
+        tdSql.error(f'alter table {stbname} modify column c13 nchar(29)')
+        tdSql.error(f'alter table {stbname} rename column c1 c21')
+        tdSql.error(f'alter table {stbname} modify column c1 int')
+        tdSql.error(f'alter table {stbname} modify column c4 int')
+        tdSql.error(f'alter table {stbname} modify column c8 int')
+        tdSql.error(f'alter table {stbname} modify column c1 unsigned int')
+        tdSql.error(f'alter table {stbname} modify column c9 double')
+        tdSql.error(f'alter table {stbname} modify column c10 float')
+        tdSql.error(f'alter table {stbname} modify column c11 int')
+        tdSql.execute(f'drop database {dbname}')
+    def alter_stb_tag_check(self):
+        dbname = self.get_long_name(length=10, mode="letters")
+        tdSql.execute(f'create database if not exists {dbname}')
+        stbname = self.get_long_name(length=3, mode="letters")
+        tbname = self.get_long_name(length=3, mode="letters")
+        tdSql.execute(f'create database if not exists {dbname}')
+        tdSql.execute(f'use {dbname}')
+        tdSql.execute(
+            f'create table {stbname} (ts timestamp, c1 int) tags(ts_tag timestamp, t1 tinyint, t2 smallint, t3 int, \
+                t4 bigint, t5 tinyint unsigned, t6 smallint unsigned, t7 int unsigned, t8 bigint unsigned, t9 float, t10 double, t11 bool,t12 binary(20),t13 nchar(20)) ')
+        tdSql.execute(f'create table {tbname} using {stbname} tags(now,1,2,3,4,5,6,7,8,9.9,10.1,true,"abcd","涛思数据")')
+        tdSql.execute(f'insert into {tbname} values(now,1)')
+
+        tdSql.execute(f'alter table {stbname} add tag t14 int')
+        tdSql.query(f'select t14 from {stbname}')
+        tdSql.checkRows(1)
+        tdSql.execute(f'alter table {stbname} add tag `t15` int')
+        tdSql.query(f'select t14 from {stbname}')
+        tdSql.checkRows(1)
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(18)
+        tdSql.execute(f'alter table {stbname} drop tag t14')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(17)
+        tdSql.execute(f'alter table {stbname} drop tag `t15`')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkRows(16)
+        tdSql.execute(f'alter table {stbname} modify tag t12 binary(30)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(14,2,30)
+        tdSql.execute(f'alter table {stbname} modify tag `t12` binary(35)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(14,2,35)
+        tdSql.error(f'alter table {stbname} modify tag `t12` binary(34)')
+        tdSql.execute(f'alter table {stbname} modify tag t13 nchar(30)')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(15,2,30)
+        tdSql.error(f'alter table {stbname} modify tag t13 nchar(29)')
+        tdSql.execute(f'alter table {stbname} rename tag t1 t21')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(3,0,'t21')
+        tdSql.execute(f'alter table {stbname} rename tag `t21` t1')
+        tdSql.query(f'describe {stbname}')
+        tdSql.checkData(3,0,'t1')
+
+        for i in ['bigint','unsigned int','float','double','binary(10)','nchar(10)']:
+            for j in [1,2,3]:
+                tdSql.error(f'alter table {stbname} modify tag t{j} {i}')
+        for i in ['int','unsigned int','float','binary(10)','nchar(10)']:
+            tdSql.error(f'alter table {stbname} modify tag t8 {i}')
+        tdSql.error(f'alter table {stbname} modify tag t4 int')
+        tdSql.execute(f'drop database {dbname}')
     def run(self):
         self.alter_tb_tag_check()
         self.alter_ntb_column_check()
+        self.alter_stb_column_check()
+        self.alter_stb_tag_check()
 
     def stop(self):
         tdSql.close()

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

@@ -23,6 +23,10 @@ from util.sql import *
 import threading
 from util.types import TDSmlProtocolType, TDSmlTimestampType
 from util.common import tdCom
+import platform
+import io
+if platform.system().lower() == 'windows':
+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf8') 
 
 class TDTestCase:
     def init(self, conn, logSql):

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

@@ -22,6 +22,10 @@ from util.sql import *
 from util.common import tdCom
 from util.types import TDSmlProtocolType, TDSmlTimestampType
 import threading
+import platform
+import io
+if platform.system().lower() == 'windows':
+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf8') 
 
 class TDTestCase:
     def init(self, conn, logSql):

tests/system-test/2-query/To_iso8601.py

@@ -3,7 +3,7 @@ from time import sleep
 from util.log import *
 from util.sql import *
 from util.cases import *
-
+import os
 
 
 
@@ -12,28 +12,47 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
-
-    def run(self):  # sourcery skip: extract-duplicate-method
-        tdSql.prepare()
-        # get system timezone
-        today_date = datetime.datetime.strptime(
-            datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d")
+        self.rowNum = 10
+        self.ts = 1640966400000  # 2022-1-1 00:00:00.000
+    def check_customize_param_ms(self):
+        
+        time_zone = os.popen('date "+%z"').read().strip()
+        tdSql.execute('create database db1 precision "ms"')
+        tdSql.execute('use db1')
+        tdSql.execute('create table if not exists ntb(ts timestamp, c1 int, c2 timestamp)')
+        for i in range(self.rowNum):
+            tdSql.execute("insert into ntb values(%d, %d, %d)" 
+                        % (self.ts + i, i + 1, self.ts + i))
+        tdSql.query('select to_iso8601(ts) from ntb')
+        for i in range(self.rowNum):
+            tdSql.checkEqual(tdSql.queryResult[i][0],f'2022-01-01T00:00:00.00{i}{time_zone}')
+            
+        timezone_list = ['+0000','+0100','+0200','+0300','+0330','+0400','+0500','+0530','+0600','+0700','+0800','+0900','+1000','+1100','+1200',\
+                        '+00','+01','+02','+03','+04','+05','+06','+07','+08','+09','+10','+11','+12',\
+                            '+00:00','+01:00','+02:00','+03:00','+03:30','+04:00','+05:00','+05:30','+06:00','+07:00','+08:00','+09:00','+10:00','+11:00','+12:00',\
+                            '-0000','-0100','-0200','-0300','-0400','-0500','-0600','-0700','-0800','-0900','-1000','-1100','-1200',\
+                        '-00','-01','-02','-03','-04','-05','-06','-07','-08','-09','-10','-11','-12',\
+                            '-00:00','-01:00','-02:00','-03:00','-04:00','-05:00','-06:00','-07:00','-08:00','-09:00','-10:00','-11:00','-12:00',\
+                                'z','Z']
+        for j in timezone_list:
+            tdSql.query(f'select to_iso8601(ts,"{j}") from ntb')
+            for i in range(self.rowNum):
+                tdSql.checkEqual(tdSql.queryResult[i][0],f'2022-01-01T00:00:00.00{i}{j}')
         
+        error_param_list = [0,100.5,'a','!']
+        for i in error_param_list:
+            tdSql.error(f'select to_iso8601(ts,"{i}") from ntb')
+        #! bug TD-16372:对于错误的时区，缺少校验
+        error_timezone_param = ['+13','-13','+1300','-1300','+0001','-0001','-0330','-0530']
+        for i in error_timezone_param:
+            tdSql.error(f'select to_iso8601(ts,"{i}") from ntb')
+        
+    def check_base_function(self):
+        tdSql.prepare()
         tdLog.printNoPrefix("==========step1:create tables==========")
-        tdSql.execute(
-            '''create table if not exists ntb
-            (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb
-            (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb_1 using stb tags(100)
-            '''
-        )
+        tdSql.execute('create table if not exists ntb(ts timestamp, c1 int, c2 float,c3 double,c4 timestamp)')
+        tdSql.execute('create table if not exists stb(ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int)')
+        tdSql.execute('create table if not exists stb_1 using stb tags(100)')
 
         tdLog.printNoPrefix("==========step2:insert data==========")
         tdSql.execute('insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())')
@@ -48,12 +67,9 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.query("select to_iso8601(ts) from ntb where ts=today()")
         tdSql.checkRows(1)
-        # tdSql.checkData(0,0,10)
-        for i in range(1,10):
+        for i in range(0,3):
             tdSql.query("select to_iso8601(1) from ntb")
-            tdSql.checkData(0,0,"1970-01-01T08:00:01+0800")
-            i+=1
-            sleep(0.2)
+            tdSql.checkData(i,0,"1970-01-01T08:00:01+0800")
             tdSql.checkRows(3)
         tdSql.query("select to_iso8601(ts) from ntb")
         tdSql.checkRows(3)
@@ -67,53 +83,34 @@ class TDTestCase:
         tdSql.error("select to_iso8601(timezone()) from ntb")
         tdSql.error("select to_iso8601('abc') from ntb")
 
-        tdSql.query("select to_iso8601(today()) *null from ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) +null from ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) -null from ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) /null from ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-
-        tdSql.query("select to_iso8601(today()) *null from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) +null from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) -null from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) /null from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        # tdSql.query("select to_iso8601(-1) from ntb")
+        for i in ['+','-','*','/']:
+            tdSql.query(f"select to_iso8601(today()) {i}null from ntb")
+            tdSql.checkRows(3)
+            tdSql.checkData(0,0,None)
+            tdSql.query(f"select to_iso8601(today()) {i}null from db.ntb")
+            tdSql.checkRows(3)
+            tdSql.checkData(0,0,None)
         tdSql.query("select to_iso8601(9223372036854775807) from ntb")
         tdSql.checkRows(3)
-        # bug TD-14896
+        # bug TD-15207
         # tdSql.query("select to_iso8601(10000000000) from ntb")
         # tdSql.checkData(0,0,None)
         # tdSql.query("select to_iso8601(-1) from ntb")
         # tdSql.checkRows(3)
         # tdSql.query("select to_iso8601(-10000000000) from ntb")
         # tdSql.checkData(0,0,None)
-        tdSql.error("select to_iso8601(1.5) from ntb")
-        tdSql.error("select to_iso8601(1.5) from db.ntb")
-        tdSql.error("select to_iso8601('a') from ntb")
-        tdSql.error("select to_iso8601(c2) from ntb")
+        err_param = [1.5,'a','c2']
+        for i in err_param:
+            tdSql.error(f"select to_iso8601({i}) from ntb")
+            tdSql.error(f"select to_iso8601({i}) from db.ntb")
+            
         tdSql.query("select to_iso8601(now) from stb")
+        tdSql.checkRows(3)
         tdSql.query("select to_iso8601(now()) from stb")
         tdSql.checkRows(3)
-        for i in range(1,10):
-            tdSql.query("select to_iso8601(1) from stb")
-            tdSql.checkData(0,0,"1970-01-01T08:00:01+0800")
-            i+=1
-            sleep(0.2)
+        tdSql.query("select to_iso8601(1) from stb")
+        for i in range(0,3):
+            tdSql.checkData(i,0,"1970-01-01T08:00:01+0800")
             tdSql.checkRows(3)
         tdSql.query("select to_iso8601(ts) from stb")
         tdSql.checkRows(3)
@@ -121,37 +118,17 @@ class TDTestCase:
         tdSql.checkRows(3)
         tdSql.query("select to_iso8601(ts)+'a' from stb ")
         tdSql.checkRows(3)
+        for i in ['+','-','*','/']:
+            tdSql.query(f"select to_iso8601(today()) {i}null from stb")
+            tdSql.checkRows(3)
+            tdSql.checkData(0,0,None)
+            tdSql.query(f"select to_iso8601(today()) {i}null from db.stb")
+            tdSql.checkRows(3)
+            tdSql.checkData(0,0,None)
         
-        tdSql.query("select to_iso8601(today()) *null from stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) +null from stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) -null from stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) /null from stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) *null from db.stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) +null from db.stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) -null from db.stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select to_iso8601(today()) /null from db.stb")
-        tdSql.checkRows(3)
-        tdSql.checkData(0,0,None)
-
-        # bug TD-14896
-        # tdSql.query("select to_iso8601(-1) from ntb")
-        # tdSql.checkRows(3)
-
-
+    def run(self):  # sourcery skip: extract-duplicate-method
+        self.check_base_function()
+        self.check_customize_param_ms()
 
     def stop(self):
         tdSql.close()

tests/system-test/2-query/abs.py

@@ -65,6 +65,60 @@ class TDTestCase:
             '''
         )
     
+
+    def prepare_tag_datas(self):
+                # prepare datas
+        tdSql.execute("create database if not exists testdb keep 3650 days 1000")
+        tdSql.execute(" use testdb ")
+        tdSql.execute(
+            '''create table stb1
+            (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+            tags (t0 timestamp, t1 int, t2 bigint, t3 smallint, t4 tinyint, t5 float, t6 double, t7 bool, t8 binary(16),t9 nchar(32))
+            '''
+        )
+
+        tdSql.execute(
+            '''
+            create table t1
+            (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+            '''
+        )
+        for i in range(4):
+            tdSql.execute(f'create table ct{i+1} using stb1 tags ( now(), {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, "binary{i}", "nchar{i}" )')
+
+        for i in range(9):
+            tdSql.execute(
+                f"insert into ct1 values ( now()-{i*10}s, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+            tdSql.execute(
+                f"insert into ct4 values ( now()-{i*90}d, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+            )
+        tdSql.execute("insert into ct1 values (now()-45s, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', now()+8a )")
+        tdSql.execute("insert into ct1 values (now()+10s, 9, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+15s, 9, -99999, -999, -99, -9.99, NULL, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute("insert into ct1 values (now()+20s, 9, -99999, -999, NULL, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+
+        tdSql.execute("insert into ct4 values (now()-810d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()-400d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute("insert into ct4 values (now()+90d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  ) ")
+
+        tdSql.execute(
+            f'''insert into t1 values
+            ( '2020-04-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2020-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now()+1a )
+            ( '2020-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now()+2a )
+            ( '2021-01-01 01:01:06.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now()+3a )
+            ( '2021-05-07 01:01:10.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now()+4a )
+            ( '2021-07-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            ( '2021-09-30 01:01:16.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now()+5a )
+            ( '2022-02-01 01:01:20.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now()+6a )
+            ( '2022-10-28 01:01:26.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", "1970-01-01 08:00:00.000" )
+            ( '2022-12-01 01:01:30.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", "1969-01-01 01:00:00.000" )
+            ( '2022-12-31 01:01:36.000', 9, -99999999999999999, -999, -99, -9.99, -999999999999999999999.99, 1, "binary9", "nchar9", "1900-01-01 00:00:00.000" )
+            ( '2023-02-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+            '''
+        )
+
     def check_result_auto(self ,origin_query , abs_query):
         abs_result = tdSql.getResult(abs_query)
         origin_result = tdSql.getResult(origin_query)
@@ -95,6 +149,7 @@ class TDTestCase:
             tdLog.info("abs value check pass , it work as expected ,sql is \"%s\"   "%abs_query )
         
     def test_errors(self):
+        tdSql.execute("use testdb")
         error_sql_lists = [
             "select abs from t1",
             # "select abs(-+--+c1) from t1",
@@ -129,11 +184,16 @@ class TDTestCase:
             tdSql.error(error_sql)
     
     def support_types(self):
+        tdSql.execute("use testdb")
         type_error_sql_lists = [
             "select abs(ts) from t1" , 
+            "select abs(t0) from t1" , 
             "select abs(c7) from t1",
             "select abs(c8) from t1",
             "select abs(c9) from t1",
+            "select abs(t7) from t1",
+            "select abs(t8) from t1",
+            "select abs(t9) from t1",
             "select abs(ts) from ct1" , 
             "select abs(c7) from ct1",
             "select abs(c8) from ct1",
@@ -171,6 +231,13 @@ class TDTestCase:
             "select abs(c5) from t1",
             "select abs(c6) from t1",
 
+            "select abs(t1) from ct1",
+            "select abs(t2) from ct1",
+            "select abs(t3) from ct1",
+            "select abs(t4) from ct1",
+            "select abs(t5) from ct1",
+            "select abs(t6) from ct1",
+
             "select abs(c1) from ct1",
             "select abs(c2) from ct1",
             "select abs(c3) from ct1",
@@ -447,6 +514,38 @@ class TDTestCase:
 
         self.check_result_auto("select c1+1 ,c2 , c3*1 , c4/2, c5/2, c6 from sub1_bound" ,"select abs(c1+1) ,abs(c2) , abs(c3*1) , abs(c4/2), abs(c5)/2, abs(c6) from sub1_bound ")
         
+    def test_tag_compute_for_scalar_function(self):
+        
+        tdSql.execute("use testdb")
+
+        self.check_result_auto( "select c1, t2, t3 , t4, t5 from ct4 ", "select (c1), abs(t2) ,abs(t3), abs(t4), abs(t5) from ct4")
+        self.check_result_auto( "select c1+2, t2+2, t3 , t4, t5 from ct4 ", "select (c1)+2, abs(t2)+2 ,abs(t3), abs(t4), abs(t5) from ct4")
+        self.check_result_auto( "select c1+2, t2+2, t3 , t4, t5 from stb1 order by t1 ", "select (c1)+2, abs(t2)+2 ,abs(t3), abs(t4), abs(t5) from stb1 order by t1")
+
+        # bug need fix 
+
+        # tdSql.query(" select sum(c1) from stb1 where t1+10 >1; ")  #　taosd crash 
+        tdSql.query("select c1 ,t1 from stb1 where t1 =0 ")
+        tdSql.checkRows(13)
+        # tdSql.query("select t1 from stb1 where t1 >0 ")
+        # tdSql.checkRows(3)
+        # tdSql.query("select sum(t1) from (select c1 ,t1 from stb1)")
+        # tdSql.checkData(0,0,61)
+        # tdSql.query("select distinct(c1) ,t1 from stb1")
+        # tdSql.checkRows(11)
+        # tdSql.query("select max(t2) , t1 ,c1, t2 from stb1")
+        # tdSql.checkData(0,3,33333)
+
+        # tag filter with abs function
+        # tdSql.query("select t1 from stb1 where abs(t1)=1")
+        # tdSql.checkRows(1)
+        tdSql.query("select t1 from stb1 where abs(c1+t1)=1")
+        tdSql.checkRows(1)
+        # tdSql.query("select t1 from stb1 where abs(t1+c1)=1")
+        # tdSql.checkRows(1)
+        tdSql.query("select abs(c1+t1)*t1 from stb1 where abs(c1)/floor(abs(ceil(t1))) ==1")
+
+
 
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
         tdSql.prepare()
@@ -454,6 +553,7 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step1:create table ==============")
         
         self.prepare_datas()
+        self.prepare_tag_datas()
 
         tdLog.printNoPrefix("==========step2:test errors ==============")    
 
@@ -475,6 +575,10 @@ class TDTestCase:
 
         self.abs_func_filter()
 
+        tdLog.printNoPrefix("==========step6: tag coumpute query ============") 
+        
+        self.test_tag_compute_for_scalar_function()
+
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")

tests/system-test/fulltest.bat

 
-@REM python3 .\test.py -f 0-others\taosShell.py
-@REM python3 .\test.py -f 0-others\taosShellError.py
+python3 .\test.py -f 0-others\taosShell.py
+python3 .\test.py -f 0-others\taosShellError.py
 python3 .\test.py -f 0-others\taosShellNetChk.py
 python3 .\test.py -f 0-others\telemetry.py
 python3 .\test.py -f 0-others\taosdMonitor.py
 python3 .\test.py -f 0-others\udfTest.py
 python3 .\test.py -f 0-others\udf_create.py
 @REM python3 .\test.py -f 0-others\udf_restart_taosd.py
-@REM python3 .\test.py -f 0-others\cachelast.py
+python3 .\test.py -f 0-others\cachelast.py
 
-@REM python3 .\test.py -f 0-others\user_control.py
-@REM python3 .\test.py -f 0-others\fsync.py
+python3 .\test.py -f 0-others\user_control.py
+python3 .\test.py -f 0-others\fsync.py
 
-@REM python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
-@REM python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
-@REM python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
+python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
+python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
+python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
 @REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py
-@REM python3 .\test.py -f 1-insert\alter_stable.py
-@REM python3 .\test.py -f 1-insert\alter_table.py
-@REM python3 .\test.py -f 2-query\between.py
-@REM python3 .\test.py -f 2-query\distinct.py
-@REM python3 .\test.py -f 2-query\varchar.py
+python3 .\test.py -f 1-insert\alter_stable.py
+python3 .\test.py -f 1-insert\alter_table.py
+python3 .\test.py -f 2-query\between.py
+python3 .\test.py -f 2-query\distinct.py
+python3 .\test.py -f 2-query\varchar.py
 @REM python3 .\test.py -f 2-query\ltrim.py
-@REM python3 .\test.py -f 2-query\rtrim.py
-@REM python3 .\test.py -f 2-query\length.py
-@REM python3 .\test.py -f 2-query\char_length.py
-@REM python3 .\test.py -f 2-query\upper.py
-@REM python3 .\test.py -f 2-query\lower.py
-@REM python3 .\test.py -f 2-query\join.py
-@REM python3 .\test.py -f 2-query\join2.py
-@REM python3 .\test.py -f 2-query\cast.py
-@REM python3 .\test.py -f 2-query\union.py
-@REM python3 .\test.py -f 2-query\union1.py
+python3 .\test.py -f 2-query\rtrim.py
+python3 .\test.py -f 2-query\length.py
+python3 .\test.py -f 2-query\char_length.py
+python3 .\test.py -f 2-query\upper.py
+python3 .\test.py -f 2-query\lower.py
+python3 .\test.py -f 2-query\join.py
+python3 .\test.py -f 2-query\join2.py
+python3 .\test.py -f 2-query\cast.py
+python3 .\test.py -f 2-query\union.py
+python3 .\test.py -f 2-query\union1.py
 @REM python3 .\test.py -f 2-query\concat.py
-@REM python3 .\test.py -f 2-query\concat2.py
-@REM python3 .\test.py -f 2-query\concat_ws.py
-@REM python3 .\test.py -f 2-query\concat_ws2.py
+python3 .\test.py -f 2-query\concat2.py
+python3 .\test.py -f 2-query\concat_ws.py
+python3 .\test.py -f 2-query\concat_ws2.py
 @REM python3 .\test.py -f 2-query\check_tsdb.py
 @REM python3 .\test.py -f 2-query\spread.py
 @REM python3 .\test.py -f 2-query\hyperloglog.py
 
+python3 .\test.py -f 2-query\timezone.py
+python3 .\test.py -f 2-query\Now.py
+python3 .\test.py -f 2-query\Today.py
+python3 .\test.py -f 2-query\max.py
+python3 .\test.py -f 2-query\min.py
+python3 .\test.py -f 2-query\count.py
+python3 .\test.py -f 2-query\last.py
+python3 .\test.py -f 2-query\first.py
+python3 .\test.py -f 2-query\To_iso8601.py
+python3 .\test.py -f 2-query\To_unixtimestamp.py
+python3 .\test.py -f 2-query\timetruncate.py
+python3 .\test.py -f 2-query\diff.py
+python3 .\test.py -f 2-query\Timediff.py
 
-@REM python3 .\test.py -f 2-query\timezone.py
-@REM python3 .\test.py -f 2-query\Now.py
-@REM python3 .\test.py -f 2-query\Today.py
-@REM python3 .\test.py -f 2-query\max.py
-@REM python3 .\test.py -f 2-query\min.py
-@REM python3 .\test.py -f 2-query\count.py
-@REM python3 .\test.py -f 2-query\last.py
-@REM python3 .\test.py -f 2-query\first.py
-@REM python3 .\test.py -f 2-query\To_iso8601.py
-@REM python3 .\test.py -f 2-query\To_unixtimestamp.py
-@REM python3 .\test.py -f 2-query\timetruncate.py
-@REM python3 .\test.py -f 2-query\diff.py
-@REM python3 .\test.py -f 2-query\Timediff.py
-
-@REM python3 .\test.py -f 2-query\top.py
-@REM python3 .\test.py -f 2-query\bottom.py
-@REM python3 .\test.py -f 2-query\percentile.py
-@REM python3 .\test.py -f 2-query\apercentile.py
-@REM python3 .\test.py -f 2-query\abs.py
-@REM python3 .\test.py -f 2-query\ceil.py
-@REM python3 .\test.py -f 2-query\floor.py
-@REM python3 .\test.py -f 2-query\round.py
-@REM python3 .\test.py -f 2-query\log.py
-@REM python3 .\test.py -f 2-query\pow.py
-@REM python3 .\test.py -f 2-query\sqrt.py
-@REM python3 .\test.py -f 2-query\sin.py
-@REM python3 .\test.py -f 2-query\cos.py
-@REM python3 .\test.py -f 2-query\tan.py
-@REM python3 .\test.py -f 2-query\arcsin.py
-@REM python3 .\test.py -f 2-query\arccos.py
-@REM python3 .\test.py -f 2-query\arctan.py
+python3 .\test.py -f 2-query\top.py
+python3 .\test.py -f 2-query\bottom.py
+python3 .\test.py -f 2-query\percentile.py
+python3 .\test.py -f 2-query\apercentile.py
+python3 .\test.py -f 2-query\abs.py
+python3 .\test.py -f 2-query\ceil.py
+python3 .\test.py -f 2-query\floor.py
+python3 .\test.py -f 2-query\round.py
+python3 .\test.py -f 2-query\log.py
+python3 .\test.py -f 2-query\pow.py
+python3 .\test.py -f 2-query\sqrt.py
+python3 .\test.py -f 2-query\sin.py
+python3 .\test.py -f 2-query\cos.py
+python3 .\test.py -f 2-query\tan.py
+python3 .\test.py -f 2-query\arcsin.py
+python3 .\test.py -f 2-query\arccos.py
+python3 .\test.py -f 2-query\arctan.py
 @REM python3 .\test.py -f 2-query\query_cols_tags_and_or.py
 @REM # python3 .\test.py -f 2-query\nestedQuery.py
 @REM # TD-15983 subquery output duplicate name column. 
 @REM # Please Xiangyang Guo modify the following script
 @REM # python3 .\test.py -f 2-query\nestedQuery_str.py
 
-@REM python3 .\test.py -f 2-query\avg.py
-@REM python3 .\test.py -f 2-query\elapsed.py
+python3 .\test.py -f 2-query\avg.py
+python3 .\test.py -f 2-query\elapsed.py
 @REM python3 .\test.py -f 2-query\csum.py
-@REM python3 .\test.py -f 2-query\mavg.py
-@REM python3 .\test.py -f 2-query\diff.py
-@REM python3 .\test.py -f 2-query\sample.py
+python3 .\test.py -f 2-query\mavg.py
+python3 .\test.py -f 2-query\diff.py
+python3 .\test.py -f 2-query\sample.py
 @REM python3 .\test.py -f 2-query\function_diff.py
-@REM python3 .\test.py -f 2-query\unique.py
-@REM python3 .\test.py -f 2-query\stateduration.py
-@REM python3 .\test.py -f 2-query\function_stateduration.py
-@REM python3 .\test.py -f 2-query\statecount.py
+python3 .\test.py -f 2-query\unique.py
+python3 .\test.py -f 2-query\stateduration.py
+python3 .\test.py -f 2-query\function_stateduration.py
+python3 .\test.py -f 2-query\statecount.py
 
 @REM python3 .\test.py -f 7-tmq\basic5.py
 @REM python3 .\test.py -f 7-tmq\subscribeDb.py
@@ -100,4 +99,4 @@ python3 .\test.py -f 0-others\udf_create.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb2.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb3.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb4.py
-@REM python3 .\test.py -f 7-tmq\db.py
+@REM python3 .\test.py -f 7-tmq\db.py
\ No newline at end of file

tests/system-test/simpletest.bat

+
+@REM python3 .\test.py -f 0-others\taosShell.py
+@REM python3 .\test.py -f 0-others\taosShellError.py
+python3 .\test.py -f 0-others\taosShellNetChk.py
+python3 .\test.py -f 0-others\telemetry.py
+python3 .\test.py -f 0-others\taosdMonitor.py
+python3 .\test.py -f 0-others\udfTest.py
+python3 .\test.py -f 0-others\udf_create.py
+@REM python3 .\test.py -f 0-others\udf_restart_taosd.py
+@REM python3 .\test.py -f 0-others\cachelast.py
+
+@REM python3 .\test.py -f 0-others\user_control.py
+@REM python3 .\test.py -f 0-others\fsync.py
+
+@REM python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
+@REM python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
+@REM python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
+@REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py
+@REM python3 .\test.py -f 1-insert\alter_stable.py
+@REM python3 .\test.py -f 1-insert\alter_table.py
+@REM python3 .\test.py -f 2-query\between.py
+@REM python3 .\test.py -f 2-query\distinct.py
+@REM python3 .\test.py -f 2-query\varchar.py
+@REM python3 .\test.py -f 2-query\ltrim.py
+@REM python3 .\test.py -f 2-query\rtrim.py
+@REM python3 .\test.py -f 2-query\length.py
+@REM python3 .\test.py -f 2-query\char_length.py
+@REM python3 .\test.py -f 2-query\upper.py
+@REM python3 .\test.py -f 2-query\lower.py
+@REM python3 .\test.py -f 2-query\join.py
+@REM python3 .\test.py -f 2-query\join2.py
+@REM python3 .\test.py -f 2-query\cast.py
+@REM python3 .\test.py -f 2-query\union.py
+@REM python3 .\test.py -f 2-query\union1.py
+@REM python3 .\test.py -f 2-query\concat.py
+@REM python3 .\test.py -f 2-query\concat2.py
+@REM python3 .\test.py -f 2-query\concat_ws.py
+@REM python3 .\test.py -f 2-query\concat_ws2.py
+@REM python3 .\test.py -f 2-query\check_tsdb.py
+@REM python3 .\test.py -f 2-query\spread.py
+@REM python3 .\test.py -f 2-query\hyperloglog.py
+
+
+@REM python3 .\test.py -f 2-query\timezone.py
+@REM python3 .\test.py -f 2-query\Now.py
+@REM python3 .\test.py -f 2-query\Today.py
+@REM python3 .\test.py -f 2-query\max.py
+@REM python3 .\test.py -f 2-query\min.py
+@REM python3 .\test.py -f 2-query\count.py
+@REM python3 .\test.py -f 2-query\last.py
+@REM python3 .\test.py -f 2-query\first.py
+@REM python3 .\test.py -f 2-query\To_iso8601.py
+@REM python3 .\test.py -f 2-query\To_unixtimestamp.py
+@REM python3 .\test.py -f 2-query\timetruncate.py
+@REM python3 .\test.py -f 2-query\diff.py
+@REM python3 .\test.py -f 2-query\Timediff.py
+
+@REM python3 .\test.py -f 2-query\top.py
+@REM python3 .\test.py -f 2-query\bottom.py
+@REM python3 .\test.py -f 2-query\percentile.py
+@REM python3 .\test.py -f 2-query\apercentile.py
+@REM python3 .\test.py -f 2-query\abs.py
+@REM python3 .\test.py -f 2-query\ceil.py
+@REM python3 .\test.py -f 2-query\floor.py
+@REM python3 .\test.py -f 2-query\round.py
+@REM python3 .\test.py -f 2-query\log.py
+@REM python3 .\test.py -f 2-query\pow.py
+@REM python3 .\test.py -f 2-query\sqrt.py
+@REM python3 .\test.py -f 2-query\sin.py
+@REM python3 .\test.py -f 2-query\cos.py
+@REM python3 .\test.py -f 2-query\tan.py
+@REM python3 .\test.py -f 2-query\arcsin.py
+@REM python3 .\test.py -f 2-query\arccos.py
+@REM python3 .\test.py -f 2-query\arctan.py
+@REM python3 .\test.py -f 2-query\query_cols_tags_and_or.py
+@REM # python3 .\test.py -f 2-query\nestedQuery.py
+@REM # TD-15983 subquery output duplicate name column. 
+@REM # Please Xiangyang Guo modify the following script
+@REM # python3 .\test.py -f 2-query\nestedQuery_str.py
+
+@REM python3 .\test.py -f 2-query\avg.py
+@REM python3 .\test.py -f 2-query\elapsed.py
+@REM python3 .\test.py -f 2-query\csum.py
+@REM python3 .\test.py -f 2-query\mavg.py
+@REM python3 .\test.py -f 2-query\diff.py
+@REM python3 .\test.py -f 2-query\sample.py
+@REM python3 .\test.py -f 2-query\function_diff.py
+@REM python3 .\test.py -f 2-query\unique.py
+@REM python3 .\test.py -f 2-query\stateduration.py
+@REM python3 .\test.py -f 2-query\function_stateduration.py
+@REM python3 .\test.py -f 2-query\statecount.py
+
+@REM python3 .\test.py -f 7-tmq\basic5.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb0.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb1.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb0.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb1.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb2.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb3.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb4.py
+@REM python3 .\test.py -f 7-tmq\db.py

tests/system-test/test-all.bat

@@ -2,26 +2,42 @@
 SETLOCAL EnableDelayedExpansion
 for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) do     rem"') do (  set "DEL=%%a")
 set /a a=0
+if %1 == full (
+    echo Windows Taosd Full Test
+    set /a exitNum=0
+    for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+        for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
+            set /a a+=1
+            echo !a! Processing %%i
+            call :GetTimeSeconds !time!
+            set time1=!_timeTemp!
+            echo Start at !time!
+            call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
+            if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 ) else ( call :colorEcho 0a "Success" &echo. ) 
+        )
+    )
+    exit !exitNum!
+)
 echo Windows Taosd Test
-for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
     for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
-        echo Processing %%i
-        call :GetTimeSeconds %time%
-        set time1=!_timeTemp!
-        echo Start at %time%
         set /a a+=1
+        echo !a! Processing %%i
+        call :GetTimeSeconds !time!
+        set time1=!_timeTemp!
+        echo Start at !time!
         call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
         if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) 
     )
 )
 @REM echo Linux Taosd Test
-@REM for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+@REM for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
 @REM     for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
-@REM         echo Processing %%i
-@REM         call :GetTimeSeconds %time%
-@REM         set time1=!_timeTemp!
-@REM         echo Start at %time%
 @REM         set /a a+=1
+@REM         echo !a! Processing %%i
+@REM         call :GetTimeSeconds !time!
+@REM         set time1=!_timeTemp!
+@REM         echo Start at !time!
 @REM         call %%i ARG1 -m %1 > result_!a!.txt 2>error_!a!.txt
 @REM         if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) 
 @REM     )
@@ -57,5 +73,5 @@ for %%a in (%tt%) do (
     )
    set /a index=index+1
 )
-set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
+set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%  || echo hh:%hh% mm:%mm% ss:%ss%
 goto :eof
\ No newline at end of file