rewrite(S3SeekableByteChannel): Use S3BasicFileAttributes to get "f…

…ile"size of path (awslabs#258) * rewrite(S3SeekableByteChannel): Extract method to fetchSize * rewrite(S3SeekableByteChannel): Use `S3BasicFileAttributes` to get "file"size of path. DRY * cleanup(S3SeekableByteChannel): Remove `client` property and cleanup imports
guicamest · Nov 3, 2023 · c07d379 · c07d379
1 parent 5dcf2d0
commit c07d379
Showing 1 changed file with 8 additions and 29 deletions.
diff --git a/src/main/java/software/amazon/nio/spi/s3/S3SeekableByteChannel.java b/src/main/java/software/amazon/nio/spi/s3/S3SeekableByteChannel.java
@@ -8,9 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
-import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
 import software.amazon.nio.spi.s3.config.S3NioSpiConfiguration;
-import software.amazon.nio.spi.s3.util.TimeOutUtils;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -23,16 +21,13 @@
 import java.nio.file.OpenOption;
 import java.nio.file.StandardOpenOption;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 class S3SeekableByteChannel implements SeekableByteChannel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(S3SeekableByteChannel.class);
 
     private long position;
-    private final S3AsyncClient s3Client;
     private final S3Path path;
     private final ReadableByteChannel readDelegate;
     private final S3WritableByteChannel writeDelegate;
@@ -48,7 +43,6 @@ private S3SeekableByteChannel(S3Path s3Path, S3AsyncClient s3Client, long startA
         position = startAt;
         path = s3Path;
         closed = false;
-        this.s3Client = s3Client;
         s3Path.getFileSystem().registerOpenChannel(this);
 
         if (options.contains(StandardOpenOption.WRITE) && options.contains(StandardOpenOption.READ)) {
@@ -195,33 +189,18 @@ public long size() throws IOException {
         validateOpen();
 
         if (size < 0) {
-
-            long timeOut = TimeOutUtils.TIMEOUT_TIME_LENGTH_1;
-            TimeUnit unit = TimeUnit.MINUTES;
-
-            LOGGER.debug("requesting size of '{}'", path.toUri());
-            synchronized (this) {
-                final HeadObjectResponse headObjectResponse;
-                try {
-                    headObjectResponse = s3Client.headObject(builder -> builder
-                            .bucket(path.bucketName())
-                            .key(path.getKey())).get(timeOut, unit);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    throw new RuntimeException(e);
-                } catch (ExecutionException e) {
-                    throw new IOException(e);
-                } catch (TimeoutException e) {
-                    throw TimeOutUtils.logAndGenerateExceptionOnTimeOut(LOGGER, "size", timeOut, unit);
-                }
-
-                LOGGER.debug("size of '{}' is '{}'", path.toUri(), headObjectResponse.contentLength());
-                this.size = headObjectResponse.contentLength();
-            }
+            fetchSize();
         }
         return this.size;
     }
 
+    private void fetchSize() {
+        synchronized (this) {
+            this.size = new S3BasicFileAttributes(path).size();
+            LOGGER.debug("size of '{}' is '{}'", path.toUri(), this.size);
+        }
+    }
+
     /**
      * Truncates the entity, to which this channel is connected, to the given
      * size.