This is an automated email from the ASF dual-hosted git repository.
dajac 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 bcfc9543d14 MINOR: Move TopicIdPartition class to server-common
(#14418)
bcfc9543d14 is described below
commit bcfc9543d141db9cf5b40f54dc971d7812f94319
Author: Ritika Reddy <[email protected]>
AuthorDate: Thu Sep 28 13:55:44 2023 -0700
MINOR: Move TopicIdPartition class to server-common (#14418)
This patch moves the TopicIdPartition from the metadata module to the
server-common module so it can be used by the group-coordinator module as well.
Reviewers: Sagar Rao <[email protected]>, David Jacot
<[email protected]>
---
.../java/org/apache/kafka/controller/BrokersToIsrs.java | 1 +
.../kafka/controller/ReplicationControlManager.java | 1 +
.../org/apache/kafka/controller/BrokersToIsrsTest.java | 1 +
.../apache/kafka/controller/QuorumControllerTest.java | 1 +
.../kafka/controller/ReplicationControlManagerTest.java | 1 +
.../apache/kafka/server/common}/TopicIdPartition.java | 17 +++++++++++++----
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git
a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java
b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java
index 5f72a109736..2ffd0744cfb 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java
@@ -18,6 +18,7 @@
package org.apache.kafka.controller;
import org.apache.kafka.common.Uuid;
+import org.apache.kafka.server.common.TopicIdPartition;
import org.apache.kafka.metadata.Replicas;
import org.apache.kafka.timeline.SnapshotRegistry;
import org.apache.kafka.timeline.TimelineHashMap;
diff --git
a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
index 8e6e4a20d22..7c6b6717773 100644
---
a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
+++
b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
@@ -91,6 +91,7 @@ import org.apache.kafka.metadata.placement.PlacementSpec;
import org.apache.kafka.metadata.placement.TopicAssignment;
import org.apache.kafka.metadata.placement.UsableBroker;
import org.apache.kafka.server.common.ApiMessageAndVersion;
+import org.apache.kafka.server.common.TopicIdPartition;
import org.apache.kafka.server.mutable.BoundedList;
import org.apache.kafka.server.policy.CreateTopicPolicy;
import org.apache.kafka.timeline.SnapshotRegistry;
diff --git
a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java
b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java
index 1258c9d5a2e..a92960fd3c5 100644
--- a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java
+++ b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java
@@ -19,6 +19,7 @@ package org.apache.kafka.controller;
import org.apache.kafka.common.Uuid;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.server.common.TopicIdPartition;
import org.apache.kafka.controller.BrokersToIsrs.PartitionsOnReplicaIterator;
import org.apache.kafka.timeline.SnapshotRegistry;
import org.junit.jupiter.api.Test;
diff --git
a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
index 61d43381068..3447cd45020 100644
---
a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
+++
b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
@@ -128,6 +128,7 @@ import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.OffsetAndEpoch;
import org.apache.kafka.server.common.ApiMessageAndVersion;
import org.apache.kafka.server.common.MetadataVersion;
+import org.apache.kafka.server.common.TopicIdPartition;
import org.apache.kafka.server.fault.FaultHandlerException;
import org.apache.kafka.snapshot.FileRawSnapshotReader;
import org.apache.kafka.snapshot.Snapshots;
diff --git
a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java
b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java
index 1cd2a2d4258..7973bb1c4a9 100644
---
a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java
+++
b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java
@@ -85,6 +85,7 @@ import
org.apache.kafka.metadata.placement.StripedReplicaPlacer;
import org.apache.kafka.metadata.placement.UsableBroker;
import org.apache.kafka.server.common.ApiMessageAndVersion;
import org.apache.kafka.server.common.MetadataVersion;
+import org.apache.kafka.server.common.TopicIdPartition;
import org.apache.kafka.server.policy.CreateTopicPolicy;
import org.apache.kafka.server.util.MockRandom;
import org.apache.kafka.timeline.SnapshotRegistry;
diff --git
a/metadata/src/main/java/org/apache/kafka/controller/TopicIdPartition.java
b/server-common/src/main/java/org/apache/kafka/server/common/TopicIdPartition.java
similarity index 81%
rename from
metadata/src/main/java/org/apache/kafka/controller/TopicIdPartition.java
rename to
server-common/src/main/java/org/apache/kafka/server/common/TopicIdPartition.java
index b594c4a4ec3..532798921a9 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/TopicIdPartition.java
+++
b/server-common/src/main/java/org/apache/kafka/server/common/TopicIdPartition.java
@@ -14,25 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.kafka.server.common;
-package org.apache.kafka.controller;
+import org.apache.kafka.common.Uuid;
import java.util.Objects;
-import org.apache.kafka.common.Uuid;
-final class TopicIdPartition {
+/**
+ * Represents a partition using its unique topic Id and partition number.
+ */
+public final class TopicIdPartition {
private final Uuid topicId;
private final int partitionId;
- TopicIdPartition(Uuid topicId, int partitionId) {
+ public TopicIdPartition(Uuid topicId, int partitionId) {
this.topicId = topicId;
this.partitionId = partitionId;
}
+ /**
+ * @return Universally unique Id representing this topic partition.
+ */
public Uuid topicId() {
return topicId;
}
+ /**
+ * @return The partition Id.
+ */
public int partitionId() {
return partitionId;
}
