Repository: kylin Updated Branches: refs/heads/KYLIN-2277 5ff1c34b4 -> 3ddc388f7
use _KY_ prefix Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3ddc388f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3ddc388f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3ddc388f Branch: refs/heads/KYLIN-2277 Commit: 3ddc388f774349a2f8420ccea2aa146e19473e97 Parents: 5ff1c34 Author: Li Yang <liy...@apache.org> Authored: Wed Dec 14 10:38:09 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Wed Dec 14 10:38:09 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java | 2 +- .../main/java/org/apache/kylin/metadata/model/FunctionDesc.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3ddc388f/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 7e00b8c..f1e4074 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java +++ b/atopcalcite/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java @@ -580,7 +580,7 @@ public class SqlToRelConverter { SqlNodeList selectList = ((SqlSelect) query).getSelectList(); SqlNodeList newSelectList = new SqlNodeList(selectList.getParserPosition()); for (int i = 0; i < inFields.size(); i++) { - if (!inFields.get(i).endsWith("_")) { + if (!inFields.get(i).startsWith("_KY_")) { RexBuilder rexBuilder = getCluster().getRexBuilder(); projExp.add(rexBuilder.makeInputRef(scan, i)); projFields.add(Pair.of(projFields.size(), inFields.get(i))); http://git-wip-us.apache.org/repos/asf/kylin/blob/3ddc388f/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java index ac13f40..4d89e1a 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/FunctionDesc.java @@ -138,9 +138,9 @@ public class FunctionDesc { if (isSum()) { return getParameter().getValue(); } else if (isCount()) { - return "COUNT__"; // ignores parameter, count(*), count(1), count(col) are all the same + return "_KY_" + "COUNT__"; // ignores parameter, count(*), count(1), count(col) are all the same } else { - return getFullExpression().replaceAll("[(),. ]", "_"); + return "_KY_" + getFullExpression().replaceAll("[(),. ]", "_"); } }
