Skip to content

[core] Skip tag copy in fastForward when branch has no tags #7800

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

Open
ArnavBalyan wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −4
Open

[core] Skip tag copy in fastForward when branch has no tags #7800

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
9 changes: 5 additions & 4 deletions paimon-core/src/main/java/org/apache/paimon/utils/FileSystemBranchManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,11 @@ public void fastForward(String branchName) {
schemaManager.copyWithBranch(branchName).schemaDirectory(),
schemaManager.schemaDirectory(),
true);
fileIO.copyFiles(
tagManager.copyWithBranch(branchName).tagDirectory(),
tagManager.tagDirectory(),
true);
// Continue fast-forward even without tags.
Path branchTagDirectory = tagManager.copyWithBranch(branchName).tagDirectory();
if (fileIO.exists(branchTagDirectory)) {
fileIO.copyFiles(branchTagDirectory, tagManager.tagDirectory(), true);
}
snapshotManager.invalidateCache();
} catch (IOException e) {
throw new RuntimeException(
Expand Down
29 changes: 29 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/table/SimpleTableTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,6 +1356,35 @@ public void testFastForward() throws Exception {
"4|40|400|binary|varbinary|mapKey:mapVal|multiset");
}

@Test
public void testFastForwardWithoutTag() throws Exception {
FileStoreTable table = createFileStoreTable();

try (StreamTableWrite write = table.newWrite(commitUser);
StreamTableCommit commit = table.newCommit(commitUser)) {
write.write(rowData(0, 0, 0L));
commit.commit(0, write.prepareCommit(false, 1));
}

table.createBranch(BRANCH_NAME);
FileStoreTable tableBranch = createBranchTable(BRANCH_NAME);

try (StreamTableWrite write = tableBranch.newWrite(commitUser);
StreamTableCommit commit = tableBranch.newCommit(commitUser)) {
write.write(rowData(2, 20, 200L));
commit.commit(1, write.prepareCommit(false, 2));
}

table.fastForward(BRANCH_NAME);

assertThat(
getResult(
table.newRead(),
toSplits(table.newSnapshotReader().read().dataSplits()),
BATCH_ROW_TO_STRING))
.contains("2|20|200|binary|varbinary|mapKey:mapVal|multiset");
}

@Test
public void testUnsupportedTagName() throws Exception {
FileStoreTable table = createFileStoreTable();
Expand Down