You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2023/01/17 02:51:28 UTC
[GitHub] [doris] XieJiann commented on a diff in pull request #15965: [fix](Nereids): always propose hashDistributeSpec of OlapScan
XieJiann commented on code in PR #15965:
URL: https://github.com/apache/doris/pull/15965#discussion_r1071692134
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/LogicalOlapScanToPhysicalOlapScan.java:
##########
@@ -48,48 +45,40 @@ public class LogicalOlapScanToPhysicalOlapScan extends OneImplementationRuleFact
@Override
public Rule build() {
return logicalOlapScan().then(olapScan ->
- new PhysicalOlapScan(
- olapScan.getId(),
- olapScan.getTable(),
- olapScan.getQualifier(),
- olapScan.getSelectedIndexId(),
- olapScan.getSelectedTabletIds(),
- olapScan.getSelectedPartitionIds(),
- convertDistribution(olapScan),
- olapScan.getPreAggStatus(),
- Optional.empty(),
- olapScan.getLogicalProperties())
+ new PhysicalOlapScan(
+ olapScan.getId(),
+ olapScan.getTable(),
+ olapScan.getQualifier(),
+ olapScan.getSelectedIndexId(),
+ olapScan.getSelectedTabletIds(),
+ olapScan.getSelectedPartitionIds(),
+ convertDistribution(olapScan),
+ olapScan.getPreAggStatus(),
+ Optional.empty(),
+ olapScan.getLogicalProperties())
).toRule(RuleType.LOGICAL_OLAP_SCAN_TO_PHYSICAL_OLAP_SCAN_RULE);
}
private DistributionSpec convertDistribution(LogicalOlapScan olapScan) {
OlapTable olapTable = olapScan.getTable();
DistributionInfo distributionInfo = olapTable.getDefaultDistributionInfo();
- ColocateTableIndex colocateTableIndex = Env.getCurrentColocateIndex();
- if ((colocateTableIndex.isColocateTable(olapTable.getId())
- && !colocateTableIndex.isGroupUnstable(colocateTableIndex.getGroup(olapTable.getId())))
- || olapTable.getPartitionInfo().getType() == PartitionType.UNPARTITIONED
- || olapTable.getPartitions().size() == 1) {
- if (!(distributionInfo instanceof HashDistributionInfo)) {
- return DistributionSpecAny.INSTANCE;
- }
- HashDistributionInfo hashDistributionInfo = (HashDistributionInfo) distributionInfo;
- List<Slot> output = olapScan.getOutput();
- List<ExprId> hashColumns = Lists.newArrayList();
- List<Column> schemaColumns = olapScan.getTable().getFullSchema();
- for (int i = 0; i < schemaColumns.size(); i++) {
- for (Column column : hashDistributionInfo.getDistributionColumns()) {
- if (schemaColumns.get(i).equals(column)) {
- hashColumns.add(output.get(i).getExprId());
- }
+
+ if (!(distributionInfo instanceof HashDistributionInfo)) {
+ return DistributionSpecAny.INSTANCE;
+ }
+ HashDistributionInfo hashDistributionInfo = (HashDistributionInfo) distributionInfo;
Review Comment:
Get it.
However the test case is wrong because the bucket shuffle join is forbidden when both join tables is partitioned and do not belong to the stable colocate group.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org