morrySnow commented on code in PR #11805: URL: https://github.com/apache/doris/pull/11805#discussion_r948173003
########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); Review Comment: need a meaningful name ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); Review Comment: add a comment to explain the meaning of key and value ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), Review Comment: one line is better ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() + .map(GroupPlan.class::cast) + .map(p -> { + List<NamedExpression> slots = p.getOutput() + .stream() + .filter(SlotReference.class::isInstance) + .filter(ref -> exprMap.containsKey(ref)) + .map(ref -> exprMap.get(ref).values()) + .flatMap(Collection::stream) + .map(NamedExpression.class::cast) + .collect(Collectors.toList()); + return new LogicalProject<>(slots, p.getGroup().getLogicalExpression().getPlan()); Review Comment: u need to use join's children as ur children, and cannot get plan from memo in rules ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() + .map(GroupPlan.class::cast) + .map(p -> { + List<NamedExpression> slots = p.getOutput() + .stream() + .filter(SlotReference.class::isInstance) + .filter(ref -> exprMap.containsKey(ref)) + .map(ref -> exprMap.get(ref).values()) + .flatMap(Collection::stream) + .map(NamedExpression.class::cast) + .collect(Collectors.toList()); + return new LogicalProject<>(slots, p.getGroup().getLogicalExpression().getPlan()); + }) + .collect(Collectors.toList()); + + LogicalJoin<Plan, Plan> joinAddProjects = (LogicalJoin<Plan, Plan>) join.withChildren(childs); + + return joinAddProjects + .withCondition(Optional.of(join.getCondition().get().accept( + new TreeReplaceVisitor(), + exprMap.values().stream() + .reduce(new HashMap<>(), (map1, map2) -> { + map1.putAll(map2); + return map1; + }) + )) + ); + }).toRule(RuleType.PUSH_DOWN_NOT_SLOT_REFERENCE_EXPRESSION); + } + + private static class TreeCollectVisitor extends ExpressionVisitor<Expression, + Map<SlotReference, Map<Expression, Expression>>> { + + @Override + public Expression visit(Expression expr, + Map<SlotReference, Map<Expression, Expression>> context) { + Set<SlotReference> set = new HashSet<>(expr.collect(SlotReference.class::isInstance)); + if (set.size() == 1) { + SlotReference ref = set.stream().findFirst().get(); Review Comment: get(0) is better ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() + .map(GroupPlan.class::cast) + .map(p -> { + List<NamedExpression> slots = p.getOutput() + .stream() + .filter(SlotReference.class::isInstance) + .filter(ref -> exprMap.containsKey(ref)) + .map(ref -> exprMap.get(ref).values()) + .flatMap(Collection::stream) + .map(NamedExpression.class::cast) + .collect(Collectors.toList()); + return new LogicalProject<>(slots, p.getGroup().getLogicalExpression().getPlan()); + }) + .collect(Collectors.toList()); + + LogicalJoin<Plan, Plan> joinAddProjects = (LogicalJoin<Plan, Plan>) join.withChildren(childs); + + return joinAddProjects + .withCondition(Optional.of(join.getCondition().get().accept( + new TreeReplaceVisitor(), + exprMap.values().stream() + .reduce(new HashMap<>(), (map1, map2) -> { + map1.putAll(map2); + return map1; + }) + )) + ); + }).toRule(RuleType.PUSH_DOWN_NOT_SLOT_REFERENCE_EXPRESSION); + } + + private static class TreeCollectVisitor extends ExpressionVisitor<Expression, + Map<SlotReference, Map<Expression, Expression>>> { + + @Override + public Expression visit(Expression expr, + Map<SlotReference, Map<Expression, Expression>> context) { + Set<SlotReference> set = new HashSet<>(expr.collect(SlotReference.class::isInstance)); + if (set.size() == 1) { + SlotReference ref = set.stream().findFirst().get(); + Map<Expression, Expression> map = context.get(ref); + if (map == null) { + Map<Expression, Expression> newMap = new HashMap<>(); + newMap.put(expr, new Alias(expr, expr.toString())); Review Comment: not use tostring, use toSql instead ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() + .map(GroupPlan.class::cast) + .map(p -> { + List<NamedExpression> slots = p.getOutput() + .stream() + .filter(SlotReference.class::isInstance) + .filter(ref -> exprMap.containsKey(ref)) + .map(ref -> exprMap.get(ref).values()) + .flatMap(Collection::stream) + .map(NamedExpression.class::cast) + .collect(Collectors.toList()); + return new LogicalProject<>(slots, p.getGroup().getLogicalExpression().getPlan()); + }) + .collect(Collectors.toList()); + + LogicalJoin<Plan, Plan> joinAddProjects = (LogicalJoin<Plan, Plan>) join.withChildren(childs); + + return joinAddProjects + .withCondition(Optional.of(join.getCondition().get().accept( + new TreeReplaceVisitor(), + exprMap.values().stream() + .reduce(new HashMap<>(), (map1, map2) -> { + map1.putAll(map2); + return map1; + }) + )) + ); + }).toRule(RuleType.PUSH_DOWN_NOT_SLOT_REFERENCE_EXPRESSION); + } + + private static class TreeCollectVisitor extends ExpressionVisitor<Expression, + Map<SlotReference, Map<Expression, Expression>>> { + + @Override + public Expression visit(Expression expr, + Map<SlotReference, Map<Expression, Expression>> context) { + Set<SlotReference> set = new HashSet<>(expr.collect(SlotReference.class::isInstance)); + if (set.size() == 1) { + SlotReference ref = set.stream().findFirst().get(); + Map<Expression, Expression> map = context.get(ref); Review Comment: map.computeIfAbsent ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) Review Comment: why arithmetic ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() Review Comment: childs -> children ########## fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/logical/PushDownNotSlotReferenceExpressionOfOnClause.java: ########## @@ -0,0 +1,200 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.doris.nereids.rules.rewrite.logical; + +import org.apache.doris.nereids.rules.Rule; +import org.apache.doris.nereids.rules.RuleType; +import org.apache.doris.nereids.rules.rewrite.OneRewriteRuleFactory; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.Arithmetic; +import org.apache.doris.nereids.trees.expressions.ComparisonPredicate; +import org.apache.doris.nereids.trees.expressions.CompoundPredicate; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.Literal; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.SlotReference; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +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; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * push down expression which is not slot reference + */ +public class PushDownNotSlotReferenceExpressionOfOnClause extends OneRewriteRuleFactory { + + private static class ListBuilder<T> { + List<T> list; + + public ListBuilder(List<T> list) { + this.list = Lists.newArrayList(list); + } + + public ListBuilder<T> addAll(List<T> element) { + list.addAll(Lists.newArrayList(element)); + return this; + } + + public List<T> get() { + return list; + } + } + + private final Map<SlotReference, Map<Expression, Expression>> exprMap = new HashMap<>(); + + /** + * rewrite example: + *join(t1.a + 1 = t2.b + 2 and t1.a > 2) join(c = d and c > 2) + * │ │ + * ├─olapScan(t1) ├────project(t1.a + 1 as c) + * │ ====> │ │ + * └─olapScan(t2) │ └─olapScan(t1) + * │ + * └────project(t2.b + 2 as d) + * │ + * └─olapScan(t2) + */ + @Override + public Rule build() { + return logicalJoin() + .when(join -> join.getCondition().isPresent() + && ((ImmutableList) join.getCondition().get() + .collect(Arithmetic.class::isInstance)).size() > 0) + .then(join -> { + join.getCondition().get().accept( + new TreeCollectVisitor(), + exprMap); + + List<Plan> childs = join.children().stream() + .map(GroupPlan.class::cast) + .map(p -> { + List<NamedExpression> slots = p.getOutput() + .stream() + .filter(SlotReference.class::isInstance) + .filter(ref -> exprMap.containsKey(ref)) + .map(ref -> exprMap.get(ref).values()) + .flatMap(Collection::stream) + .map(NamedExpression.class::cast) + .collect(Collectors.toList()); + return new LogicalProject<>(slots, p.getGroup().getLogicalExpression().getPlan()); + }) + .collect(Collectors.toList()); + + LogicalJoin<Plan, Plan> joinAddProjects = (LogicalJoin<Plan, Plan>) join.withChildren(childs); + + return joinAddProjects + .withCondition(Optional.of(join.getCondition().get().accept( + new TreeReplaceVisitor(), + exprMap.values().stream() + .reduce(new HashMap<>(), (map1, map2) -> { + map1.putAll(map2); + return map1; + }) + )) + ); + }).toRule(RuleType.PUSH_DOWN_NOT_SLOT_REFERENCE_EXPRESSION); + } + + private static class TreeCollectVisitor extends ExpressionVisitor<Expression, + Map<SlotReference, Map<Expression, Expression>>> { + + @Override + public Expression visit(Expression expr, + Map<SlotReference, Map<Expression, Expression>> context) { + Set<SlotReference> set = new HashSet<>(expr.collect(SlotReference.class::isInstance)); + if (set.size() == 1) { + SlotReference ref = set.stream().findFirst().get(); + Map<Expression, Expression> map = context.get(ref); + if (map == null) { + Map<Expression, Expression> newMap = new HashMap<>(); + newMap.put(expr, new Alias(expr, expr.toString())); + context.put(ref, newMap); + } else { + map.put(expr, new Alias(expr, expr.toString())); + } + } + return expr; + } + + public Expression visitChildren(Expression expr, + Map<SlotReference, Map<Expression, Expression>> ctx) { + expr.children().forEach(node -> node.accept(this, ctx)); + return expr; + } + + @Override + public Expression visitComparisonPredicate(ComparisonPredicate predicate, + Map<SlotReference, Map<Expression, Expression>> ctx) { + return visitChildren(predicate, ctx); + } + + @Override + public Expression visitCompoundPredicate(CompoundPredicate predicate, + Map<SlotReference, Map<Expression, Expression>> ctx) { + return visitChildren(predicate, ctx); + } + } + + private static class TreeReplaceVisitor extends ExpressionVisitor<Expression, Map<Expression, Expression>> { + + @Override + public Expression visit(Expression expr, Map<Expression, Expression> context) { + expr.children().forEach(node -> node.accept(this, context)); Review Comment: if ur default visit function do not return expression with new children. u can not get correct expression at all. btw u could refer to default expression rewriter -- 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-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org
