aokolnychyi commented on a change in pull request #2564:
URL: https://github.com/apache/iceberg/pull/2564#discussion_r629842136
##########
File path: core/src/main/java/org/apache/iceberg/MetadataLocationUtils.java
##########
@@ -58,17 +53,22 @@ private static void miscMetadataFiles(String
metadataFileLocation, Set<String> m
if (metadataFileLocation == null) {
return;
}
- try {
- TableMetadata metadata = TableMetadataParser.read(io,
metadataFileLocation);
- List<TableMetadata.MetadataLogEntry> metadataLogEntries =
metadata.previousFiles();
- List<String> previousMetadataFiles =
-
metadataLogEntries.stream().map(TableMetadata.MetadataLogEntry::file).collect(Collectors.toList());
+ TableMetadata metadata = TableMetadataParser.read(io,
metadataFileLocation);
+ List<TableMetadata.MetadataLogEntry> metadataLogEntries =
metadata.previousFiles();
+ List<String> previousMetadataFiles =
+ metadataLogEntries.stream().map(TableMetadata.MetadataLogEntry::file)
+ .collect(Collectors.toList());
+ if (previousMetadataFiles.size() > 0) {
metaFiles.addAll(previousMetadataFiles);
- if (isRecursive && previousMetadataFiles.size() > 0) {
- miscMetadataFiles(previousMetadataFiles.get(0), metaFiles, io,
isRecursive);
+ if (isRecursive) {
Review comment:
I think recursion makes it a bit hard to read and there is another
problem. We will always open the metadata file even for getting the previous
files from the current metadata. That was not the case before.
We could have something like this:
```
public static Set<String> metadataFileLocations(Table table, boolean
recursive) {
Set<String> metadataFileLocations = Sets.newHashSet();
TableOperations ops = ((HasTableOperations) table).operations();
TableMetadata metadata = ops.current();
while (metadata != null) {
metadataFileLocations.add(metadata.metadataFileLocation());
List<MetadataLogEntry> metadataLogEntries = metadata.previousFiles();
for (MetadataLogEntry metadataLogEntry : metadataLogEntries) {
metadataFileLocations.add(metadataLogEntry.file());
}
if (recursive && metadataLogEntries.size() > 0) {
String oldestMetadataFileLocation = metadataLogEntries.get(0).file();
try {
metadata = TableMetadataParser.read(table.io(),
oldestMetadataFileLocation);
} catch (Exception e) {
LOG.error("Failed to load {}", oldestMetadataFileLocation, e);
break;
}
} else {
break;
}
}
return metadataFileLocations;
}
```
Just an idea.
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
