Repository: kylin Updated Branches: refs/heads/master 38a76b6db -> 97950611f
minor, keep cube signature stable after MeasureDesc and FunctionDesc changed Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/97950611 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/97950611 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/97950611 Branch: refs/heads/master Commit: 97950611f6eb3de85c285e9a69135d0ce8317eb7 Parents: 38a76b6 Author: sunyerui <sunye...@gmail.com> Authored: Wed Jun 8 19:37:05 2016 +0800 Committer: sunyerui <sunye...@gmail.com> Committed: Wed Jun 8 19:37:05 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/metadata/model/FunctionDesc.java | 2 +- .../src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/97950611/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 9450555..c8d6ab2 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 @@ -63,7 +63,7 @@ public class FunctionDesc { private String returnType; @JsonProperty("configuration") - @JsonInclude(JsonInclude.Include.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_EMPTY) private HashMap<String, String> configuration = new LinkedHashMap<String, String>(); private DataType returnDataType; http://git-wip-us.apache.org/repos/asf/kylin/blob/97950611/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java index dde791c..19792cb 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/MeasureDesc.java @@ -35,7 +35,6 @@ public class MeasureDesc { @JsonProperty("function") private FunctionDesc function; @JsonProperty("dependent_measure_ref") - @JsonInclude(JsonInclude.Include.NON_NULL) private String dependentMeasureRef; public String getName() {
