You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@kylin.apache.org by GitBox <gi...@apache.org> on 2018/06/27 07:46:59 UTC
[GitHub] shaofengshi closed pull request #158: KYLIN-3025 fix error: {fn
CONVERT} for bigint type in tableau 10.4
shaofengshi closed pull request #158: KYLIN-3025 fix error: {fn CONVERT} for bigint type in tableau 10.4
URL: https://github.com/apache/kylin/pull/158
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/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java b/query/src/main/java/org/apache/kylin/query/util/DefaultQueryTransformer.java
index f8ab8f24d6..f32e562cb6 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
@@ -49,7 +49,7 @@
+ S0 + "([^\\s,]+)" + S0 + "AS" + SM + "DOUBLE" + S0 + "\\)" + S0 + "\\)", Pattern.CASE_INSENSITIVE);
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);
+ + "," + S0 + "(SQL_DOUBLE|SQL_BIGINT)" + S0 + "\\)" + S0 + "\\}" + S0 + "\\)", Pattern.CASE_INSENSITIVE);
@Override
public String transform(String sql, String project, String defaultSchema) {
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 b6265b3795..a38b887e44 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
@@ -27,39 +27,43 @@
@Test
public void SumOfFnConvertTransform() throws Exception {
+ SumOfFnConvertTransform("SQL_DOUBLE");
+ SumOfFnConvertTransform("SQL_BIGINT");
+ }
+
+ private void SumOfFnConvertTransform(String dataType) throws Exception {
DefaultQueryTransformer transformer = new DefaultQueryTransformer();
- String fnConvertSumSql = "select sum({fn convert(\"LSTG_SITE_ID\", SQL_DOUBLE)}) from KYLIN_SALES group by LSTG_SITE_ID";
+ String fnConvertSumSql = "select sum({fn convert(\"LSTG_SITE_ID\", " + dataType + ")}) from KYLIN_SALES group by LSTG_SITE_ID";
String correctSql = transformer.transform(fnConvertSumSql, "", "");
assertTrue("select sum(\"LSTG_SITE_ID\") from KYLIN_SALES group by LSTG_SITE_ID".equalsIgnoreCase(correctSql));
//test SQL contains blank
//Case one blank interval
- fnConvertSumSql = "select sum ( { fn convert( \"LSTG_SITE_ID\" , SQL_DOUBLE) } ) from KYLIN_SALES group by LSTG_SITE_ID";
+ fnConvertSumSql = "select sum ( { fn convert( \"LSTG_SITE_ID\" , " + dataType + ") } ) from KYLIN_SALES group by LSTG_SITE_ID";
correctSql = transformer.transform(fnConvertSumSql, "", "");
assertTrue("select sum(\"LSTG_SITE_ID\") from KYLIN_SALES group by LSTG_SITE_ID".equalsIgnoreCase(correctSql));
//Case multi blank interval
- fnConvertSumSql = "select SUM ( { fn convert( \"LSTG_SITE_ID\" , SQL_DOUBLE ) } ) from KYLIN_SALES group by LSTG_SITE_ID";
+ fnConvertSumSql = "select SUM ( { fn convert( \"LSTG_SITE_ID\" , " + dataType + " ) } ) from KYLIN_SALES group by LSTG_SITE_ID";
correctSql = transformer.transform(fnConvertSumSql, "", "");
assertTrue("select sum(\"LSTG_SITE_ID\") from KYLIN_SALES group by LSTG_SITE_ID".equalsIgnoreCase(correctSql));
//Case one or multi blank interval
- fnConvertSumSql = "select SUM( { fn convert( \"LSTG_SITE_ID\" , SQL_DOUBLE ) } ) from KYLIN_SALES group by LSTG_SITE_ID";
+ fnConvertSumSql = "select SUM( { fn convert( \"LSTG_SITE_ID\" , " + dataType + " ) } ) from KYLIN_SALES group by LSTG_SITE_ID";
correctSql = transformer.transform(fnConvertSumSql, "", "");
assertTrue("select sum(\"LSTG_SITE_ID\") from KYLIN_SALES group by LSTG_SITE_ID".equalsIgnoreCase(correctSql));
//test exception case of "... fnconvert ..."
- fnConvertSumSql = "select SUM ({fnconvert(\"LSTG_SITE_ID\", SQL_DOUBLE)}) from KYLIN_SALES group by LSTG_SITE_ID";
+ fnConvertSumSql = "select SUM ({fnconvert(\"LSTG_SITE_ID\", " + dataType + ")}) from KYLIN_SALES group by LSTG_SITE_ID";
correctSql = transformer.transform(fnConvertSumSql, "", "");
assertFalse("select sum(\"LSTG_SITE_ID\") from KYLIN_SALES group by LSTG_SITE_ID".equalsIgnoreCase(correctSql));
//test SQL contains multi sum
- fnConvertSumSql = "select SUM({fn convert(\"LSTG_SITE_ID\", SQL_DOUBLE)}), SUM({fn convert(\"price\", SQL_DOUBLE)}) from KYLIN_SALES group by LSTG_SITE_ID";
+ fnConvertSumSql = "select SUM({fn convert(\"LSTG_SITE_ID\", " + dataType + ")}), SUM({fn convert(\"price\", " + dataType + ")}) from KYLIN_SALES group by LSTG_SITE_ID";
correctSql = transformer.transform(fnConvertSumSql, "", "");
assertTrue("select sum(\"LSTG_SITE_ID\"), sum(\"price\") from KYLIN_SALES group by LSTG_SITE_ID"
.equalsIgnoreCase(correctSql));
-
}
@Test
@@ -92,7 +96,7 @@ public void SumOfCastTransform() throws Exception {
assertTrue("select sum(LSTG_SITE_ID), sum(price) from KYLIN_SALES group by LSTG_SITE_ID"
.equalsIgnoreCase(correctSql));
}
-
+
@Test
public void functionEscapeTransform() throws Exception {
DefaultQueryTransformer transformer = new DefaultQueryTransformer();
----------------------------------------------------------------
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