This is an automated email from the ASF dual-hosted git repository. yihua pushed a commit to branch release-1.1.0 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit bcb5eaacabfbd525b68dfb109876fe52f8205464 Author: Lin Liu <[email protected]> AuthorDate: Tue Nov 11 11:07:12 2025 -0500 fix: Update metadata table record level index config keys naming for standardization (#14244) --- .../org/apache/hudi/config/HoodieWriteConfig.java | 16 ++++----- .../metadata/HoodieBackedTableMetadataWriter.java | 14 ++++---- .../hudi/common/config/HoodieMetadataConfig.java | 40 ++++++++++++---------- .../hudi/functional/RecordLevelIndexTestBase.scala | 2 +- .../functional/TestGlobalRecordLevelIndex.scala | 8 ++--- .../hudi/functional/TestMetadataRecordIndex.scala | 2 +- .../TestHoodieBackedTableMetadataIndexLookup.scala | 8 ++--- .../TestHoodieMetadataTableValidator.java | 28 +++++++-------- 8 files changed, 61 insertions(+), 57 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 f53b7d2d3b3b..7dc914fe9d65 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 @@ -2676,20 +2676,20 @@ public class HoodieWriteConfig extends HoodieConfig { return getBoolean(HoodieMetadataConfig.ENABLE_LOG_COMPACTION_ON_METADATA_TABLE); } - public int getRecordIndexMinFileGroupCount() { - return metadataConfig.getRecordIndexMinFileGroupCount(); + public int getGlobalRecordLevelIndexMinFileGroupCount() { + return metadataConfig.getGlobalRecordLevelIndexMinFileGroupCount(); } - public int getRecordIndexMaxFileGroupCount() { - return metadataConfig.getRecordIndexMaxFileGroupCount(); + public int getGlobalRecordLevelIndexMaxFileGroupCount() { + return metadataConfig.getGlobalRecordLevelIndexMaxFileGroupCount(); } - public int getPartitionedRecordIndexMinFileGroupCount() { - return metadataConfig.getPartitionedRecordIndexMinFileGroupCount(); + public int getRecordLevelIndexMinFileGroupCount() { + return metadataConfig.getRecordLevelIndexMinFileGroupCount(); } - public int getPartitionedRecordIndexMaxFileGroupCount() { - return metadataConfig.getPartitionedRecordIndexMaxFileGroupCount(); + public int getRecordLevelIndexMaxFileGroupCount() { + return metadataConfig.getRecordLevelIndexMaxFileGroupCount(); } public float getRecordIndexGrowthFactor() { diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java index ab7ba22fdec4..d45cdaaedf9f 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadataWriter.java @@ -673,8 +673,8 @@ public abstract class HoodieBackedTableMetadataWriter<I, O> implements HoodieTab // Initialize the file groups - using the same estimation logic as that of record index final int fileGroupCount = HoodieTableMetadataUtil.estimateFileGroupCount(RECORD_INDEX, records::count, - RECORD_INDEX_AVERAGE_RECORD_SIZE, dataWriteConfig.getRecordIndexMinFileGroupCount(), - dataWriteConfig.getRecordIndexMaxFileGroupCount(), dataWriteConfig.getRecordIndexGrowthFactor(), + RECORD_INDEX_AVERAGE_RECORD_SIZE, dataWriteConfig.getGlobalRecordLevelIndexMinFileGroupCount(), + dataWriteConfig.getGlobalRecordLevelIndexMaxFileGroupCount(), dataWriteConfig.getRecordIndexGrowthFactor(), dataWriteConfig.getRecordIndexMaxFileGroupSizeBytes()); return Pair.of(fileGroupCount, records); @@ -811,11 +811,11 @@ public abstract class HoodieBackedTableMetadataWriter<I, O> implements HoodieTab int minFileGroupCount; int maxFileGroupCount; if (dataWriteConfig.isRecordLevelIndexEnabled()) { - minFileGroupCount = dataWriteConfig.getPartitionedRecordIndexMinFileGroupCount(); - maxFileGroupCount = dataWriteConfig.getPartitionedRecordIndexMaxFileGroupCount(); + minFileGroupCount = dataWriteConfig.getRecordLevelIndexMinFileGroupCount(); + maxFileGroupCount = dataWriteConfig.getRecordLevelIndexMaxFileGroupCount(); } else { - minFileGroupCount = dataWriteConfig.getRecordIndexMinFileGroupCount(); - maxFileGroupCount = dataWriteConfig.getRecordIndexMaxFileGroupCount(); + minFileGroupCount = dataWriteConfig.getGlobalRecordLevelIndexMinFileGroupCount(); + maxFileGroupCount = dataWriteConfig.getGlobalRecordLevelIndexMaxFileGroupCount(); } Supplier<Long> recordCountSupplier = () -> { records.persist("MEMORY_AND_DISK_SER"); @@ -1429,7 +1429,7 @@ public abstract class HoodieBackedTableMetadataWriter<I, O> implements HoodieTab for (String partitionToWrite : partitionsTouchedByInflightCommit) { // Always use the min file group count! initializeFileGroups(dataMetaClient, RECORD_INDEX, instantTime, - dataWriteConfig.getPartitionedRecordIndexMinFileGroupCount(), + dataWriteConfig.getRecordLevelIndexMinFileGroupCount(), RECORD_INDEX.getPartitionPath(), Option.of(partitionToWrite)); } initMetadataReader(); 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 3b170499fc75..9e161afa983b 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 @@ -290,30 +290,34 @@ public final class HoodieMetadataConfig extends HoodieConfig { .withDocumentation("Create the HUDI Record Index within the Metadata Table for a partitioned dataset where a " + "pair of partition path and record key is unique across the entire table"); - public static final ConfigProperty<Integer> RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP = ConfigProperty - .key(METADATA_PREFIX + ".record.index.min.filegroup.count") + public static final ConfigProperty<Integer> GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP = ConfigProperty + .key(METADATA_PREFIX + ".global.record.level.index.min.filegroup.count") .defaultValue(10) + .withAlternatives(METADATA_PREFIX + ".record.index.min.filegroup.count") .markAdvanced() .sinceVersion("0.14.0") .withDocumentation("Minimum number of file groups to use for Record Index."); - public static final ConfigProperty<Integer> RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP = ConfigProperty - .key(METADATA_PREFIX + ".record.index.max.filegroup.count") + public static final ConfigProperty<Integer> GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP = ConfigProperty + .key(METADATA_PREFIX + ".global.record.level.index.max.filegroup.count") .defaultValue(10000) + .withAlternatives(METADATA_PREFIX + ".record.index.max.filegroup.count") .markAdvanced() .sinceVersion("0.14.0") .withDocumentation("Maximum number of file groups to use for Record Index."); - public static final ConfigProperty<Integer> PARTITIONED_RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP = ConfigProperty - .key(METADATA_PREFIX + ".partitioned.record.index.min.filegroup.count") + public static final ConfigProperty<Integer> RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP = ConfigProperty + .key(METADATA_PREFIX + ".record.level.index.min.filegroup.count") .defaultValue(1) + .withAlternatives(METADATA_PREFIX + ".partitioned.record.index.min.filegroup.count") .markAdvanced() .sinceVersion("1.1.0") .withDocumentation("Minimum number of file groups to use for Partitioned Record Index."); - public static final ConfigProperty<Integer> PARTITIONED_RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP = ConfigProperty - .key(METADATA_PREFIX + ".partitioned.record.index.max.filegroup.count") + public static final ConfigProperty<Integer> RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP = ConfigProperty + .key(METADATA_PREFIX + ".record.level.index.max.filegroup.count") .defaultValue(10) + .withAlternatives(METADATA_PREFIX + ".partitioned.record.index.max.filegroup.count") .markAdvanced() .sinceVersion("1.1.0") .withDocumentation("Maximum number of file groups to use for Partitioned Record Index."); @@ -684,20 +688,20 @@ public final class HoodieMetadataConfig extends HoodieConfig { return getIntOrDefault(METADATA_MAX_NUM_DELTACOMMITS_WHEN_PENDING); } - public int getRecordIndexMinFileGroupCount() { - return getInt(RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP); + public int getGlobalRecordLevelIndexMinFileGroupCount() { + return getInt(GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP); } - public int getPartitionedRecordIndexMinFileGroupCount() { - return getInt(PARTITIONED_RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP); + public int getRecordLevelIndexMinFileGroupCount() { + return getInt(RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP); } - public int getRecordIndexMaxFileGroupCount() { - return getInt(RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP); + public int getGlobalRecordLevelIndexMaxFileGroupCount() { + return getInt(GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP); } - public int getPartitionedRecordIndexMaxFileGroupCount() { - return getInt(PARTITIONED_RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP); + public int getRecordLevelIndexMaxFileGroupCount() { + return getInt(RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP); } public float getRecordIndexGrowthFactor() { @@ -1033,8 +1037,8 @@ public final class HoodieMetadataConfig extends HoodieConfig { } public Builder withRecordIndexFileGroupCount(int minCount, int maxCount) { - metadataConfig.setValue(RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP, String.valueOf(minCount)); - metadataConfig.setValue(RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP, String.valueOf(maxCount)); + metadataConfig.setValue(GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP, String.valueOf(minCount)); + metadataConfig.setValue(GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP, String.valueOf(maxCount)); return this; } diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/RecordLevelIndexTestBase.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/RecordLevelIndexTestBase.scala index ae462759e0de..c7b8936b433d 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/RecordLevelIndexTestBase.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/RecordLevelIndexTestBase.scala @@ -152,7 +152,7 @@ class RecordLevelIndexTestBase extends HoodieStatsIndexTestBase { assertEquals(rowArr.length, recordIndexMap.keySet.size) val estimatedFileGroupCount = HoodieTableMetadataUtil.estimateFileGroupCount(MetadataPartitionType.RECORD_INDEX, () => rowArr.length, 48, - writeConfig.getRecordIndexMinFileGroupCount, writeConfig.getRecordIndexMaxFileGroupCount, + writeConfig.getGlobalRecordLevelIndexMinFileGroupCount, writeConfig.getGlobalRecordLevelIndexMaxFileGroupCount, writeConfig.getRecordIndexGrowthFactor, writeConfig.getRecordIndexMaxFileGroupSizeBytes) assertEquals(estimatedFileGroupCount, getFileGroupCountForRecordIndex(writeConfig)) val prevDf = mergedDfList.last.drop("tip_history", "_hoodie_is_deleted") diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestGlobalRecordLevelIndex.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestGlobalRecordLevelIndex.scala index 21960e4fe0ab..a39c849460de 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestGlobalRecordLevelIndex.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestGlobalRecordLevelIndex.scala @@ -74,8 +74,8 @@ class TestGlobalRecordLevelIndex extends RecordLevelIndexTestBase { def testRLIInitializationForMorGlobalIndex(): Unit = { val tableType = HoodieTableType.MERGE_ON_READ val hudiOpts = commonOpts + (DataSourceWriteOptions.TABLE_TYPE.key -> tableType.name()) + - (HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key -> "1") + - (HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key -> "1") + + (HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key -> "1") + + (HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key -> "1") + (HoodieIndexConfig.INDEX_TYPE.key -> HoodieIndex.IndexType.GLOBAL_RECORD_LEVEL_INDEX.name()) + (HoodieIndexConfig.RECORD_INDEX_UPDATE_PARTITION_PATH_ENABLE.key -> "true") - HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key @@ -116,8 +116,8 @@ class TestGlobalRecordLevelIndex extends RecordLevelIndexTestBase { deletedDf2.cache() val hudiOpts2 = commonOpts + (DataSourceWriteOptions.TABLE_TYPE.key -> tableType.name()) + - (HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key -> "1") + - (HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key -> "1") + + (HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key -> "1") + + (HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key -> "1") + (HoodieIndexConfig.INDEX_TYPE.key -> HoodieIndex.IndexType.GLOBAL_RECORD_LEVEL_INDEX.name()) + (HoodieIndexConfig.RECORD_INDEX_UPDATE_PARTITION_PATH_ENABLE.key -> "true") + (HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key -> "true") diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestMetadataRecordIndex.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestMetadataRecordIndex.scala index 111947054a91..75a2400b7bdf 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestMetadataRecordIndex.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestMetadataRecordIndex.scala @@ -207,7 +207,7 @@ class TestMetadataRecordIndex extends HoodieSparkClientTestBase { assertEquals(rowArr.length, recordIndexMap.keySet.size) val estimatedFileGroupCount = HoodieTableMetadataUtil.estimateFileGroupCount( MetadataPartitionType.RECORD_INDEX, () => rowArr.length, 48, - writeConfig.getRecordIndexMinFileGroupCount, writeConfig.getRecordIndexMaxFileGroupCount, + writeConfig.getGlobalRecordLevelIndexMinFileGroupCount, writeConfig.getGlobalRecordLevelIndexMaxFileGroupCount, writeConfig.getRecordIndexGrowthFactor, writeConfig.getRecordIndexMaxFileGroupSizeBytes) assertEquals(estimatedFileGroupCount, getFileGroupCountForRecordIndex(writeConfig)) val prevDf = mergedDfList.last.drop("tip_history") diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/feature/index/TestHoodieBackedTableMetadataIndexLookup.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/feature/index/TestHoodieBackedTableMetadataIndexLookup.scala index e04fd6cbdc6b..3be666e71db6 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/feature/index/TestHoodieBackedTableMetadataIndexLookup.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/feature/index/TestHoodieBackedTableMetadataIndexLookup.scala @@ -70,8 +70,8 @@ abstract class HoodieBackedTableMetadataIndexLookupTestBase extends HoodieSparkS | hoodie.metadata.record.index.enable = 'true', | hoodie.metadata.index.column.stats.enable = 'true', | hoodie.metadata.index.secondary.enable = 'true', - | hoodie.metadata.record.index.min.filegroup.count = '${getNumFileIndexGroup}', - | hoodie.metadata.record.index.max.filegroup.count = '${getNumFileIndexGroup}', + | hoodie.metadata.global.record.level.index.min.filegroup.count = '${getNumFileIndexGroup}', + | hoodie.metadata.global.record.level.index.max.filegroup.count = '${getNumFileIndexGroup}', | hoodie.write.table.version = '${getTableVersion}', | hoodie.datasource.write.payload.class = 'org.apache.hudi.common.model.OverwriteWithLatestAvroPayload' | ) @@ -207,8 +207,8 @@ abstract class HoodieBackedTableMetadataIndexLookupTestBase extends HoodieSparkS // Create secondary indexes on name and price columns spark.sql(s"set hoodie.write.table.version = ${getTableVersion}") - spark.sql(s"set hoodie.metadata.record.index.min.filegroup.count = ${getNumFileIndexGroup}") - spark.sql(s"set hoodie.metadata.record.index.max.filegroup.count = ${getNumFileIndexGroup}") + spark.sql(s"set hoodie.metadata.global.record.level.index.min.filegroup.count = ${getNumFileIndexGroup}") + spark.sql(s"set hoodie.metadata.global.record.level.index.max.filegroup.count = ${getNumFileIndexGroup}") spark.sql(s"create index idx_name on $tableName (name)") spark.sql(s"create index idx_price on $tableName (price)") diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieMetadataTableValidator.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieMetadataTableValidator.java index 24894d4ae512..36c562eeaa3e 100644 --- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieMetadataTableValidator.java +++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/TestHoodieMetadataTableValidator.java @@ -211,8 +211,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase inserts.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.BULK_INSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Overwrite) .save(basePath); inserts.unpersist(true); @@ -220,8 +220,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase updates.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.UPSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Append) .save(basePath); updates.unpersist(true); @@ -270,8 +270,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase inserts.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.BULK_INSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Overwrite) .save(basePath); inserts.unpersist(true); @@ -285,8 +285,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase updates.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.UPSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Append) .save(basePath); updates.unpersist(true); @@ -1398,8 +1398,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase inserts.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.BULK_INSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Overwrite) .save(basePath); inserts.unpersist(true); @@ -1407,8 +1407,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase updates.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.UPSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Append) .save(basePath); updates.unpersist(true); @@ -1417,8 +1417,8 @@ public class TestHoodieMetadataTableValidator extends HoodieSparkClientTestBase inserts2.write().format("hudi").options(writeOptions) .option(DataSourceWriteOptions.OPERATION().key(), WriteOperationType.BULK_INSERT.value()) .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_ENABLE_PROP.key(), "true") - .option(HoodieMetadataConfig.RECORD_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") - .option(HoodieMetadataConfig.RECORD_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MIN_FILE_GROUP_COUNT_PROP.key(), "1") + .option(HoodieMetadataConfig.GLOBAL_RECORD_LEVEL_INDEX_MAX_FILE_GROUP_COUNT_PROP.key(), "1") .mode(SaveMode.Append) .save(basePath); inserts2.unpersist(true);
