[GitHub] imsong closed pull request #134: KYLIN-3347 : calcite function QueryService Exception

[GitBox <gi...@apache.org>]

imsong closed pull request #134: KYLIN-3347 : calcite function QueryService Exception
URL: https://github.com/apache/kylin/pull/134
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/basic/DoubleIngester.java b/core-metadata/src/main/java/org/apache/kylin/measure/basic/DoubleIngester.java
index 90ecb0d583..3707fdcc5d 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/basic/DoubleIngester.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/basic/DoubleIngester.java
@@ -18,6 +18,7 @@
 
 package org.apache.kylin.measure.basic;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 import org.apache.kylin.common.util.Dictionary;
@@ -35,7 +36,7 @@ public Double valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, D
         if (values[0] == null || values[0].length() == 0)
             return new Double(0);
         else
-            return Double.parseDouble(values[0]);
+            return new BigDecimal(values[0]).doubleValue();
     }
 
     @Override
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/basic/LongIngester.java b/core-metadata/src/main/java/org/apache/kylin/measure/basic/LongIngester.java
index 793acf2f78..990adfa373 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/basic/LongIngester.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/basic/LongIngester.java
@@ -18,6 +18,7 @@
 
 package org.apache.kylin.measure.basic;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 import org.apache.kylin.common.util.Dictionary;
@@ -35,7 +36,7 @@ public Long valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, Dic
         if (values[0] == null || values[0].length() == 0)
             return new Long(0L);
         else
-            return Long.valueOf(values[0]);
+            return new BigDecimal(values[0]).longValue();
     }
 
     @Override
diff --git a/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java b/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java
index 671d9dbf35..6b88225693 100644
--- a/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java
+++ b/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java
@@ -50,6 +50,8 @@
     private static final Pattern PIN_SUM_OF_FN_CONVERT = Pattern
             .compile(S0 + "SUM" + S0 + "\\(" + S0 + "\\{\\s*fn" + SM + "convert" + S0 + "\\(" + S0 + "([^\\s,]+)" + S0
                     + "," + S0 + "SQL_DOUBLE" + S0 + "\\)" + S0 + "\\}" + S0 + "\\)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PTN_HAVING_FUNCTION = Pattern.compile("\\{fn" + "(.*?)" + "\\}",
+            Pattern.CASE_INSENSITIVE);
 
     @Override
     public String transform(String sql, String project, String defaultSchema) {
@@ -138,7 +140,13 @@ public String transform(String sql, String project, String defaultSchema) {
             sql = sql.substring(0, m.start(1)) + "'" + value + "'" + sql.substring(m.end(3));
         }
 
-        
+        while (true) {
+            m = PTN_HAVING_FUNCTION.matcher(sql);
+            if (!m.find())
+                break;
+            sql = sql.substring(0, m.start()) + m.group(1) + sql.substring(m.end());
+        }
+
         return sql;
     }
 }
diff --git a/query/src/test/java/org/apache/kylin/query/util/DefaultQueryTransformerTest.java b/query/src/test/java/org/apache/kylin/query/util/DefaultQueryTransformerTest.java
index 8ce10174e7..a53e02029f 100644
--- a/query/src/test/java/org/apache/kylin/query/util/DefaultQueryTransformerTest.java
+++ b/query/src/test/java/org/apache/kylin/query/util/DefaultQueryTransformerTest.java
@@ -100,5 +100,9 @@ public void functionEscapeTransform() throws Exception {
         String fnConvertSumSql = "select {fn EXTRACT(YEAR from PART_DT)} from KYLIN_SALES";
         String correctSql = transformer.transform(fnConvertSumSql, "", "");
         assertTrue("select EXTRACT(YEAR from PART_DT) from KYLIN_SALES".equalsIgnoreCase(correctSql));
+
+        fnConvertSumSql = "SELECT {fn CURRENT_TIMESTAMP(0)}";
+        correctSql = transformer.transform(fnConvertSumSql, "", "");
+        assertTrue("SELECT CURRENT_TIMESTAMP".equalsIgnoreCase(correctSql));
     }
 }
\ No newline at end of file


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services