This is an automated email from the ASF dual-hosted git repository.
schofielaj 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 861eeb859db KAFKA-19295: Remove AsyncKafkaConsumer event ID generation
(#19915)
861eeb859db is described below
commit 861eeb859db08b1472fb437606b815f544607e84
Author: Kirk True <[email protected]>
AuthorDate: Sat Jun 7 05:08:22 2025 -0700
KAFKA-19295: Remove AsyncKafkaConsumer event ID generation (#19915)
Remove the event IDs from the ApplicationEvent and BackgroundEvent as it
serves no functional purpose other than uniquely identifying events in
the logs.
Reviewers: Andrew Schofield <[email protected]>
---
.../internals/events/ApplicationEvent.java | 27 +---------------------
.../consumer/internals/events/BackgroundEvent.java | 27 +---------------------
2 files changed, 2 insertions(+), 52 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEvent.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEvent.java
index 18b4ea17144..f3f0e161015 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEvent.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEvent.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.consumer.internals.events;
import org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumer;
import org.apache.kafka.clients.consumer.internals.ShareConsumerImpl;
-import org.apache.kafka.common.Uuid;
import java.util.Objects;
@@ -48,12 +47,6 @@ public abstract class ApplicationEvent {
private final Type type;
- /**
- * This identifies a particular event. It is used to disambiguate events
via {@link #hashCode()} and
- * {@link #equals(Object)} and can be used in log messages when debugging.
- */
- private final Uuid id;
-
/**
* The time in milliseconds when this event was enqueued.
* This field can be changed after the event is created, so it should not
be used in hashCode or equals.
@@ -62,17 +55,12 @@ public abstract class ApplicationEvent {
protected ApplicationEvent(Type type) {
this.type = Objects.requireNonNull(type);
- this.id = Uuid.randomUuid();
}
public Type type() {
return type;
}
- public Uuid id() {
- return id;
- }
-
public void setEnqueuedMs(long enqueuedMs) {
this.enqueuedMs = enqueuedMs;
}
@@ -81,21 +69,8 @@ public abstract class ApplicationEvent {
return enqueuedMs;
}
- @Override
- public final boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- ApplicationEvent that = (ApplicationEvent) o;
- return type == that.type && id.equals(that.id);
- }
-
- @Override
- public final int hashCode() {
- return Objects.hash(type, id);
- }
-
protected String toStringBase() {
- return "type=" + type + ", id=" + id + ", enqueuedMs=" + enqueuedMs;
+ return "type=" + type + ", enqueuedMs=" + enqueuedMs;
}
@Override
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/BackgroundEvent.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/BackgroundEvent.java
index b2f8a3666c4..6fa737c7278 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/BackgroundEvent.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/BackgroundEvent.java
@@ -17,7 +17,6 @@
package org.apache.kafka.clients.consumer.internals.events;
import org.apache.kafka.clients.consumer.internals.ConsumerNetworkThread;
-import org.apache.kafka.common.Uuid;
import java.util.Objects;
@@ -37,12 +36,6 @@ public abstract class BackgroundEvent {
private final Type type;
- /**
- * This identifies a particular event. It is used to disambiguate events
via {@link #hashCode()} and
- * {@link #equals(Object)} and can be used in log messages when debugging.
- */
- private final Uuid id;
-
/**
* The time in milliseconds when this event was enqueued.
* This field can be changed after the event is created, so it should not
be used in hashCode or equals.
@@ -51,17 +44,12 @@ public abstract class BackgroundEvent {
protected BackgroundEvent(Type type) {
this.type = Objects.requireNonNull(type);
- this.id = Uuid.randomUuid();
}
public Type type() {
return type;
}
- public Uuid id() {
- return id;
- }
-
public void setEnqueuedMs(long enqueuedMs) {
this.enqueuedMs = enqueuedMs;
}
@@ -70,21 +58,8 @@ public abstract class BackgroundEvent {
return enqueuedMs;
}
- @Override
- public final boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- BackgroundEvent that = (BackgroundEvent) o;
- return type == that.type && id.equals(that.id);
- }
-
- @Override
- public final int hashCode() {
- return Objects.hash(type, id);
- }
-
protected String toStringBase() {
- return "type=" + type + ", id=" + id + ", enqueuedMs=" + enqueuedMs;
+ return "type=" + type + ", enqueuedMs=" + enqueuedMs;
}
@Override
