From 08f0b057217f9c7b8a068ae8bf54d23915f55dff Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 9 Apr 2022 23:28:16 +0800
Subject: [PATCH] <fix>[query]:fix bug in filter, and update a query related
 test script.

---
 source/libs/executor/src/executorimpl.c |  1 +
 tests/script/tsim/query/stddev.sim      | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index e3e2c650d8..ee5c675989 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3166,6 +3166,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock) {
   }
 
   pBlock->info.rows = numOfRow;
+  blockDataUpdateTsWindow(pBlock);
 }
 
 void doSetTableGroupOutputBuf(SAggOperatorInfo* pAggInfo, int32_t numOfOutput, int32_t tableGroupId, SExecTaskInfo* pTaskInfo) {
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index adab1c354d..70a9719b40 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -89,13 +89,14 @@ if $data00 != 5.766281297 then
 endi
 
 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 
-if $data01 != 0.000000000 then 
+if $data01 != 0.000000000 then
+  print expect 0.000000000, actual: $data01
   return -1
 endi
 
-sql select stddev(tbcol) as b from $tb interval(1d)
+sql select _wstartts, stddev(tbcol) as b from $tb interval(1d)
 print ===> $data01
 if $data01 != 5.766281297 then 
   return -1
@@ -105,19 +106,24 @@ print =============== step6
 $cc = 4 * 60000
 $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
 if $data01 != 0.000000000 then 
   return -1
 endi
-if $rows != 5 then 
+
+print $data00 , $data10 ,  $data20 , $data30 , $data40  , $data50 , $data60
+
+if $rows != 5 then
+  print expect 5, actual: $rows
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi