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 63ec2431743707c759c9d47993de50a68420a66e Author: Vova Kolmakov <[email protected]> AuthorDate: Wed Apr 24 08:05:39 2024 +0700 [MINOR] Fixe naming of methods in HoodieMetadataConfig (#11076) --- .../java/org/apache/hudi/config/HoodieWriteConfig.java | 2 +- .../hudi/table/action/index/RunIndexActionExecutor.java | 2 +- .../apache/hudi/testutils/HoodieJavaClientTestHarness.java | 2 +- .../hudi/testutils/HoodieSparkClientTestHarness.java | 2 +- .../apache/hudi/common/config/HoodieMetadataConfig.java | 14 +++++--------- .../java/org/apache/hudi/metadata/BaseTableMetadata.java | 4 ++-- .../apache/hudi/metadata/HoodieBackedTableMetadata.java | 2 +- .../java/org/apache/hudi/metadata/HoodieTableMetadata.java | 2 +- .../org/apache/hudi/metadata/HoodieTableMetadataUtil.java | 2 +- .../src/main/java/org/apache/hudi/source/FileIndex.java | 2 +- .../scala/org/apache/hudi/ColumnStatsIndexSupport.scala | 2 +- .../src/main/scala/org/apache/hudi/HoodieFileIndex.scala | 2 +- .../scala/org/apache/hudi/RecordLevelIndexSupport.scala | 2 +- 13 files changed, 18 insertions(+), 22 deletions(-) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java index e8f327faecb..2d01f13b1db 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java @@ -2439,7 +2439,7 @@ public class HoodieWriteConfig extends HoodieConfig { } public boolean isRecordIndexEnabled() { - return metadataConfig.enableRecordIndex(); + return metadataConfig.isRecordIndexEnabled(); } public int getRecordIndexMinFileGroupCount() { diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/RunIndexActionExecutor.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/RunIndexActionExecutor.java index dd2bda902a3..3573bf3889b 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/RunIndexActionExecutor.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/RunIndexActionExecutor.java @@ -98,7 +98,7 @@ public class RunIndexActionExecutor<T, I, K, O> extends BaseActionExecutor<T, I, public RunIndexActionExecutor(HoodieEngineContext context, HoodieWriteConfig config, HoodieTable<T, I, K, O> table, String instantTime) { super(context, config, table, instantTime); this.txnManager = new TransactionManager(config, table.getMetaClient().getStorage()); - if (config.getMetadataConfig().enableMetrics()) { + if (config.getMetadataConfig().isMetricsEnabled()) { this.metrics = Option.of(new HoodieMetadataMetrics(config.getMetricsConfig())); } else { this.metrics = Option.empty(); diff --git a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java index 045aac6be02..a469861c8a9 100644 --- a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java +++ b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/HoodieJavaClientTestHarness.java @@ -251,7 +251,7 @@ public abstract class HoodieJavaClientTestHarness extends HoodieWriterClientTest } public void syncTableMetadata(HoodieWriteConfig writeConfig) { - if (!writeConfig.getMetadataConfig().enabled()) { + if (!writeConfig.getMetadataConfig().isEnabled()) { return; } // Open up the metadata table again, for syncing diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieSparkClientTestHarness.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieSparkClientTestHarness.java index 7c6f32bc7a4..fe977aba877 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieSparkClientTestHarness.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieSparkClientTestHarness.java @@ -532,7 +532,7 @@ public abstract class HoodieSparkClientTestHarness extends HoodieWriterClientTes } public void syncTableMetadata(HoodieWriteConfig writeConfig) { - if (!writeConfig.getMetadataConfig().enabled()) { + if (!writeConfig.getMetadataConfig().isEnabled()) { return; } // Open up the metadata table again, for syncing diff --git a/hudi-common/src/main/java/org/apache/hudi/common/config/HoodieMetadataConfig.java b/hudi-common/src/main/java/org/apache/hudi/common/config/HoodieMetadataConfig.java index 5fb897c67e9..6670722bbe7 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/config/HoodieMetadataConfig.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/config/HoodieMetadataConfig.java @@ -344,7 +344,7 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getBoolean(HoodieMetadataConfig.ASSUME_DATE_PARTITIONING); } - public boolean enabled() { + public boolean isEnabled() { return getBoolean(ENABLE); } @@ -357,7 +357,7 @@ public final class HoodieMetadataConfig extends HoodieConfig { } public boolean isRecordIndexEnabled() { - return getBooleanOrDefault(RECORD_INDEX_ENABLE_PROP); + return isEnabled() && getBooleanOrDefault(RECORD_INDEX_ENABLE_PROP); } public List<String> getColumnsEnabledForColumnStatsIndex() { @@ -396,7 +396,7 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getIntOrDefault(METADATA_INDEX_CHECK_TIMEOUT_SECONDS); } - public boolean enableMetrics() { + public boolean isMetricsEnabled() { return getBoolean(METRICS_ENABLE); } @@ -404,11 +404,11 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getString(DIR_FILTER_REGEX); } - public boolean ignoreSpuriousDeletes() { + public boolean shouldIgnoreSpuriousDeletes() { return getBoolean(IGNORE_SPURIOUS_DELETES); } - public boolean doEnableOptimizedLogBlocksScan() { + public boolean isOptimizedLogBlocksScanEnabled() { return getBoolean(ENABLE_OPTIMIZED_LOG_BLOCKS_SCAN); } @@ -416,10 +416,6 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getIntOrDefault(METADATA_MAX_NUM_DELTACOMMITS_WHEN_PENDING); } - public boolean enableRecordIndex() { - return enabled() && getBoolean(RECORD_INDEX_ENABLE_PROP); - } - public int getRecordIndexMinFileGroupCount() { return getInt(RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP); } diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/BaseTableMetadata.java b/hudi-common/src/main/java/org/apache/hudi/metadata/BaseTableMetadata.java index 278849600cb..513abb6364a 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/BaseTableMetadata.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/BaseTableMetadata.java @@ -97,7 +97,7 @@ public abstract class BaseTableMetadata extends AbstractHoodieTableMetadata { this.metadataConfig = metadataConfig; this.isMetadataTableInitialized = dataMetaClient.getTableConfig().isMetadataTableAvailable(); - if (metadataConfig.enableMetrics()) { + if (metadataConfig.isMetricsEnabled()) { this.metrics = Option.of(new HoodieMetadataMetrics(HoodieMetricsConfig.newBuilder().fromProperties(metadataConfig.getProps()).build())); } else { this.metrics = Option.empty(); @@ -415,7 +415,7 @@ public abstract class BaseTableMetadata extends AbstractHoodieTableMetadata { */ private void checkForSpuriousDeletes(HoodieMetadataPayload metadataPayload, String partitionName) { if (!metadataPayload.getDeletions().isEmpty()) { - if (metadataConfig.ignoreSpuriousDeletes()) { + if (metadataConfig.shouldIgnoreSpuriousDeletes()) { LOG.warn("Metadata record for " + partitionName + " encountered some files to be deleted which was not added before. " + "Ignoring the spurious deletes as the `" + HoodieMetadataConfig.IGNORE_SPURIOUS_DELETES.key() + "` config is set to true"); } else { diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadata.java b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadata.java index d2d1878afa6..7ea0bb87b73 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadata.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadata.java @@ -495,7 +495,7 @@ public class HoodieBackedTableMetadata extends BaseTableMetadata { .withLogBlockTimestamps(validInstantTimestamps) .enableFullScan(allowFullScan) .withPartition(partitionName) - .withEnableOptimizedLogBlocksScan(metadataConfig.doEnableOptimizedLogBlocksScan()) + .withEnableOptimizedLogBlocksScan(metadataConfig.isOptimizedLogBlocksScanEnabled()) .withTableMetaClient(metadataMetaClient) .build(); diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadata.java b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadata.java index 1b3bd129432..4d39c4eef25 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadata.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadata.java @@ -117,7 +117,7 @@ public interface HoodieTableMetadata extends Serializable, AutoCloseable { } static HoodieTableMetadata create(HoodieEngineContext engineContext, HoodieMetadataConfig metadataConfig, String datasetBasePath, boolean reuse) { - if (metadataConfig.enabled()) { + if (metadataConfig.isEnabled()) { HoodieBackedTableMetadata metadata = createHoodieBackedTableMetadata(engineContext, metadataConfig, datasetBasePath, reuse); // If the MDT is not initialized then we fallback to FSBackedTableMetadata if (metadata.isMetadataTableInitialized()) { diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadataUtil.java b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadataUtil.java index fc0720915ed..062cfedfc12 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadataUtil.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/HoodieTableMetadataUtil.java @@ -1700,7 +1700,7 @@ public class HoodieTableMetadataUtil { } // Does any enabled partition being enabled need to track the written records - return config.enableRecordIndex(); + return config.isRecordIndexEnabled(); } /** diff --git a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/FileIndex.java b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/FileIndex.java index a954293e26b..a1461975811 100644 --- a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/FileIndex.java +++ b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/FileIndex.java @@ -306,7 +306,7 @@ public class FileIndex { // - Any expression not directly referencing top-level column (for ex, sub-queries, since there's // nothing CSI in particular could be applied for) if (dataSkippingEnabled) { - if (metadataConfig.enabled()) { + if (metadataConfig.isEnabled()) { return true; } else { LOG.warn("Data skipping requires Metadata Table to be enabled! Disable the data skipping"); diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/ColumnStatsIndexSupport.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/ColumnStatsIndexSupport.scala index f38d4318cac..7b14863ce38 100644 --- a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/ColumnStatsIndexSupport.scala +++ b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/ColumnStatsIndexSupport.scala @@ -83,7 +83,7 @@ class ColumnStatsIndexSupport(spark: SparkSession, * w/in the Metadata Table */ def isIndexAvailable: Boolean = { - checkState(metadataConfig.enabled, "Metadata Table support has to be enabled") + checkState(metadataConfig.isEnabled, "Metadata Table support has to be enabled") metaClient.getTableConfig.getMetadataPartitions.contains(HoodieTableMetadataUtil.PARTITION_NAME_COLUMN_STATS) } diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieFileIndex.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieFileIndex.scala index a15b8c7224c..243782f81f9 100644 --- a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieFileIndex.scala +++ b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieFileIndex.scala @@ -430,7 +430,7 @@ case class HoodieFileIndex(spark: SparkSession, private def isDataSkippingEnabled: Boolean = getConfigValue(options, spark.sessionState.conf, DataSourceReadOptions.ENABLE_DATA_SKIPPING.key, DataSourceReadOptions.ENABLE_DATA_SKIPPING.defaultValue.toString).toBoolean - private def isMetadataTableEnabled: Boolean = metadataConfig.enabled() + private def isMetadataTableEnabled: Boolean = metadataConfig.isEnabled() private def isColumnStatsIndexEnabled: Boolean = metadataConfig.isColumnStatsIndexEnabled diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/RecordLevelIndexSupport.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/RecordLevelIndexSupport.scala index 76873803955..1b72df1c97d 100644 --- a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/RecordLevelIndexSupport.scala +++ b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/RecordLevelIndexSupport.scala @@ -108,7 +108,7 @@ class RecordLevelIndexSupport(spark: SparkSession, * Return true if metadata table is enabled and record index metadata partition is available. */ def isIndexAvailable: Boolean = { - metadataConfig.enabled && metaClient.getTableConfig.getMetadataPartitions.contains(HoodieTableMetadataUtil.PARTITION_NAME_RECORD_INDEX) + metadataConfig.isEnabled && metaClient.getTableConfig.getMetadataPartitions.contains(HoodieTableMetadataUtil.PARTITION_NAME_RECORD_INDEX) } }
