Merge pull request #18202 from taosdata/fix/TS-2074-2.6

fix(query): variant offset save with int16_t is smaller

src/client/src/tscServer.c

@@ -3062,7 +3062,7 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
     int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
 
     TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, numOfCols - 1);
-    int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, numOfCols - 1);
+    int32_t     offset = tscFieldInfoGetOffset(pQueryInfo, numOfCols - 1);
 
     char* p = pRes->data + (pField->bytes + offset) * pRes->numOfRows;
 

src/client/src/tscStream.c

@@ -264,7 +264,7 @@ static void tscStreamFillTimeGap(SSqlStream* pStream, TSKEY ts) {
     pStream->stime += pStream->slidingTime;
     *(TSKEY*)row[0] =  pStream->stime;
     for (int32_t i = 1; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
-      int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, i);
+      int32_t     offset = tscFieldInfoGetOffset(pQueryInfo, i);
       TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
       assignVal(pSql->res.data + offset, (char *)(&pQueryInfo->fillVal[i]), pField->bytes, pField->type);
       row[i] = pSql->res.data + offset;