From 669c3aa4db484308ee6a12cd3e9b0727bfa6fef5 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao@163.com>
Date: Wed, 9 Oct 2024 19:48:24 +0800
Subject: [PATCH] fix windows ci issue

---
 source/libs/executor/inc/streamexecutorInt.h  |  4 ++--
 .../executor/src/streamtimesliceoperator.c    | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/source/libs/executor/inc/streamexecutorInt.h b/source/libs/executor/inc/streamexecutorInt.h
index 94873b98e9..29e165631d 100644
--- a/source/libs/executor/inc/streamexecutorInt.h
+++ b/source/libs/executor/inc/streamexecutorInt.h
@@ -31,8 +31,8 @@ extern "C" {
 #define HAS_ROW_DATA(pRowData)               (pRowData && pRowData->key != INT64_MIN)
 
 typedef struct SSliceRowData {
-  TSKEY                  key;
-  struct SResultCellData pRowVal[1];
+  TSKEY key;
+  char  pRowVal[];
 } SSliceRowData;
 
 typedef struct SSlicePoint {
diff --git a/source/libs/executor/src/streamtimesliceoperator.c b/source/libs/executor/src/streamtimesliceoperator.c
index f3f362ec7c..24fbdf15de 100644
--- a/source/libs/executor/src/streamtimesliceoperator.c
+++ b/source/libs/executor/src/streamtimesliceoperator.c
@@ -665,7 +665,7 @@ static int32_t getLinearResultInfoFromState(SStreamAggSupporter* pAggSup, SStrea
 
   if (HAS_ROW_DATA(pCurPoint->pRightRow)) {
     pFillSup->cur.key = pCurPoint->pRightRow->key;
-    pFillSup->cur.pRowVal = pCurPoint->pRightRow->pRowVal;
+    pFillSup->cur.pRowVal = (SResultCellData*)pCurPoint->pRightRow->pRowVal;
     if (HAS_NON_ROW_DATA(pCurPoint->pLeftRow)) {
       pPrevPoint->key.groupId = groupId;
       int32_t preVLen = 0;
@@ -677,10 +677,10 @@ static int32_t getLinearResultInfoFromState(SStreamAggSupporter* pAggSup, SStrea
         setPointBuff(pPrevPoint, pFillSup);
         if (HAS_ROW_DATA(pPrevPoint->pRightRow)) {
           pFillSup->prev.key = pPrevPoint->pRightRow->key;
-          pFillSup->prev.pRowVal = pPrevPoint->pRightRow->pRowVal;
+          pFillSup->prev.pRowVal = (SResultCellData*)pPrevPoint->pRightRow->pRowVal;
         } else {
           pFillSup->prev.key = pPrevPoint->pLeftRow->key;
-          pFillSup->prev.pRowVal = pPrevPoint->pLeftRow->pRowVal;
+          pFillSup->prev.pRowVal = (SResultCellData*)pPrevPoint->pLeftRow->pRowVal;
         }
         pFillSup->prevOriginKey = pFillSup->prev.key;
         pFillSup->prev.key = adustPrevTsKey(pPrevPoint->key.ts, pFillSup->prev.key, &pFillSup->interval);
@@ -691,7 +691,7 @@ static int32_t getLinearResultInfoFromState(SStreamAggSupporter* pAggSup, SStrea
 
   if (HAS_ROW_DATA(pCurPoint->pLeftRow)) {
     pFillSup->prev.key = pCurPoint->pLeftRow->key;
-    pFillSup->prev.pRowVal = pCurPoint->pLeftRow->pRowVal;
+    pFillSup->prev.pRowVal = (SResultCellData*)pCurPoint->pLeftRow->pRowVal;
     pFillSup->prevOriginKey = pFillSup->prev.key;
     pFillSup->prev.key = adustPrevTsKey(pCurPoint->key.ts, pFillSup->prev.key, &pFillSup->interval);
     if (HAS_NON_ROW_DATA(pCurPoint->pRightRow)) {
@@ -705,10 +705,10 @@ static int32_t getLinearResultInfoFromState(SStreamAggSupporter* pAggSup, SStrea
         setPointBuff(pNextPoint, pFillSup);
         if (HAS_ROW_DATA(pNextPoint->pLeftRow)) {
           pFillSup->next.key = pNextPoint->pLeftRow->key;
-          pFillSup->next.pRowVal = pNextPoint->pLeftRow->pRowVal;
+          pFillSup->next.pRowVal = (SResultCellData*)pNextPoint->pLeftRow->pRowVal;
         } else {
           pFillSup->next.key = pNextPoint->pRightRow->key;
-          pFillSup->next.pRowVal = pNextPoint->pRightRow->pRowVal;
+          pFillSup->next.pRowVal = (SResultCellData*)pNextPoint->pRightRow->pRowVal;
         }
         pFillSup->nextOriginKey = pFillSup->next.key;
         pFillSup->next.key = adustEndTsKey(pNextPoint->key.ts, pFillSup->next.key, &pFillSup->interval);
@@ -747,7 +747,7 @@ static int32_t getResultInfoFromState(SStreamAggSupporter* pAggSup, SStreamFillS
   if (tmpRes == TSDB_CODE_SUCCESS) {
     setPointBuff(pCurPoint, pFillSup);
     pFillSup->cur.key = pCurPoint->pRightRow->key;
-    pFillSup->cur.pRowVal = pCurPoint->pRightRow->pRowVal;
+    pFillSup->cur.pRowVal = (SResultCellData*)pCurPoint->pRightRow->pRowVal;
   } else {
     pFillSup->cur.key = pCurPoint->key.ts + 1;
   }
@@ -764,10 +764,10 @@ static int32_t getResultInfoFromState(SStreamAggSupporter* pAggSup, SStreamFillS
     setPointBuff(pPrevPoint, pFillSup);
     if (HAS_ROW_DATA(pPrevPoint->pRightRow)) {
       pFillSup->prev.key = pPrevPoint->pRightRow->key;
-      pFillSup->prev.pRowVal = pPrevPoint->pRightRow->pRowVal;
+      pFillSup->prev.pRowVal = (SResultCellData*)pPrevPoint->pRightRow->pRowVal;
     } else {
       pFillSup->prev.key = pPrevPoint->pLeftRow->key;
-      pFillSup->prev.pRowVal = pPrevPoint->pLeftRow->pRowVal;
+      pFillSup->prev.pRowVal = (SResultCellData*)pPrevPoint->pLeftRow->pRowVal;
     }
     pFillSup->prev.key = adustPrevTsKey(pPrevPoint->key.ts, pFillSup->prev.key, &pFillSup->interval);
   }
@@ -782,10 +782,10 @@ static int32_t getResultInfoFromState(SStreamAggSupporter* pAggSup, SStreamFillS
     setPointBuff(pNextPoint, pFillSup);
     if (HAS_ROW_DATA(pNextPoint->pLeftRow)) {
       pFillSup->next.key = pNextPoint->pLeftRow->key;
-      pFillSup->next.pRowVal = pNextPoint->pLeftRow->pRowVal;
+      pFillSup->next.pRowVal = (SResultCellData*)pNextPoint->pLeftRow->pRowVal;
     } else {
       pFillSup->next.key = pNextPoint->pRightRow->key;
-      pFillSup->next.pRowVal = pNextPoint->pRightRow->pRowVal;
+      pFillSup->next.pRowVal = (SResultCellData*)pNextPoint->pRightRow->pRowVal;
     }
     pFillSup->next.key = adustEndTsKey(pNextPoint->key.ts, pFillSup->next.key, &pFillSup->interval);
 
@@ -1224,7 +1224,7 @@ static void transBlockToResultRow(const SSDataBlock* pBlock, int32_t rowId, TSKE
   int32_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pColData = taosArrayGet(pBlock->pDataBlock, i);
-    SResultCellData* pCell = getSliceResultCell(pRowVal->pRowVal, i);
+    SResultCellData* pCell = getSliceResultCell((SResultCellData*)pRowVal->pRowVal, i);
     if (!colDataIsNull_s(pColData, rowId)) {
       pCell->isNull = false;
       pCell->type = pColData->info.type;