Rename OpenFileInformation to OpenStreamInformation

common/src/main/java/software/amazon/s3/analyticsaccelerator/util/OpenFileInformation.java → common/src/main/java/software/amazon/s3/analyticsaccelerator/util/OpenStreamInformation.java

@@ -26,11 +26,11 @@
  */
 @Value
 @Builder
-public class OpenFileInformation {
+public class OpenStreamInformation {
   StreamContext streamContext;
   ObjectMetadata objectMetadata;
   InputPolicy inputPolicy;
 
-  /** Default set of settings for {@link OpenFileInformation} */
-  public static final OpenFileInformation DEFAULT = OpenFileInformation.builder().build();
+  /** Default set of settings for {@link OpenStreamInformation} */
+  public static final OpenStreamInformation DEFAULT = OpenStreamInformation.builder().build();
 }

input-stream/src/main/java/software/amazon/s3/analyticsaccelerator/S3SeekableInputStreamFactory.java

@@ -29,7 +29,7 @@
 import software.amazon.s3.analyticsaccelerator.request.ObjectClient;
 import software.amazon.s3.analyticsaccelerator.request.ObjectMetadata;
 import software.amazon.s3.analyticsaccelerator.util.ObjectFormatSelector;
-import software.amazon.s3.analyticsaccelerator.util.OpenFileInformation;
+import software.amazon.s3.analyticsaccelerator.util.OpenStreamInformation;
 import software.amazon.s3.analyticsaccelerator.util.S3URI;
 
 /**
@@ -103,23 +103,25 @@ public S3SeekableInputStream createStream(@NonNull S3URI s3URI, ObjectMetadata m
    * Creates an instance of SeekableStream with file information
    *
    * @param s3URI the object's S3 URI
-   * @param openFileInformation known file information this key
+   * @param openStreamInformation known file information this key
    * @return An instance of the input stream.
    * @throws IOException IoException
    */
   public S3SeekableInputStream createStream(
-      @NonNull S3URI s3URI, @NonNull OpenFileInformation openFileInformation) throws IOException {
-    storeObjectMetadata(s3URI, openFileInformation.getObjectMetadata());
-    return new S3SeekableInputStream(s3URI, createLogicalIO(s3URI, openFileInformation), telemetry);
+      @NonNull S3URI s3URI, @NonNull OpenStreamInformation openStreamInformation)
+      throws IOException {
+    storeObjectMetadata(s3URI, openStreamInformation.getObjectMetadata());
+    return new S3SeekableInputStream(
+        s3URI, createLogicalIO(s3URI, openStreamInformation), telemetry);
   }
 
   LogicalIO createLogicalIO(S3URI s3URI) throws IOException {
-    return createLogicalIO(s3URI, OpenFileInformation.DEFAULT);
+    return createLogicalIO(s3URI, OpenStreamInformation.DEFAULT);
   }
 
-  LogicalIO createLogicalIO(S3URI s3URI, OpenFileInformation openFileInformation)
+  LogicalIO createLogicalIO(S3URI s3URI, OpenStreamInformation openStreamInformation)
       throws IOException {
-    switch (objectFormatSelector.getObjectFormat(s3URI, openFileInformation)) {
+    switch (objectFormatSelector.getObjectFormat(s3URI, openStreamInformation)) {
       case PARQUET:
         return new ParquetLogicalIOImpl(
             s3URI,
@@ -128,7 +130,7 @@ LogicalIO createLogicalIO(S3URI s3URI, OpenFileInformation openFileInformation)
                 objectMetadataStore,
                 objectBlobStore,
                 telemetry,
-                openFileInformation.getStreamContext()),
+                openStreamInformation.getStreamContext()),
             telemetry,
             configuration.getLogicalIOConfiguration(),
             parquetColumnPrefetchStore);
@@ -141,7 +143,7 @@ LogicalIO createLogicalIO(S3URI s3URI, OpenFileInformation openFileInformation)
                 objectMetadataStore,
                 objectBlobStore,
                 telemetry,
-                openFileInformation.getStreamContext()),
+                openStreamInformation.getStreamContext()),
             telemetry);
     }
   }

input-stream/src/main/java/software/amazon/s3/analyticsaccelerator/util/ObjectFormatSelector.java

