From f4ee917fda2f8168e1b3f5a65fecccca3cc57471 Mon Sep 17 00:00:00 2001 From: Sanskar Jhajharia Date: Tue, 19 Aug 2025 18:19:05 +0530 Subject: [PATCH 1/3] Cleanups in jmh-benchmarks module --- .../StreamsStickyAssignorBenchmark.java | 5 ++--- .../jmh/core/TestPurgatoryPerformance.java | 19 ++----------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/StreamsStickyAssignorBenchmark.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/StreamsStickyAssignorBenchmark.java index 3293c0223f2a5..22863fef5fa2e 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/StreamsStickyAssignorBenchmark.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/assignor/StreamsStickyAssignorBenchmark.java @@ -44,7 +44,6 @@ import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -107,7 +106,7 @@ public void setup() { taskAssignor = new StickyTaskAssignor(); Map members = createMembers(); - this.assignmentConfigs = Collections.singletonMap( + this.assignmentConfigs = Map.of( "num.standby.replicas", Integer.toString(standbyReplicas) ); @@ -138,7 +137,7 @@ private void simulateIncrementalRebalance() { for (Map.Entry member : groupSpec.members().entrySet()) { MemberAssignment memberAssignment = members.getOrDefault( member.getKey(), - new MemberAssignment(Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap()) + new MemberAssignment(Map.of(), Map.of(), Map.of()) ); updatedMemberSpec.put(member.getKey(), new AssignmentMemberSpec( diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java index 68f3a52918c5f..a19a64e09563c 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java @@ -405,12 +405,7 @@ public void shutdown() throws InterruptedException { } - private static class Scheduled implements Delayed { - final FakeOperation operation; - - public Scheduled(FakeOperation operation) { - this.operation = operation; - } + private record Scheduled(FakeOperation operation) implements Delayed { @Override public long getDelay(TimeUnit unit) { @@ -429,12 +424,7 @@ else if (operation.completesAt > other.operation.completesAt) } } - private static class FakeOperationKey implements DelayedOperationKey { - private final String key; - - public FakeOperationKey(String key) { - this.key = key; - } + private record FakeOperationKey(String key) implements DelayedOperationKey { @Override public String keyLabel() { @@ -448,11 +438,6 @@ public boolean equals(Object o) { FakeOperationKey that = (FakeOperationKey) o; return Objects.equals(key, that.key); } - - @Override - public int hashCode() { - return Objects.hash(key); - } } private static class FakeOperation extends DelayedOperation { From b86c67f56002b6c8954f766901ca6643ec614002 Mon Sep 17 00:00:00 2001 From: Sanskar Jhajharia Date: Wed, 20 Aug 2025 10:19:44 +0530 Subject: [PATCH 2/3] fix --- .../kafka/jmh/core/TestPurgatoryPerformance.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java index a19a64e09563c..3c87ba47db3d7 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java @@ -425,19 +425,10 @@ else if (operation.completesAt > other.operation.completesAt) } private record FakeOperationKey(String key) implements DelayedOperationKey { - @Override public String keyLabel() { return key; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - FakeOperationKey that = (FakeOperationKey) o; - return Objects.equals(key, that.key); - } } private static class FakeOperation extends DelayedOperation { @@ -454,7 +445,6 @@ public FakeOperation(long delayMs, long latencyMs, CountDownLatch latch) { @Override public void onExpiration() { - } @Override From 9c9ae17272717dd477f0a9f7aa994df0cba8b08b Mon Sep 17 00:00:00 2001 From: Sanskar Jhajharia Date: Wed, 20 Aug 2025 10:23:56 +0530 Subject: [PATCH 3/3] fix --- .../java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java index 3c87ba47db3d7..e0fd3d8c8d4c5 100644 --- a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java +++ b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/core/TestPurgatoryPerformance.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.Random; import java.util.concurrent.CountDownLatch;