Merge pull request #3014 from taosdata/bugfix/td-1114

fix td-1114

src/client/src/tscStream.c

@@ -135,6 +135,10 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
       etime = pStream->stime + (etime - pStream->stime) / pStream->interval * pStream->interval;
     }
     pQueryInfo->window.ekey = etime;
+    if (pQueryInfo->window.skey >= pQueryInfo->window.ekey) {
+      tscSetRetryTimer(pStream, pSql, pStream->slidingTime);
+      return;
+    }
   }
 
   // launch stream computing in a new thread

tests/pytest/stream/new.py

@@ -54,7 +54,7 @@ class TDTestCase:
                 tdSql.execute("insert into tb%d values(now + %ds, %d, %d)" % (i, j, j, j))
 
         tdLog.info("=============== step5")
-        tdLog.sleep(30)
+        tdLog.sleep(40)
         tdSql.waitedQuery("select * from st order by ts desc", 1, 120)
         v = tdSql.getData(0, 3)
         if v <= 51: