Skip to content

Update AWS SDK v2 to 2.20.89 #17989

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 2 commits into from
Jun 21, 2023
Merged

Update AWS SDK v2 to 2.20.89 #17989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d308de
Update AWS SDK v2 to 2.20.89
wendigo Jun 21, 2023
87e9678
Use AsyncRequestBody.fromByteBufferUnsafe and drop custom implementation
wendigo Jun 21, 2023
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
116 changes: 0 additions & 116 deletions ...stem/src/main/java/io/trino/plugin/exchange/filesystem/s3/ByteBufferAsyncRequestBody.java
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions ...tem/src/main/java/io/trino/plugin/exchange/filesystem/s3/S3FileSystemExchangeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
import static java.util.Objects.requireNonNull;
import static java.util.Objects.requireNonNullElseGet;
import static java.util.concurrent.TimeUnit.SECONDS;
import static software.amazon.awssdk.core.async.AsyncRequestBody.fromByteBufferUnsafe;
import static software.amazon.awssdk.core.client.config.SdkAdvancedClientOption.USER_AGENT_PREFIX;
import static software.amazon.awssdk.core.client.config.SdkAdvancedClientOption.USER_AGENT_SUFFIX;

Expand Down Expand Up @@ -712,7 +713,7 @@ public ListenableFuture<Void> write(Slice slice)
.key(key)
.storageClass(storageClass);
directUploadFuture = translateFailures(toListenableFuture(s3AsyncClient.putObject(putObjectRequestBuilder.build(),
ByteBufferAsyncRequestBody.fromByteBuffer(slice.toByteBuffer()))));
fromByteBufferUnsafe(slice.toByteBuffer()))));
stats.getPutObject().record(directUploadFuture);
stats.getPutObjectDataSizeInBytes().add(slice.length());
return directUploadFuture;
Expand Down Expand Up @@ -804,7 +805,7 @@ private ListenableFuture<CompletedPart> uploadPart(String uploadId, Slice slice,
.partNumber(partNumber);
UploadPartRequest uploadPartRequest = uploadPartRequestBuilder.build();
stats.getUploadPartDataSizeInBytes().add(slice.length());
return stats.getUploadPart().record(Futures.transform(toListenableFuture(s3AsyncClient.uploadPart(uploadPartRequest, ByteBufferAsyncRequestBody.fromByteBuffer(slice.toByteBuffer()))),
return stats.getUploadPart().record(Futures.transform(toListenableFuture(s3AsyncClient.uploadPart(uploadPartRequest, fromByteBufferUnsafe(slice.toByteBuffer()))),
uploadPartResponse -> CompletedPart.builder().eTag(uploadPartResponse.eTag()).partNumber(partNumber).build(), directExecutor()));
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dep.avro.version>1.11.1</dep.avro.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.aws-sdk.version>1.12.464</dep.aws-sdk.version>
<dep.aws-sdk-v2.version>2.20.78</dep.aws-sdk-v2.version>
<dep.aws-sdk-v2.version>2.20.89</dep.aws-sdk-v2.version>
<dep.jsonwebtoken.version>0.11.5</dep.jsonwebtoken.version>
<dep.oracle.version>21.9.0.0</dep.oracle.version>
<dep.drift.version>1.20</dep.drift.version>
Expand Down