embulk-output-s3_per_record 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c630852cd7438c47f5c7d4ce90e5ae9c260c28
-  data.tar.gz: 7485c4a4d693740fb7f6ef9975d31ab3f63522fc
+  metadata.gz: df24af87908ca267e9a6518308f0bfb319d14808
+  data.tar.gz: 1f9f6af566dff9c786c1f9531b7527d039eadcf2
 SHA512:
-  metadata.gz: d05834b8904544d92f524e09919dd8fc6793da6243a76c43056da0d8c16d025534ab5d4d036c63625acd61545a907e8bda4431312f072f66df66cdde8dc42858
-  data.tar.gz: 9181a74cc5ccd62a19090d864f96697ee74b7c0b4defeb2158b51fe4f02f7c9c89b146b105d67ecf34efc2b567d290fb7aaa84b29b69aa0726e5a714f26bc406
+  metadata.gz: 083299386ca77263932553aaab9bb0e735f73b24ebe502328568ab70e4d7d0ff5c9711792c7a4758a0a3daeb5c74f2b5567473cc9310b325f78f6d8fe25f333e
+  data.tar.gz: 38912a1f91df7c26d1db2a023babd24b7a696b8f132f8218add7b59890bd668fd172205fff76105fd851d7ed346a22314502176703861983a37a7aff73824605

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/s3_per_record/S3PerRecordOutputPlugin.java

@@ -113,7 +113,6 @@ public class S3PerRecordOutputPlugin
         private final List<KeyPart> keyPattern;
         private final Column dataColumn;
         private final Schema schema;
-        private List<Upload> uploads;
         private final boolean decodeBase64;
 
         public S3PerRecordPageOutput(PluginTask task, Schema schema) {
@@ -130,8 +129,6 @@ public class S3PerRecordOutputPlugin
                 credentials = new DefaultAWSCredentialsProviderChain().getCredentials();
             }
             transferManager = new TransferManager(credentials);
-
-            uploads = new ArrayList<>();
         }
 
         private List<KeyPart> makeKeyPattern(final String key) {
@@ -177,8 +174,8 @@ public class S3PerRecordOutputPlugin
 
                 try (InputStream is = new ByteArrayInputStream(payloadBytes)) {
                     Upload upload = transferManager.upload(bucket, key, is, metadata);
-                    uploads.add(upload);
-                } catch (IOException e) {
+                    upload.waitForUploadResult();
+                } catch (InterruptedException | IOException e) {
                     throw new RuntimeException(e);
                 }
             }
@@ -195,15 +192,7 @@ public class S3PerRecordOutputPlugin
         @Override
         public void finish()
         {
-            try {
-                for (Upload upload : uploads) {
-                    upload.waitForUploadResult();
-                }
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            } finally {
-                close();
-            }
+            close();
         }
 
         @Override
@@ -211,14 +200,12 @@ public class S3PerRecordOutputPlugin
         {
             if (pageReader != null) {
                 pageReader.close();
+                pageReader = null;
             }
         }
 
         @Override
         public void abort() {
-            for (Upload upload : uploads) {
-                upload.abort();
-            }
         }
 
         @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-s3_per_record
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tomykaira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -63,8 +63,8 @@ files:
 - classpath/commons-logging-1.1.3.jar
 - classpath/commons-codec-1.6.jar
 - classpath/aws-java-sdk-s3-1.10.71.jar
+- classpath/embulk-output-s3_per_record-0.1.2.jar
 - classpath/aws-java-sdk-core-1.10.71.jar
-- classpath/embulk-output-s3_per_record-0.1.1.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/aws-java-sdk-kms-1.10.71.jar
 homepage: https://github.com/tomykaira/embulk-output-s3_per_record