Optimized check for value presence in run container (#705)

* optimized run container's contains() with bitmap

* optimized mappable run container's contains() with bitmap

* test + benchmark for contains()

* benchmark correction

* benchmark correction

* checkstyle

* removed comparison for optimized contains() of (Mappeable)RunContainer

Author: antonin-janec

RoaringBitmap/src/main/java/org/roaringbitmap/RunContainer.java

@@ -817,19 +817,30 @@ protected boolean contains(BitmapContainer bitmapContainer) {
     }
     final int runCount = numberOfRuns();
     char ib = 0, ir = 0;
+    int start = getValue(ir);
+    int stop = start + getLength(ir);
     while(ib < bitmapContainer.bitmap.length && ir < runCount) {
       long w = bitmapContainer.bitmap[ib];
-      while (w != 0 && ir < runCount) {
-        int start = (getValue(ir));
-        int stop = start+ (getLength(ir));
-        long t = w & -w;
+      while (true) {
         long r = ib * 64L + Long.numberOfTrailingZeros(w);
         if (r < start) {
           return false;
         } else if(r > stop) {
           ++ir;
+          if (ir == runCount) {
+            break;
+          }
+          w &= w - 1;
+          start = getValue(ir);
+          stop = start + getLength(ir);
+        } else if (ib * 64 + 64 < stop) {
+          ib = (char) (stop / 64);
+          w = bitmapContainer.bitmap[ib];
         } else {
-          w ^= t;
+          w &= w - 1;
+          if (w == 0) {
+            break;
+          }
         }
       }
       if(w == 0) {

RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MappeableRunContainer.java

@@ -2737,19 +2737,31 @@ protected boolean contains(MappeableBitmapContainer bitmapContainer) {
     }
     final int runCount = numberOfRuns();
     char ib = 0, ir = 0;
+    int start = getValue(0);
+    int stop = start + getLength(0);
     while(ib < MappeableBitmapContainer.MAX_CAPACITY / 64 && ir < runCount) {
       long w = bitmapContainer.bitmap.get(ib);
-      while (w != 0 && ir < runCount) {
-        int start = (getValue(ir));
-        int stop = start+ (getLength(ir));
-        long t = w & -w;
+      while (true) {
         long r = ib * 64 + Long.numberOfTrailingZeros(w);
         if (r < start) {
           return false;
-        } else if(r > stop) {
+        } else if (r > stop) {
           ++ir;
+          if (ir == runCount) {
+            break;
+          }
+          w &= w - 1;
+          start = getValue(ir);
+          stop = start + getLength(ir);
+
+        } else if (ib * 64 + 64 < stop) {
+          ib = (char) (stop / 64);
+          w = bitmapContainer.bitmap.get(ib);
         } else {
-          w ^= t;
+          w &= w - 1;
+          if (w == 0) {
+            break;
+          }
         }
       }
       if(w == 0) {