dajac commented on code in PR #13637: URL: https://github.com/apache/kafka/pull/13637#discussion_r1180608354
########## group-coordinator/src/test/java/org/apache/kafka/coordinator/group/consumer/TargetAssignmentBuilderTest.java: ########## @@ -0,0 +1,698 @@ +/* + * 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.consumer; + +import org.apache.kafka.common.Uuid; +import org.apache.kafka.coordinator.group.assignor.AssignmentMemberSpec; +import org.apache.kafka.coordinator.group.assignor.AssignmentSpec; +import org.apache.kafka.coordinator.group.assignor.AssignmentTopicMetadata; +import org.apache.kafka.coordinator.group.assignor.GroupAssignment; +import org.apache.kafka.coordinator.group.assignor.MemberAssignment; +import org.apache.kafka.coordinator.group.assignor.PartitionAssignor; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkAssignment; +import static org.apache.kafka.coordinator.group.consumer.AssignmentTestUtil.mkTopicAssignment; +import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentEpochRecord; +import static org.apache.kafka.coordinator.group.RecordHelpers.newTargetAssignmentRecord; +import static org.apache.kafka.coordinator.group.consumer.TargetAssignmentBuilder.createAssignmentMemberSpec; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class TargetAssignmentBuilderTest { + + public static class TargetAssignmentBuilderTestContext { + private final String groupId; + private final int groupEpoch; + private final PartitionAssignor assignor = mock(PartitionAssignor.class); + private final Map<String, ConsumerGroupMember> members = new HashMap<>(); + private final Map<String, TopicMetadata> subscriptionMetadata = new HashMap<>(); + private final Map<String, ConsumerGroupMember> updatedMembers = new HashMap<>(); + private final Map<String, Assignment> targetAssignments = new HashMap<>(); + private final Map<String, MemberAssignment> assignments = new HashMap<>(); + + public TargetAssignmentBuilderTestContext( + String groupId, + int groupEpoch + ) { + this.groupId = groupId; + this.groupEpoch = groupEpoch; + } + + public void addGroupMember( + String memberId, + List<String> subscriptions, + Map<Uuid, Set<Integer>> targetPartitions + ) { + members.put(memberId, new ConsumerGroupMember.Builder(memberId) + .setSubscribedTopicNames(subscriptions) + .setRebalanceTimeoutMs(5000) + .build()); + + targetAssignments.put(memberId, new Assignment( + (byte) 0, + targetPartitions, + VersionedMetadata.EMPTY + )); + } + + public Uuid addTopicMetadata( + String topicName, + int numPartitions + ) { + Uuid topicId = Uuid.randomUuid(); + subscriptionMetadata.put(topicName, new TopicMetadata( + topicId, + topicName, + numPartitions + )); + return topicId; + } + + public void updateMemberSubscription( + String memberId, + List<String> subscriptions + ) { + updateMemberSubscription( + memberId, + subscriptions, + Optional.empty(), + Optional.empty() + ); + } + + public void updateMemberSubscription( + String memberId, + List<String> subscriptions, + Optional<String> instanceId, + Optional<String> rackId + ) { + ConsumerGroupMember existingMember = members.get(memberId); + ConsumerGroupMember.Builder builder; + if (existingMember != null) { + builder = new ConsumerGroupMember.Builder(existingMember); + } else { + builder = new ConsumerGroupMember.Builder(memberId); + } + updatedMembers.put(memberId, builder + .setSubscribedTopicNames(subscriptions) + .maybeUpdateInstanceId(instanceId) + .maybeUpdateRackId(rackId) + .build()); + } + + public void removeMemberSubscription( + String memberId + ) { + this.updatedMembers.put(memberId, null); + } + + public void prepareMemberAssignment( + String memberId, + Map<Uuid, Set<Integer>> assignment + ) { + assignments.put(memberId, new MemberAssignment(assignment)); + } + + public TargetAssignmentBuilder.TargetAssignmentResult build() { + // Prepare expected member specs. + Map<String, AssignmentMemberSpec> memberSpecs = new HashMap<>(); + + // All the existing members are prepared. + members.forEach((memberId, member) -> { + memberSpecs.put(memberId, createAssignmentMemberSpec( + member, + targetAssignments.getOrDefault(memberId, Assignment.EMPTY), + subscriptionMetadata + )); + }); + + // All the updated are added and all the deleted + // members are removed. + updatedMembers.forEach((memberId, updatedMemberOrNull) -> { + if (updatedMemberOrNull == null) { + memberSpecs.remove(memberId); + } else { + memberSpecs.put(memberId, createAssignmentMemberSpec( + updatedMemberOrNull, + targetAssignments.getOrDefault(memberId, Assignment.EMPTY), + subscriptionMetadata + )); + } + }); + + // Prepare the expected topic metadata. + Map<Uuid, AssignmentTopicMetadata> topicMetadata = new HashMap<>(); + subscriptionMetadata.forEach((topicName, metadata) -> { + topicMetadata.put(metadata.id(), new AssignmentTopicMetadata(metadata.numPartitions())); + }); + + // Prepare the expected assignment spec. + AssignmentSpec assignmentSpec = new AssignmentSpec( + memberSpecs, + topicMetadata + ); + + // We use `any` here to always return an assignment but use `verify` later on + // to ensure that the input was correct. + when(assignor.assign(any())).thenReturn(new GroupAssignment(assignments)); + + // Create and populate the assignment builder. + TargetAssignmentBuilder builder = new TargetAssignmentBuilder(groupId, groupEpoch, assignor) + .withMembers(members) + .withSubscriptionMetadata(subscriptionMetadata) + .withTargetAssignments(targetAssignments); + + // Add the updated members or delete the deleted members. + updatedMembers.forEach((memberId, updatedMemberOrNull) -> { + if (updatedMemberOrNull != null) { + builder.addOrUpdateMember(memberId, updatedMemberOrNull); + } else { + builder.removeMember(memberId); + } + }); + + // Execute the builder. + TargetAssignmentBuilder.TargetAssignmentResult result = builder.build(); + + // Verify that the assignor was called once with the expected + // assignment spec. + verify(assignor, times(1)).assign(assignmentSpec); + + return result; + } + } + + @Test + public void testCreateAssignmentMemberSpec() { + Uuid fooTopicId = Uuid.randomUuid(); + Uuid barTopicId = Uuid.randomUuid(); + + ConsumerGroupMember member = new ConsumerGroupMember.Builder("member-id") + .setSubscribedTopicNames(Arrays.asList("foo", "bar", "zar")) Review Comment: Correct. You can see at L245 that the assignor only gets the ids of foo and bar because zar does not exist. -- 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
