Skip to content
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

Fail query when the symlink file contains inexistent paths #19364

Merged
merged 1 commit into from
Oct 12, 2023
+37 −6
Merged

Fail query when the symlink file contains inexistent paths #19364

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
15 changes: 9 additions & 6 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/BackgroundHiveSplitLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,15 @@ Iterator<InternalHiveSplit> buildManifestFileIterator(InternalHiveSplitFactory s
checkPartitionLocationExists(trinoFileSystem, location);
}
fileStatusIterator.forEachRemaining(status -> fileStatuses.put(Location.of(status.getPath()).path(), status));

List<TrinoFileStatus> locatedFileStatuses = paths.stream()
.map(path -> fileStatuses.get(path.path()))
.toList();

return createInternalHiveSplitIterator(splitFactory, splittable, Optional.empty(), locatedFileStatuses.stream());
Stream<TrinoFileStatus> fileStream = paths.stream()
.map(path -> {
TrinoFileStatus status = fileStatuses.get(path.path());
if (status == null) {
throw new TrinoException(HIVE_FILE_NOT_FOUND, "Manifest file from the location [%s] contains non-existent path: %s".formatted(location, path));
}
return status;
});
return createInternalHiveSplitIterator(splitFactory, splittable, Optional.empty(), fileStream);
}

private ListenableFuture<Void> getTransactionalSplits(Location path, boolean splittable, Optional<BucketConversion> bucketConversion, InternalHiveSplitFactory splitFactory)
Expand Down
28 changes: 28 additions & 0 deletions ...roduct-tests/src/main/java/io/trino/tests/product/hive/TestParquetSymlinkInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import static io.trino.tests.product.utils.QueryExecutors.onTrino;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestParquetSymlinkInputFormat
{
Expand Down Expand Up @@ -66,6 +67,33 @@ public void testSymlinkTable()
hdfsClient.delete(dataDir);
}

@Test(groups = STORAGE_FORMATS)
public void testSymlinkTableWithSymlinkFileContainingNonExistentPath()
throws Exception
{
String table = "test_parquet_invalid_symlink";
onHive().executeQuery("DROP TABLE IF EXISTS " + table);

onHive().executeQuery("" +
"CREATE TABLE " + table +
"(col int) " +
"ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' " +
"STORED AS " +
"INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' " +
"OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'");

String tableRoot = warehouseDirectory + '/' + table;
String dataDir = warehouseDirectory + "/data_test_parquet_invalid_symlink";

saveResourceOnHdfs("data.parquet", dataDir + "/data.parquet");
hdfsClient.saveFile(tableRoot + "/symlink.txt", format("hdfs:%s/data.parquet\nhdfs:%s/missingfile.parquet", dataDir, dataDir));
assertThatThrownBy(() -> onTrino().executeQuery("SELECT * FROM " + table))
.hasMessageMatching(".*Manifest file from the location \\[.*data_test_parquet_invalid_symlink\\] contains non-existent path:.*missingfile.parquet");

onHive().executeQuery("DROP TABLE " + table);
hdfsClient.delete(dataDir);
}

@Test(groups = {AVRO, STORAGE_FORMATS})
public void testSymlinkTableWithMultipleParentDirectories()
throws Exception
Expand Down
Loading