Skip to content

Commit 8e1e12e

Browse files
committed
[FLINK-10817] Upgrade presto dependency to support path-style access
1 parent 20ede03 commit 8e1e12e

File tree

7 files changed

+19
-15
lines changed

7 files changed

+19
-15
lines changed

NOTICE-binary

+4-4
Original file line numberDiff line numberDiff line change
@@ -2551,12 +2551,12 @@ The Apache Software Foundation (http://www.apache.org/).
25512551

25522552
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
25532553

2554-
- com.facebook.presto:presto-hive:0.185
2554+
- com.facebook.presto:presto-hive:0.187
25552555
- com.facebook.presto.hadoop:hadoop-apache2:2.7.3-1
25562556
- com.google.guava:guava:21.0
2557-
- io.airlift:configuration:0.148
2558-
- io.airlift:log:0.148
2559-
- io.airlift:stats:0.148
2557+
- io.airlift:configuration:0.153
2558+
- io.airlift:log:0.153
2559+
- io.airlift:stats:0.153
25602560
- io.airlift:units:1.0
25612561
- io.airlift:slice:0.31
25622562
- com.fasterxml.jackson.core:jackson-annotations:2.8.1

docs/ops/filesystems.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ including any NFS or SAN that is mounted into that local file system.
5454
the classpath to use them. Both internally use some Hadoop code, but "shade away" all classes to avoid any dependency conflicts.
5555

5656
- `flink-s3-fs-presto`, registered under the scheme *"s3://"* and *"s3p://"*, is based on code from the [Presto project](https://prestodb.io/).
57-
You can configure it the same way you can [configure the Presto file system](https://prestodb.io/docs/0.185/connector/hive.html#amazon-s3-configuration).
57+
You can configure it the same way you can [configure the Presto file system](https://prestodb.io/docs/0.187/connector/hive.html#amazon-s3-configuration).
5858

5959
- `flink-s3-fs-hadoop`, registered under *"s3://"* and *"s3a://"*, based on code from the [Hadoop Project](https://hadoop.apache.org/).
6060
The file system can be [configured exactly like Hadoop's s3a](https://hadoop.apache.org/docs/stable/hadoop-aws/tools/hadoop-aws/index.html#S3A).

flink-filesystems/flink-s3-fs-presto/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333
<packaging>jar</packaging>
3434

3535
<properties>
36-
<presto.version>0.185</presto.version>
36+
<presto.version>0.187</presto.version>
3737
</properties>
3838

3939
<dependencies>
@@ -134,6 +134,10 @@ under the License.
134134
<groupId>io.airlift</groupId>
135135
<artifactId>aircompressor</artifactId>
136136
</exclusion>
137+
<exclusion>
138+
<groupId>io.airlift</groupId>
139+
<artifactId>log-manager</artifactId>
140+
</exclusion>
137141
<exclusion>
138142
<groupId>javax.inject</groupId>
139143
<artifactId>javax.inject</artifactId>

flink-filesystems/flink-s3-fs-presto/src/main/java/org/apache/flink/fs/s3presto/S3FileSystemFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.flink.fs.s3.common.writer.S3AccessHelper;
2525
import org.apache.flink.util.FlinkRuntimeException;
2626

27-
import com.facebook.presto.hive.PrestoS3FileSystem;
27+
import com.facebook.presto.hive.s3.PrestoS3FileSystem;
2828
import org.apache.hadoop.fs.FileSystem;
2929

3030
import javax.annotation.Nullable;

flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.facebook.presto:presto-hive:0.185
9+
- com.facebook.presto:presto-hive:0.187
1010
- com.facebook.presto.hadoop:hadoop-apache2:2.7.3-1
1111
- com.google.guava:guava:21.0
12-
- io.airlift:configuration:0.148
13-
- io.airlift:log:0.148
14-
- io.airlift:stats:0.148
12+
- io.airlift:configuration:0.153
13+
- io.airlift:log:0.153
14+
- io.airlift:stats:0.153
1515
- io.airlift:units:1.0
1616
- io.airlift:slice:0.31
1717
- com.fasterxml.jackson.core:jackson-annotations:2.8.1

flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemITCase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
import java.util.List;
3535
import java.util.UUID;
3636

37-
import static com.facebook.presto.hive.PrestoS3FileSystem.S3_USE_INSTANCE_CREDENTIALS;
37+
import static com.facebook.presto.hive.s3.PrestoS3FileSystem.S3_USE_INSTANCE_CREDENTIALS;
3838
import static org.junit.Assert.assertFalse;
3939
import static org.junit.Assert.fail;
4040

4141
/**
42-
* Unit tests for the S3 file system support via Presto's {@link com.facebook.presto.hive.PrestoS3FileSystem}.
42+
* Unit tests for the S3 file system support via Presto's {@link com.facebook.presto.hive.s3.PrestoS3FileSystem}.
4343
*
4444
* <p><strong>BEWARE</strong>: tests must take special care of S3's
4545
* <a href="https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html#ConsistencyModel">consistency guarantees</a>
46-
* and what the {@link com.facebook.presto.hive.PrestoS3FileSystem} offers.
46+
* and what the {@link com.facebook.presto.hive.s3.PrestoS3FileSystem} offers.
4747
*/
4848
@RunWith(Parameterized.class)
4949
public class PrestoS3FileSystemITCase extends AbstractHadoopFileSystemITTest {

flink-filesystems/flink-s3-fs-presto/src/test/java/org/apache/flink/fs/s3presto/PrestoS3FileSystemTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.amazonaws.auth.AWSCredentialsProvider;
2727
import com.amazonaws.auth.AWSStaticCredentialsProvider;
2828
import com.amazonaws.services.s3.AmazonS3Client;
29-
import com.facebook.presto.hive.PrestoS3FileSystem;
29+
import com.facebook.presto.hive.s3.PrestoS3FileSystem;
3030
import org.junit.Test;
3131

3232
import java.lang.reflect.Field;

0 commit comments

Comments
 (0)