You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/11/21 07:49:34 UTC
kylin git commit: KYLIN-1875 In model JSON,
rename 'join_tables' to 'lookups' temporarily, avoid RestAPI impact
Repository: kylin
Updated Branches:
refs/heads/master d38d2e955 -> a0ab87cc7
KYLIN-1875 In model JSON, rename 'join_tables' to 'lookups' temporarily, avoid RestAPI impact
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a0ab87cc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a0ab87cc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a0ab87cc
Branch: refs/heads/master
Commit: a0ab87cc7431bc43075914796f22d59aad719dac
Parents: d38d2e9
Author: Li Yang <li...@apache.org>
Authored: Mon Nov 21 15:48:57 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Mon Nov 21 15:49:28 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/metadata/model/DataModelDesc.java | 4 ++--
.../src/main/java/org/apache/kylin/engine/mr/CubingJob.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0ab87cc/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index 1fd4e85..c2de5d6 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -67,11 +67,11 @@ public class DataModelDesc extends RootPersistentEntity {
@JsonProperty("fact_table")
private String rootFactTable;
- @JsonProperty("join_tables")
+ @JsonProperty("lookups")
@JsonInclude(JsonInclude.Include.NON_NULL)
private JoinTableDesc[] joinTables;
- @JsonProperty("lookups")
+ @JsonProperty("join_tables")
@JsonInclude(JsonInclude.Include.NON_NULL)
private JoinTableDesc[] deprecatedLookups; // replaced by "join_tables" since KYLIN-1875
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0ab87cc/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
index c3ee36c..64e9edb 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
@@ -104,7 +104,7 @@ public class CubingJob extends DefaultChainedExecutable {
super();
}
- void setDeployEnvName(String name) {
+ protected void setDeployEnvName(String name) {
setParam(DEPLOY_ENV_NAME, name);
}
@@ -112,7 +112,7 @@ public class CubingJob extends DefaultChainedExecutable {
return getParam(DEPLOY_ENV_NAME);
}
- void setProjectName(String name) {
+ protected void setProjectName(String name) {
setParam(PROJECT_INSTANCE_NAME, name);
}