You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/05/28 15:18:41 UTC

[iotdb] 02/03: add TransformNode in raw aggregation query

This is an automated email from the ASF dual-hosted git repository.

hui pushed a commit to branch lmh/mppSqlParserBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit b52a99b4690d6c4dc44eee2dd56a32f64b0db447
Author: liuminghui233 <54...@qq.com>
AuthorDate: Sat May 28 22:59:04 2022 +0800

    add TransformNode in raw aggregation query
---
 .../iotdb/db/mpp/plan/planner/LogicalPlanner.java   | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
index 1f008ab26d..1cfce05a56 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
@@ -273,14 +273,19 @@ public class LogicalPlanner {
         }
       } else {
         planBuilder =
-            planBuilder.planAggregationSource(
-                sourceExpressions,
-                queryStatement.getResultOrder(),
-                analysis.getGlobalTimeFilter(),
-                analysis.getGroupByTimeParameter(),
-                aggregationExpressions,
-                analysis.getGroupByLevelExpressions(),
-                analysis.getTypeProvider());
+            planBuilder
+                .planAggregationSource(
+                    sourceExpressions,
+                    queryStatement.getResultOrder(),
+                    analysis.getGlobalTimeFilter(),
+                    analysis.getGroupByTimeParameter(),
+                    aggregationExpressions,
+                    analysis.getGroupByLevelExpressions(),
+                    analysis.getTypeProvider())
+                .planTransform(
+                    transformExpressions,
+                    queryStatement.isGroupByTime(),
+                    queryStatement.getSelectComponent().getZoneId());
       }
 
       return planBuilder.getRoot();