Samrat002 commented on code in PR #28012: URL: https://github.com/apache/flink/pull/28012#discussion_r3139706932
########## flink-filesystems/flink-s3-fs-native/src/test/java/org/apache/flink/fs/s3native/NativeS3InputStreamTest.java: ########## @@ -0,0 +1,259 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.flink.fs.s3native; + +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.ResponseInputStream; +import software.amazon.awssdk.http.Abortable; +import software.amazon.awssdk.http.AbortableInputStream; +import software.amazon.awssdk.services.s3.S3Client; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.GetObjectResponse; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.time.Duration; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +/** Tests for {@link NativeS3InputStream}. */ +class NativeS3InputStreamTest { + + private static final String BUCKET = "test-bucket"; + private static final String KEY = "test-key"; + + private static final byte[] DATA; + + static { + DATA = new byte[256]; + for (int i = 0; i < DATA.length; i++) { + DATA[i] = (byte) i; + } + } + + private static class TrackingInputStream extends InputStream implements Abortable { + private final ByteArrayInputStream delegate; + private final AtomicBoolean aborted = new AtomicBoolean(); + + TrackingInputStream(byte[] data, int offset) { + this.delegate = new ByteArrayInputStream(data, offset, data.length - offset); + } + + TrackingInputStream(byte[] data) { + this(data, 0); + } + + @Override + public int read() { + return delegate.read(); + } + + @Override + public int read(byte[] b, int off, int len) { + return delegate.read(b, off, len); + } + + @Override + public void abort() { + aborted.set(true); + } + + @Override + public void close() throws IOException { + delegate.close(); + } + + boolean wasAborted() { + return aborted.get(); + } + } + + /** {@link S3Client} stub. */ + private static final class StubS3Client implements S3Client { + private final byte[] data; + private final AtomicInteger getObjectCalls = new AtomicInteger(); + private volatile TrackingInputStream lastStream; + + StubS3Client(byte[] data) { + this.data = data; + } + + @Override + public ResponseInputStream<GetObjectResponse> getObject(GetObjectRequest request) { + getObjectCalls.incrementAndGet(); + int offset = 0; + String range = request.range(); + if (range != null && range.startsWith("bytes=")) { + offset = Integer.parseInt(range.substring(6, range.indexOf('-'))); + } + TrackingInputStream tracking = new TrackingInputStream(data, offset); + lastStream = tracking; + AbortableInputStream abortable = AbortableInputStream.create(tracking, tracking); + return new ResponseInputStream<>( + GetObjectResponse.builder().build(), abortable, Duration.ZERO); + } + + @Override + public String serviceName() { + return "s3"; + } + + @Override + public void close() {} + + TrackingInputStream lastStream() { + return lastStream; + } + + int getObjectCalls() { + return getObjectCalls.get(); + } + } + + @Test + void closeAbortsUnderlyingStream() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + assertThat(in.read()).isEqualTo(0); + assertThat(in.getPos()).isEqualTo(1); + } + assertThat(client.lastStream().wasAborted()).isTrue(); + } + + @Test + void seekAbortsOldStreamAndOpensNew() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + in.read(); + TrackingInputStream first = client.lastStream(); + + in.seek(100); + + assertThat(first.wasAborted()).isTrue(); + assertThat(client.getObjectCalls()).isEqualTo(2); + assertThat(in.getPos()).isEqualTo(100); + in.seek(100); + assertThat(client.getObjectCalls()).isEqualTo(2); + } + } + + @Test + void skipAbortsOldStreamAndOpensNew() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + in.read(); + TrackingInputStream first = client.lastStream(); + assertThat(in.skip(100)).isEqualTo(100); + assertThat(first.wasAborted()).isTrue(); + assertThat(client.getObjectCalls()).isEqualTo(2); + // skip(0) and skip(negative) are no-ops + assertThat(in.skip(0)).isZero(); + assertThat(in.skip(-5)).isZero(); + assertThat(client.getObjectCalls()).isEqualTo(2); + } + } + + @Test + void closeWithoutReadNeverOpensStream() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + // lazy init means no getObject call + } + assertThat(client.getObjectCalls()).isEqualTo(0); + } + + @Test + void doubleCloseIsIdempotent() throws Exception { + StubS3Client client = new StubS3Client(DATA); + NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length); + in.read(); + in.close(); + in.close(); + + assertThat(client.getObjectCalls()).isEqualTo(1); + assertThat(client.lastStream().wasAborted()).isTrue(); + } + + @Test + void seekBeforeFirstReadUpdatesPositionOnly() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + in.seek(50); + assertThat(in.getPos()).isEqualTo(50); + assertThat(client.getObjectCalls()).isEqualTo(0); + } + } + + @Test + void readAndSeekReturnCorrectData() throws Exception { + StubS3Client client = new StubS3Client(DATA); + try (NativeS3InputStream in = new NativeS3InputStream(client, BUCKET, KEY, DATA.length)) { + // single-byte read + assertThat(in.read()).isEqualTo(0); + assertThat(in.getPos()).isEqualTo(1); + // bulk read returns correct bytes and advances position + byte[] buf = new byte[10]; + assertThat(in.read(buf, 0, 10)).isEqualTo(10); + assertThat(in.getPos()).isEqualTo(11); + for (int i = 0; i < 10; i++) { + assertThat(buf[i]).isEqualTo(DATA[i + 1]); + } + // available() reflects remaining bytes + assertThat(in.available()).isEqualTo(DATA.length - 11); + // seek then read returns data at the seeked position + in.seek(200); + assertThat(in.read()).isEqualTo(200); + assertThat(in.getPos()).isEqualTo(201); + // partial read at EOF returns only remaining bytes + in.seek(250); + byte[] tail = new byte[20]; + assertThat(in.read(tail, 0, 20)).isEqualTo(6); + assertThat(in.getPos()).isEqualTo(256); + // read past EOF Review Comment: I dug into S3AInputStream and the FSDataInputStream JavaDoc "Can't seek past the end of the stream" and aligned the implementation accordingly. Three changes: 1. seek() now throws EOFException, not bare IOException 2. Added more to existing negative-seek assertion so it cannot regress to the more permissive IOException 3. new tests `seekPastEofThrowsEofException` and `readAtEofReturnsMinusOne ` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
