未验证 提交 0bb9e890 编写于 作者: H Haojun Liao 提交者: GitHub

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.
...@@ -3166,6 +3166,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) { ...@@ -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) {
......
...@@ -89,13 +89,14 @@ if $data00 != 5.766281297 then ...@@ -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 ...@@ -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
if $rows != 5 then
print $data00 , $data10 , $data20 , $data30 , $data40 , $data50 , $data60
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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册