From 5c9edce538b8f5d36e22869802542d260c98c56f Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Tue, 23 Jan 2024 10:45:26 +0800
Subject: [PATCH] fix: whole block error

---
 source/libs/executor/src/scanoperator.c | 2 +-
 source/libs/executor/src/tsort.c        | 6 ++++--
 tests/script/tsim/parser/limit_stb.sim  | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 3ed5128858..808956ff5c 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -3660,7 +3660,7 @@ SSDataBlock* getSortedTableMergeScanBlockData(SSortHandle* pHandle, SSDataBlock*
       terrno = TSDB_CODE_TSC_QUERY_CANCELLED;
       T_LONG_JMP(pOperator->pTaskInfo->env, terrno);
     }
-
+    
     bool limitReached = applyLimitOffset(&pInfo->limitInfo, pResBlock, pTaskInfo);
     qDebug("%s get sorted row block, rows:%" PRId64 ", limit:%" PRId64, GET_TASKID(pTaskInfo), pResBlock->info.rows,
           pInfo->limitInfo.numOfOutputRows);
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 3e8d1628aa..38aac39d8e 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -885,7 +885,7 @@ static int32_t appendDataBlockToPageBuf(SSortHandle* pHandle, SSDataBlock* blk,
 
   int32_t size = blockDataGetSize(blk) + sizeof(int32_t) + taosArrayGetSize(blk->pDataBlock) * sizeof(int32_t);
   ASSERT(size <= getBufPageSize(pHandle->pBuf));
-
+  
   blockDataToBuf(pPage, blk);
 
   setBufPageDirty(pPage, true);
@@ -1041,7 +1041,6 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SBlockO
 }
 
 static SSDataBlock* getRowsBlockWithinMergeLimit(const SSortHandle* pHandle, SSHashObj* mTableNumRows, SSDataBlock* pOrigBlk, bool* pExtractedBlock) {
-  int64_t keepRows = pOrigBlk->info.rows;
   int64_t nRows = 0;
   int64_t prevRows = 0;
   void*   pNum = tSimpleHashGet(mTableNumRows, &pOrigBlk->info.id.uid, sizeof(pOrigBlk->info.id.uid));
@@ -1055,15 +1054,18 @@ static SSDataBlock* getRowsBlockWithinMergeLimit(const SSortHandle* pHandle, SSH
     nRows = *(int64_t*)pNum;
   }
 
+  int64_t keepRows = pOrigBlk->info.rows;
   if (nRows >= pHandle->mergeLimit) {
     keepRows = pHandle->mergeLimit - prevRows;
   }
+  
   SSDataBlock* pBlock = NULL;
   if (keepRows != pOrigBlk->info.rows) {
     pBlock = blockDataExtractBlock(pOrigBlk, 0, keepRows);
     *pExtractedBlock = true;
   } else {
     *pExtractedBlock = false;
+    pBlock = pOrigBlk;
   }
   return pBlock;
 }
diff --git a/tests/script/tsim/parser/limit_stb.sim b/tests/script/tsim/parser/limit_stb.sim
index 7d6aff3b51..2e8f029260 100644
--- a/tests/script/tsim/parser/limit_stb.sim
+++ b/tests/script/tsim/parser/limit_stb.sim
@@ -129,6 +129,7 @@ endi
 
 $offset = $tbNum * $rowNum
 $offset = $offset - 1
+print select * from $stb order by ts limit 2 offset $offset
 sql select * from $stb order by ts limit 2 offset $offset
 if $rows != 1 then
   return -1