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

[fix](Nereids): fix master problem (#17275)

Browse Source
This commit is contained in:
jakevin
2023-03-01 16:34:23 +08:00
committed by GitHub
parent b8d8cf1ac9
commit e203678e18
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushdownAliasThroughJoin.java
View File

@ -26,7 +26,6 @@ import org.apache.doris.nereids.trees.expressions.ExprId;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.plans.GroupPlan;
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;
@ -58,7 +57,7 @@ public class PushdownAliasThroughJoin extends OneRewriteRuleFactory {
return logicalProject(logicalJoin())
.when(this::isAllSlotOrAliasSlot)
.then(project -> {
LogicalJoin<GroupPlan, GroupPlan> join = project.child();
LogicalJoin<? extends Plan, ? extends Plan> join = project.child();
// aliasMap { Slot -> Alias<Slot> }
Map<Expression, NamedExpression> aliasMap = project.getProjects().stream()
.filter(expr -> expr instanceof Alias && ((Alias) expr).child() instanceof Slot)

4
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/logical/PushdownAliasThroughJoinTest.java
View File

@ -21,15 +21,15 @@ import org.apache.doris.common.Pair;
import org.apache.doris.nereids.trees.plans.JoinType;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.util.LogicalPlanBuilder;
import org.apache.doris.nereids.util.MemoPatternMatchSupported;
import org.apache.doris.nereids.util.MemoTestUtils;
import org.apache.doris.nereids.util.PatternMatchSupported;
import org.apache.doris.nereids.util.PlanChecker;
import org.apache.doris.nereids.util.PlanConstructor;
import com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Test;
class PushdownAliasThroughJoinTest implements PatternMatchSupported {
class PushdownAliasThroughJoinTest implements MemoPatternMatchSupported {
@Test
void testPushdown() {