Skip to content

Fix PollLoop threading, add documentation, and split functionality in smaller methods #158

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

Merged
merged 5 commits into from
Oct 14, 2023
Merged

Fix PollLoop threading, add documentation, and split functionality in smaller methods #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
641e8c9
Fix threading, document methods, split some methods, add consumerthre…
nomisRev Oct 12, 2023
ca9c185
Further hygiene, split up in methods, rename variables and add docume…
nomisRev Oct 12, 2023
e342c4e
Small optimisation, and improve tests
nomisRev Oct 12, 2023
fb8bc53
Merge remote-tracking branch 'origin/main' into hygiene-receiver
nomisRev Oct 13, 2023
f2f53f8
Rename consumer test package to receiver
nomisRev Oct 13, 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
15 changes: 8 additions & 7 deletions src/main/kotlin/io/github/nomisRev/kafka/receiver/KafkaReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ private class DefaultKafkaReceiver<K, V>(private val settings: ReceiverSettings<
@OptIn(ExperimentalCoroutinesApi::class)
override fun receive(topicNames: Collection<String>): Flow<ReceiverRecord<K, V>> =
scopedConsumer(settings.groupId) { scope, dispatcher, consumer ->
val loop = PollLoop(topicNames, settings, consumer, scope)
loop.receive().flowOn(dispatcher)
val loop = PollLoop(topicNames, settings, consumer, scope, currentCoroutineContext())
loop.receive()
.flatMapConcat { records ->
records.map { record ->
ReceiverRecord(record, loop.toCommittableOffset(record))
Expand All @@ -54,8 +54,8 @@ private class DefaultKafkaReceiver<K, V>(private val settings: ReceiverSettings<

override fun receiveAutoAck(topicNames: Collection<String>): Flow<Flow<ConsumerRecord<K, V>>> =
scopedConsumer(settings.groupId) { scope, dispatcher, consumer ->
val loop = PollLoop(topicNames, settings, consumer, scope)
loop.receive().flowOn(dispatcher).map { records ->
val loop = PollLoop(topicNames, settings, consumer, scope, currentCoroutineContext())
loop.receive().map { records ->
records.asFlow()
.onCompletion { records.forEach { loop.toCommittableOffset(it).acknowledge() } }
}
Expand Down Expand Up @@ -84,14 +84,15 @@ private class DefaultKafkaReceiver<K, V>(private val settings: ReceiverSettings<
@OptIn(ExperimentalCoroutinesApi::class)
fun <A> scopedConsumer(
groupId: String,
block: (CoroutineScope, ExecutorCoroutineDispatcher, KafkaConsumer<K, V>) -> Flow<A>
block: suspend (CoroutineScope, ExecutorCoroutineDispatcher, KafkaConsumer<K, V>) -> Flow<A>
): Flow<A> = flow {
kafkaConsumerDispatcher(groupId).use { dispatcher: ExecutorCoroutineDispatcher ->
val job = Job()
val scope = CoroutineScope(job + dispatcher + defaultCoroutineExceptionHandler)
try {
KafkaConsumer(settings.toProperties(), settings.keyDeserializer, settings.valueDeserializer)
.use { emit(block(scope, dispatcher, it)) }
withContext(dispatcher) {
KafkaConsumer(settings.toProperties(), settings.keyDeserializer, settings.valueDeserializer)
}.use { emit(block(scope, dispatcher, it)) }
} finally {
job.cancelAndJoin()
}
Expand Down
Loading