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.

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 to JCTools #1334

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d2b3295
Replace fixed queues with checks + MPSC array queue
jponge Jul 27, 2023
71e239d
More JCTools queues, disabled some older Queues-related tests
jponge Jul 28, 2023
f921412
Remove MpscLinkedQueue
jponge Aug 1, 2023
4c1e212
Remove SpscLinkedArrayQueue
jponge Aug 1, 2023
67ec3fa
Remove SpscArrayQueue
jponge Aug 1, 2023
94cdcd5
Cleanups
jponge Aug 1, 2023
7e91a7e
Move queue size constants to Infrastructure class
jponge Aug 4, 2023
16fdd09
Avoid direct concrete instance creation
jponge Aug 4, 2023
8535f58
Avoid star imports
jponge Aug 4, 2023
36cca74
Add some native tests
jponge Oct 18, 2023
924bb7c
Infrastructure support to switch between unpadded and atomic JCTools …
jponge Oct 18, 2023
9ce7735
POM cleanup
jponge Oct 18, 2023
263fd90
Add a native compilation workflow step
jponge Oct 19, 2023
c1b6bc5
Fix missing tag to branch
jponge Oct 19, 2023
b7421ba
Skip tests vs quick build for having a javadoc artifact
jponge Oct 19, 2023
c6c18cb
Typo
jponge Oct 19, 2023
44afd31
Typo (again)
jponge Oct 19, 2023
101926c
Try to fix missing class from graal-sdk in CI
jponge Oct 19, 2023
9652a52
Revert "Try to fix missing class from graal-sdk in CI"
jponge Oct 19, 2023
02a427e
Don't do native tests in CI, it somehow doesn't work
jponge Oct 19, 2023
bb22659
First batch of Franz-ification
jponge Oct 19, 2023
594c645
Remove SuppressWarnings annotation
jponge Oct 23, 2023
53d7c2c
Perform strict bound checks inside operators rather than using queue.…
jponge Oct 23, 2023
994e55b
Use consistent parameter names
jponge Oct 24, 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
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>
</dependency>

<dependency>
<groupId>io.reactivex.rxjava3</groupId>
Expand Down
45 changes: 44 additions & 1 deletion implementation/revapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,50 @@
"criticality" : "highlight",
"minSeverity" : "POTENTIALLY_BREAKING",
"minCriticality" : "documented",
"differences" : [ ]
"differences" : [
{
"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
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

This file was deleted.

Loading
Loading