From 057f09ffbfac42a071e55a53e91546835be1b976 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao>
Date: Wed, 14 Aug 2024 19:20:21 +0800
Subject: [PATCH] fix issue && add ci

---
 source/libs/executor/inc/executorInt.h        |   1 +
 source/libs/executor/inc/streamexecutorInt.h  |   1 +
 source/libs/executor/inc/tfill.h              |   2 +
 source/libs/executor/src/streamfilloperator.c |   8 +-
 .../executor/src/streamtimesliceoperator.c    |  40 +-
 source/libs/stream/src/streamSliceState.c     |  11 +-
 .../tsim/stream/streamInterpHistory.sim       | 492 ++++++++++++
 .../tsim/stream/streamInterpHistory1.sim      | 737 ++++++++++++++++++
 .../script/tsim/stream/streamInterpPrev1.sim  | 239 ++++++
 9 files changed, 1515 insertions(+), 16 deletions(-)
 create mode 100644 tests/script/tsim/stream/streamInterpHistory.sim
 create mode 100644 tests/script/tsim/stream/streamInterpHistory1.sim
 create mode 100644 tests/script/tsim/stream/streamInterpPrev1.sim

diff --git a/source/libs/executor/inc/executorInt.h b/source/libs/executor/inc/executorInt.h
index 54c8d092d3..46a348479a 100644
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
@@ -841,6 +841,7 @@ typedef struct SStreamTimeSliceOperatorInfo {
   SGroupResInfo         groupResInfo;
   bool                  ignoreNull;
   bool                  isHistoryOp;
+  bool                  isReloadState;
 } SStreamTimeSliceOperatorInfo;
 
 #define OPTR_IS_OPENED(_optr)  (((_optr)->status & OP_OPENED) == OP_OPENED)
diff --git a/source/libs/executor/inc/streamexecutorInt.h b/source/libs/executor/inc/streamexecutorInt.h
index c02c3bcd4a..f4b5030d3a 100644
--- a/source/libs/executor/inc/streamexecutorInt.h
+++ b/source/libs/executor/inc/streamexecutorInt.h
@@ -48,6 +48,7 @@ void    destroyStreamFillSupporter(SStreamFillSupporter* pFillSup);
 bool    hasCurWindow(SStreamFillSupporter* pFillSup);
 bool    hasPrevWindow(SStreamFillSupporter* pFillSup);
 bool    hasNextWindow(SStreamFillSupporter* pFillSup);
+bool    hasNextNextWindow(SStreamFillSupporter* pFillSup);
 void    copyNotFillExpData(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo);
 int32_t setRowCell(SColumnInfoData* pCol, int32_t rowId, const SResultCellData* pCell);
 bool    hasRemainCalc(SStreamFillInfo* pFillInfo);
diff --git a/source/libs/executor/inc/tfill.h b/source/libs/executor/inc/tfill.h
index 4044cc0b9b..a8ebc6bb17 100644
--- a/source/libs/executor/inc/tfill.h
+++ b/source/libs/executor/inc/tfill.h
@@ -108,6 +108,8 @@ typedef struct SStreamFillInfo {
   TSKEY                  preRowKey;
   TSKEY                  nextRowKey;
   TSKEY                  nextPointKey;
+  TSKEY                  nextNextRowKey;
+  TSKEY                  nextNextPointKey;
   SResultRowData*        pResRow;
   SStreamFillLinearInfo* pLinearInfo;
   bool                   needFill;
diff --git a/source/libs/executor/src/streamfilloperator.c b/source/libs/executor/src/streamfilloperator.c
index 7c7b800b71..75d072a828 100644
--- a/source/libs/executor/src/streamfilloperator.c
+++ b/source/libs/executor/src/streamfilloperator.c
@@ -232,10 +232,10 @@ void getWindowFromDiscBuf(SOperatorInfo* pOperator, TSKEY ts, uint64_t groupId,
   pAPI->stateStore.streamStateFreeCur(pCur);
 }
 
-bool        hasCurWindow(SStreamFillSupporter* pFillSup) { return pFillSup->cur.key != INT64_MIN; }
-bool        hasPrevWindow(SStreamFillSupporter* pFillSup) { return pFillSup->prev.key != INT64_MIN; }
-bool        hasNextWindow(SStreamFillSupporter* pFillSup) { return pFillSup->next.key != INT64_MIN; }
-static bool hasNextNextWindow(SStreamFillSupporter* pFillSup) { return pFillSup->nextNext.key != INT64_MIN; }
+bool hasCurWindow(SStreamFillSupporter* pFillSup) { return pFillSup->cur.key != INT64_MIN; }
+bool hasPrevWindow(SStreamFillSupporter* pFillSup) { return pFillSup->prev.key != INT64_MIN; }
+bool hasNextWindow(SStreamFillSupporter* pFillSup) { return pFillSup->next.key != INT64_MIN; }
+bool hasNextNextWindow(SStreamFillSupporter* pFillSup) { return pFillSup->nextNext.key != INT64_MIN; }
 
 static void transBlockToResultRow(const SSDataBlock* pBlock, int32_t rowId, TSKEY ts, SResultRowData* pRowVal) {
   int32_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
diff --git a/source/libs/executor/src/streamtimesliceoperator.c b/source/libs/executor/src/streamtimesliceoperator.c
index 7b0e316b2f..e1d91de54e 100644
--- a/source/libs/executor/src/streamtimesliceoperator.c
+++ b/source/libs/executor/src/streamtimesliceoperator.c
@@ -125,6 +125,7 @@ void streamTimeSliceReloadState(SOperatorInfo* pOperator) {
     downstream->fpSet.reloadStreamStateFn(downstream);
   }
   reloadAggSupFromDownStream(downstream, &pInfo->streamAggSup);
+  pInfo->isReloadState = true;
 
 _end:
   if (code != TSDB_CODE_SUCCESS) {
@@ -753,6 +754,16 @@ static int32_t getResultInfoFromState(SStreamAggSupporter* pAggSup, SStreamFillS
       pFillSup->next.pRowVal = pNextPoint->pRightRow->pRowVal;
     }
     pFillSup->next.key = adustEndTsKey(pNextPoint->key.ts, pFillSup->next.key, &pFillSup->interval);
+
+    int32_t nextNextVLen = 0;
+    int32_t tmpWinCode = TSDB_CODE_SUCCESS;
+    SSlicePoint nextNextPoint = {.key.groupId = pNextPoint->key.groupId};
+    code =
+        pAggSup->stateStore.streamStateFillGetNext(pState, &pNextPoint->key, &nextNextPoint.key, NULL, NULL, &tmpWinCode);
+    if (tmpWinCode == TSDB_CODE_SUCCESS) {
+      pFillSup->nextNext.key = nextNextPoint.key.ts;
+    }
+    QUERY_CHECK_CODE(code, lino, _end);
   }
 
 _end:
@@ -896,12 +907,14 @@ static void copyCalcRowDeltaData(SResultRowData* pEndRow, SArray* pEndPoins, SFi
   }
 }
 
-static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo, TSKEY ts) {
-  if (!hasPrevWindow(pFillSup) && !hasNextWindow(pFillSup)) {
+static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo* pFillInfo, TSKEY ts, bool isReloadState) {
+  qDebug("set stream interp fill rule, isReloadState:%d", isReloadState);
+  if (!hasNextWindow(pFillSup) && (!hasPrevWindow(pFillSup) || isReloadState) ) {
     pFillInfo->needFill = false;
     pFillInfo->pos = FILL_POS_START;
     goto _end;
   }
+
   TSKEY prevWKey = INT64_MIN;
   TSKEY nextWKey = INT64_MIN;
   if (hasPrevWindow(pFillSup)) {
@@ -920,7 +933,7 @@ static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo
     case TSDB_FILL_NULL_F:
     case TSDB_FILL_SET_VALUE:
     case TSDB_FILL_SET_VALUE_F: {
-      if (hasPrevWindow(pFillSup)) {
+      if (hasPrevWindow(pFillSup) && !isReloadState) {
         setFillKeyInfo(prevWKey, endTs, &pFillSup->interval, pFillInfo);
         pFillInfo->pos = FILL_POS_END;
       } else {
@@ -931,7 +944,11 @@ static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo
       pFillInfo->pResRow->key = ts;
     } break;
     case TSDB_FILL_PREV: {
-      if (hasNextWindow(pFillSup)) {
+      if (hasPrevWindow(pFillSup) && hasNextWindow(pFillSup) && pFillInfo->nextRowKey == pFillInfo->nextPointKey &&
+      (!hasNextNextWindow(pFillSup) || pFillInfo->nextNextRowKey == pFillInfo->nextNextPointKey)  && !isReloadState ) {
+        setFillKeyInfo(prevWKey, endTs, &pFillSup->interval, pFillInfo);
+        pFillInfo->pos = FILL_POS_END;
+      } else if (hasNextWindow(pFillSup)) {
         setFillKeyInfo(startTs, nextWKey, &pFillSup->interval, pFillInfo);
         pFillInfo->pos = FILL_POS_START;
         resetFillWindow(&pFillSup->prev);
@@ -945,7 +962,7 @@ static void setTimeSliceFillRule(SStreamFillSupporter* pFillSup, SStreamFillInfo
       pFillInfo->pResRow = &pFillSup->prev;
     } break;
     case TSDB_FILL_NEXT: {
-      if (hasPrevWindow(pFillSup)) {
+      if (hasPrevWindow(pFillSup) && !isReloadState) {
         setFillKeyInfo(prevWKey, endTs, &pFillSup->interval, pFillInfo);
         pFillInfo->pos = FILL_POS_END;
         resetFillWindow(&pFillSup->next);
@@ -1217,7 +1234,7 @@ void getNextResKey(int64_t curGroupId, SArray* pKeyArray, int32_t curIndex, TSKE
 }
 
 void doBuildTimeSlicePointResult(SStreamAggSupporter* pAggSup, SStreamFillSupporter* pFillSup,
-                                 SStreamFillInfo* pFillInfo, SSDataBlock* pBlock, SGroupResInfo* pGroupResInfo) {
+                                 SStreamFillInfo* pFillInfo, SSDataBlock* pBlock, SGroupResInfo* pGroupResInfo, bool isReloadState) {
   int32_t code = TSDB_CODE_SUCCESS;
   int32_t lino = 0;
   blockDataCleanup(pBlock);
@@ -1250,7 +1267,11 @@ void doBuildTimeSlicePointResult(SStreamAggSupporter* pAggSup, SStreamFillSuppor
     if (hasNextWindow(pFillSup)) {
       pFillInfo->nextPointKey = nextPoint.key.ts;
     }
-    setTimeSliceFillRule(pFillSup, pFillInfo, pKey->ts);
+    getNextResKey(pKey->groupId, pGroupResInfo->pRows, pGroupResInfo->index + 1, &pFillInfo->nextNextRowKey);
+    if (hasNextNextWindow(pFillSup)) {
+      pFillInfo->nextNextPointKey = pFillSup->nextNext.key;
+    }
+    setTimeSliceFillRule(pFillSup, pFillInfo, pKey->ts, isReloadState);
     doStreamFillRange(pFillSup, pFillInfo, pBlock);
     releaseOutputBuf(pAggSup->pState, curPoint.pResPos, &pAggSup->stateStore);
     releaseOutputBuf(pAggSup->pState, prevPoint.pResPos, &pAggSup->stateStore);
@@ -1279,7 +1300,7 @@ static int32_t buildTimeSliceResult(SOperatorInfo* pOperator, SSDataBlock** ppRe
     goto _end;
   }
 
-  doBuildTimeSlicePointResult(pAggSup, pInfo->pFillSup, pInfo->pFillInfo, pInfo->pRes, &pInfo->groupResInfo);
+  doBuildTimeSlicePointResult(pAggSup, pInfo->pFillSup, pInfo->pFillInfo, pInfo->pRes, &pInfo->groupResInfo, pInfo->isReloadState);
   if (pInfo->pRes->info.rows != 0) {
     printDataBlock(pInfo->pRes, getStreamOpName(opType), GET_TASKID(pTaskInfo));
     (*ppRes) = pInfo->pRes;
@@ -1431,6 +1452,7 @@ static int32_t doStreamTimeSliceNext(SOperatorInfo* pOperator, SSDataBlock** ppR
       goto _end;
     }
 
+    pInfo->isReloadState = false;
     setStreamOperatorCompleted(pOperator);
     resetStreamFillSup(pInfo->pFillSup);
     (*ppRes) = NULL;
@@ -1522,6 +1544,7 @@ static int32_t doStreamTimeSliceNext(SOperatorInfo* pOperator, SSDataBlock** ppR
   QUERY_CHECK_CODE(code, lino, _end);
 
   if (!(*ppRes)) {
+    pInfo->isReloadState = false;
     setStreamOperatorCompleted(pOperator);
     resetStreamFillSup(pInfo->pFillSup);
   }
@@ -1696,6 +1719,7 @@ int32_t createStreamTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
   if (pHandle) {
     pInfo->isHistoryOp = pHandle->fillHistory;
   }
+  pInfo->isReloadState = false;
 
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERP_FUNC;
   setOperatorInfo(pOperator, getStreamOpName(pOperator->operatorType), QUERY_NODE_PHYSICAL_PLAN_STREAM_INTERP_FUNC,
diff --git a/source/libs/stream/src/streamSliceState.c b/source/libs/stream/src/streamSliceState.c
index 9eb4f57887..f5589f53ae 100644
--- a/source/libs/stream/src/streamSliceState.c
+++ b/source/libs/stream/src/streamSliceState.c
@@ -162,17 +162,17 @@ int32_t getHashSortNextRow(SStreamFileState* pFileState, const SWinKey* pKey, SW
     void*            tmpVal = NULL;
     int32_t          len = 0;
     (*pWinCode) = streamStateGetGroupKVByCur_rocksdb(pCur, pResKey, (const void**)&tmpVal, &len);
-    if ((*pWinCode) == TSDB_CODE_SUCCESS) {
+    if ((*pWinCode) == TSDB_CODE_SUCCESS && ppVal != NULL) {
       SRowBuffPos* pNewPos = getNewRowPosForWrite(pFileState);
       if (!pNewPos || !pNewPos->pRowBuff) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         QUERY_CHECK_CODE(code, lino, _end);
       }
       memcpy(pNewPos->pRowBuff, tmpVal, len);
-      taosMemoryFreeClear(tmpVal);
       *pVLen = getRowStateRowSize(pFileState);
       (*ppVal) = pNewPos;
     }
+    taosMemoryFreeClear(tmpVal);
     streamStateFreeCur(pCur);
     return code;
   }
@@ -183,17 +183,17 @@ int32_t getHashSortNextRow(SStreamFileState* pFileState, const SWinKey* pKey, SW
     void*            tmpVal = NULL;
     int32_t          len = 0;
     (*pWinCode) = streamStateGetGroupKVByCur_rocksdb(pCur, pResKey, (const void**)&tmpVal, &len);
-    if ((*pWinCode) == TSDB_CODE_SUCCESS) {
+    if ((*pWinCode) == TSDB_CODE_SUCCESS && ppVal != NULL) {
       SRowBuffPos* pNewPos = getNewRowPosForWrite(pFileState);
       if (!pNewPos || !pNewPos->pRowBuff) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         QUERY_CHECK_CODE(code, lino, _end);
       }
       memcpy(pNewPos->pRowBuff, tmpVal, len);
-      taosMemoryFreeClear(tmpVal);
       *pVLen = getRowStateRowSize(pFileState);
       (*ppVal) = pNewPos;
     }
+    taosMemoryFreeClear(tmpVal);
     streamStateFreeCur(pCur);
     return code;
   } else {
@@ -203,6 +203,9 @@ int32_t getHashSortNextRow(SStreamFileState* pFileState, const SWinKey* pKey, SW
     }
     SWinKey* pNext = taosArrayGet(pWinStates, index + 1);
     *pResKey = *pNext;
+    if (ppVal == NULL) {
+      return code;
+    }
     return getHashSortRowBuff(pFileState, pResKey, ppVal, pVLen, pWinCode);
   }
   (*pWinCode) = TSDB_CODE_FAILED;
diff --git a/tests/script/tsim/stream/streamInterpHistory.sim b/tests/script/tsim/stream/streamInterpHistory.sim
new file mode 100644
index 0000000000..6e6e99f98b
--- /dev/null
+++ b/tests/script/tsim/stream/streamInterpHistory.sim
@@ -0,0 +1,492 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print step1
+print =============== create database
+sql create database test vgroups 1;
+sql use test;
+
+sql create stable st(ts timestamp,a int,b int,c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql insert into t1 values(1648791212000,1,1,1,1.0);
+sql insert into t1 values(1648791215001,2,1,1,1.0);
+
+sql insert into t2 values(1648791212000,31,1,1,1.0);
+sql insert into t2 values(1648791215001,41,1,1,1.0);
+
+sql create stream streams1 trigger at_once FILL_HISTORY 1 IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, _isfilled as a1, interp(a) as a2 from st partition by tbname every(1s) fill(prev);
+
+
+sql insert into t1 values(1648791217000,5,1,1,1.0);
+sql insert into t2 values(1648791217000,61,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(prev) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(prev) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+
+$loop_count = 0
+
+loop0:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 <= 10 order by 1;
+sql select * from streamt where a2 < 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop0
+endi
+
+# row 0
+if $data02 != 1 then
+  print ======data02=$data02
+  goto loop0
+endi
+
+if $data12 != 1 then
+  print ======data12=$data12
+  goto loop0
+endi
+
+if $data22 != 1 then
+  print ======data22=$data22
+  goto loop0
+endi
+
+if $data32 != 1 then
+  print ======data32=$data32
+  goto loop0
+endi
+
+if $data42 != 2 then
+  print ======data42=$data42
+  goto loop0
+endi
+
+if $data52 != 5 then
+  print ======data52=$data52
+  goto loop0
+endi
+
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(prev) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(prev) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+$loop_count = 0
+
+loop0_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 > 10 order by 1;
+sql select * from streamt where a2 > 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop0_1
+endi
+
+if $data02 != 31 then
+  print ======data02=$data02
+  goto loop0_1
+endi
+
+if $data12 != 31 then
+  print ======data12=$data12
+  goto loop0_1
+endi
+
+if $data22 != 31 then
+  print ======data22=$data22
+  goto loop0_1
+endi
+
+if $data32 != 31 then
+  print ======data32=$data32
+  goto loop0_1
+endi
+
+if $data42 != 41 then
+  print ======data42=$data42
+  goto loop0_1
+endi
+
+if $data52 != 61 then
+  print ======data52=$data52
+  goto loop0_1
+endi
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791219001,7,1,1,1.0);
+sql insert into t2 values(1648791219001,81,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(prev) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(prev) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 <= 10 order by 1;
+sql select * from streamt where a2 < 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop1
+endi
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(prev) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(prev) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop1_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 > 10 order by 1;
+sql select * from streamt where a2 > 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop1_1
+endi
+
+print step2
+print =============== create database
+sql create database test2 vgroups 1;
+sql use test2;
+
+sql create stable st(ts timestamp,a int,b int,c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql insert into t1 values(1648791212000,1,1,1,1.0);
+sql insert into t1 values(1648791215001,2,1,1,1.0);
+
+sql insert into t2 values(1648791212000,31,1,1,1.0);
+sql insert into t2 values(1648791215001,41,1,1,1.0);
+
+sql create stream streams2 trigger at_once FILL_HISTORY 1 IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, _isfilled as a1, interp(a) as a2 from st partition by tbname every(1s) fill(next);
+
+
+sql insert into t1 values(1648791217000,5,1,1,1.0);
+sql insert into t2 values(1648791217000,61,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(next) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(next) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+
+$loop_count = 0
+
+loop2:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 <= 10 order by 1;
+sql select * from streamt where a2 < 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop2
+endi
+
+# row 0
+if $data02 != 1 then
+  print ======data02=$data02
+  goto loop2
+endi
+
+if $data12 != 2 then
+  print ======data12=$data12
+  goto loop2
+endi
+
+if $data22 != 2 then
+  print ======data22=$data22
+  goto loop2
+endi
+
+if $data32 != 2 then
+  print ======data32=$data32
+  goto loop2
+endi
+
+if $data42 != 5 then
+  print ======data42=$data42
+  goto loop2
+endi
+
+if $data52 != 5 then
+  print ======data52=$data52
+  goto loop2
+endi
+
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(next) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(next) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+$loop_count = 0
+
+loop2_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 > 10 order by 1;
+sql select * from streamt where a2 > 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop2_1
+endi
+
+if $data02 != 31 then
+  print ======data02=$data02
+  goto loop2_1
+endi
+
+if $data12 != 41 then
+  print ======data12=$data12
+  goto loop2_1
+endi
+
+if $data22 != 41 then
+  print ======data22=$data22
+  goto loop2_1
+endi
+
+if $data32 != 41 then
+  print ======data32=$data32
+  goto loop2_1
+endi
+
+if $data42 != 61 then
+  print ======data42=$data42
+  goto loop2_1
+endi
+
+if $data52 != 61 then
+  print ======data52=$data52
+  goto loop2_1
+endi
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791219001,7,1,1,1.0);
+sql insert into t2 values(1648791219001,81,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(next) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(next) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop3:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 <= 10 order by 1;
+sql select * from streamt where a2 < 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop3
+endi
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(next) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(next) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop3_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where a2 > 10 order by 1;
+sql select * from streamt where a2 > 10 order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop3_1
+endi
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stream/streamInterpHistory1.sim b/tests/script/tsim/stream/streamInterpHistory1.sim
new file mode 100644
index 0000000000..c4d558592c
--- /dev/null
+++ b/tests/script/tsim/stream/streamInterpHistory1.sim
@@ -0,0 +1,737 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print step1
+print =============== create database
+sql create database test vgroups 1;
+sql use test;
+
+sql create stable st(ts timestamp,a int,b int,c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql insert into t1 values(1648791212000,1,1,1,1.0);
+sql insert into t1 values(1648791215001,2,1,1,1.0);
+
+sql insert into t2 values(1648791212000,31,1,1,1.0);
+sql insert into t2 values(1648791215001,41,1,1,1.0);
+
+sql create stream streams1 trigger at_once FILL_HISTORY 1 IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, _isfilled as a1, interp(a) as a2, tbname as tb from st partition by tbname every(1s) fill(NULL);
+
+
+sql insert into t1 values(1648791217000,5,1,1,1.0);
+sql insert into t2 values(1648791217000,61,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(NULL) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(NULL) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+
+$loop_count = 0
+
+loop0:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop0
+endi
+
+# row 0
+if $data02 != 1 then
+  print ======data02=$data02
+  goto loop0
+endi
+
+if $data12 != NULL then
+  print ======data12=$data12
+  goto loop0
+endi
+
+if $data22 != NULL then
+  print ======data22=$data22
+  goto loop0
+endi
+
+if $data32 != NULL then
+  print ======data32=$data32
+  goto loop0
+endi
+
+if $data42 != NULL then
+  print ======data42=$data42
+  goto loop0
+endi
+
+if $data52 != 5 then
+  print ======data52=$data52
+  goto loop0
+endi
+
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(NULL) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(NULL) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+$loop_count = 0
+
+loop0_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop0_1
+endi
+
+if $data02 != 31 then
+  print ======data02=$data02
+  goto loop0_1
+endi
+
+if $data12 != NULL then
+  print ======data12=$data12
+  goto loop0_1
+endi
+
+if $data22 != NULL then
+  print ======data22=$data22
+  goto loop0_1
+endi
+
+if $data32 != NULL then
+  print ======data32=$data32
+  goto loop0_1
+endi
+
+if $data42 != NULL then
+  print ======data42=$data42
+  goto loop0_1
+endi
+
+if $data52 != 61 then
+  print ======data52=$data52
+  goto loop0_1
+endi
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791219001,7,1,1,1.0);
+sql insert into t2 values(1648791219001,81,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(NULL) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(NULL) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop1
+endi
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(NULL) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(NULL) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop1_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop1_1
+endi
+
+print step2
+print =============== create database
+sql create database test2 vgroups 1;
+sql use test2;
+
+sql create stable st(ts timestamp,a int,b int,c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql insert into t1 values(1648791212000,1,1,1,1.0);
+sql insert into t1 values(1648791215001,2,1,1,1.0);
+
+sql insert into t2 values(1648791212000,31,1,1,1.0);
+sql insert into t2 values(1648791212001,41,1,1,1.0);
+
+sql create stream streams2 trigger at_once FILL_HISTORY 1 IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, _isfilled as a1, interp(a) as a2, tbname as tb from st partition by tbname every(1s) fill(value, 888);
+
+
+sql insert into t1 values(1648791217000,5,1,1,1.0);
+sql insert into t2 values(1648791217000,61,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(value, 888) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(value, 888) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+
+$loop_count = 0
+
+loop2:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop2
+endi
+
+# row 0
+if $data02 != 1 then
+  print ======data02=$data02
+  goto loop2
+endi
+
+if $data12 != 888 then
+  print ======data12=$data12
+  goto loop2
+endi
+
+if $data22 != 888 then
+  print ======data22=$data22
+  goto loop2
+endi
+
+if $data32 != 888 then
+  print ======data32=$data32
+  goto loop2
+endi
+
+if $data42 != 888 then
+  print ======data42=$data42
+  goto loop2
+endi
+
+if $data52 != 5 then
+  print ======data52=$data52
+  goto loop2
+endi
+
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(value, 888) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(value, 888) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+$loop_count = 0
+
+loop2_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop2_1
+endi
+
+if $data02 != 31 then
+  print ======data02=$data02
+  goto loop2_1
+endi
+
+if $data12 != 888 then
+  print ======data12=$data12
+  goto loop2_1
+endi
+
+if $data22 != 888 then
+  print ======data22=$data22
+  goto loop2_1
+endi
+
+if $data32 != 888 then
+  print ======data32=$data32
+  goto loop2_1
+endi
+
+if $data42 != 888 then
+  print ======data42=$data42
+  goto loop2_1
+endi
+
+if $data52 != 61 then
+  print ======data52=$data52
+  goto loop2_1
+endi
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791219001,7,1,1,1.0);
+sql insert into t2 values(1648791219001,81,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(value, 888) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(value, 888) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop3:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop3
+endi
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(value, 888) order by 3, 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(value, 888) order by 3, 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop3_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop3_1
+endi
+
+
+print step3
+print =============== create database
+sql create database test3 vgroups 1;
+sql use test3;
+
+sql create stable st(ts timestamp,a int,b int,c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+
+sql insert into t1 values(1648791212000,1,1,1,1.0);
+sql insert into t1 values(1648791215001,20,1,1,1.0);
+
+sql insert into t2 values(1648791212000,31,1,1,1.0);
+sql insert into t2 values(1648791215001,41,1,1,1.0);
+
+sql create stream streams3 trigger at_once FILL_HISTORY 1 IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, _isfilled as a1, interp(a) as a2, tbname as tb from st partition by tbname every(1s) fill(linear);
+
+
+sql insert into t1 values(1648791217000,5,1,1,1.0);
+sql insert into t2 values(1648791217000,61,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(linear) order by 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(linear) order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+
+$loop_count = 0
+
+loop4:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop4
+endi
+
+# row 0
+if $data02 != 1 then
+  print ======data02=$data02
+  goto loop4
+endi
+
+if $data12 != 7 then
+  print ======data12=$data12
+  goto loop4
+endi
+
+if $data22 != 13 then
+  print ======data22=$data22
+  goto loop4
+endi
+
+if $data32 != 19 then
+  print ======data32=$data32
+  goto loop4
+endi
+
+if $data42 != 12 then
+  print ======data42=$data42
+  goto loop4
+endi
+
+if $data52 != 5 then
+  print ======data52=$data52
+  goto loop4
+endi
+
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(linear) order by 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791217000) every(1s) fill(linear) order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+$loop_count = 0
+
+loop4_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+
+# row 0
+if $rows != 6 then
+  print ======rows=$rows
+  goto loop4_1
+endi
+
+if $data02 != 31 then
+  print ======data02=$data02
+  goto loop4_1
+endi
+
+if $data12 != 34 then
+  print ======data12=$data12
+  goto loop4_1
+endi
+
+if $data22 != 37 then
+  print ======data22=$data22
+  goto loop4_1
+endi
+
+if $data32 != 40 then
+  print ======data32=$data32
+  goto loop4_1
+endi
+
+if $data42 != 50 then
+  print ======data42=$data42
+  goto loop4_1
+endi
+
+if $data52 != 61 then
+  print ======data52=$data52
+  goto loop4_1
+endi
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791219001,7,1,1,1.0);
+sql insert into t2 values(1648791219001,81,1,1,1.0);
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(linear) order by 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t1 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(linear) order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop5:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t1" order by 1;
+sql select * from streamt where tb = "t1" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop5
+endi
+
+print sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(linear) order by 1;
+sql select _irowts, _isfilled as a1, interp(a) as a2 from t2 partition by tbname range(1648791212000, 1648791219000) every(1s) fill(linear) order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+$loop_count = 0
+
+loop5_1:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 20 then
+  return -1
+endi
+
+print 0 sql select * from streamt where tb = "t2" order by 1;
+sql select * from streamt where tb = "t2" order by 1;
+
+print $data00 $data01 $data02 $data03 $data04 $data05
+print $data10 $data11 $data12 $data13 $data14 $data15
+print $data20 $data21 $data22 $data23 $data24 $data25
+print $data30 $data31 $data32 $data33 $data34 $data35
+print $data40 $data41 $data42 $data43 $data44 $data45
+print $data50 $data51 $data52 $data53 $data54 $data55
+print $data60 $data61 $data62 $data63 $data64 $data65
+print $data70 $data71 $data72 $data73 $data74 $data75
+
+if $rows != 8 then
+  print ======rows=$rows
+  goto loop5_1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stream/streamInterpPrev1.sim b/tests/script/tsim/stream/streamInterpPrev1.sim
new file mode 100644
index 0000000000..5d40d0a11f
--- /dev/null
+++ b/tests/script/tsim/stream/streamInterpPrev1.sim
@@ -0,0 +1,239 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print step1
+print =============== create database
+sql create database test vgroups 1;
+sql use test;
+
+sql create table t1(ts timestamp, a int, b int , c int, d double);
+sql create stream streams1 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 every(1s) fill(prev);
+
+run tsim/stream/checkTaskStatus.sim
+
+
+sql insert into t1 values(1648791213000,1,1,1,1.0);
+
+$loop_count = 0
+
+loop0:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+print 0 sql select * from streamt;
+sql select * from streamt;
+
+print $data00 $data01 $data02 $data03
+print $data10 $data11 $data12 $data13
+
+# row 0
+if $rows != 1 then
+  print ======rows=$rows
+  goto loop0
+endi
+
+# row 0
+if $data01 != 1 then
+  print ======data01=$data01
+  goto loop0
+endi
+
+
+sql insert into t1 values(1648791213009,3,3,3,1.0) (1648791217001,4,4,4,4.1);
+
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791213000, 1648791217001) every(1s) fill(prev);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791213000, 1648791217001) every(1s) fill(prev);
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+
+$loop_count = 0
+loop2:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+print 2 sql select * from streamt;
+sql select * from streamt;
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+
+
+# row 0
+if $rows != 5 then
+  print ======rows=$rows
+  goto loop2
+endi
+
+# row 0
+if $data01 != 1 then
+  print ======data01=$data01
+  goto loop2
+endi
+
+if $data11 != 3 then
+  print ======data11=$data11
+  goto loop2
+endi
+
+if $data21 != 3 then
+  print ======data21=$data21
+  goto loop2
+endi
+
+if $data31 != 3 then
+  print ======data31=$data31
+  goto loop2
+endi
+
+if $data41 != 3 then
+  print ======data41=$data41
+  goto loop2
+endi
+
+
+print step2
+
+sql create database test2 vgroups 1;
+sql use test2;
+
+sql create table t1(ts timestamp, a int, b int , c int, d double);
+sql create stream streams2 trigger at_once IGNORE EXPIRED 0 IGNORE UPDATE 0 into  streamt as select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 every(1s) fill(prev);
+
+run tsim/stream/checkTaskStatus.sim
+
+sql insert into t1 values(1648791213000,1,1,1,1.0);
+
+
+$loop_count = 0
+
+loop3:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+print 0 sql select * from streamt;
+sql select * from streamt;
+
+print $data00 $data01 $data02 $data03
+print $data10 $data11 $data12 $data13
+
+# row 0
+if $rows != 1 then
+  print ======rows=$rows
+  goto loop3
+endi
+
+# row 0
+if $data01 != 1 then
+  print ======data01=$data01
+  goto loop3
+endi
+
+
+sql insert into t1 values(1648791213009,3,3,3,1.0) (1648791217001,4,4,4,4.1) (1648791219000,5,5,5,5.1);
+
+print sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791213000, 1648791217001) every(1s) fill(prev);
+sql select _irowts, interp(a), interp(b), interp(c), interp(d) from t1 range(1648791213000, 1648791217001) every(1s) fill(prev);
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
+print $data70 $data71 $data72 $data73 $data74
+
+
+$loop_count = 0
+loop4:
+
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+print 2 sql select * from streamt;
+sql select * from streamt;
+
+print $data00 $data01 $data02 $data03 $data04
+print $data10 $data11 $data12 $data13 $data14
+print $data20 $data21 $data22 $data23 $data24
+print $data30 $data31 $data32 $data33 $data34
+print $data40 $data41 $data42 $data43 $data44
+print $data50 $data51 $data52 $data53 $data54
+print $data60 $data61 $data62 $data63 $data64
+print $data70 $data71 $data72 $data73 $data74
+
+# row 0
+if $rows != 7 then
+  print ======rows=$rows
+  goto loop4
+endi
+
+# row 0
+if $data01 != 1 then
+  print ======data01=$data01
+  goto loop4
+endi
+
+if $data11 != 3 then
+  print ======data11=$data11
+  goto loop4
+endi
+
+if $data21 != 3 then
+  print ======data21=$data21
+  goto loop4
+endi
+
+if $data31 != 3 then
+  print ======data31=$data31
+  goto loop4
+endi
+
+if $data41 != 3 then
+  print ======data41=$data41
+  goto loop4
+endi
+
+if $data51 != 4 then
+  print ======data51=$data51
+  goto loop4
+endi
+
+if $data61 != 5 then
+  print ======data61=$data61
+  goto loop4
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT