XuQianJin-Stars commented on code in PR #3518: URL: https://github.com/apache/fluss/pull/3518#discussion_r3465663427
########## fluss-lake/fluss-lake-hudi/src/main/java/org/apache/fluss/lake/hudi/tiering/HudiCompactionService.java: ########## @@ -0,0 +1,465 @@ +/* + * 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.fluss.lake.hudi.tiering; + +import org.apache.fluss.metadata.TableBucket; + +import org.apache.flink.configuration.Configuration; +import org.apache.hudi.avro.model.HoodieCompactionOperation; +import org.apache.hudi.avro.model.HoodieCompactionPlan; +import org.apache.hudi.client.HoodieFlinkWriteClient; +import org.apache.hudi.client.WriteStatus; +import org.apache.hudi.common.data.HoodieListData; +import org.apache.hudi.common.engine.HoodieReaderContext; +import org.apache.hudi.common.model.CompactionOperation; +import org.apache.hudi.common.model.HoodieCommitMetadata; +import org.apache.hudi.common.model.HoodieWriteStat; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.InstantGenerator; +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.configuration.FlinkOptions; +import org.apache.hudi.exception.HoodieException; +import org.apache.hudi.index.bucket.BucketIdentifier; +import org.apache.hudi.sink.compact.FlinkCompactionConfig; +import org.apache.hudi.sink.compact.strategy.CompactionPlanStrategies; +import org.apache.hudi.storage.StorageConfiguration; +import org.apache.hudi.table.HoodieFlinkTable; +import org.apache.hudi.table.action.compact.CompactHelpers; +import org.apache.hudi.table.action.compact.HoodieFlinkMergeOnReadTableCompactor; +import org.apache.hudi.table.format.FlinkRowDataReaderContext; +import org.apache.hudi.table.format.InternalSchemaManager; +import org.apache.hudi.util.CompactionUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import static org.apache.fluss.utils.Preconditions.checkNotNull; + +/** Coordinates Hudi compaction scheduling, execution, and commit for tiering writers. */ +public class HudiCompactionService { + + private static final Logger LOG = LoggerFactory.getLogger(HudiCompactionService.class); + + private final HudiWriteTableInfo hudiTableInfo; + private final HoodieFlinkWriteClient<?> writeClient; + private final HoodieTableMetaClient metaClient; + private final HoodieFlinkTable<?> table; + private final Configuration conf; + @Nullable private final TableBucket tableBucket; + @Nullable private final String partition; + + private InternalSchemaManager internalSchemaManager; + + public HudiCompactionService( + HudiWriteTableInfo hudiTableInfo, + @Nullable TableBucket tableBucket, + @Nullable String partition) { + this.hudiTableInfo = checkNotNull(hudiTableInfo, "Hudi write table info must not be null."); + this.writeClient = hudiTableInfo.getWriteClient(); + this.metaClient = hudiTableInfo.getMetaClient(); + this.table = writeClient.getHoodieTable(); + this.conf = hudiTableInfo.getFlinkConfig(); + this.tableBucket = tableBucket; + this.partition = partition; + } + + public boolean scheduleCompaction() { + LOG.info("Scheduling Hudi compaction for table {}.", hudiTableInfo.getTablePath()); + metaClient.reloadActiveTimeline(); + try { + boolean scheduled = writeClient.scheduleCompaction(Option.empty()).isPresent(); + metaClient.reloadActiveTimeline(); + if (!scheduled) { + LOG.info( + "No Hudi compaction plan was scheduled for table {}.", + hudiTableInfo.getTablePath()); + } + return scheduled; + } catch (Exception e) { + LOG.warn( + "Failed to schedule Hudi compaction for table {}.", + hudiTableInfo.getTablePath(), + e); + return false; + } + } + + public void markSelectedCompactionsInflight() { + List<String> compactionInstantTimes = getSelectedCompactionInstantTimes(); + if (compactionInstantTimes.isEmpty()) { + return; + } + + HoodieTimeline pendingCompactionTimeline = + table.getActiveTimeline().filterPendingCompactionTimeline(); + InstantGenerator instantGenerator = table.getInstantGenerator(); + + for (String timestamp : compactionInstantTimes) { + HoodieInstant inflightInstant = + instantGenerator.getCompactionInflightInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(inflightInstant)) { + LOG.info("Rollback stale inflight Hudi compaction instant {}.", timestamp); + table.rollbackInflightCompaction( + inflightInstant, writeClient.getTransactionManager()); + metaClient.reloadActiveTimeline(); + } + } + + pendingCompactionTimeline = table.getActiveTimeline().filterPendingCompactionTimeline(); + for (String timestamp : compactionInstantTimes) { + HoodieInstant requestedInstant = + instantGenerator.getCompactionRequestedInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(requestedInstant)) { + table.getActiveTimeline().transitionCompactionRequestedToInflight(requestedInstant); + LOG.info("Marked Hudi compaction instant {} as inflight.", timestamp); + } + } + metaClient.reloadActiveTimeline(); + } + + public List<String> getInflightCompactionInstantTimes() { + List<String> compactionInstantTimes = getSelectedCompactionInstantTimes(); + if (compactionInstantTimes.isEmpty()) { + return Collections.emptyList(); + } + + HoodieTimeline pendingCompactionTimeline = + metaClient.getActiveTimeline().filterPendingCompactionTimeline(); + InstantGenerator instantGenerator = table.getInstantGenerator(); + + List<String> inflightCompactionInstantTimes = new ArrayList<>(); + for (String timestamp : compactionInstantTimes) { + HoodieInstant inflightInstant = + instantGenerator.getCompactionInflightInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(inflightInstant)) { + inflightCompactionInstantTimes.add(inflightInstant.requestedTime()); + } + } + LOG.info( + "Found {} inflight Hudi compaction instants for table {}.", + inflightCompactionInstantTimes.size(), + hudiTableInfo.getTablePath()); + return inflightCompactionInstantTimes; + } + + public List<Pair<String, HoodieCompactionPlan>> getCompactionPlans( + List<String> compactionInstantTimes) { + if (compactionInstantTimes == null || compactionInstantTimes.isEmpty()) { + return Collections.emptyList(); + } + + List<Pair<String, HoodieCompactionPlan>> compactionPlans = + compactionInstantTimes.stream() + .map( + timestamp -> { + try { + return Pair.of( + timestamp, + CompactionUtils.getCompactionPlan( + metaClient, timestamp)); + } catch (Exception e) { + throw new HoodieException( + "Failed to get Hudi compaction plan " + timestamp, + e); + } + }) + .filter(pair -> isValidCompactionPlan(pair.getRight())) + .collect(Collectors.toList()); + + LOG.info( + "Loaded {} Hudi compaction plans for table {}.", + compactionPlans.size(), + hudiTableInfo.getTablePath()); + return compactionPlans; + } + + public Map<String, List<WriteStatus>> executeCompaction( + List<Pair<String, HoodieCompactionPlan>> compactionPlans) throws IOException { + if (compactionPlans == null || compactionPlans.isEmpty()) { + return Collections.emptyMap(); + } + TableBucket currentBucket = + checkNotNull(tableBucket, "Hudi compaction execution requires a table bucket."); + + Map<String, List<WriteStatus>> writeStatusesByInstant = new HashMap<>(); + HoodieWriteConfig writeConfig = writeClient.getConfig(); + String hudiPartitionPath = toHudiPartitionPath(partition); + + for (Pair<String, HoodieCompactionPlan> planPair : compactionPlans) { + String instantTime = planPair.getLeft(); + HoodieCompactionPlan compactionPlan = planPair.getRight(); + for (HoodieCompactionOperation operation : compactionPlan.getOperations()) { + if (!belongsToCurrentWriter(operation, hudiPartitionPath, currentBucket)) { + continue; + } + + HoodieFlinkMergeOnReadTableCompactor<?> compactor = + new HoodieFlinkMergeOnReadTableCompactor<>(); + CompactionOperation compactionOperation = + CompactionOperation.convertFromAvroRecordInstance(operation); + + metaClient.reload(); + try { + CompactionUtil.setAvroSchema(writeConfig, metaClient); + List<WriteStatus> writeStatuses = + compactor.compact( + writeConfig, + compactionOperation, + instantTime, + table.getTaskContextSupplier(), + createReaderContext(true), + table); + writeStatusesByInstant + .computeIfAbsent(instantTime, ignored -> new ArrayList<>()) + .addAll(writeStatuses); + LOG.info( + "Compacted Hudi file id {} for table {}, partition {}, bucket {}, instant {}.", + operation.getFileId(), + hudiTableInfo.getTablePath(), + hudiPartitionPath, + currentBucket.getBucket(), + instantTime); + } catch (Exception e) { + throw new IOException( + String.format( + "Failed to execute Hudi compaction for table %s, partition %s, bucket %s, instant %s.", + hudiTableInfo.getTablePath(), + hudiPartitionPath, + currentBucket.getBucket(), + instantTime), + e); + } + } + } + return writeStatusesByInstant; + } + + public String commitCompaction( + Map<String, HudiWriteStats> compactionWriteStats, + Map<String, String> snapshotProperties) + throws IOException { + if (compactionWriteStats == null || compactionWriteStats.isEmpty()) { + return null; + } + + String latestInstant = null; + List<String> compactionInstants = new ArrayList<>(compactionWriteStats.keySet()); + Collections.sort(compactionInstants); + for (String compactionInstant : compactionInstants) { + HudiWriteStats writeStats = compactionWriteStats.get(compactionInstant); + + if (writeStats.getTotalErrorRecords() > 0 && !conf.get(FlinkOptions.IGNORE_FAILED)) { + LOG.warn( + "Rollback Hudi compaction instant {} because it contains {} error records.", + compactionInstant, + writeStats.getTotalErrorRecords()); + CompactionUtil.rollbackCompaction( + table, compactionInstant, writeClient.getTransactionManager()); + throw new IOException( + "Failed to commit Hudi compaction instant " + + compactionInstant + + " because it contains " + + writeStats.getTotalErrorRecords() + + " error records."); + } + + doCommitCompaction(compactionInstant, writeStats, snapshotProperties); + if (latestInstant == null || compactionInstant.compareTo(latestInstant) > 0) { + latestInstant = compactionInstant; + } + LOG.info("Committed Hudi compaction instant {}.", compactionInstant); + } + return latestInstant; + } + + private List<String> getSelectedCompactionInstantTimes() { + metaClient.reloadActiveTimeline(); + HoodieTimeline pendingCompactionTimeline = + table.getActiveTimeline().filterPendingCompactionTimeline(); + FlinkCompactionConfig compactionConfig = toFlinkCompactionConfig(conf); + List<HoodieInstant> requestedInstants = + CompactionPlanStrategies.getStrategy(compactionConfig) + .select(pendingCompactionTimeline); + if (requestedInstants.isEmpty()) { + LOG.info( + "No pending Hudi compaction plan found for table {}.", + hudiTableInfo.getTablePath()); + return Collections.emptyList(); + } + return requestedInstants.stream() + .map(HoodieInstant::requestedTime) + .collect(Collectors.toList()); + } + + private HoodieReaderContext<?> createReaderContext(boolean needReloadMetaClient) { + Supplier<InternalSchemaManager> internalSchemaManagerSupplier = + () -> { + if (internalSchemaManager == null || needReloadMetaClient) { + internalSchemaManager = + InternalSchemaManager.get(metaClient.getStorageConf(), metaClient); + } + return internalSchemaManager; + }; + StorageConfiguration<?> readerConf = writeClient.getEngineContext().getStorageConf(); + return new FlinkRowDataReaderContext( + readerConf, + internalSchemaManagerSupplier, + Collections.emptyList(), + metaClient.getTableConfig(), + Option.empty()); + } + + private void doCommitCompaction( + String instant, HudiWriteStats writeStats, Map<String, String> snapshotProperties) + throws IOException { + HoodieCommitMetadata metadata = + CompactHelpers.getInstance() + .createCompactionMetadata( + table, + instant, + HoodieListData.eager(toWriteStatuses(writeStats)), + writeClient.getConfig().getSchema()); + snapshotProperties.forEach(metadata::addMetadata); + + writeClient.completeCompaction(metadata, table, instant); + if (!conf.get(FlinkOptions.CLEAN_ASYNC_ENABLED)) { + writeClient.clean(); + } + metaClient.reloadActiveTimeline(); + } + + private static boolean belongsToCurrentWriter( + HoodieCompactionOperation operation, + String hudiPartitionPath, + TableBucket currentBucket) { + return belongsToCurrentPartition(operation, hudiPartitionPath) + && belongsToCurrentBucket(operation, currentBucket); + } + + private static boolean belongsToCurrentPartition( + HoodieCompactionOperation operation, String hudiPartitionPath) { + String operationPartitionPath = normalizePartitionPath(operation.getPartitionPath()); + return Objects.equals(operationPartitionPath, hudiPartitionPath); + } + + private static boolean belongsToCurrentBucket( + HoodieCompactionOperation operation, TableBucket currentBucket) { + String fileId = operation.getFileId(); + if (fileId == null || fileId.isEmpty()) { + return false; + } + try { + return BucketIdentifier.bucketIdFromFileId(fileId) == currentBucket.getBucket(); + } catch (RuntimeException e) { + return fileId.contains(BucketIdentifier.bucketIdStr(currentBucket.getBucket())); + } + } + + private String toHudiPartitionPath(@Nullable String partitionName) { + if (partitionName == null || partitionName.isEmpty()) { + return ""; + } + + String partitionPath = partitionName.replace('$', '/'); + if (!conf.get(FlinkOptions.HIVE_STYLE_PARTITIONING)) { + return partitionPath; + } + + String partitionFields = conf.get(FlinkOptions.PARTITION_PATH_FIELD); + if (partitionFields == null || partitionFields.trim().isEmpty()) { + return partitionPath; + } + + String[] fields = partitionFields.split(","); + String[] values = partitionName.split("\\$"); + if (fields.length != values.length) { Review Comment: When hive-style partitioning is enabled but `fields.length != values.length`, this method silently returns the non-hive-style path produced by `replace('$','/')`. That path will never match what Hudi actually wrote on disk for hive-style partitioned tables, so `belongsToCurrentPartition` will always return `false` and the entire partition will be skipped from compaction. Suggest throwing `IllegalStateException` (or at least logging ERROR) instead of silently degrading. Also consider documenting the assumption that partition values cannot themselves contain `$`. ########## fluss-lake/fluss-lake-hudi/src/main/java/org/apache/fluss/lake/hudi/tiering/HudiCompactionService.java: ########## @@ -0,0 +1,465 @@ +/* + * 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.fluss.lake.hudi.tiering; + +import org.apache.fluss.metadata.TableBucket; + +import org.apache.flink.configuration.Configuration; +import org.apache.hudi.avro.model.HoodieCompactionOperation; +import org.apache.hudi.avro.model.HoodieCompactionPlan; +import org.apache.hudi.client.HoodieFlinkWriteClient; +import org.apache.hudi.client.WriteStatus; +import org.apache.hudi.common.data.HoodieListData; +import org.apache.hudi.common.engine.HoodieReaderContext; +import org.apache.hudi.common.model.CompactionOperation; +import org.apache.hudi.common.model.HoodieCommitMetadata; +import org.apache.hudi.common.model.HoodieWriteStat; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.InstantGenerator; +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.configuration.FlinkOptions; +import org.apache.hudi.exception.HoodieException; +import org.apache.hudi.index.bucket.BucketIdentifier; +import org.apache.hudi.sink.compact.FlinkCompactionConfig; +import org.apache.hudi.sink.compact.strategy.CompactionPlanStrategies; +import org.apache.hudi.storage.StorageConfiguration; +import org.apache.hudi.table.HoodieFlinkTable; +import org.apache.hudi.table.action.compact.CompactHelpers; +import org.apache.hudi.table.action.compact.HoodieFlinkMergeOnReadTableCompactor; +import org.apache.hudi.table.format.FlinkRowDataReaderContext; +import org.apache.hudi.table.format.InternalSchemaManager; +import org.apache.hudi.util.CompactionUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import static org.apache.fluss.utils.Preconditions.checkNotNull; + +/** Coordinates Hudi compaction scheduling, execution, and commit for tiering writers. */ +public class HudiCompactionService { + + private static final Logger LOG = LoggerFactory.getLogger(HudiCompactionService.class); + + private final HudiWriteTableInfo hudiTableInfo; + private final HoodieFlinkWriteClient<?> writeClient; + private final HoodieTableMetaClient metaClient; + private final HoodieFlinkTable<?> table; + private final Configuration conf; + @Nullable private final TableBucket tableBucket; + @Nullable private final String partition; + + private InternalSchemaManager internalSchemaManager; + + public HudiCompactionService( + HudiWriteTableInfo hudiTableInfo, + @Nullable TableBucket tableBucket, + @Nullable String partition) { + this.hudiTableInfo = checkNotNull(hudiTableInfo, "Hudi write table info must not be null."); + this.writeClient = hudiTableInfo.getWriteClient(); + this.metaClient = hudiTableInfo.getMetaClient(); + this.table = writeClient.getHoodieTable(); + this.conf = hudiTableInfo.getFlinkConfig(); + this.tableBucket = tableBucket; + this.partition = partition; + } + + public boolean scheduleCompaction() { + LOG.info("Scheduling Hudi compaction for table {}.", hudiTableInfo.getTablePath()); + metaClient.reloadActiveTimeline(); + try { + boolean scheduled = writeClient.scheduleCompaction(Option.empty()).isPresent(); + metaClient.reloadActiveTimeline(); + if (!scheduled) { + LOG.info( + "No Hudi compaction plan was scheduled for table {}.", + hudiTableInfo.getTablePath()); + } + return scheduled; + } catch (Exception e) { + LOG.warn( + "Failed to schedule Hudi compaction for table {}.", + hudiTableInfo.getTablePath(), + e); + return false; + } + } + + public void markSelectedCompactionsInflight() { + List<String> compactionInstantTimes = getSelectedCompactionInstantTimes(); + if (compactionInstantTimes.isEmpty()) { + return; + } + + HoodieTimeline pendingCompactionTimeline = + table.getActiveTimeline().filterPendingCompactionTimeline(); + InstantGenerator instantGenerator = table.getInstantGenerator(); + + for (String timestamp : compactionInstantTimes) { + HoodieInstant inflightInstant = + instantGenerator.getCompactionInflightInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(inflightInstant)) { + LOG.info("Rollback stale inflight Hudi compaction instant {}.", timestamp); + table.rollbackInflightCompaction( + inflightInstant, writeClient.getTransactionManager()); + metaClient.reloadActiveTimeline(); + } + } + + pendingCompactionTimeline = table.getActiveTimeline().filterPendingCompactionTimeline(); + for (String timestamp : compactionInstantTimes) { + HoodieInstant requestedInstant = + instantGenerator.getCompactionRequestedInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(requestedInstant)) { + table.getActiveTimeline().transitionCompactionRequestedToInflight(requestedInstant); + LOG.info("Marked Hudi compaction instant {} as inflight.", timestamp); + } + } + metaClient.reloadActiveTimeline(); + } + + public List<String> getInflightCompactionInstantTimes() { + List<String> compactionInstantTimes = getSelectedCompactionInstantTimes(); + if (compactionInstantTimes.isEmpty()) { + return Collections.emptyList(); + } + + HoodieTimeline pendingCompactionTimeline = + metaClient.getActiveTimeline().filterPendingCompactionTimeline(); + InstantGenerator instantGenerator = table.getInstantGenerator(); + + List<String> inflightCompactionInstantTimes = new ArrayList<>(); + for (String timestamp : compactionInstantTimes) { + HoodieInstant inflightInstant = + instantGenerator.getCompactionInflightInstant(timestamp); + if (pendingCompactionTimeline.containsInstant(inflightInstant)) { + inflightCompactionInstantTimes.add(inflightInstant.requestedTime()); + } + } + LOG.info( + "Found {} inflight Hudi compaction instants for table {}.", + inflightCompactionInstantTimes.size(), + hudiTableInfo.getTablePath()); + return inflightCompactionInstantTimes; + } + + public List<Pair<String, HoodieCompactionPlan>> getCompactionPlans( + List<String> compactionInstantTimes) { + if (compactionInstantTimes == null || compactionInstantTimes.isEmpty()) { + return Collections.emptyList(); + } + + List<Pair<String, HoodieCompactionPlan>> compactionPlans = + compactionInstantTimes.stream() + .map( + timestamp -> { + try { + return Pair.of( + timestamp, + CompactionUtils.getCompactionPlan( + metaClient, timestamp)); + } catch (Exception e) { + throw new HoodieException( + "Failed to get Hudi compaction plan " + timestamp, + e); + } + }) + .filter(pair -> isValidCompactionPlan(pair.getRight())) + .collect(Collectors.toList()); + + LOG.info( + "Loaded {} Hudi compaction plans for table {}.", + compactionPlans.size(), + hudiTableInfo.getTablePath()); + return compactionPlans; + } + + public Map<String, List<WriteStatus>> executeCompaction( + List<Pair<String, HoodieCompactionPlan>> compactionPlans) throws IOException { + if (compactionPlans == null || compactionPlans.isEmpty()) { + return Collections.emptyMap(); + } + TableBucket currentBucket = + checkNotNull(tableBucket, "Hudi compaction execution requires a table bucket."); + + Map<String, List<WriteStatus>> writeStatusesByInstant = new HashMap<>(); + HoodieWriteConfig writeConfig = writeClient.getConfig(); + String hudiPartitionPath = toHudiPartitionPath(partition); + + for (Pair<String, HoodieCompactionPlan> planPair : compactionPlans) { + String instantTime = planPair.getLeft(); + HoodieCompactionPlan compactionPlan = planPair.getRight(); + for (HoodieCompactionOperation operation : compactionPlan.getOperations()) { + if (!belongsToCurrentWriter(operation, hudiPartitionPath, currentBucket)) { + continue; + } + + HoodieFlinkMergeOnReadTableCompactor<?> compactor = + new HoodieFlinkMergeOnReadTableCompactor<>(); + CompactionOperation compactionOperation = + CompactionOperation.convertFromAvroRecordInstance(operation); + + metaClient.reload(); + try { + CompactionUtil.setAvroSchema(writeConfig, metaClient); + List<WriteStatus> writeStatuses = + compactor.compact( + writeConfig, + compactionOperation, + instantTime, + table.getTaskContextSupplier(), + createReaderContext(true), + table); + writeStatusesByInstant + .computeIfAbsent(instantTime, ignored -> new ArrayList<>()) + .addAll(writeStatuses); + LOG.info( + "Compacted Hudi file id {} for table {}, partition {}, bucket {}, instant {}.", + operation.getFileId(), + hudiTableInfo.getTablePath(), + hudiPartitionPath, + currentBucket.getBucket(), + instantTime); + } catch (Exception e) { + throw new IOException( + String.format( + "Failed to execute Hudi compaction for table %s, partition %s, bucket %s, instant %s.", + hudiTableInfo.getTablePath(), + hudiPartitionPath, + currentBucket.getBucket(), + instantTime), + e); + } + } + } + return writeStatusesByInstant; + } + + public String commitCompaction( + Map<String, HudiWriteStats> compactionWriteStats, + Map<String, String> snapshotProperties) + throws IOException { + if (compactionWriteStats == null || compactionWriteStats.isEmpty()) { + return null; + } + + String latestInstant = null; + List<String> compactionInstants = new ArrayList<>(compactionWriteStats.keySet()); + Collections.sort(compactionInstants); + for (String compactionInstant : compactionInstants) { + HudiWriteStats writeStats = compactionWriteStats.get(compactionInstant); + + if (writeStats.getTotalErrorRecords() > 0 && !conf.get(FlinkOptions.IGNORE_FAILED)) { + LOG.warn( + "Rollback Hudi compaction instant {} because it contains {} error records.", + compactionInstant, + writeStats.getTotalErrorRecords()); + CompactionUtil.rollbackCompaction( + table, compactionInstant, writeClient.getTransactionManager()); + throw new IOException( + "Failed to commit Hudi compaction instant " + + compactionInstant + + " because it contains " + + writeStats.getTotalErrorRecords() + + " error records."); + } + + doCommitCompaction(compactionInstant, writeStats, snapshotProperties); + if (latestInstant == null || compactionInstant.compareTo(latestInstant) > 0) { + latestInstant = compactionInstant; + } + LOG.info("Committed Hudi compaction instant {}.", compactionInstant); + } + return latestInstant; + } + + private List<String> getSelectedCompactionInstantTimes() { + metaClient.reloadActiveTimeline(); + HoodieTimeline pendingCompactionTimeline = + table.getActiveTimeline().filterPendingCompactionTimeline(); + FlinkCompactionConfig compactionConfig = toFlinkCompactionConfig(conf); + List<HoodieInstant> requestedInstants = + CompactionPlanStrategies.getStrategy(compactionConfig) + .select(pendingCompactionTimeline); + if (requestedInstants.isEmpty()) { + LOG.info( + "No pending Hudi compaction plan found for table {}.", + hudiTableInfo.getTablePath()); + return Collections.emptyList(); + } + return requestedInstants.stream() + .map(HoodieInstant::requestedTime) + .collect(Collectors.toList()); + } + + private HoodieReaderContext<?> createReaderContext(boolean needReloadMetaClient) { + Supplier<InternalSchemaManager> internalSchemaManagerSupplier = + () -> { + if (internalSchemaManager == null || needReloadMetaClient) { + internalSchemaManager = + InternalSchemaManager.get(metaClient.getStorageConf(), metaClient); + } + return internalSchemaManager; + }; + StorageConfiguration<?> readerConf = writeClient.getEngineContext().getStorageConf(); + return new FlinkRowDataReaderContext( + readerConf, + internalSchemaManagerSupplier, + Collections.emptyList(), + metaClient.getTableConfig(), + Option.empty()); + } + + private void doCommitCompaction( + String instant, HudiWriteStats writeStats, Map<String, String> snapshotProperties) + throws IOException { + HoodieCommitMetadata metadata = + CompactHelpers.getInstance() + .createCompactionMetadata( + table, + instant, + HoodieListData.eager(toWriteStatuses(writeStats)), + writeClient.getConfig().getSchema()); + snapshotProperties.forEach(metadata::addMetadata); + + writeClient.completeCompaction(metadata, table, instant); + if (!conf.get(FlinkOptions.CLEAN_ASYNC_ENABLED)) { + writeClient.clean(); + } + metaClient.reloadActiveTimeline(); + } + + private static boolean belongsToCurrentWriter( + HoodieCompactionOperation operation, + String hudiPartitionPath, + TableBucket currentBucket) { + return belongsToCurrentPartition(operation, hudiPartitionPath) + && belongsToCurrentBucket(operation, currentBucket); + } + + private static boolean belongsToCurrentPartition( + HoodieCompactionOperation operation, String hudiPartitionPath) { + String operationPartitionPath = normalizePartitionPath(operation.getPartitionPath()); + return Objects.equals(operationPartitionPath, hudiPartitionPath); + } + + private static boolean belongsToCurrentBucket( + HoodieCompactionOperation operation, TableBucket currentBucket) { + String fileId = operation.getFileId(); + if (fileId == null || fileId.isEmpty()) { + return false; + } + try { + return BucketIdentifier.bucketIdFromFileId(fileId) == currentBucket.getBucket(); + } catch (RuntimeException e) { + return fileId.contains(BucketIdentifier.bucketIdStr(currentBucket.getBucket())); + } + } + + private String toHudiPartitionPath(@Nullable String partitionName) { + if (partitionName == null || partitionName.isEmpty()) { + return ""; + } + + String partitionPath = partitionName.replace('$', '/'); + if (!conf.get(FlinkOptions.HIVE_STYLE_PARTITIONING)) { + return partitionPath; + } + + String partitionFields = conf.get(FlinkOptions.PARTITION_PATH_FIELD); + if (partitionFields == null || partitionFields.trim().isEmpty()) { + return partitionPath; + } + + String[] fields = partitionFields.split(","); + String[] values = partitionName.split("\\$"); + if (fields.length != values.length) { + return partitionPath; + } + + List<String> hiveStylePartitionSegments = new ArrayList<>(fields.length); + for (int i = 0; i < fields.length; i++) { + hiveStylePartitionSegments.add(fields[i].trim() + "=" + values[i]); + } + return String.join("/", hiveStylePartitionSegments); + } + + private static String normalizePartitionPath(@Nullable String partitionPath) { + return partitionPath == null ? "" : partitionPath; + } + + private static List<WriteStatus> toWriteStatuses(HudiWriteStats writeStats) { + List<HoodieWriteStat> stats = writeStats.getWriteStats(); + if (stats.isEmpty()) { + return Collections.emptyList(); + } + + List<WriteStatus> writeStatuses = new ArrayList<>(stats.size()); + for (HoodieWriteStat stat : stats) { + WriteStatus writeStatus = new WriteStatus(); + writeStatus.setStat(stat); + writeStatus.setFileId(stat.getFileId()); + writeStatus.setPartitionPath(stat.getPartitionPath()); + writeStatuses.add(writeStatus); + } + writeStatuses.get(0).setTotalErrorRecords(writeStats.getTotalErrorRecords()); Review Comment: Stuffing the entire compaction's `totalErrorRecords` into the first `WriteStatus` of the list is suspicious. Downstream `CompactHelpers.createCompactionMetadata` aggregates per-status counts; doing it this way may double-count or miscount when multiple statuses are present. Please verify against Hudi's metadata aggregation logic and either set the count per-status proportionally or split it as Hudi expects. -- 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]
