From a5f88a86e9b18ac7b3a3a61592659fa72a40c9a1 Mon Sep 17 00:00:00 2001
From: Bob Liu <bobliu@taosdata.com>
Date: Thu, 28 Dec 2023 09:45:01 +0800
Subject: [PATCH] adjust

---
 source/libs/executor/inc/executorInt.h  |  2 +-
 source/libs/executor/src/scanoperator.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/libs/executor/inc/executorInt.h b/source/libs/executor/inc/executorInt.h
index 8b0bef5fa6..b87dee475d 100644
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
@@ -275,7 +275,7 @@ typedef struct STableScanInfo {
   int8_t          scanMode;
   int8_t          assignBlockUid;
   uint8_t         countState;     // empty table count state
-  bool            isOneGroup;     // whether or not only one group in this scan
+  bool            isSameGroup;    // whether all tables are in the same group this scan
   bool            hasGroupByTag;
   bool            countOnly;
   bool            filesetDelimited;
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 0714019352..dd6dff0301 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -655,12 +655,12 @@ void setTbNameColData(const SSDataBlock* pBlock, SColumnInfoData* pColInfoData,
   colDataDestroy(&infoData);
 }
 
-static int32_t initRemainTable(STableScanInfo* pTableScanInfo, const STableKeyInfo* pList, int32_t num) {
+static int32_t initTableCountEnv(STableScanInfo* pTableScanInfo, const STableKeyInfo* pList, int32_t num) {
   if (!pTableScanInfo->needCountEmptyTable) {
     pTableScanInfo->countState = TABLE_COUNT_STATE_END;
     return TSDB_CODE_SUCCESS;
   }
-  pTableScanInfo->isOneGroup = true;
+  pTableScanInfo->isSameGroup = true;
   if (NULL == pTableScanInfo->pRemainTables) {
     int32_t tableNum = taosArrayGetSize(pTableScanInfo->base.pTableListInfo->pTableList);
     pTableScanInfo->pRemainTables =
@@ -673,11 +673,11 @@ static int32_t initRemainTable(STableScanInfo* pTableScanInfo, const STableKeyIn
   uint64_t groupId = 0;
   for (int32_t i = 0; i < num; i++) {
     const STableKeyInfo* pInfo = pList + i;
-    if (pTableScanInfo->isOneGroup) {
+    if (pTableScanInfo->isSameGroup) {
       if (i == 0) {
         groupId = pInfo->groupId;
       } else if (groupId != pInfo->groupId) {
-        pTableScanInfo->isOneGroup = false;
+        pTableScanInfo->isSameGroup = false;
       }
     }
     taosHashPut(pTableScanInfo->pRemainTables, &(pInfo->uid), sizeof(pInfo->uid), &(pInfo->groupId), sizeof(pInfo->groupId));
@@ -692,8 +692,8 @@ static void markTableProcessed(STableScanInfo* pTableScanInfo, uint64_t uid) {
   if (pTableScanInfo->countState > TABLE_COUNT_STATE_SCAN) {
     return;
   }
-  // case2 only one group, uid ready
-  if (pTableScanInfo->isOneGroup) {
+  // case2 if all table in same group, process only once
+  if (pTableScanInfo->isSameGroup) {
     pTableScanInfo->countState = TABLE_COUNT_STATE_END;
     return;
   }
@@ -802,7 +802,7 @@ static SSDataBlock* doGroupedTableScan(SOperatorInfo* pOperator, const STableKey
   }
 
   if (TABLE_COUNT_STATE_NONE == pTableScanInfo->countState) {
-    initRemainTable(pTableScanInfo, pList, num);
+    initTableCountEnv(pTableScanInfo, pList, num);
   }
 
   // do the ascending order traverse in the first place.
@@ -858,7 +858,7 @@ static SSDataBlock* doGroupedTableScan(SOperatorInfo* pOperator, const STableKey
   if (pTableScanInfo->countState < TABLE_COUNT_STATE_END) {
     int32_t tb_cnt = taosHashGetSize(pTableScanInfo->pRemainTables);
     if (tb_cnt) {
-      if (!pTableScanInfo->isOneGroup) {
+      if (!pTableScanInfo->isSameGroup) {
         // get first empty table uid, mark processed & rm from hash
         void *pIte = taosHashIterate(pTableScanInfo->pRemainTables, NULL);
         if (pIte != NULL) {