Skip to content

[fix](asof_join)PhysicalHashJoin's computeUniform method should process asof join properly #62730

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

Draft
starocean999 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[fix](asof_join)PhysicalHashJoin's computeUniform method should process asof join properly #62730

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
114ce56
[fix](asof_join)PhysicalHashJoin's computeUniform method should proce…
starocean999 Apr 23, 2026
b89b2d7
add test
starocean999 Apr 23, 2026
77042b6
fix comments
starocean999 Apr 23, 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
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalHashJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ public void computeUniform(DataTrait.Builder builder) {
}
switch (joinType) {
case INNER_JOIN:
case ASOF_LEFT_INNER_JOIN:
Comment thread
starocean999 marked this conversation as resolved.
case ASOF_RIGHT_INNER_JOIN:
case CROSS_JOIN:
builder.addUniformSlot(left().getLogicalProperties().getTrait());
builder.addUniformSlot(right().getLogicalProperties().getTrait());
Expand All @@ -319,10 +321,12 @@ public void computeUniform(DataTrait.Builder builder) {
builder.addUniformSlot(right().getLogicalProperties().getTrait());
break;
case LEFT_OUTER_JOIN:
case ASOF_LEFT_OUTER_JOIN:
builder.addUniformSlot(left().getLogicalProperties().getTrait());
builder.addUniformSlotForOuterJoinNullableSide(right().getLogicalProperties().getTrait());
break;
case RIGHT_OUTER_JOIN:
case ASOF_RIGHT_OUTER_JOIN:
builder.addUniformSlot(right().getLogicalProperties().getTrait());
builder.addUniformSlotForOuterJoinNullableSide(left().getLogicalProperties().getTrait());
break;
Expand Down
167 changes: 166 additions & 1 deletion ...ore/src/test/java/org/apache/doris/nereids/properties/ChildOutputPropertyDeriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.apache.doris.nereids.trees.plans.RelationId;
import org.apache.doris.nereids.trees.plans.SortPhase;
import org.apache.doris.nereids.trees.plans.logical.LogicalOneRowRelation;
import org.apache.doris.nereids.trees.plans.physical.AbstractPhysicalPlan;
import org.apache.doris.nereids.trees.plans.physical.PhysicalAssertNumRows;
import org.apache.doris.nereids.trees.plans.physical.PhysicalHashAggregate;
import org.apache.doris.nereids.trees.plans.physical.PhysicalHashJoin;
Expand Down Expand Up @@ -590,7 +591,7 @@ void testBroadcastJoin() {
PhysicalHashJoin<GroupPlan, GroupPlan> join = new PhysicalHashJoin<>(JoinType.INNER_JOIN,
Lists.newArrayList(new EqualTo(
leftSlot, rightSlot
)),
)),
ExpressionUtils.EMPTY_CONDITION, new DistributeHint(DistributeType.NONE),
Optional.empty(), logicalProperties, leftGroupPlan, rightGroupPlan);
GroupExpression groupExpression = new GroupExpression(join);
Expand Down Expand Up @@ -971,4 +972,168 @@ void testComputeProjectOutputProperties() {
PhysicalProperties phyProp3 = ChildOutputPropertyDeriver.computeProjectOutputProperties(projects3, hashC1);
Assertions.assertEquals(hashC1, phyProp3);
}

@Test
void testComputeUniformAfterRecomputeLogicalProperties() {
// left child has a uniform slot, right child empty
SlotReference leftSlot = new SlotReference(new ExprId(100), "left", IntegerType.INSTANCE, false,
Collections.emptyList());
SlotReference rightSlot = new SlotReference(new ExprId(101), "right", IntegerType.INSTANCE, false,
Collections.emptyList());
List<Slot> leftOutput = Lists.newArrayList(leftSlot);
List<Slot> rightOutput = Lists.newArrayList(rightSlot);

DataTrait.Builder leftBuilder = new DataTrait.Builder();
leftBuilder.addUniformSlot(leftSlot);
DataTrait leftTrait = leftBuilder.build();

LogicalProperties leftLogical = new LogicalProperties(() -> leftOutput, () -> leftTrait);
LogicalProperties rightLogical = new LogicalProperties(() -> rightOutput, () -> DataTrait.EMPTY_TRAIT);

IdGenerator<GroupId> idGenerator = GroupId.createGenerator();
GroupPlan leftGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), leftLogical));
GroupPlan rightGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), rightLogical));

