kfaraz commented on code in PR #15085: URL: https://github.com/apache/druid/pull/15085#discussion_r1361113715
########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link Review Comment: This comment is not really needed (and not even true anymore since we are creating some sets inside `perform`). I suppose it was copied over from the existing action. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link + * org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#retrieveUsedSegmentsForIntervals} which returns + * a collection. Producing a {@link Set} would require an unnecessary copy of segments collection. + */ +public class RetrieveSegmentsToReplaceAction implements TaskAction<Collection<DataSegment>> +{ + @JsonIgnore + private final String dataSource; + + @JsonIgnore + private final Interval interval; + + @JsonCreator + public RetrieveSegmentsToReplaceAction( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval + ) + { + this.dataSource = dataSource; + this.interval = interval; + } + + @JsonProperty + public String getDataSource() + { + return dataSource; + } + + @JsonProperty + public Interval getInterval() + { + return interval; + } + + @Override + public TypeReference<Collection<DataSegment>> getReturnTypeReference() + { + return new TypeReference<Collection<DataSegment>>() {}; + } + + @Override + public Collection<DataSegment> perform(Task task, TaskActionToolbox toolbox) + { + if (!task.getDataSource().equals(dataSource)) { + return toolbox.getIndexerMetadataStorageCoordinator() + .retrieveUsedSegmentsForInterval(dataSource, interval, Segments.ONLY_VISIBLE); + } + + final String supervisorId; + if (task instanceof AbstractBatchSubtask) { + supervisorId = ((AbstractBatchSubtask) task).getSupervisorTaskId(); + } else { + supervisorId = task.getId(); + } + + final Set<ReplaceTaskLock> replaceLocksForTask = toolbox + .getTaskLockbox() + .getAllReplaceLocksForDatasource(task.getDataSource()) + .stream() + .filter(lock -> supervisorId.equals(lock.getSupervisorTaskId())) + .collect(Collectors.toSet()); + + Collection<Pair<DataSegment, String>> segmentsAndCreatedDates = + toolbox.getIndexerMetadataStorageCoordinator().retrieveUsedSegmentsAndCreatedDates(dataSource, interval); + + Set<DataSegment> allSegmentsToBeReplaced = new HashSet<>(); + segmentsAndCreatedDates.forEach(segmentAndCreatedDate -> allSegmentsToBeReplaced.add(segmentAndCreatedDate.lhs)); + for (Pair<DataSegment, String> segmentAndCreatedDate : segmentsAndCreatedDates) { + final DataSegment segment = segmentAndCreatedDate.lhs; + final String createdDate = segmentAndCreatedDate.rhs; + for (ReplaceTaskLock replaceLock : replaceLocksForTask) { + if (replaceLock.getInterval().contains(segment.getInterval()) + && replaceLock.getVersion().compareTo(createdDate) < 0) { + // If a REPLACE lock covers a segment but has a version less than the segment's created date, remove it + allSegmentsToBeReplaced.remove(segment); Review Comment: Rather than going through the collection of segments and created dates twice (once to add everything, then to remove the invalid ones), start with an empty set and add only the valid entries to it. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link + * org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#retrieveUsedSegmentsForIntervals} which returns + * a collection. Producing a {@link Set} would require an unnecessary copy of segments collection. + */ +public class RetrieveSegmentsToReplaceAction implements TaskAction<Collection<DataSegment>> +{ + @JsonIgnore + private final String dataSource; + + @JsonIgnore + private final Interval interval; + + @JsonCreator + public RetrieveSegmentsToReplaceAction( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval + ) + { + this.dataSource = dataSource; + this.interval = interval; + } + + @JsonProperty + public String getDataSource() + { + return dataSource; + } + + @JsonProperty + public Interval getInterval() + { + return interval; + } + + @Override + public TypeReference<Collection<DataSegment>> getReturnTypeReference() + { + return new TypeReference<Collection<DataSegment>>() {}; + } + + @Override + public Collection<DataSegment> perform(Task task, TaskActionToolbox toolbox) + { + if (!task.getDataSource().equals(dataSource)) { + return toolbox.getIndexerMetadataStorageCoordinator() + .retrieveUsedSegmentsForInterval(dataSource, interval, Segments.ONLY_VISIBLE); + } + + final String supervisorId; + if (task instanceof AbstractBatchSubtask) { + supervisorId = ((AbstractBatchSubtask) task).getSupervisorTaskId(); + } else { + supervisorId = task.getId(); + } + + final Set<ReplaceTaskLock> replaceLocksForTask = toolbox + .getTaskLockbox() + .getAllReplaceLocksForDatasource(task.getDataSource()) + .stream() + .filter(lock -> supervisorId.equals(lock.getSupervisorTaskId())) + .collect(Collectors.toSet()); + + Collection<Pair<DataSegment, String>> segmentsAndCreatedDates = + toolbox.getIndexerMetadataStorageCoordinator().retrieveUsedSegmentsAndCreatedDates(dataSource, interval); + + Set<DataSegment> allSegmentsToBeReplaced = new HashSet<>(); + segmentsAndCreatedDates.forEach(segmentAndCreatedDate -> allSegmentsToBeReplaced.add(segmentAndCreatedDate.lhs)); + for (Pair<DataSegment, String> segmentAndCreatedDate : segmentsAndCreatedDates) { Review Comment: Given that a single interval may have several segments, see if this loop can be improved by using a map from `Interval` to version to `Set<DataSegment>`. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractBatchSubtask.java: ########## @@ -29,21 +30,34 @@ public abstract class AbstractBatchSubtask extends AbstractBatchIndexTask { + private final String supervisorTaskId; + protected AbstractBatchSubtask( String id, @Nullable String groupId, @Nullable TaskResource taskResource, String dataSource, @Nullable Map<String, Object> context, - @Nonnull IngestionMode ingestionMode + @Nonnull IngestionMode ingestionMode, + @Nonnull String supervisorTaskId ) { super(id, groupId, taskResource, dataSource, context, -1, ingestionMode); + this.supervisorTaskId = supervisorTaskId; } /** * Returns the ID of {@link SubTaskSpec} that is assigned to this subtask. * This ID is used to identify duplicate work of retry tasks for the same spec. */ public abstract String getSubtaskSpecId(); + + /** + * @return the id of the subtask's supervisor Review Comment: ```suggestion * @return Task ID of the {@code ParallelIndexSupervisorTask} which launched this sub-task. ``` ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link + * org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#retrieveUsedSegmentsForIntervals} which returns + * a collection. Producing a {@link Set} would require an unnecessary copy of segments collection. + */ +public class RetrieveSegmentsToReplaceAction implements TaskAction<Collection<DataSegment>> +{ + @JsonIgnore + private final String dataSource; + + @JsonIgnore + private final Interval interval; + + @JsonCreator + public RetrieveSegmentsToReplaceAction( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval + ) + { + this.dataSource = dataSource; + this.interval = interval; + } + + @JsonProperty + public String getDataSource() + { + return dataSource; + } + + @JsonProperty + public Interval getInterval() + { + return interval; + } + + @Override + public TypeReference<Collection<DataSegment>> getReturnTypeReference() + { + return new TypeReference<Collection<DataSegment>>() {}; + } + + @Override + public Collection<DataSegment> perform(Task task, TaskActionToolbox toolbox) + { + if (!task.getDataSource().equals(dataSource)) { + return toolbox.getIndexerMetadataStorageCoordinator() + .retrieveUsedSegmentsForInterval(dataSource, interval, Segments.ONLY_VISIBLE); + } + + final String supervisorId; + if (task instanceof AbstractBatchSubtask) { + supervisorId = ((AbstractBatchSubtask) task).getSupervisorTaskId(); + } else { + supervisorId = task.getId(); + } + + final Set<ReplaceTaskLock> replaceLocksForTask = toolbox + .getTaskLockbox() + .getAllReplaceLocksForDatasource(task.getDataSource()) + .stream() + .filter(lock -> supervisorId.equals(lock.getSupervisorTaskId())) + .collect(Collectors.toSet()); + + Collection<Pair<DataSegment, String>> segmentsAndCreatedDates = Review Comment: Why not just get a `Map` here? Then `allSegmentsToBeReplaced` would just become the `keySet` of this map. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link + * org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#retrieveUsedSegmentsForIntervals} which returns + * a collection. Producing a {@link Set} would require an unnecessary copy of segments collection. + */ +public class RetrieveSegmentsToReplaceAction implements TaskAction<Collection<DataSegment>> +{ + @JsonIgnore + private final String dataSource; + + @JsonIgnore + private final Interval interval; + + @JsonCreator + public RetrieveSegmentsToReplaceAction( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval + ) + { + this.dataSource = dataSource; + this.interval = interval; + } + + @JsonProperty + public String getDataSource() + { + return dataSource; + } + + @JsonProperty + public Interval getInterval() + { + return interval; + } + + @Override + public TypeReference<Collection<DataSegment>> getReturnTypeReference() + { + return new TypeReference<Collection<DataSegment>>() {}; + } + + @Override + public Collection<DataSegment> perform(Task task, TaskActionToolbox toolbox) + { + if (!task.getDataSource().equals(dataSource)) { Review Comment: Please add a comment here explaining that we are falling back to the behaviour of the `RetrieveUsedSegmentsAction` and mention why. Maybe also highlight this point in the javadoc of this class itself. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsToReplaceAction.java: ########## @@ -0,0 +1,171 @@ +/* + * 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.druid.indexing.common.actions; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.indexing.common.task.batch.parallel.AbstractBatchSubtask; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.Intervals; +import org.apache.druid.java.util.common.Pair; +import org.apache.druid.metadata.ReplaceTaskLock; +import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.Partitions; +import org.apache.druid.timeline.SegmentTimeline; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * This TaskAction returns a collection of segments which have data within the specified interval and are marked as + * used, and have been created before a REPLACE lock, if any, was acquired. + * + * The order of segments within the returned collection is unspecified, but each segment is guaranteed to appear in + * the collection only once. + * + * @implNote This action doesn't produce a {@link Set} because it's implemented via {@link + * org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator#retrieveUsedSegmentsForIntervals} which returns + * a collection. Producing a {@link Set} would require an unnecessary copy of segments collection. + */ +public class RetrieveSegmentsToReplaceAction implements TaskAction<Collection<DataSegment>> +{ + @JsonIgnore + private final String dataSource; + + @JsonIgnore + private final Interval interval; + + @JsonCreator + public RetrieveSegmentsToReplaceAction( + @JsonProperty("dataSource") String dataSource, + @JsonProperty("interval") Interval interval + ) + { + this.dataSource = dataSource; + this.interval = interval; + } + + @JsonProperty + public String getDataSource() + { + return dataSource; + } + + @JsonProperty + public Interval getInterval() + { + return interval; + } + + @Override + public TypeReference<Collection<DataSegment>> getReturnTypeReference() + { + return new TypeReference<Collection<DataSegment>>() {}; + } + + @Override + public Collection<DataSegment> perform(Task task, TaskActionToolbox toolbox) + { + if (!task.getDataSource().equals(dataSource)) { + return toolbox.getIndexerMetadataStorageCoordinator() + .retrieveUsedSegmentsForInterval(dataSource, interval, Segments.ONLY_VISIBLE); + } + + final String supervisorId; + if (task instanceof AbstractBatchSubtask) { + supervisorId = ((AbstractBatchSubtask) task).getSupervisorTaskId(); + } else { + supervisorId = task.getId(); + } + + final Set<ReplaceTaskLock> replaceLocksForTask = toolbox + .getTaskLockbox() + .getAllReplaceLocksForDatasource(task.getDataSource()) + .stream() + .filter(lock -> supervisorId.equals(lock.getSupervisorTaskId())) + .collect(Collectors.toSet()); + + Collection<Pair<DataSegment, String>> segmentsAndCreatedDates = + toolbox.getIndexerMetadataStorageCoordinator().retrieveUsedSegmentsAndCreatedDates(dataSource, interval); + + Set<DataSegment> allSegmentsToBeReplaced = new HashSet<>(); + segmentsAndCreatedDates.forEach(segmentAndCreatedDate -> allSegmentsToBeReplaced.add(segmentAndCreatedDate.lhs)); + for (Pair<DataSegment, String> segmentAndCreatedDate : segmentsAndCreatedDates) { + final DataSegment segment = segmentAndCreatedDate.lhs; + final String createdDate = segmentAndCreatedDate.rhs; + for (ReplaceTaskLock replaceLock : replaceLocksForTask) { + if (replaceLock.getInterval().contains(segment.getInterval()) Review Comment: I suppose we don't really have much of a choice here other than doing this processing in-memory since these filters would be too complicated to push down. ########## indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TaskAction.java: ########## @@ -40,6 +40,7 @@ @JsonSubTypes.Type(name = "segmentTransactionalReplace", value = SegmentTransactionalReplaceAction.class), // Type name doesn't correspond to the name of the class for backward compatibility. @JsonSubTypes.Type(name = "segmentListUsed", value = RetrieveUsedSegmentsAction.class), + @JsonSubTypes.Type(name = "segmentListLocked", value = RetrieveSegmentsToReplaceAction.class), Review Comment: `segmentListToReplace`? ########## server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java: ########## @@ -174,15 +174,76 @@ private Collection<DataSegment> doRetrieveUsedSegments( } @Override - public List<Pair<DataSegment, String>> retrieveUsedSegmentsAndCreatedDates(String dataSource) + public List<Pair<DataSegment, String>> retrieveUsedSegmentsAndCreatedDates(String dataSource, Interval interval) { - String rawQueryString = "SELECT created_date, payload FROM %1$s WHERE dataSource = :dataSource AND used = true"; - final String queryString = StringUtils.format(rawQueryString, dbTables.getSegmentsTable()); + StringBuilder queryBuilder = new StringBuilder( + "SELECT created_date, payload FROM %1$s WHERE dataSource = :dataSource AND used = true" + ); + + final boolean intervalStartIsEternityStart = Intervals.ETERNITY.getStart().equals(interval.getStart()); Review Comment: Why do we need to do this special eternity handling? Are other methods in this class doing this too? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
