KAFKA-20297: Cleanup org.apache.kafka.common.utils.CollectionUtils#21818
Open
unknowntpo wants to merge 4 commits intoapache:trunkfrom
Open
KAFKA-20297: Cleanup org.apache.kafka.common.utils.CollectionUtils#21818unknowntpo wants to merge 4 commits intoapache:trunkfrom
org.apache.kafka.common.utils.CollectionUtils#21818unknowntpo wants to merge 4 commits intoapache:trunkfrom
Conversation
Member
|
@unknowntpo would you mind rebasing code? |
unknowntpo
force-pushed
the
cleanup-common-utils-20297
branch
from
7e2ef79 to
10b13ba
Compare
Contributor
Author
Ok, rebased. |
…from CollectionUtils Replace all callers with idiomatic alternatives: - DescribeProducersHandler: add mapKey:true to DescribeProducersRequest.json and use find() on TopicRequestCollection - ListOffsetsHandler: use HashMap+computeIfAbsent Also fix Scala test callers affected by the DescribeProducersRequest mapKey change.
Inline subtractMap as a private helper in OAuthBearerExtensionsValidatorCallback, then delete the now-empty CollectionUtils class and its test.
…ethod Extract repeated stream-based grouping logic into a private groupPartitionsByTopic helper in StickyAssignor and AbstractStickyAssignorTest.
unknowntpo
force-pushed
the
cleanup-common-utils-20297
branch
from
82b9572 to
4aea5f0
Compare
Contributor
Author
|
and ci errors are fixed. |
chia7712
reviewed
Mar 21, 2026
| return new MemberData(partitions, generation); | ||
| } | ||
|
|
||
| private static Map<String, List<Integer>> groupPartitionsByTopic(Collection<TopicPartition> partitions) { |
| @@ -90,6 +89,12 @@ public Map<String, String> ignoredExtensions() { | |||
| return Collections.unmodifiableMap(subtractMap(subtractMap(inputExtensions.map(), invalidExtensions), validatedExtensions)); | |||
Member
There was a problem hiding this comment.
The original logic will create map repeatedly. Could you use for-loop to streamline it?
public Map<String, String> ignoredExtensions() {
Map<String, String> ignored = new HashMap<>();
for (Map.Entry<String, String> entry : inputExtensions.map().entrySet()) {
String key = entry.getKey();
if (!invalidExtensions.containsKey(key) && !validatedExtensions.containsKey(key)) {
ignored.put(key, entry.getValue());
}
}
return Collections.unmodifiableMap(ignored);
}
Contributor
Author
There was a problem hiding this comment.
I thought the subtractMap is more Functional Programming style, more declarative, and this path is unlikely a hot path, which is not suitable for repeating memory allocation, but your approach is okay for me, I'll change it.
| return new DescribeProducersResponse(response); | ||
| } | ||
|
|
||
| private static Map<String, Map<Integer, PartitionResponse>> groupPartitionDataByTopic( |
Member
There was a problem hiding this comment.
we don't use such complex structure in tests actually. Maybe we could use describeProducersResponse(TopicPartition partition, PartitionResponse partitionResponse) instead
|
|
||
| Map<String, List<Integer>> map = CollectionUtils.groupPartitionsByTopic(partitions); | ||
| Map<String, List<Integer>> otherMap = CollectionUtils.groupPartitionsByTopic(otherPartitions); | ||
| Map<String, List<Integer>> map = groupPartitionsByTopic(partitions); |
Member
There was a problem hiding this comment.
we could streamline the test.
Set<String> otherTopics = otherPartitions.stream()
.map(TopicPartition::topic)
.collect(Collectors.toSet());
for (TopicPartition tp : partitions) {
assertFalse(otherTopics.contains(tp.topic()),
"Error: Some partitions can be moved...");
}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR removes
CollectionUtilsentirely (KAFKA-20297) by replacingall usages with alternatives.