PhysicalHashJoin<GroupPlan, GroupPlan> join = new PhysicalHashJoin<>(JoinType.ASOF_LEFT_OUTER_JOIN,
ExpressionUtils.EMPTY_CONDITION, ExpressionUtils.EMPTY_CONDITION,
new DistributeHint(DistributeType.NONE), Optional.empty(), logicalProperties,
leftGroupPlan, rightGroupPlan);

// simulate physical-tree logical prop recompute by resetting logical properties on the join
AbstractPhysicalPlan processed = (AbstractPhysicalPlan) join.resetLogicalProperties();
processed = (AbstractPhysicalPlan) processed.copyStatsAndGroupIdFrom((AbstractPhysicalPlan) join);

Assertions.assertInstanceOf(PhysicalHashJoin.class, processed);

DataTrait.Builder builder = new DataTrait.Builder();
processed.computeUniform(builder);
DataTrait result = builder.build();

// left slot should still be recognized as uniform after recompute
Assertions.assertTrue(result.isUniformAndNotNull(leftSlot));
}

@Test
void testComputeUniformAfterRecomputeLogicalProperties_AsOfLeftInner() {
SlotReference leftSlot = new SlotReference(new ExprId(200), "l", IntegerType.INSTANCE, false,
Collections.emptyList());
SlotReference rightSlot = new SlotReference(new ExprId(201), "r", IntegerType.INSTANCE, false,
Collections.emptyList());
List<Slot> leftOutput = Lists.newArrayList(leftSlot);
List<Slot> rightOutput = Lists.newArrayList(rightSlot);

DataTrait.Builder leftBuilder = new DataTrait.Builder();
leftBuilder.addUniformSlot(leftSlot);
DataTrait leftTrait = leftBuilder.build();

DataTrait.Builder rightBuilder = new DataTrait.Builder();
rightBuilder.addUniformSlot(rightSlot);
DataTrait rightTrait = rightBuilder.build();

LogicalProperties leftLogical = new LogicalProperties(() -> leftOutput, () -> leftTrait);
LogicalProperties rightLogical = new LogicalProperties(() -> rightOutput, () -> rightTrait);

IdGenerator<GroupId> idGenerator = GroupId.createGenerator();
GroupPlan leftGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), leftLogical));
GroupPlan rightGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), rightLogical));

PhysicalHashJoin<GroupPlan, GroupPlan> join = new PhysicalHashJoin<>(JoinType.ASOF_LEFT_INNER_JOIN,
ExpressionUtils.EMPTY_CONDITION, ExpressionUtils.EMPTY_CONDITION,
new DistributeHint(DistributeType.NONE), Optional.empty(), logicalProperties,
leftGroupPlan, rightGroupPlan);

// simulate physical-tree logical prop recompute by resetting logical properties on the join
AbstractPhysicalPlan processed = (AbstractPhysicalPlan) join.resetLogicalProperties();
processed = (AbstractPhysicalPlan) processed.copyStatsAndGroupIdFrom((AbstractPhysicalPlan) join);

Assertions.assertInstanceOf(PhysicalHashJoin.class, processed);

DataTrait.Builder builder = new DataTrait.Builder();
processed.computeUniform(builder);
DataTrait result = builder.build();

Assertions.assertTrue(result.isUniformAndNotNull(leftSlot));
Assertions.assertTrue(result.isUniformAndNotNull(rightSlot));
}

