Skip to content
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

Jump to bottom

fix: properly implement GrpcBlobReadChannel#isOpen #1733

Merged
merged 2 commits into from Oct 24, 2022
Merged

fix: properly implement GrpcBlobReadChannel#isOpen #1733

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
4ae73f6
fix: fix GrpcBlobReadChannel#isOpen
BenWhitehead Oct 24, 2022
c00b5a6
chore: update assertion for possible RPO values via gRPC
BenWhitehead Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 27 additions & 17 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcBlobReadChannel.java
View file
Open in desktop
Expand Up @@ -49,19 +49,18 @@ final class GrpcBlobReadChannel implements ReadChannel {
boolean autoGzipDecompression) {
this.lazyReadChannel =
new LazyReadChannel(
Suppliers.memoize(
() -> {
ReadObjectRequest req =
seekReadObjectRequest(request, position, sub(limit, position));
return ResumableMedia.gapic()
.read()
.byteChannel(read)
.setHasher(Hasher.noop())
.setAutoGzipDecompression(autoGzipDecompression)
.buffered(BufferHandle.allocate(chunkSize))
.setReadObjectRequest(req)
.build();
}));
() -> {
ReadObjectRequest req =
seekReadObjectRequest(request, position, sub(limit, position));
return ResumableMedia.gapic()
.read()
.byteChannel(read)
.setHasher(Hasher.noop())
.setAutoGzipDecompression(autoGzipDecompression)
.buffered(BufferHandle.allocate(chunkSize))
.setReadObjectRequest(req)
.build();
});
}

@Override
Expand All @@ -72,7 +71,7 @@ public void setChunkSize(int chunkSize) {

@Override
public boolean isOpen() {
return false;
return lazyReadChannel.isOpen() && lazyReadChannel.getChannel().isOpen();
}

@Override
Expand All @@ -81,8 +80,8 @@ public void close() {
try {
lazyReadChannel.getChannel().close();
} catch (IOException e) {
// TODO: why does ReadChannel remove IOException?!
throw new RuntimeException(e);
// why does ReadChannel remove IOException?!
throw StorageException.coalesce(e);
}
}
}
Expand Down Expand Up @@ -149,13 +148,24 @@ private static final class LazyReadChannel {
private final Supplier<BufferedReadableByteChannelSession<Object>> session;
private final Supplier<BufferedReadableByteChannel> channel;

private boolean open = false;

public LazyReadChannel(Supplier<BufferedReadableByteChannelSession<Object>> session) {
this.session = session;
this.channel = Suppliers.memoize(() -> session.get().open());
this.channel =
Suppliers.memoize(
() -> {
open = true;
return session.get().open();
});
}

public BufferedReadableByteChannel getChannel() {
return channel.get();
}

public boolean isOpen() {
return open;
}
}
}
3 changes: 2 additions & 1 deletion google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITReadMaskTest.java
View file
Open in desktop
Expand Up @@ -183,7 +183,8 @@ public static Iterable<Args<BucketField, BucketInfo>> parameters() {
BucketField.RPO,
(jsonT, grpcT) -> {
assertThat(jsonT.getRpo()).isEqualTo(Rpo.DEFAULT);
assertThat(grpcT.getRpo()).isNull();
// TODO: cleanup allowed null value in mid nov
assertThat(grpcT.getRpo()).isAnyOf(Rpo.DEFAULT, null);
}),
new Args<>(
BucketField.SELF_LINK,
Expand Down