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

Merge pull request #11356 from taosdata/feature/3.0_liaohj 

fix[query]:fix a bug in the filter processing, and update a query related test script.
This commit is contained in:
Haojun Liao 2022-04-09 23:57:41 +08:00 committed by GitHub
parent 9d7d12b397 08f0b05721
commit 0bb9e89069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/executor/src/executorimpl.c
View File

@ -3166,6 +3166,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) {
} }
pBlock->info.rows = numOfRow; pBlock->info.rows = numOfRow;
blockDataUpdateTsWindow(pBlock);
} }
void doSetTableGroupOutputBuf(SAggOperatorInfo* pAggInfo, int32_t numOfOutput, int32_t tableGroupId, SExecTaskInfo* pTaskInfo) { void doSetTableGroupOutputBuf(SAggOperatorInfo* pAggInfo, int32_t numOfOutput, int32_t tableGroupId, SExecTaskInfo* pTaskInfo) {

14
tests/script/tsim/query/stddev.sim
View File

@ -89,13 +89,14 @@ if $data00 != 5.766281297 then
endi endi
print =============== step5 print =============== step5
sql select stddev(tbcol) as b from $tb interval(1m) sql select _wstartts, stddev(tbcol) as b from $tb interval(1m)
print ===> $data01 print ===> $data01
if $data01 != 0.000000000 then if $data01 != 0.000000000 then
print expect 0.000000000, actual: $data01
return -1 return -1
endi endi
sql select stddev(tbcol) as b from $tb interval(1d) sql select _wstartts, stddev(tbcol) as b from $tb interval(1d)
print ===> $data01 print ===> $data01
if $data01 != 5.766281297 then if $data01 != 5.766281297 then
return -1 return -1
@ -105,19 +106,24 @@ print =============== step6
$cc = 4 * 60000 $cc = 4 * 60000
$ms = 1601481600000 + $cc $ms = 1601481600000 + $cc
sql select stddev(tbcol) as b from $tb where ts <= $ms interval(1m) print select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
sql select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
print ===> $data01 print ===> $data01
if $data01 != 0.000000000 then if $data01 != 0.000000000 then
return -1 return -1
endi endi
print $data00 , $data10 , $data20 , $data30 , $data40 , $data50 , $data60
if $rows != 5 then if $rows != 5 then
print expect 5, actual: $rows
return -1 return -1
endi endi
print =============== clear print =============== clear
sql drop database $db sql drop database $db
sql show databases sql show databases
if $rows != 0 then if $rows != 1 then
return -1 return -1
endi endi