Merge branch 'DN' into ndev

include/libs/sync/sync.h

@@ -200,6 +200,7 @@ const char* syncGetMyRoleStr(int64_t rid);
 SyncTerm    syncGetMyTerm(int64_t rid);
 SyncGroupId syncGetVgId(int64_t rid);
 void        syncGetEpSet(int64_t rid, SEpSet* pEpSet);
+void        syncGetRetryEpSet(int64_t rid, SEpSet* pEpSet);
 int32_t     syncPropose(int64_t rid, SRpcMsg* pMsg, bool isWeak);
 bool        syncEnvIsStart();
 const char* syncStr(ESyncState state);

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

@@ -198,6 +198,10 @@ int32_t mndInitSync(SMnode *pMnode) {
     return -1;
   }
 
+  // decrease election timer
+  setElectTimerMS(pMgmt->sync, 600);
+  setHeartbeatTimerMS(pMgmt->sync, 300);
+
   mDebug("mnode-sync is opened, id:%" PRId64, pMgmt->sync);
   return 0;
 }
@@ -261,7 +265,8 @@ bool mndIsMaster(SMnode *pMnode) {
   SSyncMgmt *pMgmt = &pMnode->syncMgmt;
 
   if (!syncIsReady(pMgmt->sync)) {
-    terrno = TSDB_CODE_SYN_NOT_LEADER;
+    // get terrno from syncIsReady
+    // terrno = TSDB_CODE_SYN_NOT_LEADER;
     return false;
   }
 

source/dnode/vnode/src/vnd/vnodeSync.c

@@ -144,11 +144,15 @@ void vnodeProposeMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
       vnodeAccumBlockMsg(pVnode, pMsg->msgType);
     } else if (code == -1 && terrno == TSDB_CODE_SYN_NOT_LEADER) {
       SEpSet newEpSet = {0};
+      syncGetRetryEpSet(pVnode->sync, &newEpSet);
+
+      /*
       syncGetEpSet(pVnode->sync, &newEpSet);
       SEp *pEp = &newEpSet.eps[newEpSet.inUse];
       if (pEp->port == tsServerPort && strcmp(pEp->fqdn, tsLocalFqdn) == 0) {
         newEpSet.inUse = (newEpSet.inUse + 1) % newEpSet.numOfEps;
       }
+      */
 
       vGTrace("vgId:%d, msg:%p is redirect since not leader, numOfEps:%d inUse:%d", vgId, pMsg, newEpSet.numOfEps,
               newEpSet.inUse);

source/libs/executor/src/timewindowoperator.c

@@ -3902,6 +3902,7 @@ typedef struct SMergeIntervalAggOperatorInfo {
   SIntervalAggOperatorInfo intervalAggOperatorInfo;
 
   SHashObj*    groupIntervalHash;
+  void*        groupIntervalIter;
   bool         hasGroupId;
   uint64_t     groupId;
   SSDataBlock* prefetchedBlock;
@@ -3914,6 +3915,23 @@ void destroyMergeIntervalOperatorInfo(void* param, int32_t numOfOutput) {
   destroyIntervalOperatorInfo(&miaInfo->intervalAggOperatorInfo, numOfOutput);
 }
 
+static int32_t finalizeWindowResult(SOperatorInfo* pOperatorInfo, uint64_t tableGroupId, STimeWindow* win, SSDataBlock* pResultBlock) {
+  SMergeIntervalAggOperatorInfo* miaInfo = pOperatorInfo->info;
+  SIntervalAggOperatorInfo*      iaInfo = &miaInfo->intervalAggOperatorInfo;
+  SExecTaskInfo*                 pTaskInfo = pOperatorInfo->pTaskInfo;
+  bool                           ascScan = (iaInfo->order == TSDB_ORDER_ASC);
+  SExprSupp*                     pExprSup = &pOperatorInfo->exprSupp;
+
+  SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &win->skey, TSDB_KEYSIZE, tableGroupId);
+  SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
+                                                            GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  ASSERT(p1 != NULL);
+  finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pExprSup->pCtx, pExprSup->pExprInfo,
+                                       pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
+  taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t tableGroupId, SSDataBlock* pResultBlock,
                                         STimeWindow* newWin) {
   SMergeIntervalAggOperatorInfo* miaInfo = pOperatorInfo->info;
@@ -3928,20 +3946,9 @@ static int32_t outputPrevIntervalResult(SOperatorInfo* pOperatorInfo, uint64_t t
     return 0;
   }
 
-  if (newWin == NULL || (ascScan && newWin->skey > prevWin->ekey || (!ascScan) && newWin->skey < prevWin->ekey)) {
-    SET_RES_WINDOW_KEY(iaInfo->aggSup.keyBuf, &prevWin->skey, TSDB_KEYSIZE, tableGroupId);
-    SResultRowPosition* p1 = (SResultRowPosition*)taosHashGet(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf,
-                                                              GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
-    ASSERT(p1 != NULL);
-
-    finalizeResultRowIntoResultDataBlock(iaInfo->aggSup.pResultBuf, p1, pExprSup->pCtx, pExprSup->pExprInfo,
-                                         pExprSup->numOfExprs, pExprSup->rowEntryInfoOffset, pResultBlock, pTaskInfo);
-    taosHashRemove(iaInfo->aggSup.pResultRowHashTable, iaInfo->aggSup.keyBuf, GET_RES_WINDOW_KEY_LEN(TSDB_KEYSIZE));
-    if (newWin == NULL) {
-      taosHashRemove(miaInfo->groupIntervalHash, &tableGroupId, sizeof(tableGroupId));
-    } else {
-      taosHashPut(miaInfo->groupIntervalHash, &tableGroupId, sizeof(tableGroupId), newWin, sizeof(STimeWindow));
-    }
+  if ((ascScan && newWin->skey > prevWin->skey || (!ascScan) && newWin->skey < prevWin->skey)) {
+    finalizeWindowResult(pOperatorInfo, tableGroupId, prevWin, pResultBlock);
+    taosHashPut(miaInfo->groupIntervalHash, &tableGroupId, sizeof(tableGroupId), newWin, sizeof(STimeWindow));
   }
 
   return 0;
@@ -4090,12 +4097,17 @@ static SSDataBlock* doMergeIntervalAgg(SOperatorInfo* pOperator) {
     }
 
     pRes->info.groupId = miaInfo->groupId;
-  } else {
-    void* p = taosHashIterate(miaInfo->groupIntervalHash, NULL);
-    if (p != NULL) {
+  }
+
+  if (miaInfo->inputBlocksFinished) {
+    void* win = taosHashIterate(miaInfo->groupIntervalHash, miaInfo->groupIntervalIter);
+    if (win != NULL) {
+      miaInfo->groupIntervalIter = win;
+
       size_t    len = 0;
-      uint64_t* pKey = taosHashGetKey(p, &len);
-      outputPrevIntervalResult(pOperator, *pKey, pRes, NULL);
+      uint64_t* pTableGroupId = taosHashGetKey(win, &len);
+      finalizeWindowResult(pOperator, *pTableGroupId, win, pRes);
+      pRes->info.groupId = *pTableGroupId;
     }
   }
 
@@ -4118,6 +4130,7 @@ SOperatorInfo* createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SExprI
   }
 
   miaInfo->groupIntervalHash = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), true, HASH_NO_LOCK);
+  miaInfo->groupIntervalIter = NULL;
 
   SIntervalAggOperatorInfo* iaInfo = &miaInfo->intervalAggOperatorInfo;
 

source/libs/sync/src/syncElection.c

@@ -105,9 +105,16 @@ int32_t syncNodeElect(SSyncNode* pSyncNode) {
 }
 
 int32_t syncNodeRequestVote(SSyncNode* pSyncNode, const SRaftId* destRaftId, const SyncRequestVote* pMsg) {
-  sTrace("syncNodeRequestVote pSyncNode:%p ", pSyncNode);
   int32_t ret = 0;
 
+  do {
+    char     host[128];
+    uint16_t port;
+    syncUtilU642Addr(destRaftId->addr, host, sizeof(host), &port);
+    sDebug("vgId:%d, send sync-request-vote to %s:%d, {term:%lu, last-index:%ld, last-term:%lu}", pSyncNode->vgId, host,
+           port, pMsg->term, pMsg->lastLogTerm, pMsg->lastLogIndex);
+  } while (0);
+
   SRpcMsg rpcMsg;
   syncRequestVote2RpcMsg(pMsg, &rpcMsg);
   syncNodeSendMsgById(destRaftId, pSyncNode, &rpcMsg);

source/libs/sync/src/syncMain.c

@@ -370,6 +370,15 @@ bool syncIsReady(int64_t rid) {
   ASSERT(rid == pSyncNode->rid);
   bool b = (pSyncNode->state == TAOS_SYNC_STATE_LEADER) && pSyncNode->restoreFinish;
   taosReleaseRef(tsNodeRefId, pSyncNode->rid);
+
+  // if false, set error code
+  if (false == b) {
+    if (pSyncNode->state != TAOS_SYNC_STATE_LEADER) {
+      terrno = TSDB_CODE_SYN_NOT_LEADER;
+    } else {
+      terrno = TSDB_CODE_APP_NOT_READY;
+    }
+  }
   return b;
 }
 
@@ -480,12 +489,30 @@ void syncGetEpSet(int64_t rid, SEpSet* pEpSet) {
     snprintf(pEpSet->eps[i].fqdn, sizeof(pEpSet->eps[i].fqdn), "%s", (pSyncNode->pRaftCfg->cfg.nodeInfo)[i].nodeFqdn);
     pEpSet->eps[i].port = (pSyncNode->pRaftCfg->cfg.nodeInfo)[i].nodePort;
     (pEpSet->numOfEps)++;
-
-    sInfo("syncGetEpSet index:%d %s:%d", i, pEpSet->eps[i].fqdn, pEpSet->eps[i].port);
+    sInfo("vgId:%d sync get epset: index:%d %s:%d", pSyncNode->vgId, i, pEpSet->eps[i].fqdn, pEpSet->eps[i].port);
   }
   pEpSet->inUse = pSyncNode->pRaftCfg->cfg.myIndex;
+  sInfo("vgId:%d sync get epset in-use:%d", pSyncNode->vgId, pEpSet->inUse);
 
-  sInfo("syncGetEpSet pEpSet->inUse:%d ", pEpSet->inUse);
+  taosReleaseRef(tsNodeRefId, pSyncNode->rid);
+}
+
+void syncGetRetryEpSet(int64_t rid, SEpSet* pEpSet) {
+  SSyncNode* pSyncNode = (SSyncNode*)taosAcquireRef(tsNodeRefId, rid);
+  if (pSyncNode == NULL) {
+    memset(pEpSet, 0, sizeof(*pEpSet));
+    return;
+  }
+  ASSERT(rid == pSyncNode->rid);
+  pEpSet->numOfEps = 0;
+  for (int i = 0; i < pSyncNode->pRaftCfg->cfg.replicaNum; ++i) {
+    snprintf(pEpSet->eps[i].fqdn, sizeof(pEpSet->eps[i].fqdn), "%s", (pSyncNode->pRaftCfg->cfg.nodeInfo)[i].nodeFqdn);
+    pEpSet->eps[i].port = (pSyncNode->pRaftCfg->cfg.nodeInfo)[i].nodePort;
+    (pEpSet->numOfEps)++;
+    sInfo("vgId:%d sync get retry epset: index:%d %s:%d", pSyncNode->vgId, i, pEpSet->eps[i].fqdn, pEpSet->eps[i].port);
+  }
+  pEpSet->inUse = (pSyncNode->pRaftCfg->cfg.myIndex + 1) % pEpSet->numOfEps;
+  sInfo("vgId:%d sync get retry epset in-use:%d", pSyncNode->vgId, pEpSet->inUse);
 
   taosReleaseRef(tsNodeRefId, pSyncNode->rid);
 }

source/libs/sync/src/syncReplication.c

@@ -224,8 +224,8 @@ int32_t syncNodeAppendEntries(SSyncNode* pSyncNode, const SRaftId* destRaftId, c
     uint16_t port;
     syncUtilU642Addr(destRaftId->addr, host, sizeof(host), &port);
     sDebug(
-        "vgId:%d, send sync-append-entries to %s:%d, term:%lu, pre-index:%ld, pre-term:%lu, pterm:%lu, commit:%ld, "
-        "datalen:%d",
+        "vgId:%d, send sync-append-entries to %s:%d, {term:%lu, pre-index:%ld, pre-term:%lu, pterm:%lu, commit:%ld, "
+        "datalen:%d}",
         pSyncNode->vgId, host, port, pMsg->term, pMsg->prevLogIndex, pMsg->prevLogTerm, pMsg->privateTerm,
         pMsg->commitIndex, pMsg->dataLen);
   } while (0);

source/libs/sync/src/syncRequestVote.c

@@ -99,15 +99,20 @@ static bool syncNodeOnRequestVoteLogOK(SSyncNode* pSyncNode, SyncRequestVote* pM
 int32_t syncNodeOnRequestVoteSnapshotCb(SSyncNode* ths, SyncRequestVote* pMsg) {
   int32_t ret = 0;
 
-  // print log
-  char logBuf[128] = {0};
-  snprintf(logBuf, sizeof(logBuf), "recv SyncRequestVote, currentTerm:%lu", ths->pRaftStore->currentTerm);
-  syncRequestVoteLog2(logBuf, pMsg);
-
   // if already drop replica, do not process
   if (!syncNodeInRaftGroup(ths, &(pMsg->srcId)) && !ths->pRaftCfg->isStandBy) {
-    sInfo("recv SyncRequestVote maybe replica already dropped");
-    return ret;
+    do {
+      char     logBuf[256];
+      char     host[64];
+      uint16_t port;
+      syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
+      snprintf(logBuf, sizeof(logBuf),
+               "recv sync-request-vote from %s:%d, term:%lu, lindex:%ld, lterm:%lu, maybe replica already dropped",
+               host, port, pMsg->term, pMsg->lastLogIndex, pMsg->lastLogTerm);
+      syncNodeEventLog(ths, logBuf);
+    } while (0);
+
+    return -1;
   }
 
   // maybe update term
@@ -135,10 +140,22 @@ int32_t syncNodeOnRequestVoteSnapshotCb(SSyncNode* ths, SyncRequestVote* pMsg) {
   pReply->term = ths->pRaftStore->currentTerm;
   pReply->voteGranted = grant;
 
+  // trace log
+  do {
+    char     logBuf[256];
+    char     host[64];
+    uint16_t port;
+    syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
+    snprintf(logBuf, sizeof(logBuf),
+             "recv sync-request-vote from %s:%d, term:%lu, lindex:%ld, lterm:%lu, reply-grant:%d", host, port,
+             pMsg->term, pMsg->lastLogIndex, pMsg->lastLogTerm, pReply->voteGranted);
+    syncNodeEventLog(ths, logBuf);
+  } while (0);
+
   SRpcMsg rpcMsg;
   syncRequestVoteReply2RpcMsg(pReply, &rpcMsg);
   syncNodeSendMsgById(&pReply->destId, ths, &rpcMsg);
   syncRequestVoteReplyDestroy(pReply);
 
-  return ret;
+  return 0;
 }
\ No newline at end of file

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

+import taos
+import sys
+import datetime
+import inspect
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+import random
+
+
+class TDTestCase:
+    updatecfgDict = {'debugFlag': 143, "cDebugFlag": 143, "uDebugFlag": 143, "rpcDebugFlag": 143, "tmrDebugFlag": 143,
+                     "jniDebugFlag": 143, "simDebugFlag": 143, "dDebugFlag": 143, "dDebugFlag": 143, "vDebugFlag": 143, "mDebugFlag": 143, "qDebugFlag": 143,
+                     "wDebugFlag": 143, "sDebugFlag": 143, "tsdbDebugFlag": 143, "tqDebugFlag": 143, "fsDebugFlag": 143, "fnDebugFlag": 143}
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), True)
+        self.tb_nums = 10
+        self.row_nums = 20
+        self.ts = 1434938400000
+        self.time_step = 1000
+
+    def prepare_tag_datas(self):
+        # prepare datas
+        tdSql.execute(
+            "create database if not exists testdb keep 3650 duration 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 function_for_null_data(self):
+
+        function_names = ["abs" , "floor" , "ceil" , "round"]
+
+        for function_name in function_names:
+
+            scalar_sql_1 = f"select {function_name}(c1)/0 from t1 group by c1 order by c1"
+            scalar_sql_2 = f"select {function_name}(c1/0) from t1 group by c1 order by c1"
+            scalar_sql_3 = f"select {function_name}(NULL) from t1 group by c1 order by c1"
+            tdSql.query(scalar_sql_1)
+            tdSql.checkRows(10)
+            tdSql.checkData(0,0,None)
+            tdSql.checkData(9,0,None)
+            tdSql.query(scalar_sql_2)
+            tdSql.checkRows(10)
+            tdSql.checkData(0,0,None)
+            tdSql.checkData(9,0,None)
+            tdSql.query(scalar_sql_3)
+            tdSql.checkRows(10)
+            tdSql.checkData(0,0,None)
+            tdSql.checkData(9,0,None)
+
+        function_names = ["sin" ,"cos" ,"tan" ,"asin" ,"acos" ,"atan"]
+
+        PI = 3.141592654
+
+        # sin
+        tdSql.query(" select sin(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select sin(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select sin(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.000000000)
+
+        tdSql.query(f" select sin({PI/2}) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.0)
+
+        tdSql.query(" select sin(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.826879541)
+
+        # cos 
+        tdSql.query(" select cos(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select cos(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select cos(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.000000000)
+
+        tdSql.query(f" select cos({PI}/2) from t1 group by c1 order by c1")
+
+        tdSql.query(" select cos(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.562379076)  
+
+
+        # tan
+        tdSql.query(" select tan(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select tan(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select tan(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.000000000)
+
+        tdSql.query(f" select tan({PI}/2) from t1 group by c1 order by c1")
+
+        tdSql.query(" select tan(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.470324156)  
+
+        # atan              
+        tdSql.query(" select atan(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select atan(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select atan(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.000000000)
+
+        tdSql.query(f" select atan({PI}/2) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.003884822)
+
+        tdSql.query(" select atan(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.569796327)  
+
+        # asin 
+        tdSql.query(" select asin(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select asin(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select asin(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,0.000000000)
+
+        tdSql.query(f" select asin({PI}/2) from t1 group by c1 order by c1")
+
+        tdSql.query(" select asin(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)  
+
+        # acos
+
+        tdSql.query(" select acos(c1/0) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select acos(NULL) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select acos(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,1.570796327)
+
+        tdSql.query(f" select acos({PI}/2) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select acos(1000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)  
+
+        function_names = ["log" ,"pow"]
+
+        # log 
+        tdSql.query(" select log(-10) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select log(NULL ,2) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select log(c1)/0 from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(f" select log(0.00) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        # pow 
+        tdSql.query(" select pow(c1,10000) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select pow(c1,2)/0 from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(" select pow(NULL,2) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)
+
+        tdSql.query(f" select pow(c1/0 ,1 ) from t1 group by c1 order by c1")
+        tdSql.checkData(9,0,None)       
+
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        tdSql.prepare()
+
+        tdLog.printNoPrefix("==========step1:create table ==============")
+
+        self.prepare_tag_datas()
+
+        tdLog.printNoPrefix("==========step2:test errors ==============")
+
+        self.function_for_null_data()
+       
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file

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

+import taos
+import sys
+import datetime
+import inspect
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+import random
+
+
+class TDTestCase:
+    updatecfgDict = {'debugFlag': 143, "cDebugFlag": 143, "uDebugFlag": 143, "rpcDebugFlag": 143, "tmrDebugFlag": 143,
+                     "jniDebugFlag": 143, "simDebugFlag": 143, "dDebugFlag": 143, "dDebugFlag": 143, "vDebugFlag": 143, "mDebugFlag": 143, "qDebugFlag": 143,
+                     "wDebugFlag": 143, "sDebugFlag": 143, "tsdbDebugFlag": 143, "tqDebugFlag": 143, "fsDebugFlag": 143, "fnDebugFlag": 143}
+
+    def init(self, conn, logSql):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), True)
+        self.tb_nums = 10
+        self.row_nums = 20
+        self.ts = 1434938400000
+        self.time_step = 1000
+
+    def insert_datas_and_check_irate(self ,tbnums , rownums , time_step ):
+    
+        tdLog.info(" prepare datas for auto check irate function ")
+
+        tdSql.execute(" create database test ")
+        tdSql.execute(" use test ")
+        tdSql.execute(" create stable stb (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 (t1 int)")
+        for tbnum in range(tbnums):
+            tbname = "sub_tb_%d"%tbnum
+            tdSql.execute(" create table %s using stb tags(%d) "%(tbname , tbnum))
+
+            ts = self.ts
+            for row in range(rownums):
+                ts = self.ts + time_step*row
+                c1 = random.randint(0,1000)
+                c2 = random.randint(0,100000)
+                c3 = random.randint(0,125)
+                c4 = random.randint(0,125)
+                c5 = random.random()/1.0
+                c6 = random.random()/1.0
+                c7 = "'true'"
+                c8 = "'binary_val'"
+                c9 = "'nchar_val'"
+                c10 = ts
+                tdSql.execute(f" insert into  {tbname} values ({ts},{c1},{c2},{c3},{c4},{c5},{c6},{c7},{c8},{c9},{c10})")
+                
+        tdSql.execute("use test")
+        tbnames = ["stb", "sub_tb_1"]
+        support_types = ["BIGINT", "SMALLINT", "TINYINT", "FLOAT", "DOUBLE", "INT"]
+        for tbname in tbnames:
+            tdSql.query("desc {}".format(tbname))
+            coltypes = tdSql.queryResult
+            for coltype in coltypes:
+                colname = coltype[0]
+                if coltype[1] in support_types and coltype[-1] != "TAG" :
+                    irate_sql = "select irate({}) from (select * from  {} order by tbname ) ".format(colname, tbname)
+                    origin_sql = "select ts , {} , cast(ts as bigint) from (select ts , {} from {} order by ts desc limit 2 offset 0 ) order by ts".format(colname,colname, tbname)
+
+                    tdSql.query(irate_sql)
+                    irate_result = tdSql.queryResult
+                    tdSql.query(origin_sql)
+                    origin_result = tdSql.queryResult
+                    irate_value = irate_result[0][0]
+                    if origin_result[1][-1] - origin_result[0][-1] == 0:
+                        comput_irate_value = 0
+                    elif (origin_result[1][1] - origin_result[0][1])<0:
+                        comput_irate_value = origin_result[1][1]*1000/( origin_result[1][-1] - origin_result[0][-1])
+                    else:
+                        comput_irate_value = (origin_result[1][1] - origin_result[0][1])*1000/( origin_result[1][-1] - origin_result[0][-1])
+                    if comput_irate_value ==irate_value:
+                        tdLog.info(" irate work as expected , sql is %s "% irate_sql)
+                    else:
+                        tdLog.exit(" irate work not as expected , sql is %s "% irate_sql)
+
+    def prepare_tag_datas(self):
+        # prepare datas
+        tdSql.execute(
+            "create database if not exists testdb keep 3650 duration 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 test_errors(self):
+        tdSql.execute("use testdb")
+        error_sql_lists = [
+            "select irate from t1",
+            "select irate(-+--+c1) from t1",
+            # "select +-irate(c1) from t1",
+            # "select ++-irate(c1) from t1",
+            # "select ++--irate(c1) from t1",
+            # "select - -irate(c1)*0 from t1",
+            # "select irate(tbname+1) from t1 ",
+            "select irate(123--123)==1 from t1",
+            "select irate(c1) as 'd1' from t1",
+            "select irate(c1 ,c2 ) from t1",
+            "select irate(c1 ,NULL) from t1",
+            "select irate(,) from t1;",
+            "select irate(irate(c1) ab from t1)",
+            "select irate(c1) as int from t1",
+            "select irate from stb1",
+            # "select irate(-+--+c1) from stb1",
+            # "select +-irate(c1) from stb1",
+            # "select ++-irate(c1) from stb1",
+            # "select ++--irate(c1) from stb1",
+            # "select - -irate(c1)*0 from stb1",
+            # "select irate(tbname+1) from stb1 ",
+            "select irate(123--123)==1 from stb1",
+            "select irate(c1) as 'd1' from stb1",
+            "select irate(c1 ,c2 ) from stb1",
+            "select irate(c1 ,NULL) from stb1",
+            "select irate(,) from stb1;",
+            "select irate(abs(c1) ab from stb1)",
+            "select irate(c1) as int from stb1"
+        ]
+        for error_sql in error_sql_lists:
+            tdSql.error(error_sql)
+
+    def support_types(self):
+        tdSql.execute("use testdb")
+        tbnames = ["stb1", "t1", "ct1", "ct2"]
+        support_types = ["BIGINT", "SMALLINT", "TINYINT", "FLOAT", "DOUBLE", "INT"]
+        for tbname in tbnames:
+            tdSql.query("desc {}".format(tbname))
+            coltypes = tdSql.queryResult
+            for coltype in coltypes:
+                colname = coltype[0]
+                irate_sql = "select irate({}) from {}".format(colname, tbname)
+                if coltype[1] in support_types:
+                    tdSql.query(irate_sql)
+                else:
+                    tdSql.error(irate_sql)
+
+    def basic_irate_function(self):
+
+        # used for empty table  , ct3 is empty
+        tdSql.query("select irate(c1) from ct3")
+        tdSql.checkRows(0)
+        tdSql.query("select irate(c2) from ct3")
+        tdSql.checkRows(0)
+
+        # used for regular table
+        tdSql.query("select irate(c1) from t1")
+        tdSql.checkData(0, 0, 0.000000386)
+
+        # used for sub table
+        tdSql.query("select irate(abs(c1+c2)) from ct1")
+        tdSql.checkData(0, 0, 0.000000000)
+   
+
+        # mix with common col
+        tdSql.error("select c1, irate(c1) from ct1")
+   
+        # mix with common functions
+        tdSql.error("select irate(c1), abs(c1) from ct4 ")
+
+        # agg functions mix with agg functions
+        tdSql.query("select irate(c1), count(c5) from stb1 partition by tbname ")
+        tdSql.checkData(0, 0, 0.000000000)
+        tdSql.checkData(1, 0, 0.000000000)
+        tdSql.checkData(0, 1, 13)
+        tdSql.checkData(1, 1, 9)
+
+
+    def irate_func_filter(self):
+        tdSql.execute("use testdb")
+        tdSql.query(
+            "select irate(c1+2)/2 from ct4 where c1>5 ")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0.000000514)
+
+        tdSql.query(
+            "select irate(c1+c2)/10 from ct4 where c1=5 ")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0.000000000)
+
+        tdSql.query(
+            "select irate(c1+c2)/10 from stb1 where c1 = 5 partition by tbname ")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, 0.000000000)
+      
+
+    def irate_Arithmetic(self):
+        pass
+
+
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        tdSql.prepare()
+
+        tdLog.printNoPrefix("==========step1:create table ==============")
+
+        self.prepare_tag_datas()
+
+        tdLog.printNoPrefix("==========step2:test errors ==============")
+
+        self.test_errors()
+
+        tdLog.printNoPrefix("==========step3:support types ============")
+
+        self.support_types()
+
+        tdLog.printNoPrefix("==========step4: irate basic query ============")
+
+        self.basic_irate_function()
+
+        tdLog.printNoPrefix("==========step5: irate filter query ============")
+
+        self.irate_func_filter()
+
+
+        tdLog.printNoPrefix("==========step6: check result of query ============")
+
+        self.insert_datas_and_check_irate(self.tb_nums,self.row_nums,self.time_step)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

tests/system-test/fulltest.sh

@@ -109,6 +109,9 @@ python3 ./test.py -f 2-query/distribute_agg_apercentile.py
 python3 ./test.py -f 2-query/distribute_agg_avg.py
 python3 ./test.py -f 2-query/distribute_agg_stddev.py
 python3 ./test.py -f 2-query/twa.py
+python3 ./test.py -f 2-query/irate.py
+
+python3 ./test.py -f 2-query/function_null.py
 
 python3 ./test.py -f 6-cluster/5dnode1mnode.py 
 python3 ./test.py -f 6-cluster/5dnode2mnode.py