This is an automated email from the ASF dual-hosted git repository. yihua pushed a commit to branch branch-0.x in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 632e61ff2d60bcaf158c018dd6919ea29d57be6f Author: Lokesh Jain <[email protected]> AuthorDate: Sat Mar 9 22:09:50 2024 +0530 [HUDI-6043] Metadata Table should use default values for Compaction preserveCommitMetadata field (#8393) --- .../src/main/java/org/apache/hudi/io/HoodieCreateHandle.java | 4 +--- .../src/main/java/org/apache/hudi/io/HoodieMergeHandle.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java index bdb35641f26..0a0f3352069 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java @@ -34,7 +34,6 @@ import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieInsertException; import org.apache.hudi.io.storage.HoodieFileWriter; import org.apache.hudi.io.storage.HoodieFileWriterFactory; -import org.apache.hudi.metadata.HoodieTableMetadata; import org.apache.hudi.table.HoodieTable; import org.apache.avro.Schema; @@ -115,8 +114,7 @@ public class HoodieCreateHandle<T, I, K, O> extends HoodieWriteHandle<T, I, K, O public HoodieCreateHandle(HoodieWriteConfig config, String instantTime, HoodieTable<T, I, K, O> hoodieTable, String partitionPath, String fileId, Map<String, HoodieRecord<T>> recordMap, TaskContextSupplier taskContextSupplier) { - // preserveMetadata is disabled by default for MDT but enabled otherwise - this(config, instantTime, hoodieTable, partitionPath, fileId, taskContextSupplier, !HoodieTableMetadata.isMetadataTable(config.getBasePath())); + this(config, instantTime, hoodieTable, partitionPath, fileId, taskContextSupplier, true); this.recordMap = recordMap; this.useWriterSchema = true; } diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java index 4460e29c8a4..b6d13164f37 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java @@ -47,7 +47,6 @@ import org.apache.hudi.io.storage.HoodieFileReaderFactory; import org.apache.hudi.io.storage.HoodieFileWriter; import org.apache.hudi.io.storage.HoodieFileWriterFactory; import org.apache.hudi.keygen.BaseKeyGenerator; -import org.apache.hudi.metadata.HoodieTableMetadata; import org.apache.hudi.table.HoodieTable; import org.apache.avro.Schema; @@ -144,8 +143,7 @@ public class HoodieMergeHandle<T, I, K, O> extends HoodieWriteHandle<T, I, K, O> super(config, instantTime, partitionPath, fileId, hoodieTable, taskContextSupplier); this.keyToNewRecords = keyToNewRecords; this.useWriterSchemaForCompaction = true; - // preserveMetadata is disabled by default for MDT but enabled otherwise - this.preserveMetadata = !HoodieTableMetadata.isMetadataTable(config.getBasePath()); + this.preserveMetadata = true; init(fileId, this.partitionPath, dataFileToBeMerged); validateAndSetAndKeyGenProps(keyGeneratorOpt, config.populateMetaFields()); }
