This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch xingtanzjr/align_by_device_distribution in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 365f991169fc18ce0c09a3d2649d254829160574 Merge: b29e90cb3f 634492a8f3 Author: Jinrui.Zhang <[email protected]> AuthorDate: Fri May 27 20:43:07 2022 +0800 Merge branch 'master' into xingtanzjr/align_by_device_distribution .../db/mpp/plan/parser/StatementGenerator.java | 22 ++++---- .../db/mpp/plan/planner/LogicalPlanBuilder.java | 35 ++++++++++--- .../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 6 ++- .../planner/distribution/ExchangeNodeAdder.java | 8 ++- .../plan/planner/distribution/SourceRewriter.java | 13 ++++- .../planner/plan/node/process/AggregationNode.java | 5 -- .../plan/node/process/GroupByLevelNode.java | 61 ++++++++++++++++------ .../source/AlignedSeriesAggregationScanNode.java | 12 ----- .../node/source/SeriesAggregationScanNode.java | 12 ----- .../node/source/SeriesAggregationSourceNode.java | 31 +++++++++++ .../thrift/impl/DataNodeTSIServiceImpl.java | 58 +++++++++++++++++++- .../service/thrift/impl/InternalServiceImpl.java | 8 ++- .../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 10 ++-- .../distribution/AggregationDistributionTest.java | 16 ++++-- .../node/process/GroupByLevelNodeSerdeTest.java | 4 +- 15 files changed, 219 insertions(+), 82 deletions(-)
