From 8b9c34504dd45f34e11032dc95fe0d3191bc80c0 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 23 Nov 2022 16:38:59 +0800
Subject: [PATCH] fix: core dump when left data block id is equal to right data
 block id

---
 source/libs/executor/src/joinoperator.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/source/libs/executor/src/joinoperator.c b/source/libs/executor/src/joinoperator.c
index 61dc7a1b76..a1b44307d4 100644
--- a/source/libs/executor/src/joinoperator.c
+++ b/source/libs/executor/src/joinoperator.c
@@ -54,22 +54,26 @@ static void extractTimeCondition(SJoinOperatorInfo* pInfo, SOperatorInfo** pDown
     SColumnNode*   col2 = (SColumnNode*)pNode->pRight;
     SColumnNode*   leftTsCol = NULL;
     SColumnNode*   rightTsCol = NULL;
-    if (col1->dataBlockId == pDownstream[0]->resultDataBlockId) {
-      ASSERT(col2->dataBlockId == pDownstream[1]->resultDataBlockId);
+    if (col1->dataBlockId == col2->dataBlockId ) {
       leftTsCol = col1;
       rightTsCol = col2;
     } else {
-      ASSERT(col1->dataBlockId == pDownstream[1]->resultDataBlockId);
-      ASSERT(col2->dataBlockId == pDownstream[0]->resultDataBlockId);
-      leftTsCol = col2;
-      rightTsCol = col1;
+      if (col1->dataBlockId == pDownstream[0]->resultDataBlockId) {
+        ASSERT(col2->dataBlockId == pDownstream[1]->resultDataBlockId);
+        leftTsCol = col1;
+        rightTsCol = col2;
+      } else {
+        ASSERT(col1->dataBlockId == pDownstream[1]->resultDataBlockId);
+        ASSERT(col2->dataBlockId == pDownstream[0]->resultDataBlockId);
+        leftTsCol = col2;
+        rightTsCol = col1;
+      }
     }
     setJoinColumnInfo(&pInfo->leftCol, leftTsCol);
     setJoinColumnInfo(&pInfo->rightCol, rightTsCol);
   } else {
     ASSERT(false);
-  }
-}
+  }}
 
 SOperatorInfo* createMergeJoinOperatorInfo(SOperatorInfo** pDownstream, int32_t numOfDownstream,
                                            SSortMergeJoinPhysiNode* pJoinNode, SExecTaskInfo* pTaskInfo) {