From 5282c32cf198aeb64964d5d74085dd1f7a80158c Mon Sep 17 00:00:00 2001 From: gaodayue Date: Thu, 17 Nov 2016 15:52:29 +0800 Subject: [PATCH] KYLIN-2200 fix union and union all query Signed-off-by: gaodayue --- .../kylin/query/relnode/KylinEnumerableUnion.java | 95 ++++++++++++++++++++++ .../apache/kylin/query/relnode/OLAPTableScan.java | 3 +- .../apache/kylin/query/relnode/OLAPUnionRel.java | 5 +- 3 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 query/src/main/java/org/apache/kylin/query/relnode/KylinEnumerableUnion.java diff --git a/query/src/main/java/org/apache/kylin/query/relnode/KylinEnumerableUnion.java b/query/src/main/java/org/apache/kylin/query/relnode/KylinEnumerableUnion.java new file mode 100644 index 0000000..45e3f7c --- /dev/null +++ b/query/src/main/java/org/apache/kylin/query/relnode/KylinEnumerableUnion.java @@ -0,0 +1,95 @@ +/* + * 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.kylin.query.relnode; + +import org.apache.calcite.adapter.enumerable.EnumerableRel; +import org.apache.calcite.adapter.enumerable.EnumerableRelImplementor; +import org.apache.calcite.adapter.enumerable.EnumerableUnion; +import org.apache.calcite.adapter.enumerable.JavaRowFormat; +import org.apache.calcite.adapter.enumerable.PhysType; +import org.apache.calcite.adapter.enumerable.PhysTypeImpl; +import org.apache.calcite.linq4j.Enumerable; +import org.apache.calcite.linq4j.ExtendedEnumerable; +import org.apache.calcite.linq4j.Ord; +import org.apache.calcite.linq4j.function.EqualityComparer; +import org.apache.calcite.linq4j.function.Functions; +import org.apache.calcite.linq4j.tree.BlockBuilder; +import org.apache.calcite.linq4j.tree.Expression; +import org.apache.calcite.linq4j.tree.Expressions; +import org.apache.calcite.linq4j.tree.Types; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelTraitSet; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.util.BuiltInMethod; + +import java.lang.reflect.Method; +import java.util.List; + +/** + * KYLIN-2200 + */ +public class KylinEnumerableUnion extends EnumerableUnion { + private Method unionArray; + private Method arrayComparer; + + public KylinEnumerableUnion(RelOptCluster cluster, RelTraitSet traitSet, List inputs, boolean all) { + super(cluster, traitSet, inputs, all); + + unionArray = Types.lookupMethod(ExtendedEnumerable.class, "union", Enumerable.class, EqualityComparer.class); + arrayComparer = Types.lookupMethod(Functions.class, "arrayComparer"); + } + + private Expression createUnionExpression(Expression left, Expression right, boolean arrayInput) { + if (all) { + return Expressions.call(left, BuiltInMethod.CONCAT.method, right); + } + + return arrayInput + ? Expressions.call(left, unionArray, right, Expressions.call(arrayComparer)) + : Expressions.call(left, BuiltInMethod.UNION.method, right); + } + + @Override + public Result implement(EnumerableRelImplementor implementor, Prefer pref) { + final BlockBuilder builder = new BlockBuilder(); + Expression unionExp = null; + for (Ord ord : Ord.zip(inputs)) { + EnumerableRel input = (EnumerableRel) ord.e; + final Result result = implementor.visitChild(this, ord.i, input, pref); + Expression childExp = + builder.append( + "child" + ord.i, + result.block); + + if (unionExp == null) { + unionExp = childExp; + } else { + unionExp = createUnionExpression(unionExp, childExp, result.format == JavaRowFormat.ARRAY); + } + } + + builder.add(unionExp); + final PhysType physType = + PhysTypeImpl.of( + implementor.getTypeFactory(), + getRowType(), + pref.prefer(JavaRowFormat.CUSTOM)); + return implementor.result(physType, builder.toBlock()); + } +} diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java index 8b5ad78..f549b5b 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.calcite.adapter.enumerable.EnumerableRel; import org.apache.calcite.adapter.enumerable.EnumerableRelImplementor; +import org.apache.calcite.adapter.enumerable.JavaRowFormat; import org.apache.calcite.adapter.enumerable.PhysType; import org.apache.calcite.adapter.enumerable.PhysTypeImpl; import org.apache.calcite.linq4j.tree.Blocks; @@ -263,7 +264,7 @@ public class OLAPTableScan extends TableScan implements OLAPRel, EnumerableRel { context.setReturnTupleInfo(rowType, columnRowType); String execFunction = genExecFunc(); - PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), this.rowType, pref.preferArray()); + PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), this.rowType, JavaRowFormat.ARRAY); MethodCallExpression exprCall = Expressions.call(table.getExpression(OLAPTable.class), execFunction, implementor.getRootExpression(), Expressions.constant(context.id)); return implementor.result(physType, Blocks.toBlock(exprCall)); } diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPUnionRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPUnionRel.java index e04ba6f..5e55b7d 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPUnionRel.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPUnionRel.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.calcite.adapter.enumerable.EnumerableConvention; import org.apache.calcite.adapter.enumerable.EnumerableRel; -import org.apache.calcite.adapter.enumerable.EnumerableUnion; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptCost; import org.apache.calcite.plan.RelOptPlanner; @@ -41,7 +40,6 @@ import com.google.common.base.Preconditions; */ public class OLAPUnionRel extends Union implements OLAPRel { - private final boolean localAll; // avoid same name in parent class private ColumnRowType columnRowType; private OLAPContext context; @@ -51,7 +49,6 @@ public class OLAPUnionRel extends Union implements OLAPRel { for (RelNode child : inputs) { Preconditions.checkArgument(getConvention() == child.getConvention()); } - this.localAll = all; } @Override @@ -106,7 +103,7 @@ public class OLAPUnionRel extends Union implements OLAPRel { } relInputs.add(input); } - return new EnumerableUnion(getCluster(), traitSet, relInputs, localAll); + return new KylinEnumerableUnion(getCluster(), traitSet, relInputs, all); } @Override -- 2.9.3 (Apple Git-75)