Skip to content

Replace deprecated path() with location() in Iceberg ContentFile #24325

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
merged 1 commit into from
Dec 2, 2024
Merged

Replace deprecated path() with location() in Iceberg ContentFile #24325

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
4 changes: 2 additions & 2 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ private void finishOptimize(ConnectorSession session, IcebergTableExecuteHandle
cleanExtraOutputFiles(
session,
newFiles.stream()
.map(dataFile -> dataFile.path().toString())
.map(ContentFile::location)
.collect(toImmutableSet()));
}

Expand Down Expand Up @@ -2004,7 +2004,7 @@ private void removeOrphanFiles(Table table, ConnectorSession session, SchemaTabl
validMetadataFileNames.add(fileName(manifest.path()));
try (ManifestReader<? extends ContentFile<?>> manifestReader = readerForManifest(table, manifest)) {
for (ContentFile<?> contentFile : manifestReader) {
validDataFileNames.add(fileName(contentFile.path().toString()));
validDataFileNames.add(fileName(contentFile.location()));
}
}
catch (IOException e) {
Expand Down
8 changes: 4 additions & 4 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergSplitSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@ private synchronized boolean pruneFileScanTask(FileScanTaskWithDomain fileScanTa
return true;
}

if (!pathDomain.isAll() && !pathDomain.includesNullableValue(utf8Slice(fileScanTask.file().path().toString()))) {
if (!pathDomain.isAll() && !pathDomain.includesNullableValue(utf8Slice(fileScanTask.file().location()))) {
return true;
}
if (!fileModifiedTimeDomain.isAll()) {
long fileModifiedTime = getModificationTime(fileScanTask.file().path().toString(), fileSystemFactory.create(session.getIdentity(), fileIoProperties));
long fileModifiedTime = getModificationTime(fileScanTask.file().location(), fileSystemFactory.create(session.getIdentity(), fileIoProperties));
if (!fileModifiedTimeDomain.includesNullableValue(packDateTimeWithZone(fileModifiedTime, UTC_KEY))) {
return true;
}
Expand Down Expand Up @@ -662,7 +662,7 @@ private IcebergSplit toIcebergSplit(FileScanTaskWithDomain taskWithDomain)
{
FileScanTask task = taskWithDomain.fileScanTask();
return new IcebergSplit(
task.file().path().toString(),
task.file().location(),
task.start(),
task.length(),
task.file().fileSizeInBytes(),
Expand All @@ -676,7 +676,7 @@ private IcebergSplit toIcebergSplit(FileScanTaskWithDomain taskWithDomain)
SplitWeight.fromProportion(clamp(getSplitWeight(task), minimumAssignedSplitWeight, 1.0)),
taskWithDomain.fileStatisticsDomain(),
fileIoProperties,
cachingHostAddressProvider.getHosts(task.file().path().toString(), ImmutableList.of()),
cachingHostAddressProvider.getHosts(task.file().location(), ImmutableList.of()),
task.file().dataSequenceNumber());
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TableStatisticsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ public static TableStatistics makeTableStatistics(
IcebergStatistics.Builder icebergStatisticsBuilder = new IcebergStatistics.Builder(columns, typeManager);
try (CloseableIterable<FileScanTask> fileScanTasks = tableScan.planFiles()) {
fileScanTasks.forEach(fileScanTask -> {
if (!pathDomain.isAll() && !pathDomain.includesNullableValue(utf8Slice(fileScanTask.file().path().toString()))) {
if (!pathDomain.isAll() && !pathDomain.includesNullableValue(utf8Slice(fileScanTask.file().location()))) {
return;
}
if (!fileModifiedTimeDomain.isAll()) {
long fileModifiedTime = getModificationTime(fileScanTask.file().path().toString(), fileSystem);
long fileModifiedTime = getModificationTime(fileScanTask.file().location(), fileSystem);
if (!fileModifiedTimeDomain.includesNullableValue(packDateTimeWithZone(fileModifiedTime, UTC_KEY))) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/delete/DeleteFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static DeleteFile fromIceberg(org.apache.iceberg.DeleteFile deleteFile)

return new DeleteFile(
deleteFile.content(),
deleteFile.path().toString(),
deleteFile.location(),
deleteFile.format(),
deleteFile.recordCount(),
deleteFile.fileSizeInBytes(),
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/trino/plugin/iceberg/functions/tablechanges/TableChangesSplitSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private TableChangesSplit toSplit(AddedRowsScanTask task)
task.commitSnapshotId(),
DateTimeEncoding.packDateTimeWithZone(icebergTable.snapshot(task.commitSnapshotId()).timestampMillis(), UTC_KEY),
task.changeOrdinal(),
task.file().path().toString(),
task.file().location(),
task.start(),
task.length(),
task.file().fileSizeInBytes(),
Expand All @@ -164,7 +164,7 @@ private TableChangesSplit toSplit(DeletedDataFileScanTask task)
task.commitSnapshotId(),
DateTimeEncoding.packDateTimeWithZone(icebergTable.snapshot(task.commitSnapshotId()).timestampMillis(), UTC_KEY),
task.changeOrdinal(),
task.file().path().toString(),
task.file().location(),
task.start(),
task.length(),
task.file().fileSizeInBytes(),
Expand Down
6 changes: 3 additions & 3 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/procedure/MigrationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public static void addFiles(ConnectorSession session, Table table, List<DataFile
try (CloseableIterable<FileScanTask> iterator = table.newScan().planFiles()) {
for (FileScanTask fileScanTask : iterator) {
DataFile dataFile = fileScanTask.file();
existingFilesBuilder.add(dataFile.path().toString());
existingFilesBuilder.add(dataFile.location());
}
}
catch (IOException e) {
Expand Down Expand Up @@ -312,8 +312,8 @@ public static void addFiles(ConnectorSession session, Table table, List<DataFile
log.debug("Append data %d data files", dataFiles.size());
AppendFiles appendFiles = isMergeManifestsOnWrite(session) ? transaction.newAppend() : transaction.newFastAppend();
for (DataFile dataFile : dataFiles) {
if (existingFiles.contains(dataFile.path().toString())) {
throw new TrinoException(ALREADY_EXISTS, "File already exists: " + dataFile.path());
if (existingFiles.contains(dataFile.location())) {
throw new TrinoException(ALREADY_EXISTS, "File already exists: " + dataFile.location());
}
appendFiles.appendFile(dataFile);
}
Expand Down