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

Merge pull request #21622 from taosdata/fix/TD-24571 

semi interval op check data ts
This commit is contained in:
Haojun Liao 2023-06-07 13:34:14 +08:00 committed by GitHub
parent bd828cc90f 2ab43ca0d0
commit bb5af2ccee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/executor/src/timewindowoperator.c
View File

@ -2345,7 +2345,7 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p
} }
while (1) { while (1) {
bool isClosed = isCloseWindow(&nextWin, &pInfo->twAggSup); bool isClosed = isCloseWindow(&nextWin, &pInfo->twAggSup);
if ((pInfo->ignoreExpiredData && isClosed) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) { if ((pInfo->ignoreExpiredData && isClosed && !IS_FINAL_OP(pInfo)) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) {
startPos = getNexWindowPos(&pInfo->interval, &pSDataBlock->info, tsCols, startPos, nextWin.ekey, &nextWin); startPos = getNexWindowPos(&pInfo->interval, &pSDataBlock->info, tsCols, startPos, nextWin.ekey, &nextWin);
if (startPos < 0) { if (startPos < 0) {
break; break;

4
tests/script/tsim/stream/ignoreExpiredData.sim
View File

@ -132,12 +132,12 @@ if $loop_count == 10 then
return -1 return -1
endi endi
if $data01 != 1 then if $data01 != 2 then
print =====data01=$data01 print =====data01=$data01
goto loop4 goto loop4
endi endi
if $data02 != 1 then if $data02 != 2 then
print =====data02=$data02 print =====data02=$data02
goto loop4 goto loop4
endi endi

7
tests/script/tsim/stream/sliding.sim
View File

@ -576,13 +576,6 @@ $loop_count = 0
print step 7 print step 7
loop4:
sleep 100
$loop_count = $loop_count + 1
if $loop_count == 10 then
return -1
endi
sql create database test3 vgroups 6; sql create database test3 vgroups 6;
sql use test3; sql use test3;