From 5a28981d500687c09b490a898318b9e6e1120286 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Tue, 26 Sep 2023 16:00:56 +0800
Subject: [PATCH 1/2] fix: set null when creating empty input for count

---
 source/libs/executor/src/aggregateoperator.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/libs/executor/src/aggregateoperator.c b/source/libs/executor/src/aggregateoperator.c
index f6a8c6689f..19ec092acc 100644
--- a/source/libs/executor/src/aggregateoperator.c
+++ b/source/libs/executor/src/aggregateoperator.c
@@ -334,6 +334,7 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
     colInfo.info.type = TSDB_DATA_TYPE_NULL;
     colInfo.info.bytes = 1;
 
+
     SExprInfo* pOneExpr = &pOperator->exprSupp.pExprInfo[i];
     for (int32_t j = 0; j < pOneExpr->base.numOfParams; ++j) {
       SFunctParam* pFuncParam = &pOneExpr->base.pParam[j];
@@ -353,6 +354,10 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
   }
 
   blockDataEnsureCapacity(pBlock, pBlock->info.rows);
+  for (int32_t i = 0; i < blockDataGetNumOfCols(pBlock); ++i) {
+    SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+    colDataSetNULL(pColInfoData, 0);
+  }
   *ppBlock = pBlock;
 
   return TSDB_CODE_SUCCESS;

From 7045509061646ad76b59d4fd4675586886f25148 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 09:44:54 +0800
Subject: [PATCH 2/2] fix: add test case

---
 tests/parallel_test/cases.task           |  1 +
 tests/script/tsim/query/count_spread.sim | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/script/tsim/query/count_spread.sim

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index c3ad3130fd..bb5a8f0b30 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -993,6 +993,7 @@
 ,,y,script,./test.sh -f tsim/query/udf_with_const.sim
 ,,y,script,./test.sh -f tsim/query/join_interval.sim
 ,,y,script,./test.sh -f tsim/query/join_pk.sim
+,,y,script,./test.sh -f tsim/query/count_spread.sim
 ,,y,script,./test.sh -f tsim/query/unionall_as_table.sim
 ,,y,script,./test.sh -f tsim/query/multi_order_by.sim
 ,,y,script,./test.sh -f tsim/query/sys_tbname.sim
diff --git a/tests/script/tsim/query/count_spread.sim b/tests/script/tsim/query/count_spread.sim
new file mode 100644
index 0000000000..c03783b7fe
--- /dev/null
+++ b/tests/script/tsim/query/count_spread.sim
@@ -0,0 +1,24 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database test;
+sql use test;
+sql create table st(ts timestamp, f int) tags(t int);
+sql insert into ct1 using st tags(1) values(now, 0)(now+1s, 1)(now+2s, 10)(now+3s, 11)
+sql insert into ct2 using st tags(2) values(now+2s, 2)(now+3s, 3)
+sql insert into ct3 using st tags(3) values(now+4s, 4)(now+5s, 5)
+sql insert into ct4 using st tags(4) values(now+6s, 6)(now+7s, 7)
+
+sql select count(*), spread(ts) from st where tbname='ct1' 
+print $data00, $data01
+if $data00 != @4@ then
+  return -1
+endi
+if $data01 != @3000.000000000@ then
+  return -1
+endi
+
+sql drop database test;
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file