Skip to content

Remove buffer copy since it's no longer needed #2611

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
zoewangg merged 1 commit into from
Jul 21, 2021
Merged

Remove buffer copy since it's no longer needed #2611

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
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 @@ -112,7 +112,7 @@
<rxjava.version>2.2.21</rxjava.version>
<commons-codec.verion>1.10</commons-codec.verion>
<jmh.version>1.29</jmh.version>
<awscrt.version>0.13.5</awscrt.version>
<awscrt.version>0.13.11</awscrt.version>

<!--Test dependencies -->
<junit.version>4.13.1</junit.version>
Expand Down
6 changes: 1 addition & 5 deletions ...main/java/software/amazon/awssdk/transfer/s3/internal/CrtResponseDataConsumerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import software.amazon.awssdk.crt.http.HttpHeader;
import software.amazon.awssdk.http.SdkHttpResponse;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.utils.BinaryUtils;
import software.amazon.awssdk.utils.Logger;

/**
Expand Down Expand Up @@ -81,10 +80,7 @@ public void onResponse(GetObjectOutput output) {
@Override
public void onResponseData(ByteBuffer byteBuffer) {
log.trace(() -> "Received data of size " + byteBuffer.remaining());

// Need to make a copy because the incoming byteBuffer might get released soon
ByteBuffer newByteBuffer = ByteBuffer.wrap(BinaryUtils.copyAllBytesFrom(byteBuffer));
publisher.deliverData(newByteBuffer);
publisher.deliverData(byteBuffer);
}

@Override
Expand Down
13 changes: 0 additions & 13 deletions .../java/software/amazon/awssdk/transfer/s3/internal/CrtResponseDataConsumerAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,4 @@ public void onResponse_noSdkHttpResponse_shouldCreateEmptySdkHttpResponse() {
assertThat(captor.getValue().responseMetadata().requestId()).isEqualTo("UNKNOWN");
assertThat(captor.getValue().sdkHttpResponse()).isNotNull();
}

@Test
public void onResponseData_shouldCopyByteBuffer() {
ArgumentCaptor<ByteBuffer> captor = ArgumentCaptor.forClass(ByteBuffer.class);
byte[] expectedBytes = "helloworld".getBytes(StandardCharsets.UTF_8);
ByteBuffer byteBuffer = ByteBuffer.wrap(expectedBytes);
adapter.onResponseData(byteBuffer);

verify(publisher).deliverData(captor.capture());
ByteBuffer actualByteBuffer = captor.getValue();
assertThat(actualByteBuffer).isNotSameAs(byteBuffer);
assertThat(actualByteBuffer.array()).isEqualTo(expectedBytes);
}
}