fix bugs in sliding query processing

src/client/src/tscSQLParser.c

@@ -609,6 +609,10 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
 
   // for top/bottom + interval query, we do not add additional timestamp column in the front
   if (isTopBottomQuery(pQueryInfo)) {
+    if (parseSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_INVALID_SQL;
+    }
+    
     return TSDB_CODE_SUCCESS;
   }
 

src/system/detail/inc/vnodeQueryImpl.h

@@ -282,7 +282,7 @@ void clearGroupResultBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pOneOutpu
 void copyGroupResultBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult* dst, const SWindowResult* src);
 
 void resetSlidingWindowInfo(SQueryRuntimeEnv *pRuntimeEnv, SWindowResInfo* pWindowResInfo);
-void clearCompletedSlidingWindows(SQueryRuntimeEnv* pRuntimeEnv);
+void clearClosedSlidingWindows(SQueryRuntimeEnv* pRuntimeEnv);
 int32_t numOfClosedSlidingWindow(SWindowResInfo* pWindowResInfo);
 void closeSlidingWindow(SWindowResInfo* pWindowResInfo, int32_t slot);
 void closeAllSlidingWindow(SWindowResInfo* pWindowResInfo);

src/system/detail/src/vnodeQueryProcess.c

@@ -1114,11 +1114,8 @@ static void vnodeSingleMeterIntervalMainLooper(SMeterQuerySupportObj *pSupporter
   SQuery *pQuery = pRuntimeEnv->pQuery;
 
   while (1) {
-    assert((pQuery->skey <= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-           (pQuery->skey >= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery)));
-
     initCtxOutputBuf(pRuntimeEnv);
-    clearCompletedSlidingWindows(pRuntimeEnv);
+    clearClosedSlidingWindows(pRuntimeEnv);
     
     vnodeScanAllData(pRuntimeEnv);
     if (isQueryKilled(pQuery)) {
@@ -1141,16 +1138,17 @@ static void vnodeSingleMeterIntervalMainLooper(SMeterQuerySupportObj *pSupporter
         pQuery->limit.offset--;
       }
     } else {
-      pQuery->pointsRead += maxOutput;
-      forwardCtxOutputBuf(pRuntimeEnv, maxOutput);
+//      assert(0);
+//      pQuery->pointsRead += maxOutput;
+//      forwardCtxOutputBuf(pRuntimeEnv, maxOutput);
     }
 
     if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
       break;
     }
   
-    forwardIntervalQueryRange(pSupporter, pRuntimeEnv);
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED|QUERY_RESBUF_FULL)) {
+    loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
+    if (Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL)) {
       break;
     }
 
@@ -1181,6 +1179,12 @@ static void vnodeSingleTableIntervalProcessor(SQInfo *pQInfo) {
     resetCtxOutputBuf(pRuntimeEnv);
     vnodeSingleMeterIntervalMainLooper(pSupporter, pRuntimeEnv);
   
+    if (pQuery->intervalTime > 0) {
+      pSupporter->subgroupIdx = 0;
+      pQuery->pointsRead = 0;
+      copyFromGroupBuf(pQInfo, pRuntimeEnv->windowResInfo.pResult);
+    }
+    
     // the offset is handled at prepare stage if no interpolation involved
     if (pQuery->interpoType == TSDB_INTERPO_NONE) {
       doRevisedResultsByLimit(pQInfo);
@@ -1208,8 +1212,9 @@ static void vnodeSingleTableIntervalProcessor(SQInfo *pQInfo) {
     }
   }
   
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->slidingTime > 0 && pQuery->intervalTime > 0)) {
-    pQInfo->pMeterQuerySupporter->subgroupIdx = 0;
+  // all data scanned, the group by normal column can return
+  if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
+    pSupporter->subgroupIdx = 0;
     pQuery->pointsRead = 0;
     copyFromGroupBuf(pQInfo, pRuntimeEnv->windowResInfo.pResult);
   }