other: merge 3.0.

docs/en/12-taos-sql/20-keywords.md

@@ -151,7 +151,7 @@ The following list shows all reserved keywords:
 - INTERVAL
 - INTO
 - IS
-- ISNULL
+- IS NULL
 
 ### J
 
@@ -197,7 +197,7 @@ The following list shows all reserved keywords:
 - NMATCH
 - NONE
 - NOT
-- NOTNULL
+- NOT NULL
 - NOW
 - NULL
 - NULLS

docs/zh/12-taos-sql/20-keywords.md

@@ -151,7 +151,7 @@ description: TDengine 保留关键字的详细列表
 - INTERVAL
 - INTO
 - IS
-- ISNULL
+- IS NULL
 
 ### J
 
@@ -197,7 +197,7 @@ description: TDengine 保留关键字的详细列表
 - NMATCH
 - NONE
 - NOT
-- NOTNULL
+- NOT NULL
 - NOW
 - NULL
 - NULLS

source/client/src/clientHb.c

@@ -133,14 +133,15 @@ static int32_t hbUpdateUserAuthInfo(SAppHbMgr *pAppHbMgr, SUserAuthBatchRsp *bat
 
       if (pTscObj->whiteListInfo.fp) {
         SWhiteListInfo *whiteListInfo = &pTscObj->whiteListInfo;
-        int64_t    oldVer = atomic_load_64(&whiteListInfo->ver);
+        int64_t         oldVer = atomic_load_64(&whiteListInfo->ver);
-        if (oldVer < pRsp->whiteListVer) {
+
+        if (oldVer < pRsp->whiteListVer || pRsp->whiteListVer == 0) {
           atomic_store_64(&whiteListInfo->ver, pRsp->whiteListVer);
           if (whiteListInfo->fp) {
             (*whiteListInfo->fp)(whiteListInfo->param, &pRsp->whiteListVer, TAOS_NOTIFY_WHITELIST_VER);
           }
-          tscDebug("update whitelist version of user %s from %"PRId64" to %"PRId64", tscRid:%" PRIi64, pRsp->user, oldVer,
+          tscDebug("update whitelist version of user %s from %" PRId64 " to %" PRId64 ", tscRid:%" PRIi64, pRsp->user,
-                   atomic_load_64(&whiteListInfo->ver), pTscObj->id);
+                   oldVer, atomic_load_64(&whiteListInfo->ver), pTscObj->id);
         }
       }
       releaseTscObj(pReq->connKey.tscRid);
@@ -202,8 +203,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
   for (int32_t i = 0; i < numOfBatchs; ++i) {
     SDbHbRsp *rsp = taosArrayGet(batchRsp.pArray, i);
     if (rsp->useDbRsp) {
-      tscDebug("hb use db rsp, db:%s, vgVersion:%d, stateTs:%" PRId64 ", uid:%" PRIx64,
+      tscDebug("hb use db rsp, db:%s, vgVersion:%d, stateTs:%" PRId64 ", uid:%" PRIx64, rsp->useDbRsp->db,
-        rsp->useDbRsp->db, rsp->useDbRsp->vgVersion, rsp->useDbRsp->stateTs, rsp->useDbRsp->uid);
+               rsp->useDbRsp->vgVersion, rsp->useDbRsp->stateTs, rsp->useDbRsp->uid);
 
       if (rsp->useDbRsp->vgVersion < 0) {
         tscDebug("hb to remove db, db:%s", rsp->useDbRsp->db);
@@ -225,7 +226,9 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
             goto _return;
           }
 
-          catalogUpdateDBVgInfo(pCatalog, (rsp->useDbRsp->db[0] == 'i') ? TSDB_PERFORMANCE_SCHEMA_DB : TSDB_INFORMATION_SCHEMA_DB, rsp->useDbRsp->uid, vgInfo);
+          catalogUpdateDBVgInfo(pCatalog,
+                                (rsp->useDbRsp->db[0] == 'i') ? TSDB_PERFORMANCE_SCHEMA_DB : TSDB_INFORMATION_SCHEMA_DB,
+                                rsp->useDbRsp->uid, vgInfo);
         }
       }
     }
@@ -238,7 +241,7 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog
     if (rsp->pTsmaRsp) {
       if (rsp->pTsmaRsp->pTsmas) {
         for (int32_t i = 0; i < rsp->pTsmaRsp->pTsmas->size; ++i) {
-          STableTSMAInfo* pTsma = taosArrayGetP(rsp->pTsmaRsp->pTsmas, i);
+          STableTSMAInfo *pTsma = taosArrayGetP(rsp->pTsmaRsp->pTsmas, i);
           catalogAsyncUpdateTSMA(pCatalog, &pTsma, rsp->dbTsmaVersion);
         }
         taosArrayClear(rsp->pTsmaRsp->pTsmas);
@@ -294,16 +297,15 @@ static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalo
   return TSDB_CODE_SUCCESS;
 }
 
-
 static int32_t hbProcessDynViewRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) {
-  return catalogUpdateDynViewVer(pCatalog, (SDynViewVersion*)value);
+  return catalogUpdateDynViewVer(pCatalog, (SDynViewVersion *)value);
 }
 
-static void hbFreeSViewMetaInRsp(void* p) {
+static void hbFreeSViewMetaInRsp(void *p) {
-  if (NULL == p || NULL == *(void**)p) {
+  if (NULL == p || NULL == *(void **)p) {
     return;
   }
-  SViewMetaRsp *pRsp = *(SViewMetaRsp**)p;
+  SViewMetaRsp *pRsp = *(SViewMetaRsp **)p;
   tFreeSViewMetaRsp(pRsp);
   taosMemoryFreeClear(pRsp);
 }
@@ -337,7 +339,7 @@ static int32_t hbProcessViewInfoRsp(void *value, int32_t valueLen, struct SCatal
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t hbprocessTSMARsp(void* value, int32_t valueLen, struct SCatalog* pCatalog) {
+static int32_t hbprocessTSMARsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) {
   int32_t code = 0;
 
   STSMAHbRsp hbRsp = {0};
@@ -348,7 +350,7 @@ static int32_t hbprocessTSMARsp(void* value, int32_t valueLen, struct SCatalog*
 
   int32_t numOfTsma = taosArrayGetSize(hbRsp.pTsmas);
   for (int32_t i = 0; i < numOfTsma; ++i) {
-    STableTSMAInfo* pTsmaInfo = taosArrayGetP(hbRsp.pTsmas, i);
+    STableTSMAInfo *pTsmaInfo = taosArrayGetP(hbRsp.pTsmas, i);
 
     if (!pTsmaInfo->pFuncs) {
       tscDebug("hb to remove tsma: %s.%s", pTsmaInfo->dbFName, pTsmaInfo->name);
@@ -365,7 +367,7 @@ static int32_t hbprocessTSMARsp(void* value, int32_t valueLen, struct SCatalog*
   return TSDB_CODE_SUCCESS;
 }
 
-static void hbProcessQueryRspKvs(int32_t kvNum, SArray* pKvs, struct SCatalog *pCatalog, SAppHbMgr *pAppHbMgr) {
+static void hbProcessQueryRspKvs(int32_t kvNum, SArray *pKvs, struct SCatalog *pCatalog, SAppHbMgr *pAppHbMgr) {
   for (int32_t i = 0; i < kvNum; ++i) {
     SKv *kv = taosArrayGet(pKvs, i);
     switch (kv->key) {
@@ -489,7 +491,7 @@ static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
 
   if (kvNum > 0) {
     struct SCatalog *pCatalog = NULL;
-    int32_t code = catalogGetHandle(pReq->clusterId, &pCatalog);
+    int32_t          code = catalogGetHandle(pReq->clusterId, &pCatalog);
     if (code != TSDB_CODE_SUCCESS) {
       tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pReq->clusterId, tstrerror(code));
     } else {
@@ -799,8 +801,9 @@ int32_t hbGetExpiredDBInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, SCl
 
   for (int32_t i = 0; i < dbNum; ++i) {
     SDbCacheInfo *db = &dbs[i];
-    tscDebug("the %dth expired dbFName:%s, dbId:%" PRId64 ", vgVersion:%d, cfgVersion:%d, numOfTable:%d, startTs:%" PRId64,
+    tscDebug("the %dth expired dbFName:%s, dbId:%" PRId64
-      i, db->dbFName, db->dbId, db->vgVersion, db->cfgVersion, db->numOfTable, db->stateTs);
+             ", vgVersion:%d, cfgVersion:%d, numOfTable:%d, startTs:%" PRId64,
+             i, db->dbFName, db->dbId, db->vgVersion, db->cfgVersion, db->numOfTable, db->stateTs);
 
     db->dbId = htobe64(db->dbId);
     db->vgVersion = htonl(db->vgVersion);
@@ -916,7 +919,7 @@ int32_t hbGetExpiredViewInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, S
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t hbGetExpiredTSMAInfo(SClientHbKey* connKey, struct SCatalog* pCatalog, SClientHbReq* pReq) {
+int32_t hbGetExpiredTSMAInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, SClientHbReq *pReq) {
   int32_t       code = 0;
   uint32_t      tsmaNum = 0;
   STSMAVersion *tsmas = NULL;
@@ -933,7 +936,7 @@ int32_t hbGetExpiredTSMAInfo(SClientHbKey* connKey, struct SCatalog* pCatalog, S
   }
 
   for (int32_t i = 0; i < tsmaNum; ++i) {
-    STSMAVersion* tsma = &tsmas[i];
+    STSMAVersion *tsma = &tsmas[i];
     tsma->dbId = htobe64(tsma->dbId);
     tsma->tsmaId = htobe64(tsma->tsmaId);
     tsma->version = htonl(tsma->version);
@@ -1151,7 +1154,8 @@ static void *hbThreadFunc(void *param) {
     if (sz > 0) {
       hbGatherAppInfo();
       if (sz > 1 && !clientHbMgr.appHbHash) {
-        clientHbMgr.appHbHash = taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_NO_LOCK);
+        clientHbMgr.appHbHash =
+            taosHashInit(0, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_NO_LOCK);
       }
       taosHashClear(clientHbMgr.appHbHash);
     }
@@ -1433,6 +1437,4 @@ void hbDeregisterConn(STscObj *pTscObj, SClientHbKey connKey) {
 }
 
 // set heart beat thread quit mode , if quicByKill 1 then kill thread else quit from inner
-void taos_set_hb_quit(int8_t quitByKill) {
+void taos_set_hb_quit(int8_t quitByKill) { clientHbMgr.quitByKill = quitByKill; }
-  clientHbMgr.quitByKill = quitByKill;
-}

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

@@ -53,6 +53,7 @@ void mndUpdateIpWhiteForAllUser(SMnode *pMnode, char *user, char *fqdn, int8_t t
 
 int32_t mndRefreshUserIpWhiteList(SMnode *pMnode);
 
+int64_t mndGetUserIpWhiteListVer(SMnode *pMnode, SUserObj *pUser);
 #ifdef __cplusplus
 }
 #endif

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

@@ -31,7 +31,6 @@ int32_t mndCheckDbPrivilegeByName(SMnode *pMnode, const char *user, EOperType op
 
 int32_t mndCheckTopicPrivilege(SMnode *pMnode, const char *user, EOperType operType, SMqTopicObj *pTopic) { return 0; }
 
-
 int32_t mndSetUserWhiteListRsp(SMnode *pMnode, SUserObj *pUser, SGetUserWhiteListRsp *pWhiteListRsp) {
   memcpy(pWhiteListRsp->user, pUser->user, TSDB_USER_LEN);
   pWhiteListRsp->numWhiteLists = 1;
@@ -41,25 +40,6 @@ int32_t mndSetUserWhiteListRsp(SMnode *pMnode, SUserObj *pUser, SGetUserWhiteLis
   }
   memset(pWhiteListRsp->pWhiteLists, 0, pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
 
-//  if (tsEnableWhiteList) {
-//    memcpy(pWhiteListRsp->user, pUser->user, TSDB_USER_LEN);
-//    pWhiteListRsp->numWhiteLists = pUser->pIpWhiteList->num;
-//    pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
-//    if (pWhiteListRsp->pWhiteLists == NULL) {
-//      return TSDB_CODE_OUT_OF_MEMORY;
-//    }
-//    memcpy(pWhiteListRsp->pWhiteLists, pUser->pIpWhiteList->pIpRange,
-//           pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
-//  } else {
-//   memcpy(pWhiteListRsp->user, pUser->user, TSDB_USER_LEN);
-//   pWhiteListRsp->numWhiteLists = 1;
-//   pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
-//   if (pWhiteListRsp->pWhiteLists == NULL) {
-//     return TSDB_CODE_OUT_OF_MEMORY;
-//   }
-//   memset(pWhiteListRsp->pWhiteLists, 0, pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range));
-//  }
-
   return 0;
 }
 
@@ -70,7 +50,7 @@ int32_t mndSetUserAuthRsp(SMnode *pMnode, SUserObj *pUser, SGetUserAuthRsp *pRsp
   pRsp->sysInfo = pUser->sysInfo;
   pRsp->version = pUser->authVersion;
   pRsp->passVer = pUser->passVersion;
-  pRsp->whiteListVer = pUser->ipWhiteListVer;
+  pRsp->whiteListVer = mndGetUserIpWhiteListVer(pMnode, pUser);
   return 0;
 }
 

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

@@ -300,7 +300,7 @@ _CONNECT:
   connectRsp.svrTimestamp = taosGetTimestampSec();
   connectRsp.passVer = pUser->passVersion;
   connectRsp.authVer = pUser->authVersion;
-  connectRsp.whiteListVer = pUser->ipWhiteListVer;
+  connectRsp.whiteListVer = mndGetUserIpWhiteListVer(pMnode, pUser);
 
   strcpy(connectRsp.sVer, version);
   snprintf(connectRsp.sDetailVer, sizeof(connectRsp.sDetailVer), "ver:%s\nbuild:%s\ngitinfo:%s", version, buildinfo,

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

@@ -3042,3 +3042,9 @@ int32_t mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic) {
   mndUserFreeObj(&newUser);
   return code;
 }
+
+int64_t mndGetUserIpWhiteListVer(SMnode *pMnode, SUserObj *pUser) {
+  // ver = 0, disable ip white list
+  // ver > 0, enable ip white list
+  return tsEnableWhiteList ? pUser->ipWhiteListVer : 0;
+}

source/libs/parser/src/parAstCreater.c

@@ -2914,7 +2914,8 @@ SNode* createSyncdbStmt(SAstCreateContext* pCxt, const SToken* pDbName) {
 SNode* createGrantStmt(SAstCreateContext* pCxt, int64_t privileges, STokenPair* pPrivLevel, SToken* pUserName,
                        SNode* pTagCond) {
   CHECK_PARSER_STATUS(pCxt);
-  if (!checkDbName(pCxt, &pPrivLevel->first, false) || !checkUserName(pCxt, pUserName)) {
+  if (!checkDbName(pCxt, &pPrivLevel->first, false) || !checkUserName(pCxt, pUserName) ||
+      !checkTableName(pCxt, &pPrivLevel->second)) {
     return NULL;
   }
   SGrantStmt* pStmt = (SGrantStmt*)nodesMakeNode(QUERY_NODE_GRANT_STMT);

source/libs/scheduler/src/schJob.c

@@ -567,7 +567,7 @@ int32_t schLaunchJobLowerLevel(SSchJob *pJob, SSchTask *pTask) {
   }
 
   SSchLevel *pLevel = pTask->level;
-  int32_t    doneNum = atomic_add_fetch_32(&pLevel->taskExecDoneNum, 1);
+  int32_t    doneNum = atomic_load_32(&pLevel->taskExecDoneNum);
   if (doneNum == pLevel->taskNum) {
     atomic_sub_fetch_32(&pJob->levelIdx, 1);
 

source/libs/scheduler/src/schTask.c

@@ -248,6 +248,8 @@ int32_t schProcessOnTaskSuccess(SSchJob *pJob, SSchTask *pTask) {
 
   SCH_LOG_TASK_END_TS(pTask);
 
+  int32_t taskDone = atomic_add_fetch_32(&pTask->level->taskExecDoneNum, 1);
+
   SCH_SET_TASK_STATUS(pTask, JOB_TASK_STATUS_PART_SUCC);
 
   SCH_ERR_RET(schRecordTaskSucceedNode(pJob, pTask));
@@ -317,7 +319,9 @@ int32_t schProcessOnTaskSuccess(SSchJob *pJob, SSchTask *pTask) {
     }
   }
 
-  SCH_ERR_RET(schLaunchJobLowerLevel(pJob, pTask));
+  if (taskDone == pTask->level->taskNum) {
+    SCH_ERR_RET(schLaunchJobLowerLevel(pJob, pTask));
+  }
   
   return TSDB_CODE_SUCCESS;
 }
@@ -483,6 +487,34 @@ _return:
   SCH_RET(schProcessOnTaskFailure(pJob, pTask, code));
 }
 
+int32_t schResetTaskSetLevelInfo(SSchJob *pJob, SSchTask *pTask) {
+  SSchLevel *pLevel = pTask->level;
+
+  SCH_TASK_DLOG("start to reset level for current task set, execDone:%d, launched:%d", 
+    atomic_load_32(&pLevel->taskExecDoneNum), atomic_load_32(&pLevel->taskLaunchedNum));
+
+  if (SCH_GET_TASK_STATUS(pTask) >= JOB_TASK_STATUS_PART_SUCC) {
+    atomic_sub_fetch_32(&pLevel->taskExecDoneNum, 1);
+  }
+  
+  atomic_sub_fetch_32(&pLevel->taskLaunchedNum, 1);
+
+  int32_t childrenNum = taosArrayGetSize(pTask->children);
+  for (int32_t i = 0; i < childrenNum; ++i) {
+    SSchTask *pChild = taosArrayGetP(pTask->children, i);
+    SCH_LOCK_TASK(pChild);
+    pLevel = pChild->level;
+    atomic_sub_fetch_32(&pLevel->taskExecDoneNum, 1);
+    atomic_sub_fetch_32(&pLevel->taskLaunchedNum, 1);
+    SCH_UNLOCK_TASK(pChild);
+  }  
+
+  SCH_TASK_DLOG("end to reset level for current task set, execDone:%d, launched:%d", 
+    atomic_load_32(&pLevel->taskExecDoneNum), atomic_load_32(&pLevel->taskLaunchedNum));
+
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t schHandleTaskSetRetry(SSchJob *pJob, SSchTask *pTask, SDataBuf *pData, int32_t rspCode) {
   int32_t code = 0;
 
@@ -498,12 +530,7 @@ int32_t schHandleTaskSetRetry(SSchJob *pJob, SSchTask *pTask, SDataBuf *pData, i
 
   SCH_TASK_DLOG("start to redirect current task set cause of error: %s", tstrerror(rspCode));
 
-  for (int32_t i = 0; i < pJob->levelNum; ++i) {
+  SCH_ERR_JRET(schResetTaskSetLevelInfo(pJob, pTask));
-    SSchLevel *pLevel = taosArrayGet(pJob->levels, i);
-
-    pLevel->taskExecDoneNum = 0;
-    pLevel->taskLaunchedNum = 0;
-  }
 
   SCH_RESET_JOB_LEVEL_IDX(pJob);
 

tests/script/tsim/stream/checkStreamSTable1.sim

@@ -15,7 +15,7 @@ sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
 sql create table t1 using st tags(1,1,1);
 sql create table t2 using st tags(2,2,2);
 sql create stream streams1 trigger at_once  into streamt1 as select  _wstart, count(*) c1, count(a) c2  from st interval(1s) ;
-sleep 500
+sleep 1000
 
 sql insert into t1 values(1648791211000,1,2,3);
 sql insert into t1 values(1648791212000,2,2,3);
@@ -46,7 +46,7 @@ sql alter table streamt1 add column c3 double;
 
 print create stream streams1 trigger at_once  into streamt1 as select  _wstart, count(*) c1, count(a) c2, avg(b) c3  from st interval(1s) ;
 sql create stream streams1 trigger at_once  into streamt1 as select  _wstart, count(*) c1, count(a) c2, avg(b) c3  from st interval(1s) ;
-sleep 500
+sleep 1000
 
 sql insert into t2 values(1648791213000,1,2,3);
 sql insert into t1 values(1648791214000,1,2,3);