Skip to content

Fix UUID check for existing tables without a UUID #652

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
rdblue merged 3 commits into from
Feb 18, 2020
Merged

Fix UUID check for existing tables without a UUID #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7f35dc
Fix UUID check for existing tables without a UUID.
rdblue Oct 24, 2019
4576866
Update HadoopTableOperations.
rdblue Feb 17, 2020
3b45822
Fix complexity in HadoopTableOperations.refresh.
rdblue Feb 18, 2020
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: 2 additions & 2 deletions core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ protected void refreshFromMetadataLocation(String newLocation, Predicate<Excepti
TableMetadataParser.read(io(), metadataLocation)));

String newUUID = newMetadata.get().uuid();
if (currentMetadata != null) {
Preconditions.checkState(newUUID == null || newUUID.equals(currentMetadata.uuid()),
if (currentMetadata != null && currentMetadata.uuid() != null && newUUID != null) {
Preconditions.checkState(newUUID.equals(currentMetadata.uuid()),
"Table UUID does not match: current=%s != refreshed=%s", currentMetadata.uuid(), newUUID);
}

Expand Down
18 changes: 10 additions & 8 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 @@ -96,14 +96,7 @@ public TableMetadata refresh() {
if (version == null || version != ver) {
this.version = ver;

TableMetadata newMetadata = TableMetadataParser.read(io(), 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 = checkUUID(currentMetadata, TableMetadataParser.read(io(), metadataFile.toString()));
}

this.shouldRefresh = false;
Expand Down Expand Up @@ -321,4 +314,13 @@ private void deleteRemovedMetadataFiles(TableMetadata base, TableMetadata metada
.run(previousMetadataFile -> io().deleteFile(previousMetadataFile.file()));
}
}

private static TableMetadata checkUUID(TableMetadata currentMetadata, TableMetadata newMetadata) {
String newUUID = newMetadata.uuid();
if (currentMetadata != null && currentMetadata.uuid() != null && newUUID != null) {
Preconditions.checkState(newUUID.equals(currentMetadata.uuid()),
"Table UUID does not match: current=%s != refreshed=%s", currentMetadata.uuid(), newUUID);
}
return newMetadata;
}
}
5 changes: 4 additions & 1 deletion core/src/main/java/org/apache/iceberg/util/JsonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ public static String getStringOrNull(String property, JsonNode node) {
return null;
}
JsonNode pNode = node.get(property);
Preconditions.checkArgument(pNode != null && !pNode.isNull() && pNode.isTextual(),
if (pNode != null && pNode.isNull()) {
return null;
}
Preconditions.checkArgument(pNode != null && pNode.isTextual(),
"Cannot parse %s from non-string value: %s", property, pNode);
return pNode.asText();
}
Expand Down