You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/02/23 07:28:21 UTC
[07/11] kylin git commit: KYLIN-2456 review
KYLIN-2456 review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/730f5d7c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/730f5d7c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/730f5d7c
Branch: refs/heads/master-hbase0.98
Commit: 730f5d7ca296ad82e8bb89568dff3d010c9ad9c8
Parents: 4332b3d
Author: Hongbin Ma <ma...@apache.org>
Authored: Thu Feb 23 14:03:27 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Thu Feb 23 14:04:12 2017 +0800
----------------------------------------------------------------------
.../calcite/sql2rel/SqlToRelConverter.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/730f5d7c/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 a7be94f..02c45a0 100644
--- a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
+++ b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
@@ -595,14 +595,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) {
@@ -613,16 +613,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();
@@ -5298,4 +5298,4 @@ public class SqlToRelConverter {
}
}
-// End SqlToRelConverter.java
\ No newline at end of file
+// End SqlToRelConverter.java