bvaradar commented on code in PR #8385: URL: https://github.com/apache/hudi/pull/8385#discussion_r1164549351
########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/FiveToSixUpgradeHandler.java: ########## @@ -0,0 +1,56 @@ +/* + * 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.hadoop.fs.Path; +import org.apache.hudi.common.config.ConfigProperty; +import org.apache.hudi.common.engine.HoodieEngineContext; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.exception.HoodieUpgradeDowngradeException; +import org.apache.hudi.table.HoodieTable; + +import java.io.IOException; +import java.util.Map; + +/** + * Upgrade handle to assist in upgrading hoodie table from version 5 to 6. + */ +public class FiveToSixUpgradeHandler implements UpgradeHandler { + + @Override + public Map<ConfigProperty, String> upgrade(HoodieWriteConfig config, HoodieEngineContext context, String instantTime, SupportsUpgradeDowngrade upgradeDowngradeHelper) { + HoodieTable table = upgradeDowngradeHelper.getTable(config, context); + HoodieTableMetaClient metaClient = table.getMetaClient(); + // delete compaction requested file from .aux + HoodieTimeline compactionTimeline = metaClient.getActiveTimeline().filterPendingCompactionTimeline() Review Comment: As compaction plan is the only file type present in .aux folder, we should cleanup the all the compaction files there. You can use the following code found in HoodieTimelineArchiver.deleteAllInstantsOlderOrEqualsInAuxMetaFolder to collect all the instants to be deleted. ``` instantsToBeDeleted = metaClient.scanHoodieInstantsFromFileSystem( new Path(metaClient.getMetaAuxiliaryPath()), HoodieActiveTimeline.VALID_EXTENSIONS_IN_ACTIVE_TIMELINE, false); for (HoodieInstant deleteInstant : instantsToBeDeleted) { LOG.info("Deleting instant " + deleteInstant + " in auxiliary meta path " + metaClient.getMetaAuxiliaryPath()); Path metaFile = new Path(metaClient.getMetaAuxiliaryPath(), deleteInstant.getFileName()); if (metaClient.getFs().exists(metaFile)) { success &= metaClient.getFs().delete(metaFile, false); LOG.info("Deleted instant file in auxiliary meta path : " + metaFile); } } ``` ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/FiveToSixUpgradeHandler.java: ########## @@ -0,0 +1,56 @@ +/* + * 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.hadoop.fs.Path; +import org.apache.hudi.common.config.ConfigProperty; +import org.apache.hudi.common.engine.HoodieEngineContext; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.exception.HoodieUpgradeDowngradeException; +import org.apache.hudi.table.HoodieTable; + +import java.io.IOException; +import java.util.Map; + +/** + * Upgrade handle to assist in upgrading hoodie table from version 5 to 6. + */ +public class FiveToSixUpgradeHandler implements UpgradeHandler { + + @Override + public Map<ConfigProperty, String> upgrade(HoodieWriteConfig config, HoodieEngineContext context, String instantTime, SupportsUpgradeDowngrade upgradeDowngradeHelper) { + HoodieTable table = upgradeDowngradeHelper.getTable(config, context); + HoodieTableMetaClient metaClient = table.getMetaClient(); + // delete compaction requested file from .aux + HoodieTimeline compactionTimeline = metaClient.getActiveTimeline().filterPendingCompactionTimeline() + .filter(instant -> instant.getState() == HoodieInstant.State.REQUESTED); + compactionTimeline.getInstants().stream().forEach(instant -> { + String fileName = instant.getFileName(); + try { + metaClient.getFs().delete(new Path(metaClient.getMetaAuxiliaryPath(), fileName)); Review Comment: @Mulavar : We need to basically look at all caller of metaClient.getMetaAuxiliaryPath() and remove the usage of metaAuxiliaryPath since we should not no longer write to them. Also in HoodieTableMetaClient.initTableAndGetMetaClient, can you remove the creation of .aux folder -- 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]
