m1a2st commented on code in PR #20064: URL: https://github.com/apache/kafka/pull/20064#discussion_r2173729240
########## tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommand.java: ########## @@ -631,7 +635,34 @@ else if (logEndOffsetResult.getValue() instanceof OffsetsUtils.Ignore) return null; throw new IllegalStateException("Unknown LogOffset subclass: " + logEndOffsetResult.getValue()); - }).collect(Collectors.toList()); + }).toList(); + + // prepare data for partitions without leaders + List<PartitionAssignmentState> noneLeaderAssignments = nonLeaderTopicPartitions.stream() + .map(tp -> getDescribePartitionResult.apply(tp, Optional.empty())).toList(); + + // concat the data and then sort them + return Stream.concat(existLeaderAssignments.stream(), noneLeaderAssignments.stream()) + .sorted(Comparator.<PartitionAssignmentState, String>comparing( + state -> state.topic.orElse(""), String::compareTo) + .thenComparingInt(state -> state.partition.orElse(-1))) + .collect(Collectors.toList()); + } + + private Set<TopicPartition> filterNoneLeaderPartitions(List<TopicPartition> topicPartitions) { + // collect all topics + Set<String> topics = topicPartitions.stream().map(TopicPartition::topic).collect(Collectors.toSet()); Review Comment: Since we still need to map to TopicPartition::topic, the current approach is acceptable. -- 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