This is an automated email from the ASF dual-hosted git repository. danny0405 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push: new c17f50dbbfc [MINOR] Fixe naming of methods in HoodieMetadataConfig (#11076) c17f50dbbfc is described below commit c17f50dbbfcf4b32ca0790837c672e4fd2d54e85 Author: Vova Kolmakov <wombatu...@gmail.com> 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 +- .../scala/org/apache/hudi/FunctionalIndexSupport.scala | 2 +- .../src/main/scala/org/apache/hudi/HoodieFileIndex.scala | 2 +- .../scala/org/apache/hudi/RecordLevelIndexSupport.scala | 2 +- 14 files changed, 19 insertions(+), 23 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 8c53b06d879..755074997cb 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 @@ -2508,7 +2508,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 09a9b153db1..1da3c0c4be2 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 @@ -99,7 +99,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 96ac7444eca..74cc19ea875 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 2c97e960779..284c08f7309 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 @@ -531,7 +531,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 28043c857d4..445f35c7fde 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 @@ -346,7 +346,7 @@ public final class HoodieMetadataConfig extends HoodieConfig { return Math.max(getInt(HoodieMetadataConfig.FILE_LISTING_PARALLELISM_VALUE), 1); } - public boolean enabled() { + public boolean isEnabled() { return getBoolean(ENABLE); } @@ -359,7 +359,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() { @@ -398,7 +398,7 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getIntOrDefault(METADATA_INDEX_CHECK_TIMEOUT_SECONDS); } - public boolean enableMetrics() { + public boolean isMetricsEnabled() { return getBoolean(METRICS_ENABLE); } @@ -406,11 +406,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); } @@ -418,10 +418,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 1a1ee4390c4..d81062af43f 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 @@ -92,7 +92,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(); @@ -412,7 +412,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 6ad1e376e55..a882c9df69d 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 @@ -655,7 +655,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 b7a5f61dea7..3a69e2dea3d 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 fcb99e07c53..1c46f552a24 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 @@ -1685,7 +1685,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 238962b964c..43c31d5b5e4 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 @@ -115,7 +115,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/FunctionalIndexSupport.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/FunctionalIndexSupport.scala index 8614bcb0b5f..1ce2851e71a 100644 --- a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/FunctionalIndexSupport.scala +++ b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/FunctionalIndexSupport.scala @@ -76,7 +76,7 @@ class FunctionalIndexSupport(spark: SparkSession, * Return true if metadata table is enabled and functional index metadata partition is available. */ def isIndexAvailable: Boolean = { - metadataConfig.enabled && metaClient.getFunctionalIndexMetadata.isPresent && !metaClient.getFunctionalIndexMetadata.get().getIndexDefinitions.isEmpty + metadataConfig.isEnabled && metaClient.getFunctionalIndexMetadata.isPresent && !metaClient.getFunctionalIndexMetadata.get().getIndexDefinitions.isEmpty } /** 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 faabbecc5c1..f4ecbc44cd8 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 @@ -388,7 +388,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 119e3318902..ee8c6f9c86e 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 @@ -127,7 +127,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) } }