rahil-c commented on code in PR #13669: URL: https://github.com/apache/hudi/pull/13669#discussion_r2252331318
########## hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java: ########## @@ -0,0 +1,653 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.table.upgrade; + +import org.apache.hudi.common.config.RecordMergeMode; +import org.apache.hudi.common.model.HoodieIndexMetadata; +import org.apache.hudi.common.table.HoodieTableConfig; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.HoodieTableVersion; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.InstantFileNameGenerator; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.testutils.HoodieTestUtils; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.metadata.HoodieTableMetadata; +import org.apache.hudi.storage.StoragePath; +import org.apache.hudi.testutils.SparkClientFunctionalTestHarness; +import org.apache.spark.sql.Dataset; +import org.apache.spark.sql.Row; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Properties; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for upgrade/downgrade operations using pre-created fixture tables + * from different Hudi releases. + */ +public class TestUpgradeDowngrade extends SparkClientFunctionalTestHarness { + + private static final Logger LOG = LoggerFactory.getLogger(TestUpgradeDowngrade.class); + private static final String FIXTURES_BASE_PATH = "/upgrade-downgrade-fixtures/mor-tables/"; + + @TempDir + java.nio.file.Path tempDir; + + private HoodieTableMetaClient metaClient; + + @ParameterizedTest + @MethodSource("upgradeVersions") + public void testUpgradeOnly(HoodieTableVersion originalVersion) throws Exception { + LOG.info("Testing upgrade for version {}", originalVersion); + + HoodieTableMetaClient originalMetaClient = loadFixtureTable(originalVersion); + assertEquals(originalVersion, originalMetaClient.getTableConfig().getTableVersion(), + "Fixture table should be at expected version"); + + Option<HoodieTableVersion> targetVersionOpt = getNextVersion(originalVersion); + if (!targetVersionOpt.isPresent()) { + LOG.info("Skipping upgrade test for version {} (no higher version available)", originalVersion); + return; + } + HoodieTableVersion targetVersion = targetVersionOpt.get(); + + HoodieWriteConfig config = createWriteConfig(originalMetaClient, true); + + int initialPendingCommits = originalMetaClient.getCommitsTimeline().filterPendingExcludingCompaction().countInstants(); + int initialCompletedCommits = originalMetaClient.getCommitsTimeline().filterCompletedInstants().countInstants(); + + // Read original data before upgrade for validation + Dataset<Row> originalData = readTableData(originalMetaClient, "before upgrade"); + + LOG.info("Upgrading from {} to {}", originalVersion, targetVersion); + new UpgradeDowngrade(originalMetaClient, config, context(), SparkUpgradeDowngradeHelper.getInstance()) + .run(targetVersion, null); + + HoodieTableMetaClient upgradedMetaClient = HoodieTableMetaClient.builder() + .setConf(storageConf().newInstance()) + .setBasePath(originalMetaClient.getBasePath()) + .build(); + + assertTableVersionOnDataAndMetadataTable(upgradedMetaClient, targetVersion); + validateVersionSpecificProperties(upgradedMetaClient, originalVersion, targetVersion); + validateDataConsistency(originalData, upgradedMetaClient, "after upgrade"); + + int finalPendingCommits = upgradedMetaClient.getCommitsTimeline().filterPendingExcludingCompaction().countInstants(); + assertTrue(finalPendingCommits <= initialPendingCommits, + "Pending commits should be cleaned up or reduced after upgrade"); + + int finalCompletedCommits = upgradedMetaClient.getCommitsTimeline().filterCompletedInstants().countInstants(); + assertTrue(finalCompletedCommits >= initialCompletedCommits, + "Completed commits should be preserved or increased after upgrade"); + + LOG.info("Successfully completed upgrade test for version {} -> {}", originalVersion, targetVersion); + } + + @ParameterizedTest + @MethodSource("downgradeVersions") + public void testDowngradeOnly(HoodieTableVersion targetVersion) throws Exception { Review Comment: yea the naming for this is confusing let me fix to say `startVersion`. ########## hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/table/upgrade/TestUpgradeDowngrade.java: ########## @@ -0,0 +1,653 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.table.upgrade; + +import org.apache.hudi.common.config.RecordMergeMode; +import org.apache.hudi.common.model.HoodieIndexMetadata; +import org.apache.hudi.common.table.HoodieTableConfig; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.HoodieTableVersion; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.table.timeline.InstantFileNameGenerator; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.testutils.HoodieTestUtils; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.metadata.HoodieTableMetadata; +import org.apache.hudi.storage.StoragePath; +import org.apache.hudi.testutils.SparkClientFunctionalTestHarness; +import org.apache.spark.sql.Dataset; +import org.apache.spark.sql.Row; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; + +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Properties; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for upgrade/downgrade operations using pre-created fixture tables + * from different Hudi releases. + */ +public class TestUpgradeDowngrade extends SparkClientFunctionalTestHarness { + + private static final Logger LOG = LoggerFactory.getLogger(TestUpgradeDowngrade.class); + private static final String FIXTURES_BASE_PATH = "/upgrade-downgrade-fixtures/mor-tables/"; + + @TempDir + java.nio.file.Path tempDir; + + private HoodieTableMetaClient metaClient; + + @ParameterizedTest + @MethodSource("upgradeVersions") + public void testUpgradeOnly(HoodieTableVersion originalVersion) throws Exception { + LOG.info("Testing upgrade for version {}", originalVersion); + + HoodieTableMetaClient originalMetaClient = loadFixtureTable(originalVersion); + assertEquals(originalVersion, originalMetaClient.getTableConfig().getTableVersion(), + "Fixture table should be at expected version"); + + Option<HoodieTableVersion> targetVersionOpt = getNextVersion(originalVersion); + if (!targetVersionOpt.isPresent()) { + LOG.info("Skipping upgrade test for version {} (no higher version available)", originalVersion); + return; + } + HoodieTableVersion targetVersion = targetVersionOpt.get(); + + HoodieWriteConfig config = createWriteConfig(originalMetaClient, true); + + int initialPendingCommits = originalMetaClient.getCommitsTimeline().filterPendingExcludingCompaction().countInstants(); + int initialCompletedCommits = originalMetaClient.getCommitsTimeline().filterCompletedInstants().countInstants(); + + // Read original data before upgrade for validation + Dataset<Row> originalData = readTableData(originalMetaClient, "before upgrade"); + + LOG.info("Upgrading from {} to {}", originalVersion, targetVersion); + new UpgradeDowngrade(originalMetaClient, config, context(), SparkUpgradeDowngradeHelper.getInstance()) + .run(targetVersion, null); + + HoodieTableMetaClient upgradedMetaClient = HoodieTableMetaClient.builder() + .setConf(storageConf().newInstance()) + .setBasePath(originalMetaClient.getBasePath()) + .build(); + + assertTableVersionOnDataAndMetadataTable(upgradedMetaClient, targetVersion); + validateVersionSpecificProperties(upgradedMetaClient, originalVersion, targetVersion); + validateDataConsistency(originalData, upgradedMetaClient, "after upgrade"); + + int finalPendingCommits = upgradedMetaClient.getCommitsTimeline().filterPendingExcludingCompaction().countInstants(); + assertTrue(finalPendingCommits <= initialPendingCommits, + "Pending commits should be cleaned up or reduced after upgrade"); + + int finalCompletedCommits = upgradedMetaClient.getCommitsTimeline().filterCompletedInstants().countInstants(); + assertTrue(finalCompletedCommits >= initialCompletedCommits, + "Completed commits should be preserved or increased after upgrade"); + + LOG.info("Successfully completed upgrade test for version {} -> {}", originalVersion, targetVersion); + } + + @ParameterizedTest + @MethodSource("downgradeVersions") + public void testDowngradeOnly(HoodieTableVersion targetVersion) throws Exception { Review Comment: yea the naming for this is confusing let me fix to say `startVersion`. Or current/original -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
