Merge pull request #16397 from taosdata/fix/TD-18617

fix(query): fix multiple interp used result number of rows incorrect 

source/libs/executor/src/timewindowoperator.c

@@ -2146,6 +2146,7 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
   // todo set the correct primary timestamp column
 
   // output the result
+  bool hasInterp = true;
   for (int32_t j = 0; j < pExprSup->numOfExprs; ++j) {
     SExprInfo* pExprInfo = &pExprSup->pExprInfo[j];
     int32_t    srcSlot = pExprInfo->base.pParam[0].pCol->slotId;
@@ -2157,7 +2158,6 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
     switch (pSliceInfo->fillType) {
       case TSDB_FILL_NULL: {
         colDataAppendNULL(pDst, rows);
-        pResBlock->info.rows += 1;
         break;
       }
 
@@ -2177,7 +2177,6 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           GET_TYPED_DATA(v, int64_t, pVar->nType, &pVar->i);
           colDataAppend(pDst, rows, (char*)&v, false);
         }
-        pResBlock->info.rows += 1;
         break;
       }
 
@@ -2191,6 +2190,7 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
 
         // before interp range, do not fill
         if (start.key == INT64_MIN || end.key == INT64_MAX) {
+          hasInterp = false;
           break;
         }
 
@@ -2202,28 +2202,27 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
         }
 
         taosMemoryFree(current.val);
-        pResBlock->info.rows += 1;
         break;
       }
       case TSDB_FILL_PREV: {
         if (!pSliceInfo->isPrevRowSet) {
+          hasInterp = false;
           break;
         }
 
         SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, srcSlot);
         colDataAppend(pDst, rows, pkey->pData, false);
-        pResBlock->info.rows += 1;
         break;
       }
 
       case TSDB_FILL_NEXT: {
         if (!pSliceInfo->isNextRowSet) {
+          hasInterp = false;
           break;
         }
 
         SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, srcSlot);
         colDataAppend(pDst, rows, pkey->pData, false);
-        pResBlock->info.rows += 1;
         break;
       }
 
@@ -2232,6 +2231,11 @@ static void genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
         break;
     }
   }
+
+  if (hasInterp) {
+    pResBlock->info.rows += 1;
+  }
+
 }
 
 static int32_t initPrevRowsKeeper(STimeSliceOperatorInfo* pInfo, SSDataBlock* pBlock) {
@@ -2412,6 +2416,11 @@ static SSDataBlock* doTimeslice(SOperatorInfo* pOperator) {
           SColumnInfoData* pSrc = taosArrayGet(pBlock->pDataBlock, srcSlot);
           SColumnInfoData* pDst = taosArrayGet(pResBlock->pDataBlock, dstSlot);
 
+          if (colDataIsNull_s(pSrc, i)) {
+            colDataAppendNULL(pDst, pResBlock->info.rows);
+            continue;
+          }
+
           char* v = colDataGetData(pSrc, i);
           colDataAppend(pDst, pResBlock->info.rows, v, false);
         }

tests/system-test/2-query/interp.py

@@ -551,7 +551,57 @@ class TDTestCase:
         tdSql.checkData(0, 0, 15)
         tdSql.checkData(1, 0, 15)
 
-        tdLog.printNoPrefix("==========step9:test error cases")
+        tdLog.printNoPrefix("==========step9:test multi-interp cases")
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(null)")
+        tdSql.checkRows(5)
+        tdSql.checkCols(4)
+
+        for i in range (tdSql.queryCols):
+          tdSql.checkData(0, i, None)
+          tdSql.checkData(1, i, None)
+          tdSql.checkData(2, i, 15)
+          tdSql.checkData(3, i, None)
+          tdSql.checkData(4, i, None)
+
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(value, 1)")
+        tdSql.checkRows(5)
+        tdSql.checkCols(4)
+
+        for i in range (tdSql.queryCols):
+          tdSql.checkData(0, i, 1)
+          tdSql.checkData(1, i, 1)
+          tdSql.checkData(2, i, 15)
+          tdSql.checkData(3, i, 1)
+          tdSql.checkData(4, i, 1)
+
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(prev)")
+        tdSql.checkRows(5)
+        tdSql.checkCols(4)
+
+        for i in range (tdSql.queryCols):
+          tdSql.checkData(0, i, 5)
+          tdSql.checkData(1, i, 5)
+          tdSql.checkData(2, i, 15)
+          tdSql.checkData(3, i, 15)
+          tdSql.checkData(4, i, 15)
+
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(next)")
+        tdSql.checkRows(3)
+        tdSql.checkCols(4)
+
+        for i in range (tdSql.queryCols):
+          tdSql.checkData(0, i, 15)
+          tdSql.checkData(1, i, 15)
+          tdSql.checkData(2, i, 15)
+
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkCols(4)
+
+        for i in range (tdSql.queryCols):
+            tdSql.checkData(0, i, 15)
+
+        tdLog.printNoPrefix("==========step10:test error cases")
 
         tdSql.error(f"select interp(c0) from {dbname}.{tbname}")
         tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05')")