Skip to content

Hadoop tables: If the version matches, do not reload metadata. #774

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
aokolnychyi merged 1 commit into from
Feb 4, 2020
Merged

Hadoop tables: If the version matches, do not reload metadata. #774

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
18 changes: 11 additions & 7 deletions core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,20 @@ public TableMetadata refresh() {
nextMetadataFile = getMetadataFile(ver + 1);
}

this.version = ver;
// only load if the current version is out of date
if (version == null || version != ver) {
this.version = ver;

TableMetadata newMetadata = TableMetadataParser.read(io(), io().newInputFile(metadataFile.toString()));
String newUUID = newMetadata.uuid();
if (currentMetadata != null) {
Preconditions.checkState(newUUID == null || newUUID.equals(currentMetadata.uuid()),
"Table UUID does not match: current=%s != refreshed=%s", currentMetadata.uuid(), newUUID);
}

TableMetadata newMetadata = TableMetadataParser.read(io(), io().newInputFile(metadataFile.toString()));
String newUUID = newMetadata.uuid();
if (currentMetadata != null) {
Preconditions.checkState(newUUID == null || newUUID.equals(currentMetadata.uuid()),
"Table UUID does not match: current=%s != refreshed=%s", currentMetadata.uuid(), newUUID);
this.currentMetadata = newMetadata;
}

this.currentMetadata = newMetadata;
this.shouldRefresh = false;
return currentMetadata;
} catch (IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private void testRenameWithFileSystem(FileSystem mockFs) throws Exception {
// inject the mockFS into the TableOperations
doReturn(mockFs).when(spyOps).getFileSystem(any(), any());
try {
spyOps.commit(spyOps.current(), meta1);
spyOps.commit(tops.current(), meta1);
fail("Commit should fail due to mock file system");
} catch (CommitFailedException expected) {
}
Expand Down