Skip to content

GCP: fix single byte read in GCSInputStream #8071

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
danielcweeks merged 2 commits into from
Jul 15, 2023
Merged

GCP: fix single byte read in GCSInputStream #8071

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
757243b
GCP: fix byte read in GCSInputStream
bryanck Jul 15, 2023
b41d857
add test
bryanck Jul 15, 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
2 changes: 1 addition & 1 deletion gcp/src/main/java/org/apache/iceberg/gcp/gcs/GCSInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public int read() throws IOException {
readBytes.increment();
readOperations.increment();

return singleByteBuffer.array()[0];
return singleByteBuffer.array()[0] & 0xFF;
Copy link
Contributor

@danielcweeks danielcweeks Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use Byte.toUnsignedInt() here to be more clear?

Copy link
Contributor

@nastra nastra Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

}

@Override
Expand Down
16 changes: 16 additions & 0 deletions gcp/src/test/java/org/apache/iceberg/gcp/gcs/GCSInputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,22 @@ public void testRead() throws Exception {
}
}

@Test
public void testReadSingle() throws Exception {
BlobId uri = BlobId.fromGsUtilUri("gs://bucket/path/to/read.dat");
int i0 = 1;
int i1 = 255;
byte[] data = {(byte) i0, (byte) i1};

writeGCSData(uri, data);

try (SeekableInputStream in =
new GCSInputStream(storage, uri, gcpProperties, MetricsContext.nullMetrics())) {
assertThat(in.read()).isEqualTo(i0);
assertThat(in.read()).isEqualTo(i1);
}
}

private void readAndCheck(
SeekableInputStream in, long rangeStart, int size, byte[] original, boolean buffered)
throws IOException {
Expand Down