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

chore: Avoid forwarding method on ArrayDequeue in stream module. #1687

Merged
merged 1 commit into from
Jan 6, 2025
Merged

chore: Avoid forwarding method on ArrayDequeue in stream module. #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import pekko.stream.stage._
private val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max
require(maxBuffer > 0, "Buffer size must be greater than 0")

private val buffer: util.Deque[In] = new util.ArrayDeque[In]()
private val buffer: util.ArrayDeque[In] = new util.ArrayDeque[In]()
private var acknowledgementReceived = false
private var completeReceived = false
private var completionSignalled = false
Expand Down Expand Up @@ -75,7 +75,7 @@ import pekko.stream.stage._
}

private def dequeueAndSend(): Unit = {
ref ! messageAdapter(self)(buffer.poll())
ref ! messageAdapter(self)(buffer.pollFirst())
}

private def finish(): Unit = {
Expand All @@ -85,7 +85,7 @@ import pekko.stream.stage._
}

def onPush(): Unit = {
buffer.offer(grab(in))
buffer.offerLast(grab(in))
if (acknowledgementReceived) {
dequeueAndSend()
acknowledgementReceived = false
Expand Down
2 changes: 1 addition & 1 deletion stream/src/main/scala/org/apache/pekko/stream/impl/PhasedFusingActorMaterializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ private final case class SavedIslandData(
if (Debug) println(s"PUSH: $matValue => $matValueStack")

case Concat(first, next) =>
if (next ne EmptyTraversal) traversalStack.add(next)
if (next ne EmptyTraversal) traversalStack.addLast(next)
nextStep = first
case Pop =>
val popped = matValueStack.removeLast()
Expand Down
4 changes: 2 additions & 2 deletions stream/src/main/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ import org.reactivestreams.Subscription
else if (currentLimit == 0) {
self ! Resume
} else {
shortCircuitBuffer.poll() match {
shortCircuitBuffer.pollFirst() match {
case b: BoundaryEvent => processEvent(b)
case Resume => finishShellRegistration()
case unexpected =>
Expand Down Expand Up @@ -845,7 +845,7 @@ import org.reactivestreams.Subscription
override def postStop(): Unit = {
if (shortCircuitBuffer ne null) {
while (!shortCircuitBuffer.isEmpty) {
shortCircuitBuffer.poll() match {
shortCircuitBuffer.pollFirst() match {
case b: BoundaryEvent =>
// signal to telemetry that this event won't be processed
b.cancel()
Expand Down
Loading