Skip to content

Add special characters missing test coverage for native-fs s3 path #22476

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
ebyhr merged 1 commit into from
Jun 27, 2024
Merged

Add special characters missing test coverage for native-fs s3 path #22476

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
52 changes: 37 additions & 15 deletions plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestHiveS3MinioQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,36 @@
package io.trino.plugin.hive.s3;

import com.google.common.collect.ImmutableMap;
import io.trino.plugin.hive.HiveQueryRunner;
import io.trino.plugin.hive.containers.HiveMinioDataLake;
import io.trino.testing.AbstractTestQueryFramework;
import io.trino.testing.QueryRunner;
import io.trino.testing.containers.Minio;
import org.junit.jupiter.api.Test;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static com.google.common.base.Verify.verify;
import static io.trino.testing.TestingNames.randomNameSuffix;
import static io.trino.testing.containers.Minio.MINIO_ACCESS_KEY;
import static io.trino.testing.containers.Minio.MINIO_SECRET_KEY;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;

public class TestHiveS3MinioQueries
extends AbstractTestQueryFramework
{
private Minio minio;
private HiveMinioDataLake hiveMinioDataLake;
private String bucketName;

@Override
protected QueryRunner createQueryRunner()
throws Exception
{
minio = closeAfterClass(Minio.builder().build());
minio.start();
this.bucketName = "test-hive-minio-queries-" + randomNameSuffix();
this.hiveMinioDataLake = closeAfterClass(new HiveMinioDataLake(bucketName));
this.hiveMinioDataLake.start();

return HiveQueryRunner.builder()
return S3HiveQueryRunner.builder(hiveMinioDataLake)
.setHiveProperties(ImmutableMap.<String, String>builder()
.put("hive.metastore.disable-location-checks", "true")
.put("hive.s3.aws-access-key", MINIO_ACCESS_KEY)
.put("hive.s3.aws-secret-key", MINIO_SECRET_KEY)
.put("hive.s3.endpoint", minio.getMinioAddress())
.put("hive.s3.path-style-access", "true")
.put("hive.non-managed-table-writes-enabled", "true")
.buildOrThrow())
.build();
Expand All @@ -58,8 +53,8 @@ protected QueryRunner createQueryRunner()
public void testTableLocationTopOfTheBucket()
{
String bucketName = "test-bucket-" + randomNameSuffix();
minio.createBucket(bucketName);
minio.writeFile("We are\nawesome at\nmultiple slashes.".getBytes(UTF_8), bucketName, "a_file");
hiveMinioDataLake.getMinio().createBucket(bucketName);
hiveMinioDataLake.getMinio().writeFile("We are\nawesome at\nmultiple slashes.".getBytes(UTF_8), bucketName, "a_file");

// without trailing slash
assertQueryFails(
Expand Down Expand Up @@ -105,4 +100,31 @@ private String getDeclaredTableLocation(String tableName)
}
throw new IllegalStateException("Location not found in: " + result);
}

@Test
public void testPathContainsSpecialCharacter()
{
String tableName = "test_path_special_character" + randomNameSuffix();
String location = "s3://%s/%s/".formatted(bucketName, tableName);
assertUpdate(format(
"CREATE TABLE %s (id bigint, part varchar) WITH (partitioned_by = ARRAY['part'], external_location='%s')",
tableName,
location));

String values = "(1, 'with-hyphen')," +
"(2, 'with.dot')," +
"(3, 'with:colon')," +
"(4, 'with/slash')," +
"(5, 'with\\\\backslashes')," +
"(6, 'with\\backslash')," +
"(7, 'with=equal')," +
"(8, 'with?question')," +
"(9, 'with!exclamation')," +
"(10, 'with%percent')," +
"(11, 'with%%percents')," +
"(12, 'with space')";
assertUpdate("INSERT INTO " + tableName + " VALUES " + values, 12);
assertQuery("SELECT * FROM " + tableName, "VALUES " + values);
assertUpdate("DROP TABLE " + tableName);
}
}
27 changes: 27 additions & 0 deletions ...ino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergMinioConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,33 @@ public void testExpireSnapshotsBatchDeletes()
assertUpdate("DROP TABLE " + tableName);
}

@Test
public void testPathContainsSpecialCharacter()
{
String tableName = "test_path_special_character" + randomNameSuffix();
String location = "s3://%s/%s/%s/".formatted(bucketName, schemaName, tableName);
assertUpdate(format(
"CREATE TABLE %s (id bigint, part varchar) WITH (partitioning = ARRAY['part'], location='%s')",
tableName,
location));

String values = "(1, 'with-hyphen')," +
"(2, 'with.dot')," +
"(3, 'with:colon')," +
"(4, 'with/slash')," +
"(5, 'with\\\\backslashes')," +
"(6, 'with\\backslash')," +
"(7, 'with=equal')," +
"(8, 'with?question')," +
"(9, 'with!exclamation')," +
"(10, 'with%percent')," +
"(11, 'with%%percents')," +
"(12, 'with space')";
assertUpdate("INSERT INTO " + tableName + " VALUES " + values, 12);
assertQuery("SELECT * FROM " + tableName, "VALUES " + values);
assertUpdate("DROP TABLE " + tableName);
}

private String onMetastore(@Language("SQL") String sql)
{
return hiveMinioDataLake.getHiveHadoop().runOnMetastore(sql);
Expand Down