Merge pull request #21567 from wangjiaming0909/fix/3.0/TD-24525

fix: prevent projectoperator scanning all rows when limit with no group
taosdata · Jun 8, 2023 · a9ed1f6 · a9ed1f6
2 parents 87d91bf + 3cb64f3
commit a9ed1f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
@@ -647,6 +647,8 @@ uint64_t calcGroupId(char* pData, int32_t len) {
   // NOTE: only extract the initial 8 bytes of the final MD5 digest
   uint64_t id = 0;
   memcpy(&id, context.digest, sizeof(uint64_t));
+  if (0 == id)
+    memcpy(&id, context.digest + 8, sizeof(uint64_t));
   return id;
 }
 

diff --git a/source/libs/executor/src/joinoperator.c b/source/libs/executor/src/joinoperator.c
@@ -319,6 +319,11 @@ void destroyMergeJoinOperator(void* param) {
   }
   nodesDestroyNode(pJoinOperator->pCondAfterMerge);
 
+  taosArrayDestroy(pJoinOperator->rowCtx.leftCreatedBlocks);
+  taosArrayDestroy(pJoinOperator->rowCtx.rightCreatedBlocks);
+  taosArrayDestroy(pJoinOperator->rowCtx.leftRowLocations);
+  taosArrayDestroy(pJoinOperator->rowCtx.rightRowLocations);
+
   pJoinOperator->pRes = blockDataDestroy(pJoinOperator->pRes);
   taosMemoryFreeClear(param);
 }

diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c
@@ -213,6 +213,8 @@ static int32_t doIngroupLimitOffset(SLimitInfo* pLimitInfo, uint64_t groupId, SS
   } else {
     if (limitReached && (pLimitInfo->slimit.limit >= 0 && pLimitInfo->slimit.limit <= pLimitInfo->numOfOutputGroups)) {
       setOperatorCompleted(pOperator);
+    } else if (limitReached && groupId == 0) {
+      setOperatorCompleted(pOperator);
     }
   }