diff --git a/.palantir/revapi.yml b/.palantir/revapi.yml index fade79326a49..6d0aa3bac1ee 100644 --- a/.palantir/revapi.yml +++ b/.palantir/revapi.yml @@ -1100,6 +1100,12 @@ acceptedBreaks: - code: "java.class.removed" old: "enum org.apache.iceberg.BaseMetastoreTableOperations.CommitStatus" justification: "Removing deprecated code" + - code: "java.method.parameterTypeChanged" + old: "parameter java.lang.String[] org.apache.iceberg.hadoop.Util::blockLocations(===org.apache.iceberg.CombinedScanTask===,\ + \ org.apache.hadoop.conf.Configuration)" + new: "parameter java.lang.String[] org.apache.iceberg.hadoop.Util::blockLocations(===org.apache.iceberg.ScanTaskGroup===,\ + \ org.apache.hadoop.conf.Configuration)" + justification: "False positive - CombinedScanTask is a subclass of ScanTaskGroup" - code: "java.method.removed" old: "method java.lang.String org.apache.iceberg.FileScanTaskParser::toJson(org.apache.iceberg.FileScanTask)" justification: "Removing deprecated code" diff --git a/core/src/main/java/org/apache/iceberg/hadoop/Util.java b/core/src/main/java/org/apache/iceberg/hadoop/Util.java index ce774d6f259b..d992347d003c 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/Util.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/Util.java @@ -27,7 +27,6 @@ import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.iceberg.CombinedScanTask; import org.apache.iceberg.ContentScanTask; import org.apache.iceberg.FileScanTask; import org.apache.iceberg.ScanTask; @@ -59,9 +58,9 @@ public static FileSystem getFs(Path path, Configuration conf) { } } - public static String[] blockLocations(CombinedScanTask task, Configuration conf) { + public static String[] blockLocations(ScanTaskGroup taskGroup, Configuration conf) { Set locationSets = Sets.newHashSet(); - for (FileScanTask f : task.files()) { + for (FileScanTask f : taskGroup.tasks()) { Path path = new Path(f.file().path().toString()); try { FileSystem fs = path.getFileSystem(conf);