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/12/22 07:24:47 UTC

kylin git commit: KYLIN-1832 UT bug fix

Repository: kylin
Updated Branches:
  refs/heads/master d337ab1fd -> 440394de1


KYLIN-1832 UT bug fix


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/440394de
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/440394de
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/440394de

Branch: refs/heads/master
Commit: 440394de1ac0a8ebbc64f117f9442052508cce81
Parents: d337ab1
Author: Li Yang <li...@apache.org>
Authored: Thu Dec 22 15:24:28 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Thu Dec 22 15:24:40 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/440394de/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java
index 21f3a0e..82c881b 100644
--- a/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java
+++ b/core-metadata/src/main/java/org/apache/kylin/measure/hllc/HLLCounter.java
@@ -142,9 +142,10 @@ public class HLLCounter implements Serializable, Comparable<HLLCounter> {
             case SINGLE_VALUE:
                 if (register.getSize() > 0 && another.register.getSize() > 0) {
                     register = ((SingleValueRegister) register).toSparse();
-                } else if (register.getSize() == 0 && another.register.getSize() > 0) {
+                } else {
                     SingleValueRegister sr = (SingleValueRegister) another.register;
-                    register.set(sr.getSingleValuePos(), sr.getValue());
+                    if (sr.getSize() > 0)
+                        register.set(sr.getSingleValuePos(), sr.getValue());
                     return;
                 }
                 break;