@Test
void testComputeUniformAfterRecomputeLogicalProperties_AsOfRightInner() {
SlotReference leftSlot = new SlotReference(new ExprId(300), "l2", IntegerType.INSTANCE, false,
Collections.emptyList());
SlotReference rightSlot = new SlotReference(new ExprId(301), "r2", IntegerType.INSTANCE, false,
Collections.emptyList());
List<Slot> leftOutput = Lists.newArrayList(leftSlot);
List<Slot> rightOutput = Lists.newArrayList(rightSlot);

DataTrait.Builder leftBuilder = new DataTrait.Builder();
leftBuilder.addUniformSlot(leftSlot);
DataTrait leftTrait = leftBuilder.build();

DataTrait.Builder rightBuilder = new DataTrait.Builder();
rightBuilder.addUniformSlot(rightSlot);
DataTrait rightTrait = rightBuilder.build();

LogicalProperties leftLogical = new LogicalProperties(() -> leftOutput, () -> leftTrait);
LogicalProperties rightLogical = new LogicalProperties(() -> rightOutput, () -> rightTrait);

IdGenerator<GroupId> idGenerator = GroupId.createGenerator();
GroupPlan leftGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), leftLogical));
GroupPlan rightGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), rightLogical));

PhysicalHashJoin<GroupPlan, GroupPlan> join = new PhysicalHashJoin<>(JoinType.ASOF_RIGHT_INNER_JOIN,
ExpressionUtils.EMPTY_CONDITION, ExpressionUtils.EMPTY_CONDITION,
new DistributeHint(DistributeType.NONE), Optional.empty(), logicalProperties,
leftGroupPlan, rightGroupPlan);

// simulate physical-tree logical prop recompute by resetting logical properties on the join
AbstractPhysicalPlan processed = (AbstractPhysicalPlan) join.resetLogicalProperties();
processed = (AbstractPhysicalPlan) processed.copyStatsAndGroupIdFrom((AbstractPhysicalPlan) join);

Assertions.assertInstanceOf(PhysicalHashJoin.class, processed);

DataTrait.Builder builder = new DataTrait.Builder();
processed.computeUniform(builder);
DataTrait result = builder.build();

Assertions.assertTrue(result.isUniformAndNotNull(leftSlot));
Assertions.assertTrue(result.isUniformAndNotNull(rightSlot));
}

@Test
void testComputeUniformAfterRecomputeLogicalProperties_AsOfRightOuter() {
SlotReference leftSlot = new SlotReference(new ExprId(400), "l3", IntegerType.INSTANCE, false,
Collections.emptyList());
SlotReference rightSlot = new SlotReference(new ExprId(401), "r3", IntegerType.INSTANCE, false,
Collections.emptyList());
List<Slot> leftOutput = Lists.newArrayList(leftSlot);
List<Slot> rightOutput = Lists.newArrayList(rightSlot);

DataTrait.Builder rightBuilder = new DataTrait.Builder();
rightBuilder.addUniformSlot(rightSlot);
DataTrait rightTrait = rightBuilder.build();

LogicalProperties leftLogical = new LogicalProperties(() -> leftOutput, () -> DataTrait.EMPTY_TRAIT);
LogicalProperties rightLogical = new LogicalProperties(() -> rightOutput, () -> rightTrait);

IdGenerator<GroupId> idGenerator = GroupId.createGenerator();
GroupPlan leftGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), leftLogical));
GroupPlan rightGroupPlan = new GroupPlan(new Group(idGenerator.getNextId(), rightLogical));

PhysicalHashJoin<GroupPlan, GroupPlan> join = new PhysicalHashJoin<>(JoinType.ASOF_RIGHT_OUTER_JOIN,
ExpressionUtils.EMPTY_CONDITION, ExpressionUtils.EMPTY_CONDITION,
new DistributeHint(DistributeType.NONE), Optional.empty(), logicalProperties,
leftGroupPlan, rightGroupPlan);

// simulate physical-tree logical prop recompute by resetting logical properties on the join
AbstractPhysicalPlan processed = (AbstractPhysicalPlan) join.resetLogicalProperties();
processed = (AbstractPhysicalPlan) processed.copyStatsAndGroupIdFrom((AbstractPhysicalPlan) join);

Assertions.assertInstanceOf(PhysicalHashJoin.class, processed);

DataTrait.Builder builder = new DataTrait.Builder();
processed.computeUniform(builder);
DataTrait result = builder.build();

Assertions.assertTrue(result.isUniformAndNotNull(rightSlot));
}
}
Loading