database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids) dphyper support evaluate join that has one side condition (#33702)

Browse Source
This commit is contained in:
谢健
2024-04-17 20:41:15 +08:00
committed by yiguolei
parent 461561fed0
commit 048448eb32
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java
View File

@ -19,12 +19,17 @@ package org.apache.doris.nereids.jobs.joinorder.hypergraph;
import org.apache.doris.nereids.CascadesContext;
import org.apache.doris.nereids.datasets.tpch.TPCHTestBase;
import org.apache.doris.nereids.trees.expressions.EqualTo;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.plans.JoinType;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.logical.LogicalJoin;
import org.apache.doris.nereids.trees.plans.logical.LogicalProject;
import org.apache.doris.nereids.util.HyperGraphBuilder;
import org.apache.doris.nereids.util.MemoTestUtils;
import org.apache.doris.nereids.util.PlanChecker;
import avro.shaded.com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@ -68,4 +73,17 @@ public class OtherJoinTest extends TPCHTestBase {
Assertions.assertTrue(res1.equals(res2));
}
@Test
void testOneSideJoin() {
HyperGraphBuilder hyperGraphBuilder = new HyperGraphBuilder();
Plan plan = hyperGraphBuilder.init(1, 2, 3)
.addEdge(JoinType.LEFT_OUTER_JOIN, 0, 1)
.addEdge(JoinType.LEFT_OUTER_JOIN, 0, 2)
.buildPlan();
Expression oneSideCond = new EqualTo(plan.child(0).getOutput().get(0), plan.child(0).getOutput().get(2));
plan = ((LogicalJoin<?, ?>) plan).withJoinConjuncts(ImmutableList.of(), ImmutableList.of(oneSideCond), ((LogicalJoin<?, ?>) plan).getJoinReorderContext());
Set<List<String>> res = hyperGraphBuilder.evaluate(plan);
Assertions.assertEquals(4, res.size());
}
}

5
fe/fe-core/src/test/java/org/apache/doris/nereids/util/HyperGraphBuilder.java
View File

@ -672,9 +672,12 @@ public class HyperGraphBuilder {
Integer rv;
if (left.containsKey(slots.get(0))) {
lv = left.get(slots.get(0)).get(leftIndex);
rv = right.get(slots.get(1)).get(rightIndex);
} else {
lv = right.get(slots.get(0)).get(rightIndex);
}
if (right.containsKey(slots.get(1))) {
rv = right.get(slots.get(1)).get(rightIndex);
} else {
rv = left.get(slots.get(1)).get(leftIndex);
}
Boolean res = (lv == rv) && (lv != null) && (rv != null);