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

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

commit a7450f648f26bfe39175869819a86ccfa247bdf3
Merge: d39cb928a1 7205b03d25
Author: liuminghui233 <[email protected]>
AuthorDate: Wed Jun 1 21:08:17 2022 +0800

    Merge remote-tracking branch 'upstream/fix_some_issues_0531' into 
GroupByLevelDebug
    
    # Conflicts:
    #       
server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java

 .../apache/iotdb/db/metadata/path/AlignedPath.java |  5 ++++
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |  2 +-
 .../plan/planner/distribution/SourceRewriter.java  | 26 ++++++++++++++----
 .../plan/planner/plan/node/PlanGraphPrinter.java   | 32 ++++++++++++++++++++++
 .../distribution/AggregationDistributionTest.java  |  2 +-
 5 files changed, 60 insertions(+), 7 deletions(-)

Reply via email to