You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2021/04/11 14:02:22 UTC

[incubator-doris] branch master updated (9c7d8d2 -> a25e3af)

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

morningman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git.


    from 9c7d8d2  [Bug] Fix bug that isPreAggregation is incorrectly set (#5608)
     add a25e3af  [Colocate plan][Step1] Colocate join covers more situations (#5521)

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/doris/analysis/Expr.java  |  31 +-
 .../analysis/ModifyTablePropertiesClause.java      |   4 -
 .../java/org/apache/doris/catalog/Catalog.java     |  28 +-
 ...r.java => ColocateTableCheckerAndBalancer.java} |  17 +-
 .../main/java/org/apache/doris/common/Config.java  |  20 +-
 ...runer.java => DistributedPlanColocateRule.java} |  17 +-
 .../apache/doris/planner/DistributedPlanner.java   | 341 +++++++++++----------
 .../org/apache/doris/planner/HashJoinNode.java     |   6 +-
 .../java/org/apache/doris/planner/PlanNode.java    |  14 +
 .../main/java/org/apache/doris/qe/Coordinator.java |   6 +-
 .../java/org/apache/doris/qe/SessionVariable.java  |  10 +-
 .../org/apache/doris/system/SystemInfoService.java |  20 +-
 .../java/org/apache/doris/analysis/ExprTest.java   |  28 +-
 .../apache/doris/catalog/ColocateTableTest.java    |   3 +-
 ...va => ColocateTableCheckerAndBalancerTest.java} |   4 +-
 .../org/apache/doris/planner/ColocatePlanTest.java | 122 ++++++++
 .../org/apache/doris/planner/QueryPlanTest.java    |   2 +-
 .../org/apache/doris/utframe/AnotherDemoTest.java  |  46 +--
 .../org/apache/doris/utframe/UtFrameUtils.java     |  21 +-
 19 files changed, 455 insertions(+), 285 deletions(-)
 rename fe/fe-core/src/main/java/org/apache/doris/clone/{ColocateTableBalancer.java => ColocateTableCheckerAndBalancer.java} (98%)
 copy fe/fe-core/src/main/java/org/apache/doris/planner/{DistributionPruner.java => DistributedPlanColocateRule.java} (51%)
 rename fe/fe-core/src/test/java/org/apache/doris/clone/{ColocateTableBalancerTest.java => ColocateTableCheckerAndBalancerTest.java} (99%)
 create mode 100644 fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org