Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace old MPSC/SPSC queues with JCTools (simplified) #1434

Merged
merged 2 commits into from
Jan 31, 2024
Merged

refactor: replace old MPSC/SPSC queues with JCTools (simplified) #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05b9889
refactor!: replace old MPSC/SPSC queues with JCTools
jponge Oct 25, 2023
9c17a6e
feat: use upstream JCTools 4.0.2
jponge Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions implementation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
jponge marked this conversation as resolved.
Show resolved Hide resolved
</dependency>

<dependency>
<groupId>io.reactivex.rxjava3</groupId>
Expand Down
51 changes: 50 additions & 1 deletion implementation/revapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions implementation/src/main/java/io/smallrye/mutiny/groups/MultiFlatten.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}

/**
Expand Down
242 changes: 0 additions & 242 deletions implementation/src/main/java/io/smallrye/mutiny/helpers/queues/MpscLinkedQueue.java
View file
Open in desktop

This file was deleted.

Loading
Loading