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/cb7c0ad8 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/cb7c0ad8 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/cb7c0ad8 Branch: refs/heads/KYLIN-2277 Commit: cb7c0ad83b6f96f0972dd76384d0e9ba9ef2f198 Parents: 9cffc10 Author: Li Yang <[email protected]> Authored: Wed Dec 14 10:38:09 2016 +0800 Committer: Li Yang <[email protected]> Committed: Wed Dec 14 15:41:19 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/cb7c0ad8/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/cb7c0ad8/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("[(),. ]", "_"); } }
