Skip to content

Commit 82d0c12

Browse files
authored
MINOR: Add topicId parameter to OffsetAndMetadata.fromRequest for TxnOffsetCommit (#22159)
This patch adds a `topicId` parameter to the `TxnOffsetCommitRequestPartition` overload of `OffsetAndMetadata.fromRequest`, mirroring the existing `OffsetCommitRequestPartition` overload. The single caller in `OffsetMetadataManager.commitTransactionalOffset` passes `Uuid.ZERO_UUID` to preserve the current behavior. The `testFromTransactionalRequest` test is converted to a parameterized test that covers both `Uuid.ZERO_UUID` and a random topic ID. Reviewers: Andrew Schofield <aschofield@confluent.io>
1 parent 7340eef commit 82d0c12

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetAndMetadata.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public static OffsetAndMetadata fromRequest(
190190
* @return An OffsetAndMetadata created from an OffsetCommitRequestPartition request.
191191
*/
192192
public static OffsetAndMetadata fromRequest(
193+
Uuid topicId,
193194
TxnOffsetCommitRequestData.TxnOffsetCommitRequestPartition partition,
194195
long currentTimeMs
195196
) {
@@ -200,7 +201,7 @@ public static OffsetAndMetadata fromRequest(
200201
OffsetAndMetadata.NO_METADATA : partition.committedMetadata(),
201202
currentTimeMs,
202203
OptionalLong.empty(),
203-
Uuid.ZERO_UUID
204+
topicId
204205
);
205206
}
206207
}

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/OffsetMetadataManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ public CoordinatorResult<TxnOffsetCommitResponseData, CoordinatorRecord> commitT
737737
.setErrorCode(Errors.NONE.code()));
738738

739739
final OffsetAndMetadata offsetAndMetadata = OffsetAndMetadata.fromRequest(
740+
Uuid.ZERO_UUID,
740741
partition,
741742
currentTimeMs
742743
);

group-coordinator/src/test/java/org/apache/kafka/coordinator/group/OffsetAndMetadataTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ public void testFromRequest(Uuid uuid) {
161161
);
162162
}
163163

164-
@Test
165-
public void testFromTransactionalRequest() {
164+
@ParameterizedTest
165+
@MethodSource("uuids")
166+
public void testFromTransactionalRequest(Uuid uuid) {
166167
MockTime time = new MockTime();
167168

168169
TxnOffsetCommitRequestData.TxnOffsetCommitRequestPartition partition =
@@ -179,8 +180,9 @@ public void testFromTransactionalRequest() {
179180
"",
180181
time.milliseconds(),
181182
OptionalLong.empty(),
182-
Uuid.ZERO_UUID
183+
uuid
183184
), OffsetAndMetadata.fromRequest(
185+
uuid,
184186
partition,
185187
time.milliseconds()
186188
)
@@ -197,8 +199,9 @@ public void testFromTransactionalRequest() {
197199
"hello",
198200
time.milliseconds(),
199201
OptionalLong.empty(),
200-
Uuid.ZERO_UUID
202+
uuid
201203
), OffsetAndMetadata.fromRequest(
204+
uuid,
202205
partition,
203206
time.milliseconds()
204207
)

0 commit comments

Comments
 (0)