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/07/04 02:19:52 UTC
[10/10] incubator-kylin git commit: KYLIN-780 bug fix, 1) replace
'executeIndexQuery' with 'executeOLAPQuery';
2) set returnTupleInfo on OLAPContext
KYLIN-780 bug fix, 1) replace 'executeIndexQuery' with 'executeOLAPQuery';
2) set returnTupleInfo on OLAPContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/c5b1ab5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c5b1ab5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c5b1ab5c
Branch: refs/heads/0.8
Commit: c5b1ab5c36373663140cbb6de993f7cc6bbf5346
Parents: fe2b922
Author: Li, Yang <ya...@ebay.com>
Authored: Sat Jul 4 06:23:33 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Jul 4 08:18:13 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/query/relnode/OLAPJoinRel.java | 5 ++++-
.../main/java/org/apache/kylin/query/relnode/OLAPTableScan.java | 5 ++---
.../main/java/org/apache/kylin/rest/service/BasicService.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c5b1ab5c/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 3c57fdb..840c277 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
@@ -229,9 +229,12 @@ public class OLAPJoinRel extends EnumerableJoin implements OLAPRel {
@Override
public Result implement(EnumerableRelImplementor implementor, Prefer pref) {
+
+ context.setReturnTupleInfo(rowType, columnRowType);
+
PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), getRowType(), pref.preferArray());
RelOptTable factTable = context.firstTableScan.getTable();
- MethodCallExpression exprCall = Expressions.call(factTable.getExpression(OLAPTable.class), "executeIndexQuery", implementor.getRootExpression(), Expressions.constant(context.id));
+ MethodCallExpression exprCall = Expressions.call(factTable.getExpression(OLAPTable.class), "executeOLAPQuery", implementor.getRootExpression(), Expressions.constant(context.id));
return implementor.result(physType, Blocks.toBlock(exprCall));
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c5b1ab5c/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java
----------------------------------------------------------------------
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 9d62ebc..1fff7d5 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
@@ -177,8 +177,6 @@ public class OLAPTableScan extends TableScan implements OLAPRel, EnumerableRel {
if (context.firstTableScan == null) {
context.firstTableScan = this;
}
-
- context.setReturnTupleInfo(rowType, columnRowType);
}
private ColumnRowType buildColumnRowType() {
@@ -197,10 +195,11 @@ public class OLAPTableScan extends TableScan implements OLAPRel, EnumerableRel {
@Override
public Result implement(EnumerableRelImplementor implementor, Prefer pref) {
- PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), this.rowType, pref.preferArray());
+ context.setReturnTupleInfo(rowType, columnRowType);
String execFunction = genExecFunc();
+ PhysType physType = PhysTypeImpl.of(implementor.getTypeFactory(), this.rowType, pref.preferArray());
MethodCallExpression exprCall = Expressions.call(table.getExpression(OLAPTable.class), execFunction, implementor.getRootExpression(), Expressions.constant(context.id));
return implementor.result(physType, Blocks.toBlock(exprCall));
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c5b1ab5c/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/BasicService.java b/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
index e9e35e2..2eb8472 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/BasicService.java
@@ -37,13 +37,13 @@ import javax.sql.DataSource;
import net.sf.ehcache.CacheManager;
+import org.apache.calcite.jdbc.Driver;
import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.cube.CubeDescManager;
import org.apache.kylin.cube.CubeManager;
import org.apache.kylin.invertedindex.IIDescManager;
import org.apache.kylin.invertedindex.IIManager;
-import org.apache.kylin.jdbc.Driver;
import org.apache.kylin.job.cube.CubingJob;
import org.apache.kylin.job.execution.AbstractExecutable;
import org.apache.kylin.job.execution.ExecutableState;