From ae91d43a7fa6e7df784f703b856340bc4f882665 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 4 Jun 2021 13:28:06 +0800
Subject: [PATCH] [td-4529]

---
 src/client/src/tscUtil.c  | 10 ++++++++++
 src/query/src/qExecutor.c |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index d5693a29bf..b621f89d52 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3273,6 +3273,16 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pNewQueryInfo->pTableMetaInfo = NULL;
   pNewQueryInfo->bufLen = pQueryInfo->bufLen;
 
+  pNewQueryInfo->projectionQuery = pQueryInfo->projectionQuery;
+  pNewQueryInfo->hasFilter = pQueryInfo->hasFilter;
+  pNewQueryInfo->simpleAgg = pQueryInfo->simpleAgg;
+  pNewQueryInfo->onlyTagQuery = pQueryInfo->onlyTagQuery;
+  pNewQueryInfo->groupbyColumn = pQueryInfo->groupbyColumn;
+
+  pNewQueryInfo->arithmeticOnAgg = pQueryInfo->arithmeticOnAgg;
+  pNewQueryInfo->orderProjectQuery = pQueryInfo->orderProjectQuery;
+  pNewQueryInfo->diffQuery = pQueryInfo->diffQuery;
+
   pNewQueryInfo->buf = malloc(pQueryInfo->bufLen);
   if (pNewQueryInfo->buf == NULL) {
     terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 3aae336169..d14189657a 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -4275,7 +4275,7 @@ static SSDataBlock* doTableScanImpl(void* param, bool* newgroup) {
       doTableQueryInfoTimeWindowCheck(pQueryAttr, *pTableQueryInfo);
 
       if (pTableScanInfo->prevGroupId != -1 && pTableScanInfo->prevGroupId != (*pTableQueryInfo)->groupIndex) {
-        *newgroup = true;
+        *newgroup = false;
       }
 
       pTableScanInfo->prevGroupId = (*pTableQueryInfo)->groupIndex;
-- 
GitLab