Skip to content

[fix](join) Restrict auto salt join rewrite #64518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feiniaofeiafei wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[fix](join) Restrict auto salt join rewrite #64518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd6da3
add flag isSaltJoinGenerated in JoinReorderContext
feiniaofeiafei Jun 15, 2026
3d77768
asof join not support auto salt join
feiniaofeiafei Jun 15, 2026
f96bcb1
fix ut
feiniaofeiafei Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...ore/src/main/java/org/apache/doris/nereids/rules/exploration/join/JoinReorderContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class JoinReorderContext {
private boolean hasLeftAssociate = false;

private boolean isLeadingJoin = false;
private boolean isSaltJoinGenerated = false;

public JoinReorderContext() {
}
Expand All @@ -55,6 +56,7 @@ public void copyFrom(JoinReorderContext joinReorderContext) {
this.hasRightAssociate = joinReorderContext.hasRightAssociate;
this.hasCommuteZigZag = joinReorderContext.hasCommuteZigZag;
this.isLeadingJoin = joinReorderContext.isLeadingJoin;
this.isSaltJoinGenerated = joinReorderContext.isSaltJoinGenerated;
}

/**
Expand All @@ -68,6 +70,7 @@ public void clear() {
hasRightAssociate = false;
hasLeftAssociate = false;
isLeadingJoin = false;
isSaltJoinGenerated = false;
}

public boolean hasCommute() {
Expand Down Expand Up @@ -125,4 +128,12 @@ public boolean isLeadingJoin() {
public void setLeadingJoin(boolean leadingJoin) {
isLeadingJoin = leadingJoin;
}

public boolean isSaltJoinGenerated() {
return isSaltJoinGenerated;
}

public void setSaltJoinGenerated(boolean saltJoinGenerated) {
isSaltJoinGenerated = saltJoinGenerated;
}
}
1 change: 1 addition & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/SaltJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ private static LogicalProject<Plan> expandSkewValueRows(Expression skewExpr, Lis
equalTo = (EqualPredicate) TypeCoercionUtils.processComparisonPredicate(equalTo);
JoinReorderContext joinReorderContext = new JoinReorderContext();
joinReorderContext.setLeadingJoin(true);
joinReorderContext.setSaltJoinGenerated(true);
LogicalJoin<Plan, Plan> rightJoin = new LogicalJoin<>(JoinType.RIGHT_OUTER_JOIN, ImmutableList.of(equalTo),
project, originPlan, joinReorderContext);
// construct upper project
Expand Down
8 changes: 4 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/SkewJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ public class SkewJoin extends OneRewriteRuleFactory {
public Rule build() {
return logicalJoin()
.when(join -> join.getJoinType().isOneSideOuterJoin()
|| join.getJoinType().isInnerJoin() || join.getJoinType().isAsofJoin())
|| join.getJoinType().isInnerJoin())
.when(join -> join.getDistributeHint().distributeType == DistributeType.NONE)
.whenNot(join -> join.getJoinReorderContext().isSaltJoinGenerated())
.whenNot(LogicalJoin::isMarkJoin)
.thenApply(SkewJoin::transform).toRule(RuleType.SALT_JOIN);
}
Expand Down Expand Up @@ -86,8 +87,7 @@ private static Plan transform(MatchingContext<LogicalJoin<Plan, Plan>> ctx) {
equal = equal.commute();
}

if (join.getJoinType().isInnerJoin() || join.getJoinType().isLeftOuterJoin()
|| join.getJoinType().isAsofInnerJoin() || join.getJoinType().isAsofLeftOuterJoin()) {
if (join.getJoinType().isInnerJoin() || join.getJoinType().isLeftOuterJoin()) {
Expression leftEqHand = equal.child(0);
if (left.getStats().findColumnStatistics(leftEqHand) != null) {
ColumnStatistic leftColStats = left.getStats().findColumnStatistics(leftEqHand);
Expand All @@ -98,7 +98,7 @@ private static Plan transform(MatchingContext<LogicalJoin<Plan, Plan>> ctx) {
hotValues.addAll(filtered.keySet());
}
}
} else if (join.getJoinType().isRightOuterJoin() || join.getJoinType().isAsofRightOuterJoin()) {
} else if (join.getJoinType().isRightOuterJoin()) {
Expression rightEqHand = equal.child(1);
if (right.getStats().findColumnStatistics(rightEqHand) != null) {
ColumnStatistic rightColStats = right.getStats().findColumnStatistics(rightEqHand);
Expand Down
14 changes: 10 additions & 4 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SaltJoinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,14 @@ public void testRightJoin() {
logicalGenerate(
logicalUnion())),
logicalOlapScan()
).when(join -> join.getJoinType() == JoinType.RIGHT_OUTER_JOIN)
).when(join -> join.getJoinType() == JoinType.RIGHT_OUTER_JOIN
&& join.getJoinReorderContext().isSaltJoinGenerated())
),
logicalProject(
logicalOlapScan())
).when(join -> join.getHashJoinConjuncts().size() == 2 && join.getJoinType() == JoinType.RIGHT_OUTER_JOIN)
).when(join -> join.getHashJoinConjuncts().size() == 2
&& join.getJoinType() == JoinType.RIGHT_OUTER_JOIN
&& !join.getJoinReorderContext().isSaltJoinGenerated())
);
}

Expand Down Expand Up @@ -265,11 +268,14 @@ public void testLeading() {
logicalGenerate(
logicalUnion())),
logicalOlapScan()
).when(join -> join.getJoinType() == JoinType.RIGHT_OUTER_JOIN)
).when(join -> join.getJoinType() == JoinType.RIGHT_OUTER_JOIN
&& join.getJoinReorderContext().isSaltJoinGenerated())
),
logicalProject(
logicalOlapScan())
).when(join -> join.getHashJoinConjuncts().size() == 2 && join.getJoinType() == JoinType.RIGHT_OUTER_JOIN)
).when(join -> join.getHashJoinConjuncts().size() == 2
&& join.getJoinType() == JoinType.RIGHT_OUTER_JOIN
&& !join.getJoinReorderContext().isSaltJoinGenerated())
);
}

Expand Down
Loading