(kafka) branch trunk updated: KAFKA-18234 DumpLogSegments cannot print ConsumerGroupRegularExpression record (#18173)

[chia7712]

This is an automated email from the ASF dual-hosted git repository.

chia7712 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 fef625cfa20 KAFKA-18234 DumpLogSegments cannot print 
ConsumerGroupRegularExpression record (#18173)
fef625cfa20 is described below

commit fef625cfa2080633fbfa582afa657ed6a3bea832
Author: Kuan-Po Tseng <brandb...@gmail.com>
AuthorDate: Sun Dec 15 06:02:02 2024 +0800

    KAFKA-18234 DumpLogSegments cannot print ConsumerGroupRegularExpression 
record (#18173)
    
    Reviewers: Chia-Ping Tsai <chia7...@gmail.com>
---
 core/src/main/scala/kafka/tools/DumpLogSegments.scala               | 6 +++++-
 .../apache/kafka/coordinator/group/GroupCoordinatorRecordSerde.java | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/scala/kafka/tools/DumpLogSegments.scala 
b/core/src/main/scala/kafka/tools/DumpLogSegments.scala
index 2b846b4c136..da5565b87d4 100755
--- a/core/src/main/scala/kafka/tools/DumpLogSegments.scala
+++ b/core/src/main/scala/kafka/tools/DumpLogSegments.scala
@@ -37,7 +37,7 @@ import 
org.apache.kafka.common.metadata.{MetadataJsonConverters, MetadataRecordT
 import org.apache.kafka.common.protocol.{ByteBufferAccessor, Message}
 import org.apache.kafka.common.record._
 import org.apache.kafka.common.utils.Utils
-import 
org.apache.kafka.coordinator.group.generated.{ConsumerGroupCurrentMemberAssignmentKey,
 ConsumerGroupCurrentMemberAssignmentKeyJsonConverter, 
ConsumerGroupCurrentMemberAssignmentValue, 
ConsumerGroupCurrentMemberAssignmentValueJsonConverter, 
ConsumerGroupMemberMetadataKey, ConsumerGroupMemberMetadataKeyJsonConverter, 
ConsumerGroupMemberMetadataValue, 
ConsumerGroupMemberMetadataValueJsonConverter, ConsumerGroupMetadataKey, 
ConsumerGroupMetadataKeyJsonConverter, ConsumerGroupMetadataV [...]
+import 
org.apache.kafka.coordinator.group.generated.{ConsumerGroupCurrentMemberAssignmentKey,
 ConsumerGroupCurrentMemberAssignmentKeyJsonConverter, 
ConsumerGroupCurrentMemberAssignmentValue, 
ConsumerGroupCurrentMemberAssignmentValueJsonConverter, 
ConsumerGroupMemberMetadataKey, ConsumerGroupMemberMetadataKeyJsonConverter, 
ConsumerGroupMemberMetadataValue, 
ConsumerGroupMemberMetadataValueJsonConverter, ConsumerGroupMetadataKey, 
ConsumerGroupMetadataKeyJsonConverter, ConsumerGroupMetadataV [...]
 import 
org.apache.kafka.coordinator.common.runtime.CoordinatorLoader.UnknownRecordTypeException
 import org.apache.kafka.coordinator.group.GroupCoordinatorRecordSerde
 import org.apache.kafka.coordinator.share.ShareCoordinatorRecordSerde
@@ -440,6 +440,8 @@ object DumpLogSegments {
           ConsumerGroupTargetAssignmentMemberKeyJsonConverter.write(m, version)
         case m: ConsumerGroupCurrentMemberAssignmentKey =>
           ConsumerGroupCurrentMemberAssignmentKeyJsonConverter.write(m, 
version)
+        case m: ConsumerGroupRegularExpressionKey =>
+          ConsumerGroupRegularExpressionKeyJsonConverter.write(m, version)
         case m: ShareGroupMetadataKey =>
           ShareGroupMetadataKeyJsonConverter.write(m, version)
         case m: ShareGroupPartitionMetadataKey =>
@@ -534,6 +536,8 @@ object DumpLogSegments {
           ConsumerGroupTargetAssignmentMemberValueJsonConverter.write(m, 
version)
         case m: ConsumerGroupCurrentMemberAssignmentValue =>
           ConsumerGroupCurrentMemberAssignmentValueJsonConverter.write(m, 
version)
+        case m: ConsumerGroupRegularExpressionValue =>
+          ConsumerGroupRegularExpressionValueJsonConverter.write(m, version)
         case m: ShareGroupMetadataValue =>
           ShareGroupMetadataValueJsonConverter.write(m, version)
         case m: ShareGroupPartitionMetadataValue =>
diff --git 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordSerde.java
 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordSerde.java
index c23ff9c9ec3..38abc233f5d 100644
--- 
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordSerde.java
+++ 
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordSerde.java
@@ -52,6 +52,9 @@ import 
org.apache.kafka.coordinator.group.generated.ShareGroupTargetAssignmentMe
 import 
org.apache.kafka.coordinator.group.generated.ShareGroupTargetAssignmentMetadataKey;
 import 
org.apache.kafka.coordinator.group.generated.ShareGroupTargetAssignmentMetadataValue;
 
+/**
+ * Please ensure any new record added here stays in sync with DumpLogSegments.
+ */
 public class GroupCoordinatorRecordSerde extends CoordinatorRecordSerde {
     @Override
     protected ApiMessage apiMessageKeyFor(short recordVersion) {