Offset batch: remove intermediary structure #870
Merged
+17
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2m
approved these changes
Aug 23, 2019
| @@ -180,7 +180,7 @@ private[kafka] final class CommittableOffsetBatchImpl( | |||
| } | |||
|
|
|||
| val newOffsets = | |||
| offsetsAndMetadata.updated(key, new OffsetAndMetadata(committableOffset.partitionOffset.offset, metadata)) | |||
| offsetsAndMetadata.updated(key, new OffsetAndMetadata(committableOffset.partitionOffset.offset + 1L, metadata)) | |||
There was a problem hiding this comment.
I do not see immediately, why the change in offset increment and decrement above.
There was a problem hiding this comment.
The OffsetAndMetadata is now passed through as-is. Before it was constructed, decomposed and constructed again with the + 1.
ennru
commented
Aug 23, 2019
| private def commit(offsets: immutable.Seq[PartitionOffsetMetadata]): Future[Done] = { | ||
| val offsetsMap: Map[TopicPartition, OffsetAndMetadata] = offsets.map { offset => | ||
| new TopicPartition(offset.key.topic, offset.key.partition) -> | ||
| new OffsetAndMetadata(offset.offset + 1, offset.metadata) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Convert the
Map[GroupTopicPartition, OffsetAndMetadata]directly into aMap[TopicPartition, OffsetAndMetadata]to be sent to the consumer actor.Changes
offset + 1is appliedtoStringback to just show the offsetsBackground Context
Before sending offsets in
KafkaAsyncConsumerCommitterRefthe map was first transformed to aSeq[PartitionOffsetMetadata](unpacking theOffsetWithMetaData) and than back to aMap[TopicPartition, OffsetAndMetadata]in thecommitmethod.By mapping directly less intermediary objects are created. The
OffsetAndMetadatacan be kept, but theoffset + 1needed to be applied when building the batch inCommittableOffsetBatchImplinstead. The publicoffsetsmethod compensates for that.