Skip to content

KAFKA-9405: Use Map API computeIfAbsent Where Applicable #7937

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
ijuma merged 2 commits into from
Jan 29, 2020
Merged

KAFKA-9405: Use Map API computeIfAbsent Where Applicable #7937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f863f6f
KAFKA-9405: Use Map API computeIfAbsent Where Applicable
belugabehr Jan 12, 2020
180a740
Fix checkstyle issues
belugabehr Jan 13, 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
12 changes: 5 additions & 7 deletions clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,10 +2242,9 @@ public DescribeReplicaLogDirsResult describeReplicaLogDirs(Collection<TopicParti

Map<Integer, Set<TopicPartition>> partitionsByBroker = new HashMap<>();

for (TopicPartitionReplica replica: replicas) {
if (!partitionsByBroker.containsKey(replica.brokerId()))
partitionsByBroker.put(replica.brokerId(), new HashSet<>());
partitionsByBroker.get(replica.brokerId()).add(new TopicPartition(replica.topic(), replica.partition()));
for (TopicPartitionReplica replica : replicas) {
partitionsByBroker.computeIfAbsent(replica.brokerId(), key -> new HashSet<>())
.add(new TopicPartition(replica.topic(), replica.partition()));
}

final long now = time.milliseconds();
Expand Down Expand Up @@ -2414,9 +2413,8 @@ void handleResponse(AbstractResponse abstractResponse) {
} else {
Node node = cluster.leaderFor(entry.getKey());
if (node != null) {
if (!leaders.containsKey(node))
leaders.put(node, new HashMap<>());
leaders.get(node).put(entry.getKey(), entry.getValue().beforeOffset());
leaders.computeIfAbsent(node, key -> new HashMap<>()).put(entry.getKey(),
entry.getValue().beforeOffset());
} else {
future.completeExceptionally(Errors.LEADER_NOT_AVAILABLE.exception());
}
Expand Down
14 changes: 2 additions & 12 deletions ...t/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/ConnectProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,21 +387,11 @@ protected Map<String, Collection<Integer>> asMap() {
// Using LinkedHashMap preserves the ordering, which is helpful for tests and debugging
Map<String, Collection<Integer>> taskMap = new LinkedHashMap<>();
for (String connectorId : new HashSet<>(connectorIds)) {
Collection<Integer> connectorTasks = taskMap.get(connectorId);
if (connectorTasks == null) {
connectorTasks = new ArrayList<>();
taskMap.put(connectorId, connectorTasks);
}
connectorTasks.add(CONNECTOR_TASK);
taskMap.computeIfAbsent(connectorId, key -> new ArrayList<>()).add(CONNECTOR_TASK);
}
for (ConnectorTaskId taskId : taskIds) {
String connectorId = taskId.connector();
Collection<Integer> connectorTasks = taskMap.get(connectorId);
if (connectorTasks == null) {
connectorTasks = new ArrayList<>();
taskMap.put(connectorId, connectorTasks);
}
connectorTasks.add(taskId.task());
taskMap.computeIfAbsent(connectorId, key -> new ArrayList<>()).add(taskId.task());
}
return taskMap;
}
Expand Down