[revert] "[improve][broker] Optimize ConcurrentOpenLongPairRangeSet…

… by RoaringBitmap (#22908)" (#22968)
apache · Jun 25, 2024 · 2da4ee8 · 2da4ee8
1 parent f323342
commit 2da4ee8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 453 deletions.
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -513,7 +513,7 @@ The Apache Software License, Version 2.0
   * RxJava
     - io.reactivex.rxjava3-rxjava-3.0.1.jar
   * RoaringBitmap
-    - org.roaringbitmap-RoaringBitmap-1.1.0.jar
+    - org.roaringbitmap-RoaringBitmap-1.0.6.jar
   * OpenTelemetry
     - io.opentelemetry-opentelemetry-api-1.38.0.jar
     - io.opentelemetry-opentelemetry-api-incubator-1.38.0-alpha.jar

diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -382,8 +382,6 @@ The Apache Software License, Version 2.0
     - simpleclient_tracer_common-0.16.0.jar
     - simpleclient_tracer_otel-0.16.0.jar
     - simpleclient_tracer_otel_agent-0.16.0.jar
- * RoaringBitmap
-    - RoaringBitmap-1.1.0.jar
  * Log4J
     - log4j-api-2.23.1.jar
     - log4j-core-2.23.1.jar

diff --git a/pom.xml b/pom.xml
@@ -317,7 +317,7 @@ flexible messaging model and an intuitive client API.</description>
     <j2objc-annotations.version>1.3</j2objc-annotations.version>
     <lightproto-maven-plugin.version>0.4</lightproto-maven-plugin.version>
     <dependency-check-maven.version>9.1.0</dependency-check-maven.version>
-    <roaringbitmap.version>1.1.0</roaringbitmap.version>
+    <roaringbitmap.version>1.0.6</roaringbitmap.version>
     <extra-enforcer-rules.version>1.6.1</extra-enforcer-rules.version>
     <oshi.version>6.4.0</oshi.version>
     <checkerframework.version>3.33.0</checkerframework.version>

diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
@@ -252,11 +252,6 @@
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.roaringbitmap</groupId>
-      <artifactId>RoaringBitmap</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/...c/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java b/...c/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
@@ -29,7 +29,6 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.lang.mutable.MutableInt;
-import org.roaringbitmap.RoaringBitSet;
 
 /**
  * A Concurrent set comprising zero or more ranges of type {@link LongPair}. This can be alternative of
@@ -45,7 +44,7 @@
 public class ConcurrentOpenLongPairRangeSet<T extends Comparable<T>> implements LongPairRangeSet<T> {
 
     protected final NavigableMap<Long, BitSet> rangeBitSetMap = new ConcurrentSkipListMap<>();
-    private final boolean threadSafe;
+    private boolean threadSafe = true;
     private final int bitSetSize;
     private final LongPairConsumer<T> consumer;
 
@@ -96,7 +95,9 @@ public void addOpenClosed(long lowerKey, long lowerValueOpen, long upperKey, lon
             // (2) set 0th-index to upper-index in upperRange.getKey()
             if (isValid(upperKey, upperValue)) {
                 BitSet rangeBitSet = rangeBitSetMap.computeIfAbsent(upperKey, (key) -> createNewBitSet());
-                rangeBitSet.set(0, (int) upperValue + 1);
+                if (rangeBitSet != null) {
+                    rangeBitSet.set(0, (int) upperValue + 1);
+                }
             }
             // No-op if values are not valid eg: if lower == LongPair.earliest or upper == LongPair.latest then nothing
             // to set
@@ -413,6 +414,7 @@ private int getSafeEntry(long value) {
     }
 
     private BitSet createNewBitSet() {
-        return this.threadSafe ? new ConcurrentRoaringBitSet() : new RoaringBitSet();
+        return this.threadSafe ? new ConcurrentBitSet(bitSetSize) : new BitSet(bitSetSize);
     }
-}
+
+}