Slightly refactor LocalFileSystemExchangeStorage

trinodb · May 10, 2022 · 260a244 · 260a244
1 parent 6ed6160
commit 260a244
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...c/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java b/...c/main/java/io/trino/plugin/exchange/filesystem/local/LocalFileSystemExchangeStorage.java
@@ -168,6 +168,7 @@ private static class LocalExchangeStorageReader
         private static final int INSTANCE_SIZE = ClassLayout.parseClass(LocalExchangeStorageReader.class).instanceSize();
 
         private final Queue<ExchangeSourceFile> sourceFiles;
+
         @GuardedBy("this")
         private InputStreamSliceInput sliceInput;
         @GuardedBy("this")
@@ -185,18 +186,19 @@ public synchronized Slice read()
             if (closed) {
                 return null;
             }
+
             if (sliceInput != null && sliceInput.isReadable()) {
                 return sliceInput.readSlice(sliceInput.readInt());
             }
+
             ExchangeSourceFile sourceFile = sourceFiles.poll();
-            if (sourceFile != null) {
-                sliceInput = getSliceInput(sourceFile);
-                return sliceInput.readSlice(sliceInput.readInt());
-            }
-            else {
+            if (sourceFile == null) {
                 close();
+                return null;
             }
-            return null;
+
+            sliceInput = getSliceInput(sourceFile);
+            return sliceInput.readSlice(sliceInput.readInt());
         }
 
         @Override