KYLIN-1643 HLL shouldnât count NULL Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/60848ce7 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/60848ce7 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/60848ce7
Branch: refs/heads/1.5.x-HBase1.x Commit: 60848ce75b4200a2199c066cd6eb50ad0f8f7194 Parents: 119d24b Author: shaofengshi <shaofeng...@apache.org> Authored: Tue May 3 17:02:32 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue May 3 19:11:15 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/measure/hllc/HLLCMeasureType.java | 6 ++++-- .../org/apache/kylin/invertedindex/measure/FixedHLLCodec.java | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/60848ce7/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java index a90846f..1138822 100644 --- a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java +++ b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCMeasureType.java @@ -97,8 +97,10 @@ public class HLLCMeasureType extends MeasureType<HyperLogLogPlusCounter> { public HyperLogLogPlusCounter valueOf(String[] values, MeasureDesc measureDesc, Map<TblColRef, Dictionary<String>> dictionaryMap) { HyperLogLogPlusCounter hllc = current; hllc.clear(); - for (String v : values) - hllc.add(v == null ? "__nUlL__" : v); + for (String v : values) { + if (v != null) + hllc.add(v); + } return hllc; } }; http://git-wip-us.apache.org/repos/asf/kylin/blob/60848ce7/invertedindex/src/main/java/org/apache/kylin/invertedindex/measure/FixedHLLCodec.java ---------------------------------------------------------------------- diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/measure/FixedHLLCodec.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/measure/FixedHLLCodec.java index eb213b8..0ec2638 100644 --- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/measure/FixedHLLCodec.java +++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/measure/FixedHLLCodec.java @@ -49,9 +49,7 @@ public class FixedHLLCodec extends FixedLenMeasureCodec<HyperLogLogPlusCounter> @Override public HyperLogLogPlusCounter valueOf(String value) { current.clear(); - if (value == null) - current.add("__nUlL__"); - else + if (value != null) current.add(value.getBytes()); return current; }
