From 21232e2650e649cc4e1114c547815e91599f4557 Mon Sep 17 00:00:00 2001
From: zhihaop <zhihaop@zju.edu.cn>
Date: Mon, 26 Sep 2022 18:56:38 +0800
Subject: [PATCH] fix(query): mirror fix on doEveryInterpolation()

---
 src/query/src/qExecutor.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index a0d183e823..166fcf3397 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6529,6 +6529,10 @@ static bool doEveryInterpolation(SOperatorInfo* pOperatorInfo, SSDataBlock* pBlo
     }
   }
   
+  if (pCtx == NULL) {
+    goto group_finished_exit;
+  }
+  
   TSKEY* tsCols = NULL;
   if (pBlock && pBlock->pDataBlock != NULL) {
     SColumnInfoData* pColDataInfo = taosArrayGet(pBlock->pDataBlock, 0);
@@ -6536,10 +6540,6 @@ static bool doEveryInterpolation(SOperatorInfo* pOperatorInfo, SSDataBlock* pBlo
     assert(tsCols[0] == pBlock->info.window.skey && tsCols[pBlock->info.rows - 1] == pBlock->info.window.ekey);
   }
   
-  if (pCtx == NULL || pBlock == NULL) {
-    return false;
-  }
-
   if (pCtx->startTs == INT64_MIN) {
     if (pQueryAttr->range.skey == INT64_MIN) {
       if (NULL == tsCols) {        
@@ -6631,8 +6631,8 @@ static bool doEveryInterpolation(SOperatorInfo* pOperatorInfo, SSDataBlock* pBlo
     return false;
   }
 
-
-  int32_t startPos = binarySearchForKey((char *)tsCols, pBlock->info.rows, pCtx->startTs, pQueryAttr->order.order);
+  int32_t nRows = pBlock ? pBlock->info.rows : 0;
+  int32_t startPos = binarySearchForKey((char *)tsCols, nRows, pCtx->startTs, pQueryAttr->order.order);
 
   if (ascQuery && pQueryAttr->fillType != TSDB_FILL_NEXT && pCtx->start.key == INT64_MIN) {
     if (startPos < 0) {
-- 
GitLab