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 7cadc96b0495ccd695682897b6b85a8f1186704b Author: Sagar Sumit <[email protected]> AuthorDate: Mon Apr 22 22:00:35 2024 +0530 [MINOR] Reuse MetadataPartitionType enum to get all partition paths (#11068) --- .../org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java | 12 +----------- .../java/org/apache/hudi/metadata/MetadataPartitionType.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java index 1f383cdd5d3..313101a355c 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java @@ -39,7 +39,6 @@ import org.apache.hudi.common.table.view.SyncableFileSystemView; import org.apache.hudi.common.testutils.HoodieMetadataTestTable; import org.apache.hudi.common.testutils.HoodieTestDataGenerator; import org.apache.hudi.common.testutils.HoodieTestUtils; -import org.apache.hudi.common.util.CollectionUtils; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; import org.apache.hudi.config.HoodieWriteConfig; @@ -99,10 +98,6 @@ import static org.apache.hudi.common.testutils.HoodieTestDataGenerator.DEFAULT_F import static org.apache.hudi.common.testutils.HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; import static org.apache.hudi.common.util.MarkerUtils.MARKERS_FILENAME_PREFIX; import static org.apache.hudi.common.util.PartitionPathEncodeUtils.DEPRECATED_DEFAULT_PARTITION_PATH; -import static org.apache.hudi.metadata.HoodieTableMetadataUtil.PARTITION_NAME_BLOOM_FILTERS; -import static org.apache.hudi.metadata.HoodieTableMetadataUtil.PARTITION_NAME_COLUMN_STATS; -import static org.apache.hudi.metadata.HoodieTableMetadataUtil.PARTITION_NAME_FILES; -import static org.apache.hudi.metadata.HoodieTableMetadataUtil.PARTITION_NAME_RECORD_INDEX; import static org.apache.hudi.metadata.MetadataPartitionType.RECORD_INDEX; import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -557,12 +552,7 @@ public class TestUpgradeDowngrade extends HoodieClientTestBase { // validate the relevant table states before downgrade java.nio.file.Path recordIndexPartitionPath = Paths.get(basePath, METADATA_TABLE_FOLDER_PATH, RECORD_INDEX.getPartitionPath()); - Set<String> allPartitions = CollectionUtils.createImmutableSet( - PARTITION_NAME_FILES, - PARTITION_NAME_COLUMN_STATS, - PARTITION_NAME_BLOOM_FILTERS, - PARTITION_NAME_RECORD_INDEX - ); + Set<String> allPartitions = MetadataPartitionType.getAllPartitionPaths(); assertTrue(Files.exists(recordIndexPartitionPath), "record index partition should exist."); assertEquals(allPartitions, metaClient.getTableConfig().getMetadataPartitions(), TABLE_METADATA_PARTITIONS.key() + " should contain all partitions."); diff --git a/hudi-common/src/main/java/org/apache/hudi/metadata/MetadataPartitionType.java b/hudi-common/src/main/java/org/apache/hudi/metadata/MetadataPartitionType.java index 81a6b43c4f5..ef0806d3a61 100644 --- a/hudi-common/src/main/java/org/apache/hudi/metadata/MetadataPartitionType.java +++ b/hudi-common/src/main/java/org/apache/hudi/metadata/MetadataPartitionType.java @@ -18,8 +18,11 @@ package org.apache.hudi.metadata; +import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * Partition types for metadata table. @@ -57,6 +60,15 @@ public enum MetadataPartitionType { return Collections.singletonList(MetadataPartitionType.RECORD_INDEX); } + /** + * Returns the set of all metadata partition names. + */ + public static Set<String> getAllPartitionPaths() { + return Arrays.stream(values()) + .map(MetadataPartitionType::getPartitionPath) + .collect(Collectors.toSet()); + } + @Override public String toString() { return "Metadata partition {"
