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 00f712abb18 KAFKA-20266 Finish rename of TargetAssignmentEpoch record
methods (#21697)
00f712abb18 is described below
commit 00f712abb18bb411015ac70d74c7b4e25a1f195b
Author: Sean Quah <[email protected]>
AuthorDate: Tue Mar 10 17:18:15 2026 +0000
KAFKA-20266 Finish rename of TargetAssignmentEpoch record methods (#21697)
Rename
new{Consumer,Share,Streams}GroupTargetAssignmentEpoch(Tombstone)Record
methods to
new{Consumer,Share,Streams}GroupTargetAssignmentMetadata(Tombstone)Record.
These were missed in the previous change.
Reviewers: Chia-Ping Tsai <[email protected]>
---
.../group/GroupCoordinatorRecordHelpers.java | 4 +--
.../group/modern/consumer/ConsumerGroup.java | 4 +--
.../coordinator/group/modern/share/ShareGroup.java | 2 +-
.../streams/StreamsCoordinatorRecordHelpers.java | 2 +-
.../coordinator/group/streams/StreamsGroup.java | 2 +-
.../group/GroupCoordinatorRecordHelpersTest.java | 8 ++---
.../group/GroupMetadataManagerTest.java | 38 +++++++++++-----------
.../group/modern/consumer/ConsumerGroupTest.java | 4 +--
.../StreamsCoordinatorRecordHelpersTest.java | 12 +++----
9 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpers.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpers.java
index 8cdfc83ff1a..b73749ba45f 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpers.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpers.java
@@ -263,7 +263,7 @@ public class GroupCoordinatorRecordHelpers {
* @param groupId The consumer group id.
* @return The record.
*/
- public static CoordinatorRecord
newConsumerGroupTargetAssignmentEpochTombstoneRecord(
+ public static CoordinatorRecord
newConsumerGroupTargetAssignmentMetadataTombstoneRecord(
String groupId
) {
return CoordinatorRecord.tombstone(
@@ -694,7 +694,7 @@ public class GroupCoordinatorRecordHelpers {
* @param groupId The group id.
* @return The record.
*/
- public static CoordinatorRecord
newShareGroupTargetAssignmentEpochTombstoneRecord(
+ public static CoordinatorRecord
newShareGroupTargetAssignmentMetadataTombstoneRecord(
String groupId
) {
return CoordinatorRecord.tombstone(
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java
index 8664591f5ff..c869477190d 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroup.java
@@ -740,7 +740,7 @@ public class ConsumerGroup extends
ModernGroup<ConsumerGroupMember> {
members.keySet().forEach(memberId ->
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId))
);
-
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId));
+
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId));
members.keySet().forEach(memberId ->
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId))
@@ -777,7 +777,7 @@ public class ConsumerGroup extends
ModernGroup<ConsumerGroupMember> {
String removedMemberId = memberId.equals(leavingMemberId) ?
joiningMemberId : memberId;
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
removedMemberId));
});
-
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId));
+
records.add(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId));
members.keySet().forEach(memberId -> {
String removedMemberId = memberId.equals(leavingMemberId) ?
joiningMemberId : memberId;
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/share/ShareGroup.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/share/ShareGroup.java
index 4d8be291743..290bbbdc416 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/share/ShareGroup.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/modern/share/ShareGroup.java
@@ -265,7 +265,7 @@ public class ShareGroup extends
ModernGroup<ShareGroupMember> {
members().forEach((memberId, member) ->
records.add(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentTombstoneRecord(groupId(),
memberId))
);
-
records.add(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentEpochTombstoneRecord(groupId()));
+
records.add(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentMetadataTombstoneRecord(groupId()));
members().forEach((memberId, member) ->
records.add(GroupCoordinatorRecordHelpers.newShareGroupMemberSubscriptionTombstoneRecord(groupId(),
memberId))
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpers.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpers.java
index 1cac2849d8e..4f75de8137f 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpers.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpers.java
@@ -248,7 +248,7 @@ public class StreamsCoordinatorRecordHelpers {
* @param groupId The streams group id.
* @return The record.
*/
- public static CoordinatorRecord
newStreamsGroupTargetAssignmentEpochTombstoneRecord(
+ public static CoordinatorRecord
newStreamsGroupTargetAssignmentMetadataTombstoneRecord(
String groupId
) {
Objects.requireNonNull(groupId, "groupId should not be null here");
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java
index 2e62f306749..f0d07611f86 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java
@@ -836,7 +836,7 @@ public class StreamsGroup implements Group {
members().forEach((memberId, member) ->
records.add(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentTombstoneRecord(groupId(),
memberId))
);
-
records.add(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord(groupId()));
+
records.add(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord(groupId()));
members().forEach((memberId, member) ->
records.add(StreamsCoordinatorRecordHelpers.newStreamsGroupMemberTombstoneRecord(groupId(),
memberId))
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java
index 9ce8bad9755..dc8f643fed3 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorRecordHelpersTest.java
@@ -80,8 +80,8 @@ import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.n
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupSubscriptionMetadataTombstoneRecord;
-import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataRecord;
+import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord;
import static
org.apache.kafka.coordinator.group.GroupCoordinatorRecordHelpers.newShareGroupEpochRecord;
@@ -308,7 +308,7 @@ public class GroupCoordinatorRecordHelpersTest {
}
@Test
- public void testNewConsumerGroupTargetAssignmentEpochRecord() {
+ public void testNewConsumerGroupTargetAssignmentMetadataRecord() {
CoordinatorRecord expectedRecord = CoordinatorRecord.record(
new ConsumerGroupTargetAssignmentMetadataKey()
.setGroupId("group-id"),
@@ -328,13 +328,13 @@ public class GroupCoordinatorRecordHelpersTest {
}
@Test
- public void testNewConsumerGroupTargetAssignmentEpochTombstoneRecord() {
+ public void testNewConsumerGroupTargetAssignmentMetadataTombstoneRecord() {
CoordinatorRecord expectedRecord = CoordinatorRecord.tombstone(
new ConsumerGroupTargetAssignmentMetadataKey()
.setGroupId("group-id")
);
- assertEquals(expectedRecord,
newConsumerGroupTargetAssignmentEpochTombstoneRecord(
+ assertEquals(expectedRecord,
newConsumerGroupTargetAssignmentMetadataTombstoneRecord(
"group-id"
));
}
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
index 0f3536ad588..154808578c2 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupMetadataManagerTest.java
@@ -11233,7 +11233,7 @@ public class GroupMetadataManagerTest {
.build();
List<CoordinatorRecord> expectedRecords = List.of(
-
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId),
+
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newConsumerGroupSubscriptionMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newConsumerGroupEpochTombstoneRecord(groupId)
);
@@ -11287,7 +11287,7 @@ public class GroupMetadataManagerTest {
List<CoordinatorRecord> expectedRecords = List.of(
StreamsCoordinatorRecordHelpers.newStreamsGroupCurrentAssignmentTombstoneRecord(groupId,
memberId),
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentTombstoneRecord(groupId,
memberId),
-
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord(groupId),
+
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord(groupId),
StreamsCoordinatorRecordHelpers.newStreamsGroupMemberTombstoneRecord(groupId,
memberId),
StreamsCoordinatorRecordHelpers.newStreamsGroupEpochTombstoneRecord(groupId),
StreamsCoordinatorRecordHelpers.newStreamsGroupTopologyRecordTombstone(groupId)
@@ -11303,7 +11303,7 @@ public class GroupMetadataManagerTest {
.build();
List<CoordinatorRecord> expectedRecords = List.of(
-
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId),
+
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newConsumerGroupSubscriptionMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newConsumerGroupEpochTombstoneRecord(groupId)
);
@@ -11467,7 +11467,7 @@ public class GroupMetadataManagerTest {
GroupMetadataManagerTestContext.JoinResult joinResult =
context.sendClassicGroupJoin(request, true);
List<CoordinatorRecord> expectedRecords = List.of(
-
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(consumerGroupId),
+
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(consumerGroupId),
GroupCoordinatorRecordHelpers.newConsumerGroupSubscriptionMetadataTombstoneRecord(consumerGroupId),
GroupCoordinatorRecordHelpers.newConsumerGroupEpochTombstoneRecord(consumerGroupId)
);
@@ -12891,7 +12891,7 @@ public class GroupMetadataManagerTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId2)
),
-
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId)),
+
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId)),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId2)
@@ -13075,7 +13075,7 @@ public class GroupMetadataManagerTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId2)
),
-
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId)),
+
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId)),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId2)
@@ -13277,7 +13277,7 @@ public class GroupMetadataManagerTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId2)
),
-
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId)),
+
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId)),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId2)
@@ -13533,7 +13533,7 @@ public class GroupMetadataManagerTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
newMemberId2)
),
-
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId)),
+
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId)),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
newMemberId2)
@@ -16465,7 +16465,7 @@ public class GroupMetadataManagerTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId3),
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord(groupId,
memberId4)
),
-
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord(groupId)),
+
List.of(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord(groupId)),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId1),
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord(groupId,
memberId2),
@@ -17073,7 +17073,7 @@ public class GroupMetadataManagerTest {
.build();
List<CoordinatorRecord> expectedRecords = List.of(
-
GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentEpochTombstoneRecord(groupId),
+
GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newShareGroupStatePartitionMetadataTombstoneRecord(groupId),
GroupCoordinatorRecordHelpers.newShareGroupEpochTombstoneRecord(groupId)
);
@@ -20558,7 +20558,7 @@ public class GroupMetadataManagerTest {
GroupMetadataManagerTestContext.JoinResult joinResult =
context.sendClassicGroupJoin(request, true);
List<CoordinatorRecord> expectedRecords = List.of(
-
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord(streamsGroupId),
+
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord(streamsGroupId),
StreamsCoordinatorRecordHelpers.newStreamsGroupEpochTombstoneRecord(streamsGroupId),
StreamsCoordinatorRecordHelpers.newStreamsGroupTopologyRecordTombstone(streamsGroupId)
);
@@ -21048,7 +21048,7 @@ public class GroupMetadataManagerTest {
// The group may not exist at all. Replaying the
ConsumerGroupTargetAssignmentMetadata tombstone
// should be a no-op.
-
context.replay(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertThrows(GroupIdNotFoundException.class, () ->
context.groupMetadataManager.consumerGroup("foo"));
}
@@ -21063,7 +21063,7 @@ public class GroupMetadataManagerTest {
assertEquals(12345L,
context.groupMetadataManager.consumerGroup("foo").assignmentTimestamp());
// Replay the tombstone. It should reset both the epoch and the
timestamp.
-
context.replay(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertEquals(-1,
context.groupMetadataManager.consumerGroup("foo").assignmentEpoch());
assertEquals(0L,
context.groupMetadataManager.consumerGroup("foo").assignmentTimestamp());
}
@@ -21122,7 +21122,7 @@ public class GroupMetadataManagerTest {
// The group may not exist at all. Replaying the
ShareGroupTargetAssignmentMetadata tombstone
// should be a no-op.
-
context.replay(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertThrows(GroupIdNotFoundException.class, () ->
context.groupMetadataManager.shareGroup("foo"));
}
@@ -21137,7 +21137,7 @@ public class GroupMetadataManagerTest {
assertEquals(12345L,
context.groupMetadataManager.shareGroup("foo").assignmentTimestamp());
// Replay the tombstone. It should reset both the epoch and the
timestamp.
-
context.replay(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(GroupCoordinatorRecordHelpers.newShareGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertEquals(-1,
context.groupMetadataManager.shareGroup("foo").assignmentEpoch());
assertEquals(0L,
context.groupMetadataManager.shareGroup("foo").assignmentTimestamp());
}
@@ -21303,7 +21303,7 @@ public class GroupMetadataManagerTest {
assertEquals("Received a tombstone record to delete group foo but did
not receive StreamsGroupTargetAssignmentMetadataValue tombstone.",
e2.getMessage());
-
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord("foo"));
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupEpochTombstoneRecord("foo"));
@@ -21380,7 +21380,7 @@ public class GroupMetadataManagerTest {
// The group may not exist at all. Replaying the
StreamsGroupTargetAssignmentMetadata tombstone
// should be a no-op.
-
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertThrows(GroupIdNotFoundException.class, () ->
context.groupMetadataManager.streamsGroup("foo"));
}
@@ -21407,14 +21407,14 @@ public class GroupMetadataManagerTest {
IllegalStateException e = assertThrows(
IllegalStateException.class,
- () ->
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord("foo"))
+ () ->
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord("foo"))
);
assertEquals("Received a tombstone record to delete target assignment
of foo but the assignment still has 1 members.",
e.getMessage());
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentTombstoneRecord("foo",
"m1"));
-
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord("foo"));
+
context.replay(StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord("foo"));
assertEquals(-1,
context.groupMetadataManager.streamsGroup("foo").assignmentEpoch());
assertEquals(0L,
context.groupMetadataManager.streamsGroup("foo").assignmentTimestamp());
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java
index 54867e21a23..825211d72fa 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/modern/consumer/ConsumerGroupTest.java
@@ -1810,7 +1810,7 @@ public class ConsumerGroupTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord("foo",
"member3")
),
List.of(
-
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord("foo")
+
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord("foo")
),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord("foo",
"member1"),
@@ -1898,7 +1898,7 @@ public class ConsumerGroupTest {
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentTombstoneRecord("foo",
"member4")
),
List.of(
-
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentEpochTombstoneRecord("foo")
+
GroupCoordinatorRecordHelpers.newConsumerGroupTargetAssignmentMetadataTombstoneRecord("foo")
),
List.of(
GroupCoordinatorRecordHelpers.newConsumerGroupMemberSubscriptionTombstoneRecord("foo",
"member1"),
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpersTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpersTest.java
index bf5b1403e87..f3d2ec8203f 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpersTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/StreamsCoordinatorRecordHelpersTest.java
@@ -375,7 +375,7 @@ class StreamsCoordinatorRecordHelpersTest {
}
@Test
- public void testNewStreamsGroupTargetAssignmentEpochRecord() {
+ public void testNewStreamsGroupTargetAssignmentMetadataRecord() {
CoordinatorRecord expectedRecord = CoordinatorRecord.record(
new StreamsGroupTargetAssignmentMetadataKey()
.setGroupId(GROUP_ID),
@@ -391,13 +391,13 @@ class StreamsCoordinatorRecordHelpersTest {
}
@Test
- public void testNewStreamsGroupTargetAssignmentEpochTombstoneRecord() {
+ public void testNewStreamsGroupTargetAssignmentMetadataTombstoneRecord() {
CoordinatorRecord expectedRecord = CoordinatorRecord.tombstone(
new StreamsGroupTargetAssignmentMetadataKey()
.setGroupId(GROUP_ID)
);
- assertEquals(expectedRecord,
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord(GROUP_ID));
+ assertEquals(expectedRecord,
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord(GROUP_ID));
}
@Test
@@ -736,16 +736,16 @@ class StreamsCoordinatorRecordHelpersTest {
}
@Test
- public void testNewStreamsGroupTargetAssignmentEpochRecordNullGroupId() {
+ public void testNewStreamsGroupTargetAssignmentMetadataRecordNullGroupId()
{
NullPointerException exception =
assertThrows(NullPointerException.class, () ->
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataRecord(null,
1, 12345L));
assertEquals("groupId should not be null here",
exception.getMessage());
}
@Test
- public void
testNewStreamsGroupTargetAssignmentEpochTombstoneRecordNullGroupId() {
+ public void
testNewStreamsGroupTargetAssignmentMetadataTombstoneRecordNullGroupId() {
NullPointerException exception =
assertThrows(NullPointerException.class, () ->
-
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentEpochTombstoneRecord(null));
+
StreamsCoordinatorRecordHelpers.newStreamsGroupTargetAssignmentMetadataTombstoneRecord(null));
assertEquals("groupId should not be null here",
exception.getMessage());
}
