Merge pull request #18369 from taosdata/szhou/fixbugs

fix: build data from mem/imem first when large nchar column incur …eBlockShouldLoad since SDataBlockToLoadInfo.moreThanCapacity

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -2432,7 +2432,8 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
     TSDBKEY   keyInBuf = getCurrentKeyInBuf(pBlockScanInfo, pReader);
 
     // it is a clean block, load it directly
-    if (isCleanFileDataBlock(pReader, pBlockInfo, pBlock, pBlockScanInfo, keyInBuf, pLastBlockReader)) {
+    if (isCleanFileDataBlock(pReader, pBlockInfo, pBlock, pBlockScanInfo, keyInBuf, pLastBlockReader) && 
+        pBlock->nRow <= pReader->capacity) {
       if (asc || ((!asc) && (!hasDataInLastBlock(pLastBlockReader)))) {
         copyBlockDataToSDataBlock(pReader, pBlockScanInfo);
 

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) {