APACHE-KYLIN-3359 minor fix

Signed-off-by: shaofengshi <shaofengshi@apache.org>
apache · May 24, 2018 · 28df046 · 28df046
1 parent c6c8051
commit 28df046
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/expression/ExpressionVisitor.java b/core-metadata/src/main/java/org/apache/kylin/metadata/expression/ExpressionVisitor.java
@@ -19,17 +19,17 @@
 package org.apache.kylin.metadata.expression;
 
 public interface ExpressionVisitor {
-    public TupleExpression visitNumber(NumberTupleExpression numExpr);
+    TupleExpression visitNumber(NumberTupleExpression numExpr);
 
-    public TupleExpression visitString(StringTupleExpression strExpr);
+    TupleExpression visitString(StringTupleExpression strExpr);
 
-    public TupleExpression visitColumn(ColumnTupleExpression colExpr);
+    TupleExpression visitColumn(ColumnTupleExpression colExpr);
 
-    public TupleExpression visitBinary(BinaryTupleExpression binaryExpr);
+    TupleExpression visitBinary(BinaryTupleExpression binaryExpr);
 
-    public TupleExpression visitCaseCall(CaseTupleExpression caseExpr);
+    TupleExpression visitCaseCall(CaseTupleExpression caseExpr);
 
-    public TupleExpression visitRexCall(RexCallTupleExpression rexCallExpr);
+    TupleExpression visitRexCall(RexCallTupleExpression rexCallExpr);
 
-    public TupleExpression visitNone(NoneTupleExpression noneExpr);
+    TupleExpression visitNone(NoneTupleExpression noneExpr);
 }
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/GTCubeStorageQueryBase.java
@@ -221,8 +221,9 @@ protected void buildDimensionsAndMetrics(SQLDigest sqlDigest, Collection<TblColR
 
         for (TblColRef column : sqlDigest.allColumns) {
             // skip measure columns
-            if (sqlDigest.metricColumns.contains(column)
-                    && !(sqlDigest.groupbyColumns.contains(column) || sqlDigest.filterColumns.contains(column))) {
+            if ((sqlDigest.metricColumns.contains(column) || sqlDigest.rtMetricColumns.contains(column))
+                    && !(sqlDigest.groupbyColumns.contains(column) || sqlDigest.filterColumns.contains(column)
+                            || sqlDigest.rtDimensionColumns.contains(column))) {
                 continue;
             }
 

diff --git a/query/src/main/java/org/apache/kylin/query/relnode/visitor/TupleExpressionVisitor.java b/query/src/main/java/org/apache/kylin/query/relnode/visitor/TupleExpressionVisitor.java
@@ -64,7 +64,7 @@ public TupleExpression visitCall(RexCall call) {
         if (op == SqlStdOperatorTable.EXTRACT_DATE) {
             return visitFirstRexInputRef(call);
         } else if (op instanceof SqlCastFunction) {
-            return visitFirstRexInputRef(call);
+            return call.getOperands().get(0).accept(this);
         } else if (op instanceof SqlUserDefinedFunction) {
             if (op.getName().equals("QUARTER")) {
                 return visitFirstRexInputRef(call);