dajac commented on code in PR #13524:
URL: https://github.com/apache/kafka/pull/13524#discussion_r1162846084
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/assignor/AssignmentMemberSpec.java:
##########
@@ -37,29 +39,30 @@ public class AssignmentMemberSpec {
final Optional<String> rackId;
/**
- * The topics that the member is subscribed to.
+ * The topicIds of topics that the member is subscribed to.
*/
- final Collection<String> subscribedTopics;
+ final Collection<Uuid> subscribedTopics;
/**
- * The current target partitions of the member.
+ * Partitions assigned for this member grouped by topicId
*/
- final Collection<TopicPartition> targetPartitions;
+ final Map<Uuid, Set<Integer>> currentAssignmentTopicIdPartitions;
Review Comment:
nit: `assignment` or `assignedPartitions`? Using `current` is not really
appropriate here because this field is filled in with the last computed target
assignment.
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/assignor/MemberAssignment.java:
##########
@@ -16,25 +16,28 @@
*/
package org.apache.kafka.coordinator.group.assignor;
-import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.Uuid;
-import java.util.Collection;
+import java.util.Map;
import java.util.Objects;
+import java.util.Set;
/**
* The partition assignment for a consumer group member.
*/
public class MemberAssignment {
/**
- * The target partitions assigned to this member.
+ * The target partitions assigned to this member grouped by topicId.
*/
- final Collection<TopicPartition> targetPartitions;
+ private final Map<Uuid, Set<Integer>> topicIdPartitionsMap;
Review Comment:
nit: `assignedPartitions` or `assignment`?
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/assignor/AssignmentMemberSpec.java:
##########
@@ -89,7 +92,7 @@ public String toString() {
return "AssignmentMemberSpec(instanceId=" + instanceId +
", rackId=" + rackId +
", subscribedTopics=" + subscribedTopics +
- ", targetPartitions=" + targetPartitions +
+ ", targetPartitions=" + currentAssignmentTopicIdPartitions +
Review Comment:
nit: We need to update the string as well.
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/assignor/AssignmentMemberSpec.java:
##########
@@ -37,29 +39,30 @@ public class AssignmentMemberSpec {
final Optional<String> rackId;
/**
- * The topics that the member is subscribed to.
+ * The topicIds of topics that the member is subscribed to.
Review Comment:
nit: `The topic ids that the member is subscribed to.`?
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/assignor/MemberAssignment.java:
##########
@@ -44,16 +47,16 @@ public boolean equals(Object o) {
MemberAssignment that = (MemberAssignment) o;
- return targetPartitions.equals(that.targetPartitions);
+ return topicIdPartitionsMap.equals(that.topicIdPartitionsMap);
}
@Override
public int hashCode() {
- return targetPartitions.hashCode();
+ return topicIdPartitionsMap.hashCode();
}
@Override
public String toString() {
- return "MemberAssignment(targetPartitions=" + targetPartitions + ')';
+ return "MemberAssignment ( Assignment per topic Id = " +
topicIdPartitionsMap + ')';
Review Comment:
nit: We always use the name of the variable as string, followed by `=`, and
the value. In this case, `topicIdPartitionsMap= + topicIdPartitionsMap`.
Moreover, we don't put spaces before/after the `(`.
##########
group-coordinator/src/main/java/org/apache/kafka/coordinator/group/common/TopicIdToPartition.java:
##########
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.coordinator.group.common;
+
+import org.apache.kafka.common.Uuid;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public class TopicIdToPartition {
Review Comment:
Is it used in the interface? If not, let's remove it from this PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
