[HUDI-8780] Incremental Table Service #12601
+1,470
−212
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| /* | ||
| * 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.hudi.table.action; | ||
|
|
||
| import org.apache.hudi.avro.model.HoodieClusteringPlan; | ||
| import org.apache.hudi.avro.model.HoodieCompactionPlan; | ||
| import org.apache.hudi.common.engine.HoodieEngineContext; | ||
| import org.apache.hudi.common.fs.FSUtils; | ||
| import org.apache.hudi.common.model.HoodieCommitMetadata; | ||
| import org.apache.hudi.common.model.HoodieWriteStat; | ||
| import org.apache.hudi.common.model.TableServiceType; | ||
| import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; | ||
| import org.apache.hudi.common.table.timeline.HoodieInstant; | ||
| import org.apache.hudi.common.table.timeline.HoodieTimeline; | ||
| import org.apache.hudi.common.table.timeline.TimelineUtils; | ||
| import org.apache.hudi.common.table.timeline.versioning.v1.InstantComparatorV1; | ||
| import org.apache.hudi.common.util.ClusteringUtils; | ||
| import org.apache.hudi.common.util.CollectionUtils; | ||
| import org.apache.hudi.common.util.CompactionUtils; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.common.util.collection.Pair; | ||
| import org.apache.hudi.config.HoodieWriteConfig; | ||
| import org.apache.hudi.exception.HoodieException; | ||
| import org.apache.hudi.exception.HoodieIOException; | ||
| import org.apache.hudi.table.HoodieTable; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMMIT_ACTION; | ||
| import static org.apache.hudi.common.table.timeline.HoodieTimeline.DELTA_COMMIT_ACTION; | ||
| import static org.apache.hudi.common.table.timeline.HoodieTimeline.REPLACE_COMMIT_ACTION; | ||
|
|
||
| public abstract class BaseTableServicePlanActionExecutor<T, I, K, O, R> extends BaseActionExecutor<T, I, K, O, R> { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(BaseTableServicePlanActionExecutor.class); | ||
| private static final Set<String> MOR_COMMITS = CollectionUtils.createSet(DELTA_COMMIT_ACTION, REPLACE_COMMIT_ACTION); | ||
| private static final Set<String> COW_COMMITS = CollectionUtils.createSet(COMMIT_ACTION, REPLACE_COMMIT_ACTION); | ||
|
|
||
| public BaseTableServicePlanActionExecutor(HoodieEngineContext context, HoodieWriteConfig config, | ||
| HoodieTable<T, I, K, O> table, String instantTime) { | ||
| super(context, config, table, instantTime); | ||
| } | ||
|
|
||
| /** | ||
| * Get partitions, if strategy implement `IncrementalPartitionAwareStrategy` then return incremental partitions, | ||
| * otherwise return all partitions of the table | ||
| * @param strategy | ||
| * @return | ||
| */ | ||
| public List<String> getPartitions(Object strategy, TableServiceType type) { | ||
| if (config.isIncrementalTableServiceEnable() && strategy instanceof IncrementalPartitionAwareStrategy) { | ||
| try { | ||
| // get incremental partitions. | ||
| LOG.info("Start to fetch incremental partitions for " + type); | ||
| Pair<Option<HoodieInstant>, Set<String>> lastInstantAndIncrPartitions = getIncrementalPartitions(type); | ||
| Option<HoodieInstant> lastCompleteTableServiceInstant = lastInstantAndIncrPartitions.getLeft(); | ||
| Set<String> incrementalPartitions = lastInstantAndIncrPartitions.getRight(); | ||
|
|
||
| if (lastCompleteTableServiceInstant.isPresent()) { | ||
| if (!incrementalPartitions.isEmpty()) { | ||
| LOG.info("Fetched incremental partitions for " + type + ". " + incrementalPartitions + ". Instant " + instantTime); | ||
| return new ArrayList<>(incrementalPartitions); | ||
| } else { | ||
| // handle the case the writer just commits the empty commits continuously | ||
| // the incremental partition list is empty we just skip the scheduling | ||
| LOG.info("Incremental partitions are empty. Skip current schedule " + instantTime); | ||
| return Collections.emptyList(); | ||
| } | ||
| } | ||
| // Last complete table service commit maybe archived. | ||
| // fall back to get all partitions. | ||
| LOG.info("No previous completed table service instant, fall back to get all partitions"); | ||
| } catch (Exception ex) { | ||
| LOG.warn("Failed to get incremental partitions", ex); | ||
| } | ||
| } | ||
|
|
||
| // get all partitions | ||
| LOG.info("Start to fetch all partitions for " + type + ". Instant " + instantTime); | ||
| return FSUtils.getAllPartitionPaths(context, table.getMetaClient().getStorage(), | ||
| config.getMetadataConfig(), table.getMetaClient().getBasePath()); | ||
| } | ||
|
|
||
| public Pair<Option<HoodieInstant>, Set<String>> getIncrementalPartitions(TableServiceType type) { | ||
| Pair<Option<HoodieInstant>, List<String>> missingPair = fetchMissingPartitions(type); | ||
| Option<HoodieInstant> lastCompleteTableServiceInstant = missingPair.getLeft(); | ||
| List<String> missingPartitions = missingPair.getRight(); | ||
|
|
||
| String leftBoundary = lastCompleteTableServiceInstant.isPresent() | ||
| ? missingPair.getLeft().get().requestedTime() : HoodieTimeline.INIT_INSTANT_TS; | ||
| String rightBoundary = instantTime; | ||
| // compute [leftBoundary, rightBoundary) as time window | ||
| HoodieActiveTimeline activeTimeline = table.getActiveTimeline(); | ||
| Set<String> partitionsInCommitMeta = table.getActiveTimeline().findInstantsAfter(leftBoundary).filterCompletedInstants().getCommitsTimeline().getInstantsAsStream() | ||
|
There was a problem hiding this comment. why filtering the instant time by There was a problem hiding this comment. @danny0405 Nice catch Danny. |
||
| .filter(this::filterCommitByTableType).flatMap(instant -> { | ||
| try { | ||
| String completionTime = instant.getCompletionTime(); | ||
| if (completionTime.compareTo(leftBoundary) >= 0 && completionTime.compareTo(rightBoundary) < 0) { | ||
| HoodieCommitMetadata metadata = TimelineUtils.getCommitMetadata(instant, activeTimeline); | ||
| return metadata.getWriteStats().stream().map(HoodieWriteStat::getPartitionPath); | ||
| } | ||
| return Stream.empty(); | ||
| } catch (IOException e) { | ||
| throw new HoodieIOException("Failed to get commit meta " + instant, e); | ||
| } | ||
| }).collect(Collectors.toSet()); | ||
|
|
||
| partitionsInCommitMeta.addAll(missingPartitions); | ||
| return Pair.of(lastCompleteTableServiceInstant, partitionsInCommitMeta); | ||
| } | ||
|
|
||
| private boolean filterCommitByTableType(HoodieInstant instant) { | ||
| switch (table.getMetaClient().getTableType()) { | ||
| case MERGE_ON_READ: { | ||
| // for mor only take care of delta commit and replace commit | ||
| return MOR_COMMITS.contains(instant.getAction()); | ||
| } | ||
| case COPY_ON_WRITE: { | ||
| // for mor only take care of commit and replace commit | ||
| return COW_COMMITS.contains(instant.getAction()); | ||
| } | ||
| default: | ||
| throw new HoodieException("Un-supported table type " + table.getMetaClient().getTableType()); | ||
| } | ||
| } | ||
|
|
||
| public Pair<Option<HoodieInstant>, List<String>> fetchMissingPartitions(TableServiceType tableServiceType) { | ||
| if (!config.isIncrementalTableServiceEnable()) { | ||
| return Pair.of(Option.empty(), Collections.emptyList()); | ||
| } | ||
|
|
||
| Option<HoodieInstant> instant = Option.empty(); | ||
| List<String> missingPartitions = new ArrayList<>(); | ||
|
|
||
| switch (tableServiceType) { | ||
| case COMPACT: | ||
| case LOG_COMPACT: { | ||
| Option<HoodieInstant> lastCompactionCommitInstant = table.getActiveTimeline() | ||
| .filterCompletedInstants().getTimelineOfActions(CollectionUtils.createSet(COMMIT_ACTION)).lastInstant(); | ||
| if (lastCompactionCommitInstant.isPresent()) { | ||
| instant = lastCompactionCommitInstant; | ||
| String action = tableServiceType.equals(TableServiceType.COMPACT) ? HoodieTimeline.COMPACTION_ACTION : HoodieTimeline.LOG_COMPACTION_ACTION; | ||
| HoodieInstant compactionPlanInstant = new HoodieInstant(HoodieInstant.State.REQUESTED, action, | ||
| instant.get().requestedTime(), InstantComparatorV1.REQUESTED_TIME_BASED_COMPARATOR); | ||
| Option<byte[]> details = table.getMetaClient().getActiveTimeline().readCompactionPlanAsBytes(compactionPlanInstant); | ||
| HoodieCompactionPlan compactionPlan = CompactionUtils.getCompactionPlan(table.getMetaClient(), details); | ||
| if (compactionPlan.getMissingSchedulePartitions() != null) { | ||
| missingPartitions = compactionPlan.getMissingSchedulePartitions(); | ||
| } | ||
| } | ||
| break; | ||
| } | ||
| case CLUSTER: { | ||
| Option<HoodieInstant> lastClusteringInstant = table.getActiveTimeline().filterCompletedInstants().getLastClusteringInstant(); | ||
| if (lastClusteringInstant.isPresent()) { | ||
| instant = lastClusteringInstant; | ||
| Option<Pair<HoodieInstant, HoodieClusteringPlan>> clusteringPlan = ClusteringUtils.getClusteringPlan(table.getMetaClient(), lastClusteringInstant.get()); | ||
| if (clusteringPlan.isPresent() && clusteringPlan.get().getRight().getMissingSchedulePartitions() != null) { | ||
| missingPartitions = clusteringPlan.get().getRight().getMissingSchedulePartitions(); | ||
| } | ||
| } | ||
| break; | ||
| } | ||
| default: | ||
| throw new HoodieException("Un-supported incremental table service " + tableServiceType); | ||
| } | ||
|
|
||
| return Pair.of(instant, missingPartitions); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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.hudi.table.action; | ||
|
|
||
| import org.apache.hudi.common.util.collection.Pair; | ||
| import org.apache.hudi.config.HoodieWriteConfig; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Marking interface for table service strategy that utilize incremental partitions. | ||
| * | ||
| * <p> Any strategy class that implements this `IncrementalPartitionAwareStrategy` could have the ability to perform incremental partitions processing. | ||
| * Currently, Incremental partitions will be passed to the strategy instance as a best-effort. In the following cases, the partitions would fallback to full partition list: | ||
| * | ||
| * <ul> | ||
| * <li> Executing Table Service for the first time. </li> | ||
| * <li> The last completed table service instant is archived. </li> | ||
| * <li> Any exception thrown during retrieval of incremental partitions. </li> | ||
| * </ul> | ||
| */ | ||
| public interface IncrementalPartitionAwareStrategy { | ||
|
|
||
| /** | ||
| * Filter the given incremental partitions. | ||
| * @param writeConfig | ||
| * @param partitions | ||
| * @return Pair of final processing partition paths and filtered partitions which will be recorded as missing partitions. | ||
| * Different strategies can individually implement whether to record, or which partitions to record as missing partitions. | ||
| */ | ||
| Pair<List<String>, List<String>> filterPartitionPaths(HoodieWriteConfig writeConfig, List<String> partitions); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
enabled
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed all the related
enabletoenabled