simplify outer loop break logic in HBaseCriticalPoint

Yan Zhou · Yan Zhou · commit 1c4b131284a0 · 2015-09-23T10:17:54.000-07:00
diff --git a/src/main/scala/org/apache/spark/sql/hbase/HBaseCriticalPoint.scala b/src/main/scala/org/apache/spark/sql/hbase/HBaseCriticalPoint.scala
@@ -23,7 +23,6 @@ import org.apache.spark.sql.types._
 
 import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
-import scala.util.control.Breaks._
 
 object CriticalPointType extends Enumeration {
   type CriticalPointType = Value
@@ -503,23 +502,21 @@ object RangeCriticalPoint {
     var newLimit = limit
     var cmp = 0
     var prevEq = eq
-    breakable {
-      while (incr * (newLimit - prevEq) >= 0) {
-        if (incr * (newLimit - prevEq) < threshold) {
-          // linear search
-          mid = prevEq + incr
-          while (incr * (newLimit - mid) > 0 && cmp == 0) {
-            prevEq = mid
-            mid = mid + incr
-            cmp = comp(src, tgt(mid))
-          }
-          break
-        } else {
-          mid = (prevEq + newLimit) / 2
+    while (incr * (newLimit - prevEq) >= 0) {
+      if (incr * (newLimit - prevEq) < threshold) {
+        // linear search
+        mid = prevEq + incr
+        while (incr * (newLimit - mid) > 0 && cmp == 0) {
+          prevEq = mid
+          mid = mid + incr
           cmp = comp(src, tgt(mid))
-          if (cmp == 0) prevEq = mid
-          else newLimit = mid
         }
+        newLimit = prevEq - incr // break the outer loop
+      } else {
+        mid = (prevEq + newLimit) / 2
+        cmp = comp(src, tgt(mid))
+        if (cmp == 0) prevEq = mid
+        else newLimit = mid
       }
     }
     prevEq