@@ -38,19 +38,19 @@ public ObjectFormatSelector(LogicalIOConfiguration configuration) {
    * Uses a regex matcher to select the file format based on the file extension of the key.
    *
    * @param s3URI the object's S3 URI
-   * @param openFileInformation known file information for the file
+   * @param openStreamInformation known file information for the file
    * @return the file format of the object
    */
-  public ObjectFormat getObjectFormat(S3URI s3URI, OpenFileInformation openFileInformation) {
+  public ObjectFormat getObjectFormat(S3URI s3URI, OpenStreamInformation openStreamInformation) {
 
     // If the supplied policy in open file information is Sequential, then use the default input
     // stream, regardless of the file format (even if it's parquet!). This is important for
     // applications like DISTCP, which use a "whole_file" read policy with S3A, where they will
     // read parquet file sequentially (as they simply need to copy over the file),
     // instead of the regular parquet pattern of footer first, then specific columns etc., so our
     // parquet specific optimisations are of no use there :(
-    if (openFileInformation.getInputPolicy() != null
-        && openFileInformation.getInputPolicy().equals(InputPolicy.Sequential)) {
+    if (openStreamInformation.getInputPolicy() != null
+        && openStreamInformation.getInputPolicy().equals(InputPolicy.Sequential)) {
       return ObjectFormat.DEFAULT;
     }
 

input-stream/src/test/java/software/amazon/s3/analyticsaccelerator/S3SeekableInputStreamFactoryTest.java

@@ -40,7 +40,7 @@
 import software.amazon.s3.analyticsaccelerator.io.logical.impl.ParquetLogicalIOImpl;
 import software.amazon.s3.analyticsaccelerator.request.ObjectClient;
 import software.amazon.s3.analyticsaccelerator.request.ObjectMetadata;
-import software.amazon.s3.analyticsaccelerator.util.OpenFileInformation;
+import software.amazon.s3.analyticsaccelerator.util.OpenStreamInformation;
 import software.amazon.s3.analyticsaccelerator.util.S3URI;
 
 @SuppressFBWarnings(
@@ -99,7 +99,7 @@ void testCreateDefaultStream() throws IOException {
 
     inputStream =
         s3SeekableInputStreamFactory.createStream(
-            S3URI.of("bucket", "key"), mock(OpenFileInformation.class));
+            S3URI.of("bucket", "key"), mock(OpenStreamInformation.class));
     assertNotNull(inputStream);
   }
 
@@ -156,7 +156,8 @@ void testCreateIndependentStream() throws IOException {
     S3SeekableInputStream inputStream = s3SeekableInputStreamFactory.createStream(s3URI);
     assertNotNull(inputStream);
 
-    inputStream = s3SeekableInputStreamFactory.createStream(s3URI, mock(OpenFileInformation.class));
+    inputStream =
+        s3SeekableInputStreamFactory.createStream(s3URI, mock(OpenStreamInformation.class));
     assertNotNull(inputStream);
   }
 
@@ -174,7 +175,7 @@ void testCreateStreamThrowsOnNullArgument() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          s3SeekableInputStreamFactory.createStream(null, mock(OpenFileInformation.class));
+          s3SeekableInputStreamFactory.createStream(null, mock(OpenStreamInformation.class));
         });
   }
 
@@ -206,17 +207,18 @@ void testCreateLogicalIO() throws IOException {
 
     assertTrue(
         s3SeekableInputStreamFactory.createLogicalIO(
-                testURIParquet, mock(OpenFileInformation.class))
+                testURIParquet, mock(OpenStreamInformation.class))
             instanceof ParquetLogicalIOImpl);
     assertTrue(
-        s3SeekableInputStreamFactory.createLogicalIO(testURIKEYPAR, mock(OpenFileInformation.class))
+        s3SeekableInputStreamFactory.createLogicalIO(
+                testURIKEYPAR, mock(OpenStreamInformation.class))
             instanceof ParquetLogicalIOImpl);
 
     assertTrue(
-        s3SeekableInputStreamFactory.createLogicalIO(testURIJAVA, mock(OpenFileInformation.class))
+        s3SeekableInputStreamFactory.createLogicalIO(testURIJAVA, mock(OpenStreamInformation.class))
             instanceof DefaultLogicalIOImpl);
     assertTrue(
-        s3SeekableInputStreamFactory.createLogicalIO(testURITXT, mock(OpenFileInformation.class))
+        s3SeekableInputStreamFactory.createLogicalIO(testURITXT, mock(OpenStreamInformation.class))
             instanceof DefaultLogicalIOImpl);
   }
 
