amaliujia commented on a change in pull request #2329: URL: https://github.com/apache/calcite/pull/2329#discussion_r561588160
########## File path: core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java ########## @@ -0,0 +1,97 @@ +/* + * 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.calcite.adapter.enumerable; + +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.plan.RelRule; +import org.apache.calcite.rel.RelCollation; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.core.Sort; +import org.apache.calcite.rel.core.Union; +import org.apache.calcite.rel.logical.LogicalSort; +import org.apache.calcite.rel.logical.LogicalUnion; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; + +import java.util.ArrayList; +import java.util.List; + +/** + * Rule to convert a {@link org.apache.calcite.rel.logical.LogicalSort} on top of a + * {@link org.apache.calcite.rel.logical.LogicalUnion} into a {@link EnumerableMergeUnion}. + * + * @see EnumerableRules#ENUMERABLE_MERGE_UNION_RULE + */ +public class EnumerableMergeUnionRule extends RelRule<EnumerableMergeUnionRule.Config> { + + /** Rule configuration. */ + public interface Config extends RelRule.Config { + Config DEFAULT_CONFIG = EMPTY.withDescription("EnumerableMergeUnionRule").withOperandSupplier( + b0 -> b0.operand(LogicalSort.class).oneInput( + b1 -> b1.operand(LogicalUnion.class).anyInputs())).as(Config.class); + + @Override default EnumerableMergeUnionRule toRule() { + return new EnumerableMergeUnionRule(this); + } + } + + public EnumerableMergeUnionRule(Config config) { + super(config); + } + + @Override public void onMatch(RelOptRuleCall call) { + final Sort sort = call.rel(0); + final RelCollation collation = sort.getCollation(); + if (collation == null || collation.getFieldCollations().isEmpty()) { + return; + } + + final Union union = call.rel(1); + final int unionInputsSize = union.getInputs().size(); + if (unionInputsSize < 2) { + return; + } + + // Push down sort limit, if possible. + RexNode inputFetch = null; + if (sort.fetch != null) { + if (sort.offset == null) { + inputFetch = sort.fetch; + } else if (sort.fetch instanceof RexLiteral && sort.offset instanceof RexLiteral) { + inputFetch = call.builder().literal( + RexLiteral.intValue(sort.fetch) + RexLiteral.intValue(sort.offset)); + } + } + + final List<RelNode> inputs = new ArrayList<>(unionInputsSize); + for (RelNode input : union.getInputs()) { + final RelNode newInput = sort.copy(sort.getTraitSet(), input, collation, null, inputFetch); Review comment: Maybe stupid question: why need to copy sort for each input (rather than use a copied Sort for all inputs)? ########## File path: core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java ########## @@ -0,0 +1,97 @@ +/* + * 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.calcite.adapter.enumerable; + +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.plan.RelRule; +import org.apache.calcite.rel.RelCollation; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.core.Sort; +import org.apache.calcite.rel.core.Union; +import org.apache.calcite.rel.logical.LogicalSort; +import org.apache.calcite.rel.logical.LogicalUnion; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; + +import java.util.ArrayList; +import java.util.List; + +/** + * Rule to convert a {@link org.apache.calcite.rel.logical.LogicalSort} on top of a + * {@link org.apache.calcite.rel.logical.LogicalUnion} into a {@link EnumerableMergeUnion}. + * + * @see EnumerableRules#ENUMERABLE_MERGE_UNION_RULE + */ +public class EnumerableMergeUnionRule extends RelRule<EnumerableMergeUnionRule.Config> { + + /** Rule configuration. */ + public interface Config extends RelRule.Config { + Config DEFAULT_CONFIG = EMPTY.withDescription("EnumerableMergeUnionRule").withOperandSupplier( + b0 -> b0.operand(LogicalSort.class).oneInput( + b1 -> b1.operand(LogicalUnion.class).anyInputs())).as(Config.class); + + @Override default EnumerableMergeUnionRule toRule() { + return new EnumerableMergeUnionRule(this); + } + } + + public EnumerableMergeUnionRule(Config config) { + super(config); + } + + @Override public void onMatch(RelOptRuleCall call) { + final Sort sort = call.rel(0); + final RelCollation collation = sort.getCollation(); + if (collation == null || collation.getFieldCollations().isEmpty()) { + return; + } + + final Union union = call.rel(1); + final int unionInputsSize = union.getInputs().size(); + if (unionInputsSize < 2) { + return; + } + + // Push down sort limit, if possible. + RexNode inputFetch = null; + if (sort.fetch != null) { + if (sort.offset == null) { + inputFetch = sort.fetch; + } else if (sort.fetch instanceof RexLiteral && sort.offset instanceof RexLiteral) { + inputFetch = call.builder().literal( + RexLiteral.intValue(sort.fetch) + RexLiteral.intValue(sort.offset)); + } + } + + final List<RelNode> inputs = new ArrayList<>(unionInputsSize); + for (RelNode input : union.getInputs()) { + final RelNode newInput = sort.copy(sort.getTraitSet(), input, collation, null, inputFetch); + inputs.add( + convert(newInput, newInput.getTraitSet().replace(EnumerableConvention.INSTANCE))); + } + + RelNode result = EnumerableMergeUnion.create(sort.getCollation(), inputs, union.all); + + // If Sort contained a LIMIT / OFFSET, then put it back as an EnumerableLimit. + // The output of the MergeUnion is already sorted, so we do not need a sort anymore. + if (sort.offset != null || sort.fetch != null) { + result = EnumerableLimit.create(result, sort.offset, sort.fetch); Review comment: I think you will need to set the collation in EnumerableLimit? Basically the collation need to be passed through? ########## File path: core/src/test/java/org/apache/calcite/test/enumerable/EnumerableMergeUnionTest.java ########## @@ -0,0 +1,282 @@ +/* + * 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.calcite.test.enumerable; + +import org.apache.calcite.adapter.enumerable.EnumerableRules; +import org.apache.calcite.adapter.java.ReflectiveSchema; +import org.apache.calcite.config.CalciteConnectionProperty; +import org.apache.calcite.config.Lex; +import org.apache.calcite.plan.RelOptPlanner; +import org.apache.calcite.runtime.Hook; +import org.apache.calcite.test.CalciteAssert; +import org.apache.calcite.test.JdbcTest; + +import org.junit.jupiter.api.Test; + +import java.util.function.Consumer; + +/** + * Unit test for + * {@link org.apache.calcite.adapter.enumerable.EnumerableMergeUnion}. + */ +class EnumerableMergeUnionTest { + + @Test void mergeUnionAllOrderByEmpid() { + tester(false, + new JdbcTest.HrSchemaBig(), + "select * from (select empid, name from emps where name like 'G%' union all select empid, name from emps where name like '%l') order by empid") + .explainContains("EnumerableMergeUnion(all=[true])\n" + + " EnumerableSort(sort0=[$0], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['G%'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n" + + " EnumerableSort(sort0=[$0], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['%l'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n") + .returnsOrdered( + "empid=1; name=Bill", + "empid=6; name=Guy", + "empid=10; name=Gabriel", + "empid=10; name=Gabriel", + "empid=12; name=Paul", + "empid=29; name=Anibal", + "empid=40; name=Emmanuel", + "empid=45; name=Pascal"); + } + + @Test void mergeUnionOrderByEmpid() { + tester(false, + new JdbcTest.HrSchemaBig(), + "select * from (select empid, name from emps where name like 'G%' union select empid, name from emps where name like '%l') order by empid") + .explainContains("EnumerableMergeUnion(all=[false])\n" + + " EnumerableSort(sort0=[$0], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['G%'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n" + + " EnumerableSort(sort0=[$0], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['%l'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n") + .returnsOrdered( + "empid=1; name=Bill", + "empid=6; name=Guy", + "empid=10; name=Gabriel", + "empid=12; name=Paul", + "empid=29; name=Anibal", + "empid=40; name=Emmanuel", + "empid=45; name=Pascal"); + } + + @Test void mergeUnionAllOrderByName() { + tester(false, + new JdbcTest.HrSchemaBig(), + "select * from (select empid, name from emps where name like 'G%' union all select empid, name from emps where name like '%l') order by name") + .explainContains("EnumerableMergeUnion(all=[true])\n" + + " EnumerableSort(sort0=[$1], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['G%'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n" + + " EnumerableSort(sort0=[$1], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['%l'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n") + .returnsOrdered( + "empid=29; name=Anibal", + "empid=1; name=Bill", + "empid=40; name=Emmanuel", + "empid=10; name=Gabriel", + "empid=10; name=Gabriel", + "empid=6; name=Guy", + "empid=45; name=Pascal", + "empid=12; name=Paul"); + } + + @Test void mergeUnionOrderByName() { + tester(false, + new JdbcTest.HrSchemaBig(), + "select * from (select empid, name from emps where name like 'G%' union select empid, name from emps where name like '%l') order by name") + .explainContains("EnumerableMergeUnion(all=[false])\n" + + " EnumerableSort(sort0=[$1], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['G%'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n" + + " EnumerableSort(sort0=[$1], dir0=[ASC])\n" + + " EnumerableCalc(expr#0..4=[{inputs}], expr#5=['%l'], expr#6=[LIKE($t2, $t5)], empid=[$t0], name=[$t2], $condition=[$t6])\n" + + " EnumerableTableScan(table=[[s, emps]])\n") + .returnsOrdered( + "empid=29; name=Anibal", + "empid=1; name=Bill", + "empid=40; name=Emmanuel", + "empid=10; name=Gabriel", + "empid=6; name=Guy", + "empid=45; name=Pascal", + "empid=12; name=Paul"); + } + + @Test void mergeUnionOrderByNameWithLimit() { + tester(false, + new JdbcTest.HrSchemaBig(), + "select * from (select empid, name from emps where name like 'G%' union select empid, name from emps where name like '%l') order by name limit 3") + .explainContains("EnumerableLimit(fetch=[3])\n" Review comment: This is a good point! ########## File path: core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java ########## @@ -0,0 +1,97 @@ +/* + * 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.calcite.adapter.enumerable; + +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.plan.RelRule; +import org.apache.calcite.rel.RelCollation; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.core.Sort; +import org.apache.calcite.rel.core.Union; +import org.apache.calcite.rel.logical.LogicalSort; +import org.apache.calcite.rel.logical.LogicalUnion; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; + +import java.util.ArrayList; +import java.util.List; + +/** + * Rule to convert a {@link org.apache.calcite.rel.logical.LogicalSort} on top of a + * {@link org.apache.calcite.rel.logical.LogicalUnion} into a {@link EnumerableMergeUnion}. + * + * @see EnumerableRules#ENUMERABLE_MERGE_UNION_RULE + */ +public class EnumerableMergeUnionRule extends RelRule<EnumerableMergeUnionRule.Config> { + + /** Rule configuration. */ + public interface Config extends RelRule.Config { + Config DEFAULT_CONFIG = EMPTY.withDescription("EnumerableMergeUnionRule").withOperandSupplier( + b0 -> b0.operand(LogicalSort.class).oneInput( + b1 -> b1.operand(LogicalUnion.class).anyInputs())).as(Config.class); + + @Override default EnumerableMergeUnionRule toRule() { + return new EnumerableMergeUnionRule(this); + } + } + + public EnumerableMergeUnionRule(Config config) { + super(config); + } + + @Override public void onMatch(RelOptRuleCall call) { + final Sort sort = call.rel(0); + final RelCollation collation = sort.getCollation(); + if (collation == null || collation.getFieldCollations().isEmpty()) { + return; + } + + final Union union = call.rel(1); + final int unionInputsSize = union.getInputs().size(); + if (unionInputsSize < 2) { + return; + } + + // Push down sort limit, if possible. + RexNode inputFetch = null; + if (sort.fetch != null) { + if (sort.offset == null) { + inputFetch = sort.fetch; + } else if (sort.fetch instanceof RexLiteral && sort.offset instanceof RexLiteral) { + inputFetch = call.builder().literal( + RexLiteral.intValue(sort.fetch) + RexLiteral.intValue(sort.offset)); + } + } + + final List<RelNode> inputs = new ArrayList<>(unionInputsSize); + for (RelNode input : union.getInputs()) { + final RelNode newInput = sort.copy(sort.getTraitSet(), input, collation, null, inputFetch); Review comment: Yes that's the good point :) ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
