xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix td-1114

This commit is contained in:
Bomin Zhang 2020-08-11 14:01:28 +08:00
parent fe6f96b1ce
commit c505914b04
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/src/tscStream.c
View File

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

2
tests/pytest/stream/new.py
View File

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