diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 3407d2fe4bdb456c8b7b2a0f1ef3ab5b92be14a3..ef5ec5808b66b3a100fd72714d7e0972eb574298 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -652,7 +652,16 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
 
   SColumnList ids = getColumnList(1, 0, PRIMARYKEY_TIMESTAMP_COL_INDEX);
 
-  return insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS].aName);
+  int32_t ret = insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS].aName);
+  if (ret != TSDB_CODE_SUCCESS) {
+    return ret;
+  }
+  
+  if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_INVALID_SQL;
+  }
+  
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
@@ -675,6 +684,8 @@ int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
     if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
       return invalidSqlErrMsg(pQueryInfo->msg, msg1);
     }
+  } else {
+    pSliding->n = pQueryInfo->nAggTimeInterval;
   }
 
   return TSDB_CODE_SUCCESS;
@@ -5394,10 +5405,6 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
     }
   }
 
-  if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
-  }
-
   // set the created table[stream] name
   if (setMeterID(pMeterMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg1);
@@ -5581,29 +5588,29 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg2);
   }
   
-  // set sliding value, the query time range needs to be decide in the first place
-  SSQLToken* pSliding = &pQuerySql->sliding;
-  if (pSliding->n != 0) {
-    if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) {  // sliding only allowed in stream
-      const char* msg = "time range expected for sliding window query";
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
-    }
-    
-    getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
-    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-      pQueryInfo->nSlidingTime /= 1000;
-    }
-    
-    if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
-    }
-    
-    if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-    }
-  } else {
-    pQueryInfo->nSlidingTime = -1;
-  }
+//  // set sliding value, the query time range needs to be decide in the first place
+//  SSQLToken* pSliding = &pQuerySql->sliding;
+//  if (pSliding->n != 0) {
+//    if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) {  // sliding only allowed in stream
+//      const char* msg = "time range expected for sliding window query";
+//      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+//    }
+//
+//    getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
+//    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
+//      pQueryInfo->nSlidingTime /= 1000;
+//    }
+//
+//    if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
+//      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+//    }
+//
+//    if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
+//      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+//    }
+//  } else {
+//    pQueryInfo->nSlidingTime = -1;
+//  }
 
   // in case of join query, time range is required.
   if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 361fb16f697a8398a95815df286121430e2f88c7..492cc5cda2b77fa00ce7b2c4e4df6c122404ce6d 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1110,8 +1110,7 @@ static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSq
   }
 
   // all subqueries are failed
-  tscError("%p retrieve from %d vnode(s) completed,code:%d.FAILED.", pPObj, pState->numOfTotal,
-           pState->code);
+  tscError("%p retrieve from %d vnode(s) completed,code:%d.FAILED.", pPObj, pState->numOfTotal, pState->code);
   pPObj->res.code = -(pState->code);
 
   // release allocated resource
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 2b72c24c94ba986e71cc8bca73d630a18e9785a8..6a03278a077bab0aa078685acd8a0ecd3402acce 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -754,6 +754,8 @@ void taos_free_result_imp(TAOS_RES* res, int keepCmd) {
         pSql->pStream == NULL && pMeterMetaInfo->pMeterMeta != NULL))) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
 
+    tscTrace("%p code:%d, numOfRows:%d, command:%d", pSql, pRes->code, pRes->numOfRows, pCmd->command);
+    
     void *fp = pSql->fp;
     if (fp != NULL) {
       pSql->freed = 1;
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 7314f55144a61ed2f79c16c0610866da7ec0b391..9fc9706dd9fb87179fabcc484f7ae56afb231914 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -411,7 +411,9 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   }
 
   pStream->slidingTime = pQueryInfo->nSlidingTime;
+  
   pQueryInfo->nAggTimeInterval = 0; // clear the interval value to avoid the force time window split by query processor
+  pQueryInfo->nSlidingTime = 0;
 }
 
 static int64_t tscGetStreamStartTimestamp(SSqlObj *pSql, SSqlStream *pStream, int64_t stime) {
diff --git a/src/client/src/tscSyntaxtreefunction.c b/src/client/src/tscSyntaxtreefunction.c
index 914053f2f17461e0f5e7ffbd56691e7fd206cd49..1d82b0f239572676c204025fe535704c192e4da6 100644
--- a/src/client/src/tscSyntaxtreefunction.c
+++ b/src/client/src/tscSyntaxtreefunction.c
@@ -26,7 +26,7 @@
     int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1;                                                  \
                                                                                                       \
     if ((len1) == (len2)) {                                                                           \
-      for (; i < (len2) && i >= 0; i += step, (out) += step) {                                        \
+      for (; i < (len2) && i >= 0; i += step, (out) += 1) {                                        \
         if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -34,7 +34,7 @@
         *(out) = (double)(left)[i] op(right)[i];                                                      \
       }                                                                                               \
     } else if ((len1) == 1) {                                                                         \
-      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
         if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) {         \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -42,7 +42,7 @@
         *(out) = (double)(left)[0] op(right)[i];                                                      \
       }                                                                                               \
     } else if ((len2) == 1) {                                                                         \
-      for (; i >= 0 && i < (len1); i += step, (out) += step) {                                        \
+      for (; i >= 0 && i < (len1); i += step, (out) += 1) {                                        \
         if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) {         \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -58,7 +58,7 @@
     int32_t step = (_ord == TSQL_SO_ASC) ? 1 : -1;                                                    \
                                                                                                       \
     if (len1 == (len2)) {                                                                             \
-      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
         if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) {     \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -66,7 +66,7 @@
         *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i];      \
       }                                                                                               \
     } else if (len1 == 1) {                                                                           \
-      for (; i >= 0 && i < (len2); i += step, (out) += step) {                                        \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
         if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) {       \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -74,7 +74,7 @@
         *(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i];      \
       }                                                                                               \
     } else if ((len2) == 1) {                                                                         \
-      for (; i >= 0 && i < len1; i += step, (out) += step) {                                          \
+      for (; i >= 0 && i < len1; i += step, (out) += 1) {                                          \
         if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) {       \
           setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
           continue;                                                                                   \
@@ -112,7 +112,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -121,7 +121,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[i] + pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -130,7 +130,7 @@ void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[0] + pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -310,7 +310,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)&(pOutput[i]), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -318,7 +318,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[i] - pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -326,7 +326,7 @@ void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[0] - pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -521,7 +521,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -530,7 +530,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
       *pOutput = (double)pLeft[i] * pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -539,7 +539,7 @@ void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t num
       *pOutput = (double)pLeft[0] * pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -719,7 +719,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -728,7 +728,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[i] / pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -737,7 +737,7 @@ void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[0] / pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -933,7 +933,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -942,7 +942,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -951,7 +951,7 @@ void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRi
       *pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -991,7 +991,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
   int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
 
   if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -1000,7 +1000,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
       *pOutput = (double)pLeft[i] - ((int64_t)(((double)pLeft[i]) / pRight[i])) * pRight[i];
     }
   } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += step) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
       if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
@@ -1009,7 +1009,7 @@ void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRigh
       *pOutput = (double)pLeft[0] - ((int64_t)(((double)pLeft[0]) / pRight[i])) * pRight[i];
     }
   } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += step) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
       if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
         setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
         continue;
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 8c5953c10c4c429a720b229f1ecd069ea9e5c6ce..e9395d7dde46e478ae5058e6842579eb33079b57 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -214,6 +214,10 @@ bool tscIsTwoStageMergeMetricQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   if (pMeterMetaInfo == NULL || pMeterMetaInfo->pMetricMeta == NULL) {
     return false;
   }
+  
+  if ((pQueryInfo->type & TSDB_QUERY_TYPE_FREE_RESOURCE) == TSDB_QUERY_TYPE_FREE_RESOURCE) {
+    return false;
+  }
 
   // for ordered projection query, iterate all qualified vnodes sequentially
   if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, tableIndex)) {