cshuo commented on code in PR #12601:
URL: https://github.com/apache/hudi/pull/12601#discussion_r1915863817
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java:
##########
@@ -808,6 +808,13 @@ public class HoodieWriteConfig extends HoodieConfig {
.withDocumentation("Avro schema of the partial updates. This is
automatically set by the "
+ "Hudi write client and user is not expected to manually change the
value.");
+ public static final ConfigProperty<Boolean> INCREMENTAL_TABLE_SERVICE_ENABLE
= ConfigProperty
+ .key("hoodie.incremental.tableservice.enabled")
Review Comment:
tableservice -> table.service to keep consistent with other table service
conf?
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/BaseTableServicePlanActionExecutor.java:
##########
@@ -0,0 +1,201 @@
+/*
+ * 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.model.WriteOperationType;
+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);
+
+ 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().filterCompletedInstants().getCommitsTimeline().getInstantsAsStream()
+ .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);
+ // ignore all the clustering operation for both mor and cow table
+ if
(!metadata.getOperationType().equals(WriteOperationType.CLUSTER)) {
+ 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) {
+ // for completed replace commit, need CommitMetadata to distinguish
clustering or insert overwrite
+ switch (table.getMetaClient().getTableType()) {
+ case MERGE_ON_READ: {
+ // for mor only take cares of delta commit and replace commit
+ Set<String> operations =
CollectionUtils.createSet(DELTA_COMMIT_ACTION, REPLACE_COMMIT_ACTION);
Review Comment:
better not create constant set per instant
--
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]
