From d125bb0952054ca3ad53864a18f71c537481c9bf Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Wed, 19 Jul 2023 14:59:05 +0800
Subject: [PATCH] fix: merge join reset params issue

---
 source/libs/executor/src/mergejoinoperator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/mergejoinoperator.c b/source/libs/executor/src/mergejoinoperator.c
index 8a28a29ab9..fd1e2fe463 100644
--- a/source/libs/executor/src/mergejoinoperator.c
+++ b/source/libs/executor/src/mergejoinoperator.c
@@ -658,10 +658,10 @@ static bool mergeJoinGetNextTimestamp(SOperatorInfo* pOperator, int64_t* pLeftTs
     pJoinInfo->leftPos = 0;
     if (pJoinInfo->pLeft == NULL) {
       qError("merge join left got empty block");
-      setMergeJoinDone(pOperator);
       if (pOperator->pOperatorParam && ((SSortMergeJoinOperatorParam*)pOperator->pOperatorParam->value)->initParam) {
         leftEmpty = true;
       } else {
+        setMergeJoinDone(pOperator);
         return false;
       }
     } else {
@@ -680,6 +680,7 @@ static bool mergeJoinGetNextTimestamp(SOperatorInfo* pOperator, int64_t* pLeftTs
     } else {
       qError("merge join right got block");
       if (leftEmpty) {
+        setMergeJoinDone(pOperator);
         return false;
       }
     }
-- 
GitLab