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 2017/04/11 11:02:28 UTC
kylin git commit: minor, but important,
backport select * fix from 2.0 branch
Repository: kylin
Updated Branches:
refs/heads/yang22 a943ddaa2 -> c2d733ef3
minor, but important, backport select * fix from 2.0 branch
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c2d733ef
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c2d733ef
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c2d733ef
Branch: refs/heads/yang22
Commit: c2d733ef3ba48e41622b743bd0fd4325fddf1292
Parents: a943dda
Author: Li Yang <li...@apache.org>
Authored: Tue Apr 11 19:02:18 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Tue Apr 11 19:02:18 2017 +0800
----------------------------------------------------------------------
.../calcite/sql2rel/SqlToRelConverter.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c2d733ef/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
----------------------------------------------------------------------
diff --git a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
index 927bc82..0b4bee6 100644
--- a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
+++ b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
@@ -596,14 +596,14 @@ public class SqlToRelConverter {
/* OVERRIDE POINT */
private RelRoot hackSelectStar(SqlNode query, RelRoot root) {
- /*
- * Rel tree is like:
- *
- * LogicalSort (optional)
- * |- LogicalProject
- * |- LogicalFilter (optional)
- * |- OLAPTableScan or LogicalJoin
- */
+ // /*
+ // * Rel tree is like:
+ // *
+ // * LogicalSort (optional)
+ // * |- LogicalProject
+ // * |- LogicalFilter (optional)
+ // * |- OLAPTableScan or LogicalJoin
+ // */
LogicalProject rootPrj = null;
LogicalSort rootSort = null;
if (root.rel instanceof LogicalProject) {
@@ -614,16 +614,16 @@ public class SqlToRelConverter {
} else {
return root;
}
-
+ //
RelNode input = rootPrj.getInput();
- if (!(//
- isAmong(input, "OLAPTableScan", "LogicalJoin")//
- || (isAmong(input, "LogicalFilter") && isAmong(input.getInput(0), "OLAPTableScan", "LogicalJoin"))//
- ))
- return root;
-
- if (rootPrj.getRowType().getFieldCount() < input.getRowType().getFieldCount())
- return root;
+ // if (!(//
+ // isAmong(input, "OLAPTableScan", "LogicalJoin")//
+ // || (isAmong(input, "LogicalFilter") && isAmong(input.getInput(0), "OLAPTableScan", "LogicalJoin"))//
+ // ))
+ // return root;
+ //
+ // if (rootPrj.getRowType().getFieldCount() < input.getRowType().getFieldCount())
+ // return root;
RelDataType inType = rootPrj.getRowType();
List<String> inFields = inType.getFieldNames();