Skip to content

[HUDI-4883] Supporting delete savepoint for MOR #6744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codope merged 1 commit into from
Sep 23, 2022
Merged

[HUDI-4883] Supporting delete savepoint for MOR #6744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...-client-common/src/main/java/org/apache/hudi/table/action/savepoint/SavepointHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

package org.apache.hudi.table.action.savepoint;

import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.table.timeline.HoodieInstant;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.util.Option;
Expand All @@ -33,9 +32,6 @@ public class SavepointHelpers {
private static final Logger LOG = LogManager.getLogger(SavepointHelpers.class);

public static void deleteSavepoint(HoodieTable table, String savepointTime) {
if (table.getMetaClient().getTableType() == HoodieTableType.MERGE_ON_READ) {
throw new UnsupportedOperationException("Savepointing is not supported or MergeOnRead table types");
}
HoodieInstant savePoint = new HoodieInstant(false, HoodieTimeline.SAVEPOINT_ACTION, savepointTime);
boolean isSavepointPresent = table.getCompletedSavepointTimeline().containsInstant(savePoint);
if (!isSavepointPresent) {
Expand Down
3 changes: 3 additions & 0 deletions ...src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@ private void testUpsertsInternal(HoodieWriteConfig config,

assertFalse(metaClient.reloadActiveTimeline().getRollbackTimeline().lastInstant().isPresent());

client.deleteSavepoint("004");
assertFalse(metaClient.reloadActiveTimeline().getSavePointTimeline().containsInstant("004"));

// Check the entire dataset has all records still
String[] fullPartitionPaths = new String[dataGen.getPartitionPaths().length];
for (int i = 0; i < fullPartitionPaths.length; i++) {
Expand Down
3 changes: 3 additions & 0 deletions ...c/test/java/org/apache/hudi/table/functional/TestHoodieSparkMergeOnReadTableRollback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,9 @@ void testRestoreWithCleanedUpCommits() throws Exception {
HoodieTableFileSystemView tableView = getHoodieTableFileSystemView(metaClient, metaClient.getCommitTimeline().filterCompletedInstants(), allFiles);
Stream<HoodieBaseFile> dataFilesToRead = tableView.getLatestBaseFiles();
assertFalse(dataFilesToRead.anyMatch(file -> HoodieTimeline.compareTimestamps("002", HoodieTimeline.GREATER_THAN, file.getCommitTime())));

client.deleteSavepoint("002");
assertFalse(metaClient.reloadActiveTimeline().getSavePointTimeline().containsInstant("002"));
}
}

Expand Down