Skip to content

MINOR: Remove unused isSticky assert out from tests only do constrainedAssign #8788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guozhangwang merged 3 commits into from
Jun 8, 2020
Merged

MINOR: Remove unused isSticky assert out from tests only do constrainedAssign #8788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e331d04
remove unused isSticky assert out from tests only do constrainedAssign
showuon Jun 3, 2020
a33e85a
Merge branch 'trunk' of https://github.com/apache/kafka into cleanupU…
showuon Jun 8, 2020
5230ffd
refactor
showuon Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nts/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public MemberData(List<TopicPartition> partitions, Optional<Integer> generation)
@Override
public Map<String, List<TopicPartition>> assign(Map<String, Integer> partitionsPerTopic,
Map<String, Subscription> subscriptions) {
partitionMovements = new PartitionMovements();
Map<String, List<TopicPartition>> consumerToOwnedPartitions = new HashMap<>();
if (allSubscriptionsEqual(partitionsPerTopic.keySet(), subscriptions, consumerToOwnedPartitions)) {
log.debug("Detected that all consumers were subscribed to same set of topics, invoking the "
Expand Down Expand Up @@ -273,6 +272,7 @@ private Map<String, List<TopicPartition>> generalAssign(Map<String, Integer> par
Map<String, Subscription> subscriptions) {
Map<String, List<TopicPartition>> currentAssignment = new HashMap<>();
Map<TopicPartition, ConsumerGenerationPair> prevAssignment = new HashMap<>();
partitionMovements = new PartitionMovements();

prepopulateCurrentAssignments(subscriptions, currentAssignment, prevAssignment);

Expand Down
6 changes: 0 additions & 6 deletions clients/src/test/java/org/apache/kafka/clients/consumer/StickyAssignorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ public void testAssignmentWithMultipleGenerations1() {
assertTrue(r2partitions2.containsAll(r1partitions2));
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
assertFalse(Collections.disjoint(r2partitions2, r1partitions3));

subscriptions.remove(consumer1);
Expand All @@ -97,7 +96,6 @@ public void testAssignmentWithMultipleGenerations1() {
assertTrue(Collections.disjoint(r3partitions2, r3partitions3));
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
}

@Test
Expand Down Expand Up @@ -130,7 +128,6 @@ public void testAssignmentWithMultipleGenerations2() {
assertTrue(r2partitions2.containsAll(r1partitions2));
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());

subscriptions.put(consumer1, buildSubscriptionWithGeneration(topics(topic), r1partitions1, 1));
subscriptions.put(consumer2, buildSubscriptionWithGeneration(topics(topic), r2partitions2, 2));
Expand All @@ -146,7 +143,6 @@ public void testAssignmentWithMultipleGenerations2() {
assertEquals(r1partitions3, r3partitions3);
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
}

@Test
Expand Down Expand Up @@ -185,7 +181,6 @@ public void testAssignmentWithConflictingPreviousGenerations() {
assertTrue(c3partitions0.containsAll(c3partitions));
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
}

@Test
Expand Down Expand Up @@ -218,7 +213,6 @@ public void testSchemaBackwardCompatibility() {
assertTrue(c2partitions0.containsAll(c2partitions));
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
}

private Subscription buildSubscriptionWithGeneration(List<String> topics, List<TopicPartition> partitions, int generation) {
Expand Down
7 changes: 0 additions & 7 deletions ...src/test/java/org/apache/kafka/clients/consumer/internals/AbstractStickyAssignorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ public void testAddRemoveConsumerOneTopic() {
assertEquals(partitions(tp(topic, 0), tp(topic, 1)), assignment.get(consumer1));
assertEquals(partitions(tp(topic, 2)), assignment.get(consumer2));
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());

subscriptions.remove(consumer1);
subscriptions.put(consumer2, buildSubscription(topics(topic), assignment.get(consumer2)));
Expand All @@ -254,7 +253,6 @@ public void testAddRemoveConsumerOneTopic() {

verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(isFullyBalanced(assignment));
assertTrue(assignor.isSticky());
}

/**
Expand Down Expand Up @@ -330,7 +328,6 @@ public void testAddRemoveTopicTwoConsumers() {
assertTrue(consumer1assignment.size() == 3 && consumer2assignment.size() == 3);
assertTrue(consumer1assignment.containsAll(consumer1Assignment1));
assertTrue(consumer2assignment.containsAll(consumer2Assignment1));
assertTrue(assignor.isSticky());

partitionsPerTopic.remove(topic);
subscriptions.put(consumer1, buildSubscription(topics(topic2), assignment.get(consumer1)));
Expand All @@ -347,7 +344,6 @@ public void testAddRemoveTopicTwoConsumers() {
(consumer1Assignment3.size() == 2 && consumer2Assignment3.size() == 1));
assertTrue(consumer1assignment.containsAll(consumer1Assignment3));
assertTrue(consumer2assignment.containsAll(consumer2Assignment3));
assertTrue(assignor.isSticky());
}


Expand Down Expand Up @@ -397,7 +393,6 @@ public void testReassignmentAfterOneConsumerAdded() {

assignment = assignor.assign(partitionsPerTopic, subscriptions);
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(assignor.isSticky());
}

@Test
Expand Down Expand Up @@ -425,7 +420,6 @@ public void testSameSubscriptions() {

assignment = assignor.assign(partitionsPerTopic, subscriptions);
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(assignor.isSticky());
}

@Test(timeout = 30 * 1000)
Expand Down Expand Up @@ -575,7 +569,6 @@ public void testStickiness() {

assignment = assignor.assign(partitionsPerTopic, subscriptions);
verifyValidityAndBalance(subscriptions, assignment, partitionsPerTopic);
assertTrue(assignor.isSticky());

assignments = assignment.entrySet();
for (Map.Entry<String, List<TopicPartition>> entry: assignments) {
Expand Down