From 6936c9aacd6094ebc56e5f25e6a5a5234c7607ee Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Thu, 22 Aug 2024 14:04:39 +0800
Subject: [PATCH 1/2] fix(query):remove null pointer

---
 source/libs/executor/src/sysscanoperator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index 242e4c0830..6559ba0e68 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -1490,13 +1490,13 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
       // create time
       pColInfoData = taosArrayGet(p->pDataBlock, 2);
       QUERY_CHECK_NULL(pColInfoData, code, lino, _end, terrno);
-      code = colDataSetVal(pColInfoData, numOfRows, (char*)&pInfo->pCur->mr.me.ntbEntry.btime, false);
+      code = colDataSetVal(pColInfoData, numOfRows, (char*)&mr.me.ntbEntry.btime, false);
       QUERY_CHECK_CODE(code, lino, _end);
 
       // number of columns
       pColInfoData = taosArrayGet(p->pDataBlock, 3);
       QUERY_CHECK_NULL(pColInfoData, code, lino, _end, terrno);
-      code = colDataSetVal(pColInfoData, numOfRows, (char*)&pInfo->pCur->mr.me.ntbEntry.schemaRow.nCols, false);
+      code = colDataSetVal(pColInfoData, numOfRows, (char*)&mr.me.ntbEntry.schemaRow.nCols, false);
       QUERY_CHECK_CODE(code, lino, _end);
 
       // super table name

From 167a385b64b8595042c45292d65ec58cd8f2e55b Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Thu, 22 Aug 2024 16:47:23 +0800
Subject: [PATCH 2/2] adj functioin res

---
 source/libs/executor/src/timewindowoperator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 95d415f85c..c9bb1e69e0 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1256,7 +1256,7 @@ void destroyIntervalOperatorInfo(void* param) {
   taosMemoryFreeClear(param);
 }
 
-static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SIntervalAggOperatorInfo* pInfo,
+static int32_t timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SIntervalAggOperatorInfo* pInfo,
                                    bool* pRes) {
   // the primary timestamp column
   bool    needed = false;