From fdffc2883fa4db97c602059c74e0263276d6dc0c Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 14 Oct 2022 17:05:18 +0800
Subject: [PATCH] fix: fix code merge issue

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

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 672c0d1246..3426fe51ac 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1473,7 +1473,9 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
     }
   }
 
-  doFilter(pInfo->pCondition, pInfo->pRes, NULL, NULL);
+  if (filter) {
+    doFilter(pInfo->pCondition, pInfo->pRes, NULL, NULL);
+  }
   blockDataUpdateTsWindow(pInfo->pRes, pInfo->primaryTsIndex);
   blockDataFreeRes((SSDataBlock*)pBlock);