mimaison commented on code in PR #13760: URL: https://github.com/apache/kafka/pull/13760#discussion_r1222667563
########## clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java: ########## @@ -0,0 +1,170 @@ +/* + * 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.clients.admin.internals; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.kafka.clients.admin.DeletedRecords; +import org.apache.kafka.clients.admin.RecordsToDelete; +import org.apache.kafka.clients.admin.internals.AdminApiFuture.SimpleAdminApiFuture; +import org.apache.kafka.clients.admin.internals.AdminApiHandler.Batched; +import org.apache.kafka.common.Node; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.errors.ApiException; +import org.apache.kafka.common.errors.RetriableException; +import org.apache.kafka.common.message.DeleteRecordsRequestData; +import org.apache.kafka.common.message.DeleteRecordsResponseData; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.DeleteRecordsRequest; +import org.apache.kafka.common.requests.DeleteRecordsResponse; +import org.apache.kafka.common.utils.LogContext; +import org.slf4j.Logger; + +public final class DeleteRecordsHandler extends Batched<TopicPartition, DeletedRecords> { + + private final Map<TopicPartition, RecordsToDelete> recordsToDelete; + private final Logger log; + private final AdminApiLookupStrategy<TopicPartition> lookupStrategy; + + public DeleteRecordsHandler( + Map<TopicPartition, RecordsToDelete> recordsToDelete, + LogContext logContext + ) { + this.recordsToDelete = recordsToDelete; + this.log = logContext.logger(DeleteRecordsHandler.class); + this.lookupStrategy = new PartitionLeaderStrategy(logContext); + } + + @Override + public String apiName() { + return "deleteRecords"; + } + + @Override + public AdminApiLookupStrategy<TopicPartition> lookupStrategy() { + return this.lookupStrategy; + } + + public static SimpleAdminApiFuture<TopicPartition, DeletedRecords> newFuture( + Collection<TopicPartition> topicPartitions + ) { + return AdminApiFuture.forKeys(new HashSet<>(topicPartitions)); + } + + @Override + public DeleteRecordsRequest.Builder buildBatchedRequest(int brokerId, Set<TopicPartition> keys) { + Map<String, DeleteRecordsRequestData.DeleteRecordsTopic> deletionsForTopic = new HashMap<>(); + for (Map.Entry<TopicPartition, RecordsToDelete> entry: recordsToDelete.entrySet()) { + TopicPartition topicPartition = entry.getKey(); + DeleteRecordsRequestData.DeleteRecordsTopic deleteRecords = deletionsForTopic.get(topicPartition.topic()); + if (deleteRecords == null) { + deleteRecords = new DeleteRecordsRequestData.DeleteRecordsTopic() + .setName(topicPartition.topic()); + deletionsForTopic.put(topicPartition.topic(), deleteRecords); + } + deleteRecords.partitions().add(new DeleteRecordsRequestData.DeleteRecordsPartition() + .setPartitionIndex(topicPartition.partition()) + .setOffset(entry.getValue().beforeOffset())); + + System.out.println("Partitions: " + deleteRecords.partitions()); Review Comment: Let's remove this debugging statement ########## clients/src/main/java/org/apache/kafka/clients/admin/internals/DeleteRecordsHandler.java: ########## @@ -0,0 +1,170 @@ +/* + * 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.clients.admin.internals; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.kafka.clients.admin.DeletedRecords; +import org.apache.kafka.clients.admin.RecordsToDelete; +import org.apache.kafka.clients.admin.internals.AdminApiFuture.SimpleAdminApiFuture; +import org.apache.kafka.clients.admin.internals.AdminApiHandler.Batched; +import org.apache.kafka.common.Node; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.errors.ApiException; +import org.apache.kafka.common.errors.RetriableException; +import org.apache.kafka.common.message.DeleteRecordsRequestData; +import org.apache.kafka.common.message.DeleteRecordsResponseData; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.DeleteRecordsRequest; +import org.apache.kafka.common.requests.DeleteRecordsResponse; +import org.apache.kafka.common.utils.LogContext; +import org.slf4j.Logger; + +public final class DeleteRecordsHandler extends Batched<TopicPartition, DeletedRecords> { + + private final Map<TopicPartition, RecordsToDelete> recordsToDelete; + private final Logger log; + private final AdminApiLookupStrategy<TopicPartition> lookupStrategy; + + public DeleteRecordsHandler( + Map<TopicPartition, RecordsToDelete> recordsToDelete, + LogContext logContext + ) { + this.recordsToDelete = recordsToDelete; + this.log = logContext.logger(DeleteRecordsHandler.class); + this.lookupStrategy = new PartitionLeaderStrategy(logContext); + } + + @Override + public String apiName() { + return "deleteRecords"; + } + + @Override + public AdminApiLookupStrategy<TopicPartition> lookupStrategy() { + return this.lookupStrategy; + } + + public static SimpleAdminApiFuture<TopicPartition, DeletedRecords> newFuture( + Collection<TopicPartition> topicPartitions + ) { + return AdminApiFuture.forKeys(new HashSet<>(topicPartitions)); + } + + @Override + public DeleteRecordsRequest.Builder buildBatchedRequest(int brokerId, Set<TopicPartition> keys) { + Map<String, DeleteRecordsRequestData.DeleteRecordsTopic> deletionsForTopic = new HashMap<>(); + for (Map.Entry<TopicPartition, RecordsToDelete> entry: recordsToDelete.entrySet()) { + TopicPartition topicPartition = entry.getKey(); + DeleteRecordsRequestData.DeleteRecordsTopic deleteRecords = deletionsForTopic.get(topicPartition.topic()); + if (deleteRecords == null) { + deleteRecords = new DeleteRecordsRequestData.DeleteRecordsTopic() + .setName(topicPartition.topic()); + deletionsForTopic.put(topicPartition.topic(), deleteRecords); + } Review Comment: Nothing wrong with your logic but we could use `computeIfAbsent` here ```suggestion DeleteRecordsRequestData.DeleteRecordsTopic deleteRecords = deletionsForTopic.computeIfAbsent( topicPartition.topic(), key -> new DeleteRecordsRequestData.DeleteRecordsTopic().setName(topicPartition.topic()) ); ``` -- 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
