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 4c479d8da05..5ef33035e57 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 @@ -62,7 +62,6 @@ import org.junit.jupiter.params.provider.MethodSource; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -898,21 +897,4 @@ public class GroupCoordinatorRecordHelpersTest { 10 )); } - - /** - * Creates a map of partitions to racks for testing. - * - * @param numPartitions The number of partitions for the topic. - * - * For testing purposes, the following criteria are used: - * - Number of replicas for each partition: 2 - * - Number of racks available to the cluster: 4 - */ - public static Map> mkMapOfPartitionRacks(int numPartitions) { - Map> partitionRacks = new HashMap<>(numPartitions); - for (int i = 0; i < numPartitions; i++) { - partitionRacks.put(i, new HashSet<>(Arrays.asList("rack" + i % 4, "rack" + (i + 1) % 4))); - } - return partitionRacks; - } } diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ClientSideAssignorBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ClientSideAssignorBenchmark.java index 4be40e2148c..b12b4e1195f 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ClientSideAssignorBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ClientSideAssignorBenchmark.java @@ -215,7 +215,7 @@ public class ClientSideAssignorBenchmark { for (int i = 0; i < numberOfPartitions; i++) { Node[] replicas = new Node[3]; for (int j = 0; j < 3; j++) { - // Assign nodes based on partition number to mimic mkMapOfPartitionRacks logic. + // Assign nodes based on partition number. int nodeIndex = (i + j) % NUMBER_OF_RACKS; replicas[j] = nodes.get(nodeIndex); } diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ServerSideAssignorBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ServerSideAssignorBenchmark.java index fa232c9427f..af1abfdb68b 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ServerSideAssignorBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/ServerSideAssignorBenchmark.java @@ -48,7 +48,6 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Threads; import org.openjdk.jmh.annotations.Warmup; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -186,18 +185,6 @@ public class ServerSideAssignorBenchmark { return isRackAware ? Optional.of("rack" + memberIndex % NUMBER_OF_RACKS) : Optional.empty(); } - private static Map> mkMapOfPartitionRacks(int numPartitions) { - Map> partitionRacks = new HashMap<>(numPartitions); - for (int i = 0; i < numPartitions; i++) { - partitionRacks.put(i, new HashSet<>(Arrays.asList( - "rack" + i % NUMBER_OF_RACKS, - "rack" + (i + 1) % NUMBER_OF_RACKS, - "rack" + (i + 2) % NUMBER_OF_RACKS - ))); - } - return partitionRacks; - } - private void simulateIncrementalRebalance() { GroupAssignment initialAssignment = partitionAssignor.assign(groupSpec, subscribedTopicDescriber); Map members = initialAssignment.members();