You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/04/04 22:56:39 UTC

Change in asterixdb[mad-hatter]: [ASTERIXDB-2870][EXT]: Close client after it is used

From Hussain Towaileb <hu...@gmail.com>:

Hussain Towaileb has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10885 )


Change subject: [ASTERIXDB-2870][EXT]: Close client after it is used
......................................................................

[ASTERIXDB-2870][EXT]: Close client after it is used

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Close the S3 client after it is used to release
  the connections.

Change-Id: I8611b5a05fcbd8a4a9a4556c290281fd5cbd56a4
---
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java
1 file changed, 8 insertions(+), 6 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/85/10885/1

diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java
index f558820..40f38ab 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java
@@ -66,21 +66,19 @@
     protected boolean advance() throws IOException {
         // No files to read for this partition
         if (filePaths == null || filePaths.isEmpty()) {
+            finish();
             return false;
         }
 
         // Finished reading all the files
         if (nextFileIndex >= filePaths.size()) {
-            if (in != null) {
-                CleanupUtils.close(in, null);
-            }
+            close();
+            finish();
             return false;
         }
 
         // Close the current stream before going to the next one
-        if (in != null) {
-            CleanupUtils.close(in, null);
-        }
+        close();
 
         String bucket = configuration.get(AwsS3.CONTAINER_NAME_FIELD_NAME);
         GetObjectRequest.Builder getObjectBuilder = GetObjectRequest.builder();
@@ -138,6 +136,10 @@
         }
     }
 
+    private void finish() {
+        CleanupUtils.close(s3Client, null);
+    }
+
     @Override
     public String getStreamName() {
         return getStreamNameAt(nextFileIndex - 1);

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10885
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: mad-hatter
Gerrit-Change-Id: I8611b5a05fcbd8a4a9a4556c290281fd5cbd56a4
Gerrit-Change-Number: 10885
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <hu...@gmail.com>
Gerrit-MessageType: newchange