-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: port ParallelCompositeUploadBlobWriteSessionConfig to work with…
… HttpStorageOptions (#2474)
- Loading branch information
1 parent
d84e255
commit 3bf6026
Showing
8 changed files
with
286 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
...le-cloud-storage/src/main/java/com/google/cloud/storage/RewindableContentInputStream.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.storage; | ||
|
|
||
| import com.google.cloud.storage.UnbufferedWritableByteChannelSession.UnbufferedWritableByteChannel; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.ByteBuffer; | ||
| import java.nio.channels.GatheringByteChannel; | ||
|
|
||
| /** | ||
| * Facade which makes an instance of {@link RewindableContent} appear as an input stream. | ||
| * | ||
| * <p>It does this by calling {@link RewindableContent#writeTo(GatheringByteChannel)} on an | ||
| * anonymous channel which closes over the read destination. | ||
| */ | ||
| final class RewindableContentInputStream extends InputStream { | ||
|
|
||
| private final RewindableContent content; | ||
|
|
||
| RewindableContentInputStream(RewindableContent content) { | ||
| this.content = content; | ||
| } | ||
|
|
||
| @Override | ||
| public int read() throws IOException { | ||
| byte[] tmp = new byte[1]; | ||
| int read = read(tmp); | ||
| if (read == -1) { | ||
| return -1; | ||
| } else { | ||
| return tmp[0] & 0xFF; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int read(byte[] b, int off, int len) throws IOException { | ||
| // define a byte buffer as the destination for our write | ||
| ByteBuffer dst = ByteBuffer.wrap(b, off, len); | ||
| int remaining = dst.remaining(); | ||
| if (remaining == 0) { | ||
| return 0; | ||
| } | ||
| long written = | ||
| content.writeTo( | ||
| new AnonWritableByteChannel() { | ||
| @Override | ||
| public long write(ByteBuffer[] srcs, int offset, int length) { | ||
| // srcs here is the bytes of content | ||
| long total = 0; | ||
| for (int i = offset; i < length; i++) { | ||
| ByteBuffer src = srcs[i]; | ||
| // copy what we can from our src to the dst buffer | ||
| long written = Buffers.copy(src, dst); | ||
| total += written; | ||
| } | ||
| return total; | ||
| } | ||
| }); | ||
| // if the dst has space, but we didn't write anything means we didn't have anything to write | ||
| if (written == 0) { | ||
| return -1; | ||
| } | ||
| return Math.toIntExact(written); | ||
| } | ||
|
|
||
| private abstract static class AnonWritableByteChannel implements UnbufferedWritableByteChannel { | ||
|
|
||
| @Override | ||
| public boolean isOpen() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
...loud-storage/src/test/java/com/google/cloud/storage/RewindableContentInputStreamTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.storage; | ||
|
|
||
| import static com.google.cloud.storage.ByteSizeConstants._256KiB; | ||
| import static com.google.cloud.storage.TestUtils.xxd; | ||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| import com.google.protobuf.ByteString; | ||
| import java.io.IOException; | ||
| import java.nio.ByteBuffer; | ||
| import org.junit.Test; | ||
|
|
||
| public final class RewindableContentInputStreamTest { | ||
|
|
||
| @Test | ||
| public void read_empty() throws IOException { | ||
| RewindableContent content = RewindableContent.empty(); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| int read = in.read(); | ||
| assertThat(read).isEqualTo(-1); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void readB_emptySrc() throws IOException { | ||
| RewindableContent content = RewindableContent.empty(); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| int read = in.read(new byte[1]); | ||
| assertThat(read).isEqualTo(-1); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void readB_emptyDst() throws IOException { | ||
| byte[] bytes = DataGenerator.base64Characters().genBytes(1); | ||
| RewindableContent content = RewindableContent.of(ByteBuffer.wrap(bytes)); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| byte[] tmp = new byte[0]; | ||
| int read = in.read(tmp); | ||
| assertThat(read).isEqualTo(0); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void readB_singleByte() throws IOException { | ||
| byte[] bytes = DataGenerator.base64Characters().genBytes(1); | ||
| RewindableContent content = RewindableContent.of(ByteBuffer.wrap(bytes)); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| byte[] tmp = new byte[_256KiB]; | ||
| int read = in.read(tmp); | ||
| assertThat(read).isEqualTo(1); | ||
| assertThat(tmp[0]).isEqualTo(bytes[0]); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void read_singleByte() throws IOException { | ||
| byte[] bytes = DataGenerator.base64Characters().genBytes(1); | ||
| RewindableContent content = RewindableContent.of(ByteBuffer.wrap(bytes)); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| int read = in.read(); | ||
| assertThat(read).isEqualTo(bytes[0]); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void readB_multiContent() throws IOException { | ||
| byte[] bytes = DataGenerator.base64Characters().genBytes(30); | ||
| RewindableContent content = | ||
| RewindableContent.of( | ||
| ByteBuffer.wrap(bytes, 0, 10), | ||
| ByteBuffer.wrap(bytes, 10, 10), | ||
| ByteBuffer.wrap(bytes, 20, 10)); | ||
| try (RewindableContentInputStream in = new RewindableContentInputStream(content)) { | ||
| byte[] tmp = new byte[_256KiB]; | ||
| int read = in.read(tmp); | ||
| assertThat(read).isEqualTo(30); | ||
| assertThat(xxd(ByteString.copyFrom(tmp, 0, read))).isEqualTo(xxd(bytes)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters