dengziming commented on code in PR #13432: URL: https://github.com/apache/kafka/pull/13432#discussion_r1159516278
########## clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java: ########## @@ -0,0 +1,229 @@ +/* + * 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.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.kafka.clients.admin.ListOffsetsOptions; +import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; +import org.apache.kafka.clients.admin.OffsetSpec; +import org.apache.kafka.clients.admin.OffsetSpec.TimestampSpec; +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.InvalidMetadataException; +import org.apache.kafka.common.errors.RetriableException; +import org.apache.kafka.common.errors.UnsupportedVersionException; +import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsPartition; +import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsTopic; +import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse; +import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsTopicResponse; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.utils.CollectionUtils; +import org.apache.kafka.common.utils.LogContext; +import org.slf4j.Logger; + +public final class ListOffsetsHandler extends Batched<TopicPartition, ListOffsetsResultInfo> { + + private final Map<TopicPartition, OffsetSpec> offsetSpecsByPartition; + private final ListOffsetsOptions options; + private final Logger log; + private final AdminApiLookupStrategy<TopicPartition> lookupStrategy; + + public ListOffsetsHandler( + Map<TopicPartition, OffsetSpec> offsetSpecsByPartition, + ListOffsetsOptions options, + LogContext logContext + ) { + this.offsetSpecsByPartition = offsetSpecsByPartition; + this.options = options; + this.log = logContext.logger(ListOffsetsHandler.class); + this.lookupStrategy = new PartitionLeaderStrategy(logContext); + } + + @Override + public String apiName() { + return "listOffsets"; + } + + @Override + public AdminApiLookupStrategy<TopicPartition> lookupStrategy() { + return this.lookupStrategy; + } + + @Override + ListOffsetsRequest.Builder buildBatchedRequest(int brokerId, Set<TopicPartition> keys) { + Map<String, ListOffsetsTopic> topicsByName = CollectionUtils.groupPartitionsByTopic( + keys, + topicName -> new ListOffsetsTopic().setName(topicName), + (listOffsetsTopic, partitionId) -> { + TopicPartition topicPartition = new TopicPartition(listOffsetsTopic.name(), partitionId); + OffsetSpec offsetSpec = offsetSpecsByPartition.get(topicPartition); + long offsetQuery = getOffsetFromSpec(offsetSpec); + listOffsetsTopic.partitions().add( + new ListOffsetsPartition() + .setPartitionIndex(partitionId) + .setTimestamp(offsetQuery)); + }); + boolean supportsMaxTimestamp = keys Review Comment: I think we should make `supportsMaxTimestamp` a class field and init it in construct method, then in `handleUnsupportedVersion` we will change it to false. This is what we did in the past in `KafkaAdminClient.getListOffsetsCalls`, right? https://github.com/apache/kafka/blob/9b409de1e2719f72e3c17663ce131e40dc459361/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java#L3922-L3944 ########## clients/src/main/java/org/apache/kafka/clients/admin/internals/ListOffsetsHandler.java: ########## @@ -0,0 +1,229 @@ +/* + * 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.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import org.apache.kafka.clients.admin.ListOffsetsOptions; +import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo; +import org.apache.kafka.clients.admin.OffsetSpec; +import org.apache.kafka.clients.admin.OffsetSpec.TimestampSpec; +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.InvalidMetadataException; +import org.apache.kafka.common.errors.RetriableException; +import org.apache.kafka.common.errors.UnsupportedVersionException; +import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsPartition; +import org.apache.kafka.common.message.ListOffsetsRequestData.ListOffsetsTopic; +import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse; +import org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsTopicResponse; +import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.AbstractResponse; +import org.apache.kafka.common.requests.ListOffsetsRequest; +import org.apache.kafka.common.requests.ListOffsetsResponse; +import org.apache.kafka.common.utils.CollectionUtils; +import org.apache.kafka.common.utils.LogContext; +import org.slf4j.Logger; + +public final class ListOffsetsHandler extends Batched<TopicPartition, ListOffsetsResultInfo> { + + private final Map<TopicPartition, OffsetSpec> offsetSpecsByPartition; Review Comment: We translate `OffsetSpec` to long every time we use it, we can just change `offsetSpecsByPartition` to use `Map<TopicPartition, Long>` ########## clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java: ########## @@ -260,12 +261,18 @@ public void onFailure( .filter(future.lookupKeys()::contains) .collect(Collectors.toSet()); retryLookup(keysToUnmap); + } else if (t instanceof UnsupportedVersionException) { + Map<K, Throwable> unrecoverableFailures = + handler.handleUnsupportedVersionException( + (UnsupportedVersionException) t, + spec.keys, + spec.scope instanceof FulfillmentScope); Review Comment: Yes, I agree with you, we can remove `isFulfillmentStage` it from `handleUnsupportedVersionException`, and add another `handleUnsupportedVersionException` to `AdminApiLookupStrategy` if necessary in the future, currently, we can just `retryLookup`. ########## clients/src/main/java/org/apache/kafka/clients/admin/OffsetSpec.java: ########## @@ -33,7 +33,7 @@ public static class TimestampSpec extends OffsetSpec { this.timestamp = timestamp; } - long timestamp() { + public long timestamp() { Review Comment: We need to maintain it in the future if we change it public and may bring some compatible problem, we can move `getOffsetFromSpec` to `KafkaAdminClient` to solve it. -- 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
