This is an automated email from the ASF dual-hosted git repository. dajac pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push: new f6912a9a6af MINOR: Fix typo in DumpLogSegments' TransactionLogMessageParser (#18505) f6912a9a6af is described below commit f6912a9a6aff8c4f02b466b26ebdfa6f0162380a Author: David Jacot <david.ja...@gmail.com> AuthorDate: Tue Jan 14 08:10:10 2025 +0100 MINOR: Fix typo in DumpLogSegments' TransactionLogMessageParser (#18505) The value should use `version` instead of `type`. Reviewers: Jeff Kim <jeff....@confluent.io>, Chia-Ping Tsai <chia7...@gmail.com> --- core/src/main/scala/kafka/tools/DumpLogSegments.scala | 2 +- core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/kafka/tools/DumpLogSegments.scala b/core/src/main/scala/kafka/tools/DumpLogSegments.scala index f48a6162a29..7b7b765c930 100755 --- a/core/src/main/scala/kafka/tools/DumpLogSegments.scala +++ b/core/src/main/scala/kafka/tools/DumpLogSegments.scala @@ -548,7 +548,7 @@ object DumpLogSegments { } val json = new ObjectNode(JsonNodeFactory.instance) - json.set("type", new TextNode(version.toString)) + json.set("version", new TextNode(version.toString)) json.set("data", messageAsJson) json.toString } diff --git a/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala b/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala index 2dc463428ef..4557fce99eb 100644 --- a/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala +++ b/core/src/test/scala/unit/kafka/tools/DumpLogSegmentsTest.scala @@ -858,7 +858,7 @@ class DumpLogSegmentsTest { assertEquals( ( Some("{\"type\":\"0\",\"data\":{\"transactionalId\":\"txnId\"}}"), - Some("{\"type\":\"0\",\"data\":{\"producerId\":123,\"producerEpoch\":0,\"transactionTimeoutMs\":0," + + Some("{\"version\":\"0\",\"data\":{\"producerId\":123,\"producerEpoch\":0,\"transactionTimeoutMs\":0," + "\"transactionStatus\":0,\"transactionPartitions\":[],\"transactionLastUpdateTimestampMs\":0," + "\"transactionStartTimestampMs\":0}}") ), @@ -915,7 +915,7 @@ class DumpLogSegmentsTest { assertEquals( ( Some("{\"type\":\"0\",\"data\":{\"transactionalId\":\"txnId\"}}"), - Some("{\"type\":\"1\",\"data\":{\"producerId\":12,\"previousProducerId\":11,\"nextProducerId\":10," + + Some("{\"version\":\"1\",\"data\":{\"producerId\":12,\"previousProducerId\":11,\"nextProducerId\":10," + "\"producerEpoch\":2,\"transactionTimeoutMs\":14,\"transactionStatus\":0," + "\"transactionPartitions\":[{\"topic\":\"topic1\",\"partitionIds\":[0,1,2]}," + "{\"topic\":\"topic2\",\"partitionIds\":[3,4,5]}],\"transactionLastUpdateTimestampMs\":123," +