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

Remove buffered records #744

Merged
merged 4 commits into from
Mar 25, 2023
Merged

Remove buffered records #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
136b8b1
Remove buffered records
erikvanoosten Mar 25, 2023
6874327
Fix for scala 3
erikvanoosten Mar 25, 2023
9aefac7
Restore diagnostics
erikvanoosten Mar 25, 2023
4517fd5
Inline code (review feedback)
erikvanoosten Mar 25, 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: 2 additions & 2 deletions zio-kafka/src/main/scala/zio/kafka/consumer/internal/ConsumerAccess.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ private[consumer] class ConsumerAccess(
access: Semaphore
) {
def withConsumer[A](f: ByteArrayKafkaConsumer => A): Task[A] =
withConsumerM[Any, A](c => ZIO.attempt(f(c)))
withConsumerZIO[Any, A](c => ZIO.attempt(f(c)))

def withConsumerM[R, A](f: ByteArrayKafkaConsumer => RIO[R, A]): RIO[R, A] =
def withConsumerZIO[R, A](f: ByteArrayKafkaConsumer => RIO[R, A]): RIO[R, A] =
access.withPermit(withConsumerNoPermit(f))

private[consumer] def withConsumerNoPermit[R, A](
Expand Down
16 changes: 4 additions & 12 deletions zio-kafka/src/main/scala/zio/kafka/consumer/internal/PartitionStreamControl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ private[internal] class PartitionStreamControl private (
LogAnnotation("partition", tp.partition().toString)
)

/** Offer new data for the stream to process. */
def offerRecords(data: Chunk[ByteArrayCommittableRecord]): ZIO[Any, Nothing, Unit] =
dataQueue.offer(Take.chunk(data)).unit

/** To be invoked when the partition was lost. */
def lost(): UIO[Boolean] =
interruptPromise.fail(new RuntimeException(s"Partition ${tp.toString} was lost"))
Expand All @@ -31,18 +35,6 @@ private[internal] class PartitionStreamControl private (
dataQueue.offer(Take.end).unit
}

/** To be invoked when the partition was revoked or otherwise needs to be ended, after the last data is processed. */
def endWith(data: Chunk[ByteArrayCommittableRecord]): ZIO[Any, Nothing, Unit] =
logAnnotate {
ZIO.logTrace(s"Partition ${tp.toString} ending after ${data.size} records") *> {
if (data.isEmpty) {
dataQueue.offer(Take.end).unit
} else {
dataQueue.offerAll(List(Take.chunk(data), Take.end)).unit
}
}
}

/** Returns true when the stream is done. */
def isCompleted: ZIO[Any, Nothing, Boolean] =
completedPromise.isDone
Expand Down
Loading