Merge pull request #1434 from smallrye/feat/use-jctools-no-native-han…

…dling refactor: replace old MPSC/SPSC queues with JCTools (simplified)
smallrye · Jan 31, 2024 · 26f87e7 · 26f87e7
2 parents 78a1303 + 9c17a6e
commit 26f87e7
Show file tree

Hide file tree

Showing 21 changed files with 275 additions and 1,184 deletions.
diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -23,6 +23,10 @@
             <artifactId>smallrye-common-annotation</artifactId>
             <version>${smallrye-common-annotation.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jctools</groupId>
+            <artifactId>jctools-core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava3</groupId>

diff --git a/implementation/revapi.json b/implementation/revapi.json
@@ -51,7 +51,56 @@
     "criticality" : "highlight",
     "minSeverity" : "POTENTIALLY_BREAKING",
     "minCriticality" : "documented",
-    "differences" : [ ]
+    "differences" : [
+      {
+        "ignore": true,
+        "code": "java.class.removed",
+        "old": "class io.smallrye.mutiny.operators.multi.MultiConcatMapOp.ConcatMapMainSubscriber<I, O>",
+        "justification": "Internal API refactoring"
+      },
+      {
+        "ignore": true,
+        "code": "java.method.removed",
+        "old": "method <T> java.util.Queue<T> io.smallrye.mutiny.helpers.queues.Queues::createStrictSizeQueue(int)",
+        "justification": "Refactoring of internal APIs"
+      },
+      {
+        "ignore": true,
+        "code": "java.field.removedWithConstant",
+        "old": "field io.smallrye.mutiny.helpers.queues.Queues.TO_LARGE_TO_BE_BOUNDED",
+        "justification": "Typo (internal API)"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.removed",
+        "old": "class io.smallrye.mutiny.helpers.queues.MpscLinkedQueue<T>",
+        "justification": "Refactoring of internal APIs"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.removed",
+        "old": "class io.smallrye.mutiny.helpers.queues.SpscArrayQueue<E>",
+        "justification": "Refactoring of internal APIs"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.removed",
+        "old": "class io.smallrye.mutiny.helpers.queues.SpscLinkedArrayQueue<E>",
+        "justification": "Refactoring of internal APIs"
+      },
+      {
+        "ignore": true,
+        "code": "java.field.removed",
+        "old": "field io.smallrye.mutiny.helpers.queues.Queues.BUFFER_S",
+        "justification": "Refactoring of internal APIs"
+      },
+      {
+        "ignore": true,
+        "code": "java.field.removed",
+        "old": "field io.smallrye.mutiny.helpers.queues.Queues.BUFFER_XS",
+        "justification": "Refactoring of internal APIs"
+      }
+    ]
   }
 }, {
   "extension" : "revapi.reporter.json",

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiFlatten.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiFlatten.java
@@ -8,7 +8,6 @@
 import io.smallrye.common.annotation.CheckReturnValue;
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.helpers.queues.Queues;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
 import io.smallrye.mutiny.operators.multi.MultiConcatMapOp;
 import io.smallrye.mutiny.operators.multi.MultiFlatMapOp;
@@ -77,7 +76,7 @@ public MultiFlatten<I, O> withRequests(int requests) {
      */
     @CheckReturnValue
     public Multi<O> merge() {
-        return merge(Queues.BUFFER_S);
+        return merge(Infrastructure.getBufferSizeS());
     }
 
     /**

diff --git a/implementation/src/main/java/io/smallrye/mutiny/helpers/queues/MpscLinkedQueue.java b/implementation/src/main/java/io/smallrye/mutiny/helpers/queues/MpscLinkedQueue.java