@@ -267,7 +269,7 @@ private static void assertInputStreamReadExceptions(
         new S3SeekableInputStreamFactory(
             new S3SdkObjectClient(mockS3AsyncClient), S3SeekableInputStreamConfiguration.DEFAULT);
     S3SeekableInputStream inputStream =
-        factory.createStream(TEST_URI, mock(OpenFileInformation.class));
+        factory.createStream(TEST_URI, mock(OpenStreamInformation.class));
     Exception thrownException = assertThrows(Exception.class, inputStream::read);
     assertInstanceOf(IOException.class, thrownException);
     Optional.ofNullable(thrownException.getCause())
@@ -283,7 +285,8 @@ private static void assertInputStreamHeadException(
             new S3SdkObjectClient(mockS3AsyncClient), S3SeekableInputStreamConfiguration.DEFAULT);
     Exception thrownException =
         assertThrows(
-            Exception.class, () -> factory.createStream(TEST_URI, mock(OpenFileInformation.class)));
+            Exception.class,
+            () -> factory.createStream(TEST_URI, mock(OpenStreamInformation.class)));
     assertInstanceOf(IOException.class, thrownException);
     Optional.ofNullable(thrownException.getCause())
         .ifPresent(

input-stream/src/test/java/software/amazon/s3/analyticsaccelerator/util/ObjectFormatSelectorTest.java

@@ -30,7 +30,8 @@ public void testDefaultConfigParquetLogicalIOSelection(String key) {
         new ObjectFormatSelector(LogicalIOConfiguration.DEFAULT);
 
     assertEquals(
-        objectFormatSelector.getObjectFormat(S3URI.of("bucket", key), OpenFileInformation.DEFAULT),
+        objectFormatSelector.getObjectFormat(
+            S3URI.of("bucket", key), OpenStreamInformation.DEFAULT),
         ObjectFormat.PARQUET);
   }
 
@@ -43,7 +44,8 @@ public void testConfiguredExtensionParquetLogicalIOSelection(String key) {
             LogicalIOConfiguration.builder().parquetFormatSelectorRegex("^.*.(pr3|par3)$").build());
 
     assertEquals(
-        objectFormatSelector.getObjectFormat(S3URI.of("bucket", key), OpenFileInformation.DEFAULT),
+        objectFormatSelector.getObjectFormat(
+            S3URI.of("bucket", key), OpenStreamInformation.DEFAULT),
         ObjectFormat.PARQUET);
   }
 
@@ -54,7 +56,8 @@ public void testNonParquetLogicalIOSelection(String key) {
         new ObjectFormatSelector(LogicalIOConfiguration.DEFAULT);
 
     assertEquals(
-        objectFormatSelector.getObjectFormat(S3URI.of("bucket", key), OpenFileInformation.DEFAULT),
+        objectFormatSelector.getObjectFormat(
+            S3URI.of("bucket", key), OpenStreamInformation.DEFAULT),
         ObjectFormat.DEFAULT);
   }
 
@@ -67,7 +70,7 @@ public void testDefaultLogicalIOSelectionWithSequentialInputPolicy(String key) {
     assertEquals(
         objectFormatSelector.getObjectFormat(
             S3URI.of("bucket", key),
-            OpenFileInformation.builder().inputPolicy(InputPolicy.Sequential).build()),
+            OpenStreamInformation.builder().inputPolicy(InputPolicy.Sequential).build()),
         ObjectFormat.DEFAULT);
   }
 }

object-client/src/main/java/software/amazon/s3/analyticsaccelerator/S3SdkObjectClient.java

@@ -23,8 +23,6 @@
 import java.util.function.Function;
 import lombok.Getter;
 import lombok.NonNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -41,7 +39,6 @@
 public class S3SdkObjectClient implements ObjectClient {
   private static final String HEADER_USER_AGENT = "User-Agent";
   private static final String HEADER_REFERER = "Referer";
-  private static final Logger LOG = LoggerFactory.getLogger(S3SdkObjectClient.class);
 
   @Getter @NonNull private final S3AsyncClient s3AsyncClient;
   @NonNull private final Telemetry telemetry;
@@ -185,8 +182,6 @@ public CompletableFuture<ObjectContent> getObject(
       referrerHeader = getRequest.getReferrer().toString();
     }
 
-    LOG.info("auditHeaders {}", referrerHeader);
-
     builder.overrideConfiguration(
         AwsRequestOverrideConfiguration.builder()
             .putHeader(HEADER_REFERER, referrerHeader)