From a0c38f574b616bc8d992554dab0c25f8445004a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Tue, 25 Mar 2014 16:21:44 -0700
Subject: [PATCH] check should be safe to move out of loop

---
 .../hyperloglog/HyperLogLogCollector.java     | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollector.java b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollector.java
index 40f64f19acb..5e8a9f63f30 100644
--- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollector.java
+++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollector.java
@@ -350,7 +350,7 @@ public abstract class HyperLogLogCollector implements Comparable<HyperLogLogColl
     byte myOffset = getRegisterOffset();
     short numNonZero = getNumNonZeroRegisters();
 
-    int offsetDiff = myOffset - otherOffset;
+    final int offsetDiff = myOffset - otherOffset;
     if (offsetDiff < 0) {
       throw new ISE("offsetDiff[%d] < 0, shouldn't happen because of swap.", offsetDiff);
     }
@@ -368,13 +368,11 @@ public abstract class HyperLogLogCollector implements Comparable<HyperLogLogColl
             offsetDiff,
             otherBuffer.get()
         );
-        if (numNonZero == NUM_BUCKETS) {
-          numNonZero = decrementBuckets();
-          setRegisterOffset(++myOffset);
-          setNumNonZeroRegisters(numNonZero);
-
-          offsetDiff = myOffset - otherOffset;
-        }
+      }
+      if (numNonZero == NUM_BUCKETS) {
+        numNonZero = decrementBuckets();
+        setRegisterOffset(++myOffset);
+        setNumNonZeroRegisters(numNonZero);
       }
     } else { // dense
       int position = getPayloadBytePosition();
@@ -384,15 +382,13 @@ public abstract class HyperLogLogCollector implements Comparable<HyperLogLogColl
             offsetDiff,
             otherBuffer.get()
         );
-        if (numNonZero == NUM_BUCKETS) {
-          numNonZero = decrementBuckets();
-          setRegisterOffset(++myOffset);
-          setNumNonZeroRegisters(numNonZero);
-
-          offsetDiff = myOffset - otherOffset;
-        }
         position++;
       }
+      if (numNonZero == NUM_BUCKETS) {
+        numNonZero = decrementBuckets();
+        setRegisterOffset(++myOffset);
+        setNumNonZeroRegisters(numNonZero);
+      }
     }
 
     // no need to call setRegisterOffset(myOffset) here, since it gets updated every time myOffset is incremented