Repository: kylin Updated Branches: refs/heads/temp_0802 [created] 49da6cb27
cover spark cubing in IT Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/49da6cb2 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/49da6cb2 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/49da6cb2 Branch: refs/heads/temp_0802 Commit: 49da6cb27852d8d4d4b625d4201e484f04576ca2 Parents: 6a570a1 Author: Hongbin Ma <mahong...@apache.org> Authored: Wed Aug 2 12:02:46 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Wed Aug 2 12:02:46 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/metadata/model/ComputedColumnDesc.java | 10 ++++++---- .../localmeta/cube_desc/ci_inner_join_cube.json | 2 +- .../org/apache/kylin/rest/util/Log4jConfigListener.java | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/49da6cb2/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java index e8cc351..2ee2b38 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java @@ -17,12 +17,13 @@ */ package org.apache.kylin.metadata.model; +import java.io.Serializable; + +import org.apache.kylin.metadata.model.tool.CalciteParser; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import org.apache.kylin.metadata.model.tool.CalciteParser; - -import java.io.Serializable; @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE) public class ComputedColumnDesc implements Serializable { @@ -46,7 +47,8 @@ public class ComputedColumnDesc implements Serializable { tableIdentity = tableIdentity.toUpperCase(); columnName = columnName.toUpperCase(); - CalciteParser.ensureNoTableNameExists(expression); + if ("true".equals(System.getProperty("needCheckCC"))) + CalciteParser.ensureNoTableNameExists(expression); } public String getFullName() { http://git-wip-us.apache.org/repos/asf/kylin/blob/49da6cb2/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json index 28a63d5..27acdd3 100644 --- a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json +++ b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json @@ -610,7 +610,7 @@ "status_need_notify": [], "auto_merge_time_ranges": null, "retention_range": 0, - "engine_type": 2, + "engine_type": 4, "storage_type": 2, "override_kylin_properties": { "kylin.cube.algorithm": "LAYER" http://git-wip-us.apache.org/repos/asf/kylin/blob/49da6cb2/server-base/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java b/server-base/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java index 7e79511..3dde9cf 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java +++ b/server-base/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java @@ -35,6 +35,7 @@ public class Log4jConfigListener extends org.springframework.web.util.Log4jConfi if (!isDebugTomcat) { super.contextInitialized(event); } + System.setProperty("needCheckCC", "true"); } @Override
