You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/06/18 09:31:16 UTC
[03/13] incubator-kylin git commit: KYLIN-780 undo the added debug
info that fails regression test
KYLIN-780 undo the added debug info that fails regression test
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/49ce3915
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/49ce3915
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/49ce3915
Branch: refs/heads/KYLIN-780
Commit: 49ce39158eb080e317925cbce6d13151c7dffd17
Parents: 888255d
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jun 18 15:12:48 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 18 15:12:48 2015 +0800
----------------------------------------------------------------------
.../apache/kylin/query/relnode/OLAPAggregateRel.java | 2 --
.../apache/kylin/query/relnode/OLAPProjectRel.java | 2 --
.../query/relnode/OLAPToEnumerableConverter.java | 14 +++++++-------
3 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/49ce3915/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
index 940668d..7cdb0b4 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java
@@ -33,7 +33,6 @@ import net.hydromatic.optiq.rules.java.EnumerableRel;
import net.hydromatic.optiq.rules.java.EnumerableRelImplementor;
import net.hydromatic.optiq.rules.java.JavaRules.EnumerableAggregateRel;
-import org.apache.kylin.common.util.ClassUtil;
import org.apache.kylin.metadata.model.ColumnDesc;
import org.apache.kylin.metadata.model.FunctionDesc;
import org.apache.kylin.metadata.model.ParameterDesc;
@@ -283,7 +282,6 @@ public class OLAPAggregateRel extends AggregateRelBase implements OLAPRel, Enume
}
this.rewriteAggCalls.add(aggCall);
}
- ClassUtil.updateFinalField(AggregateRelBase.class, "aggCalls", this, this.rewriteAggCalls);
}
// rebuild rowType & columnRowType
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/49ce3915/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
index 9b9b07e..1215f9e 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPProjectRel.java
@@ -30,7 +30,6 @@ import net.hydromatic.optiq.rules.java.EnumerableRel;
import net.hydromatic.optiq.rules.java.EnumerableRelImplementor;
import net.hydromatic.optiq.rules.java.JavaRules.EnumerableCalcRel;
-import org.apache.kylin.common.util.ClassUtil;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.metadata.model.TblColRef.InnerDataTypeEnum;
import org.eigenbase.rel.ProjectRelBase;
@@ -269,7 +268,6 @@ public class OLAPProjectRel extends ProjectRelBase implements OLAPRel, Enumerabl
List<RexNode> newProjects = new ArrayList<RexNode>(this.rewriteProjects);
newProjects.addAll(newExpList);
this.rewriteProjects = newProjects;
- ClassUtil.updateFinalField(ProjectRelBase.class, "exps", this, ImmutableList.copyOf(this.rewriteProjects));
// rebuild row type
FieldInfoBuilder fieldInfo = getCluster().getTypeFactory().builder();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/49ce3915/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
index 16a4ecb..54cafe5 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPToEnumerableConverter.java
@@ -27,15 +27,19 @@ import net.hydromatic.optiq.rules.java.EnumerableRelImplementor;
import net.hydromatic.optiq.rules.java.PhysType;
import net.hydromatic.optiq.rules.java.PhysTypeImpl;
+import org.apache.kylin.metadata.realization.IRealization;
import org.apache.kylin.query.routing.NoRealizationFoundException;
import org.apache.kylin.query.routing.QueryRouter;
import org.apache.kylin.query.schema.OLAPTable;
import org.eigenbase.rel.RelNode;
import org.eigenbase.rel.convert.ConverterRelImpl;
-import org.eigenbase.relopt.*;
+import org.eigenbase.relopt.ConventionTraitDef;
+import org.eigenbase.relopt.RelOptCluster;
+import org.eigenbase.relopt.RelOptCost;
+import org.eigenbase.relopt.RelOptPlanner;
+import org.eigenbase.relopt.RelOptTable;
+import org.eigenbase.relopt.RelTraitSet;
import org.eigenbase.reltype.RelDataType;
-import org.eigenbase.sql.SqlExplainLevel;
-import org.apache.kylin.metadata.realization.IRealization;
/**
* @author xjiang
@@ -82,10 +86,6 @@ public class OLAPToEnumerableConverter extends ConverterRelImpl implements Enume
OLAPRel.RewriteImplementor rewriteImplementor = new OLAPRel.RewriteImplementor();
rewriteImplementor.visitChild(this, getChild());
- // String dumpPlan = RelOptUtil.dumpPlan("", this, false, SqlExplainLevel.DIGEST_ATTRIBUTES);
- // System.out.println("============================================================================");
- // System.out.println(dumpPlan);
-
// build java implementation
EnumerableRel child = (EnumerableRel) getChild();
OLAPRel.JavaImplementor javaImplementor = new OLAPRel.JavaImplementor(enumImplementor);