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:24 UTC
[11/13] incubator-kylin git commit: KYLIN-780 minor changes about
debug
KYLIN-780 minor changes about debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/621a80c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/621a80c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/621a80c9
Branch: refs/heads/KYLIN-780
Commit: 621a80c9457c6038e711981227deb76936830939
Parents: 5d94f1a
Author: Li, Yang <ya...@ebay.com>
Authored: Wed Jun 17 18:13:44 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 18 15:20:08 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/project/ProjectL2Cache.java | 2 +-
.../java/org/apache/kylin/query/enumerator/CubeEnumerator.java | 5 +----
.../java/org/apache/kylin/query/relnode/OLAPAggregateRel.java | 2 +-
.../main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java | 1 -
.../src/main/java/org/apache/kylin/query/relnode/OLAPRel.java | 5 +++++
.../apache/kylin/query/relnode/OLAPToEnumerableConverter.java | 6 ++++++
.../test/java/org/apache/kylin/query/test/KylinTestBase.java | 2 +-
7 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java b/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
index 10c4472..bc1b3a6 100644
--- a/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
+++ b/metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
@@ -256,7 +256,7 @@ class ProjectL2Cache {
private static class TableCache {
private boolean exposed = false;
private TableDesc tableDesc;
- private Set<ColumnDesc> exposedColumns = Sets.newHashSet();
+ private Set<ColumnDesc> exposedColumns = Sets.newLinkedHashSet();
private Set<IRealization> realizations = Sets.newHashSet();
TableCache(TableDesc tableDesc) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/query/src/main/java/org/apache/kylin/query/enumerator/CubeEnumerator.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/enumerator/CubeEnumerator.java b/query/src/main/java/org/apache/kylin/query/enumerator/CubeEnumerator.java
index cc89119..b83e449 100644
--- a/query/src/main/java/org/apache/kylin/query/enumerator/CubeEnumerator.java
+++ b/query/src/main/java/org/apache/kylin/query/enumerator/CubeEnumerator.java
@@ -132,11 +132,9 @@ public class CubeEnumerator implements Enumerator<Object[]> {
// bind dynamic variables
bindVariable(olapContext.filter);
-
-
// query storage engine
IStorageEngine storageEngine = StorageEngineFactory.getStorageEngine(olapContext.realization);
- ITupleIterator iterator = storageEngine.search(olapContext.storageContext,olapContext.getSQLDigest());
+ ITupleIterator iterator = storageEngine.search(olapContext.storageContext, olapContext.getSQLDigest());
if (logger.isDebugEnabled()) {
logger.debug("return TupleIterator...");
}
@@ -145,7 +143,6 @@ public class CubeEnumerator implements Enumerator<Object[]> {
return iterator;
}
-
private void bindVariable(TupleFilter filter) {
if (filter == null) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/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 24d9a3e..4581561 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
@@ -346,7 +346,7 @@ public class OLAPAggregateRel extends Aggregate implements OLAPRel, EnumerableRe
try {
enumAggRel = new EnumerableAggregate(getCluster(), getCluster().traitSetOf(EnumerableConvention.INSTANCE), getInput(), false, this.groupSet, this.groupSets, rewriteAggCalls);
} catch (InvalidRelException e) {
- throw new IllegalStateException("Can't create EnumerableAggregateRel!", e);
+ throw new IllegalStateException("Can't create EnumerableAggregate!", e);
}
return enumAggRel.implement(implementor, pref);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
index cb0c65f..6be2b7f 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java
@@ -230,7 +230,6 @@ public class OLAPJoinRel extends EnumerableJoin implements OLAPRel {
result = super.implement(implementor, pref);
} else {
PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), getRowType(), pref.preferArray());
-
RelOptTable factTable = context.firstTableScan.getTable();
result = implementor.result(physType, Blocks.toBlock(Expressions.call(factTable.getExpression(OLAPTable.class), "executeIndexQuery", implementor.getRootExpression(), Expressions.constant(context.id))));
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/query/src/main/java/org/apache/kylin/query/relnode/OLAPRel.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPRel.java
index 1f6057f..806323c 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPRel.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPRel.java
@@ -148,6 +148,11 @@ public interface OLAPRel extends RelNode {
if (parent instanceof OLAPRel) {
OLAPRel olapRel = (OLAPRel) parent;
this.parentContext = olapRel.getContext();
+ System.out.println("Parent: " + olapRel);
+ }
+ if (child instanceof OLAPRel) {
+ OLAPRel olapRel = (OLAPRel) child;
+ System.out.println(this.parentContext + " - " + olapRel.getContext() + " - " + olapRel);
}
return super.visitChild(parent, ordinal, child, prefer);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/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 9f7009e..57b8ee7 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
@@ -84,6 +84,12 @@ public class OLAPToEnumerableConverter extends ConverterImpl implements Enumerab
OLAPRel.RewriteImplementor rewriteImplementor = new OLAPRel.RewriteImplementor();
rewriteImplementor.visitChild(this, getInput());
+// if (System.getProperty("calcite.debug") != null) {
+// String dumpPlan = RelOptUtil.dumpPlan("", this, false, SqlExplainLevel.DIGEST_ATTRIBUTES);
+// System.out.println("EXECUTION PLAN AFTER REWRITE");
+// System.out.println(dumpPlan);
+// }
+
// build java implementation
EnumerableRel child = (EnumerableRel) getInput();
OLAPRel.JavaImplementor javaImplementor = new OLAPRel.JavaImplementor(enumImplementor);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/621a80c9/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
index 55699d3..819d2f9 100644
--- a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
+++ b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
@@ -423,7 +423,7 @@ public class KylinTestBase {
int count = executeQuery(sql, true);
if (debug) {
- System.clearProperty("optiq.debug");
+ System.clearProperty("calcite.debug");
}
return count;
}