Skip to content

Commit 9f1138f

Browse files
committed
Changed to stream context
1 parent 2bc740d commit 9f1138f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
import org.apache.hadoop.util.SemaphoredDelegatingExecutor;
230230
import org.apache.hadoop.util.concurrent.HadoopExecutors;
231231
import org.apache.hadoop.util.functional.CallableRaisingIOE;
232-
import software.amazon.s3.analyticsaccelerator.request.AuditHeaders;
232+
import software.amazon.s3.analyticsaccelerator.request.StreamContext;
233233
import software.amazon.s3.analyticsaccelerator.request.ObjectClient;
234234

235235
import static java.util.Objects.requireNonNull;
@@ -1960,13 +1960,13 @@ private FSDataInputStream executeOpen(
19601960
if (this.analyticsAcceleratorEnabled) {
19611961
ActiveAuditManagerS3A.WrappingAuditSpan wrappingAuditSpan = (ActiveAuditManagerS3A.WrappingAuditSpan) auditSpan;
19621962
LoggingAuditor.LoggingAuditSpan loggingAuditSpan = (LoggingAuditor.LoggingAuditSpan) wrappingAuditSpan.getSpan();
1963-
AuditHeaders auditHeaders = new S3AAuditHeaders(loggingAuditSpan.getReferrer());
1963+
StreamContext streamContext = new S3AStreamContext(loggingAuditSpan.getReferrer());
19641964
return new FSDataInputStream(
19651965
new S3ASeekableStream(
19661966
this.bucket,
19671967
pathToKey(path),
19681968
s3SeekableInputStreamFactory,
1969-
auditHeaders));
1969+
streamContext));
19701970
}
19711971

19721972
if (this.prefetchEnabled) {

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ASeekableStream.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import software.amazon.s3.analyticsaccelerator.S3SeekableInputStream;
3333
import software.amazon.s3.analyticsaccelerator.S3SeekableInputStreamFactory;
34-
import software.amazon.s3.analyticsaccelerator.request.AuditHeaders;
34+
import software.amazon.s3.analyticsaccelerator.request.StreamContext;
3535
import software.amazon.s3.analyticsaccelerator.util.S3URI;
3636

3737
public class S3ASeekableStream extends FSInputStream implements StreamCapabilities {
@@ -43,8 +43,8 @@ public class S3ASeekableStream extends FSInputStream implements StreamCapabiliti
4343

4444
public static final Logger LOG = LoggerFactory.getLogger(S3ASeekableStream.class);
4545

46-
public S3ASeekableStream(String bucket, String key, S3SeekableInputStreamFactory s3SeekableInputStreamFactory, AuditHeaders auditHeaders) {
47-
this.inputStream = s3SeekableInputStreamFactory.createStream(S3URI.of(bucket, key), auditHeaders);
46+
public S3ASeekableStream(String bucket, String key, S3SeekableInputStreamFactory s3SeekableInputStreamFactory, StreamContext streamContext) {
47+
this.inputStream = s3SeekableInputStreamFactory.createStream(S3URI.of(bucket, key), streamContext);
4848
this.key = key;
4949
}
5050

0 commit comments

Comments
 (0)