KYLIN-1379 code review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/444013b4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/444013b4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/444013b4 Branch: refs/heads/master Commit: 444013b4bae91a0c2a410f03e4497b1500b418be Parents: d889893 Author: Yang Li <liy...@apache.org> Authored: Sun May 22 15:25:53 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Sun May 22 15:25:53 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/metadata/model/FunctionDesc.java | 9 ++++----- .../cube_desc/test_kylin_cube_with_slr_left_join_desc.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/444013b4/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 e1a9e88..f237e73 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 @@ -294,11 +294,10 @@ public class FunctionDesc { if (other.parameter != null) return false; } else { - if (isCountDistinct() - && (parameter.getType() == null ? other.parameter.getType() == null : parameter.getType().equals(other.parameter.getType())) - && (parameter.getValue() == null ? other.parameter.getType() == null : parameter.getValue().equals(other.parameter.getValue()))) - return true; - else if (!parameter.equals(other.parameter)) + if (parameter == null) { + if (other.parameter != null) + return false; + } else if (!parameter.equals(other.parameter)) return false; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/444013b4/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json index 94bc406..5dbee21 100644 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json +++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json @@ -145,7 +145,7 @@ "value": "SELLER_ID", "next_parameter": null }, - "returntype": "hllc12" + "returntype": "hllc(12)" }, "dependent_measure_ref": null }
