embulk-output-azure_blob_storage 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0517ecae2588f48dd8266de574626f89534a7c
-  data.tar.gz: 2487729f05d378c29cf76b81a8a921d1710df3c6
+  metadata.gz: 45c7205b0ee914070c15b48038ec9afd82134136
+  data.tar.gz: 1173936e3234bd114085b28545f1fc6df1e1cec3
 SHA512:
-  metadata.gz: 0bcd72b765c0d90581a38ae5b6b095c3eaa18e3adf5819469f3da9eb61d899c01401b68be87e01c4d1ec0940d200bbd5a602e56ad05b94e1ce7b0d72594d6907
-  data.tar.gz: 6677c17408925c38d2ac0896686fae03fcfdcb89a7777f1fb4f33d26de9b1d9321c6462fde2bda05a7e7c51e1088c35f2ade0c1b4ef5004cb8773ede29aefde1
+  metadata.gz: 8d19051e9154907145766a16215242996ca51abf3a968d2cfea6861c278f5bcfa6730d9e12fccaa9b97d90d7542bf08a75a8f408889b47c5e7f913c087d26f6f
+  data.tar.gz: db41bfb30ec06404c9d3d6691f0d2b12cb080f227ca37b2559db10dc4fa0dd2544474b0da7ff65756164c5d65adda6a14889bbd0a54f14280ea128ee4837d65f

data/CHANGELOG.md

@@ -1,14 +1,19 @@
-## 0.1.4 - 2015-03-20
+## 0.1.5 - 2016-04-06
+
+* [maintenance] Refactoring codes [#8](https://github.com/sakama/embulk-output-azure_blob_storage/pull/8)
+
+
+## 0.1.4 - 2016-03-20
 
 * [maintenance] Use RetryExecutor when retry is needed [#7](https://github.com/sakama/embulk-output-azure_blob_storage/pull/7)
 
-## 0.1.3 - 2015-03-15
+## 0.1.3 - 2016-03-15
 
 * [maintenance] Add retry logic using expotential backoff [#6](https://github.com/sakama/embulk-output-azure_blob_storage/pull/6)
 * [maintenance] Change local file output path to temporary directory
 [#5](https://github.com/sakama/embulk-output-azure_blob_storage/pull/5)
 
-## 0.1.2 - 2015-02-02
+## 0.1.2 - 2016-02-02
 
 * [maintenance] Upgrade embulk version to v0.8.2 [#3](https://github.com/sakama/embulk-output-azure_blob_storage/pull/3)
 

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-version = "0.1.4"
+version = "0.1.5"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.2"
@@ -69,7 +69,7 @@ Gem::Specification.new do |spec|
   spec.description   = %[Stores files on Microsoft Azure Blob Storage.]
   spec.email         = ["satoshiakama@gmail.com"]
   spec.licenses      = ["Apache-2.0"]
-  spec.homepage      = "https://github.com/sakama/embulk-output-azure_blob_storage"
+  spec.homepage      = "https://github.com/embulk/embulk-output-azure_blob_storage"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")

data/src/main/java/org/embulk/output/azure_blob_storage/AzureBlobStorageFileOutputPlugin.java

@@ -23,6 +23,7 @@ import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.slf4j.Logger;
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -60,7 +61,7 @@ public class AzureBlobStorageFileOutputPlugin
         String getSequenceFormat();
 
         @Config("max_connection_retry")
-        @ConfigDefault("10") // 5 times retry to connect sftp server if failed.
+        @ConfigDefault("10") // 10 times retry to connect Azure Blob Storage if failed.
         int getMaxConnectionRetry();
     }
 
@@ -77,12 +78,12 @@ public class AzureBlobStorageFileOutputPlugin
             String containerName = task.getContainer();
             CloudBlobContainer container = blobClient.getContainerReference(containerName);
             if (!container.exists()) {
-                log.info("container {} doesn't exists and created.", containerName);
+                log.info("container {} doesn't exist and is created.", containerName);
                 container.createIfNotExists();
             }
         }
-        catch (StorageException | URISyntaxException | ConfigException ex) {
-            Throwables.propagate(ex);
+        catch (StorageException | URISyntaxException ex) {
+            throw new ConfigException(ex);
         }
 
         return resume(task.dump(), taskCount, control);
@@ -121,37 +122,33 @@ public class AzureBlobStorageFileOutputPlugin
     public TransactionalFileOutput open(TaskSource taskSource, final int taskIndex)
     {
         final PluginTask task = taskSource.loadTask(PluginTask.class);
-        return new AzureFileOutput(task, taskIndex);
+        CloudBlobClient client = newAzureClient(task.getAccountName(), task.getAccountKey());
+        return new AzureFileOutput(client, task, taskIndex);
     }
 
     public static class AzureFileOutput implements TransactionalFileOutput
     {
+        private final CloudBlobClient client;
+        private final String containerName;
         private final String pathPrefix;
         private final String sequenceFormat;
         private final String pathSuffix;
-        private final CloudBlobClient client;
         private final int maxConnectionRetry;
-        private CloudBlobContainer container = null;
         private BufferedOutputStream output = null;
         private int fileIndex;
         private File file;
         private String filePath;
         private int taskIndex;
 
-        public AzureFileOutput(PluginTask task, int taskIndex)
+        public AzureFileOutput(CloudBlobClient client, PluginTask task, int taskIndex)
         {
+            this.client = client;
+            this.containerName = task.getContainer();
             this.taskIndex = taskIndex;
             this.pathPrefix = task.getPathPrefix();
             this.sequenceFormat = task.getSequenceFormat();
             this.pathSuffix = task.getFileNameExtension();
-            this.client = newAzureClient(task.getAccountName(), task.getAccountKey());
             this.maxConnectionRetry = task.getMaxConnectionRetry();
-            try {
-                this.container = client.getContainerReference(task.getContainer());
-            }
-            catch (URISyntaxException | StorageException ex) {
-                Throwables.propagate(ex);
-            }
         }
 
         @Override
@@ -220,9 +217,10 @@ public class AzureBlobStorageFileOutputPlugin
                                 @Override
                                 public Void call() throws StorageException, URISyntaxException, IOException, RetryGiveupException
                                 {
+                                    CloudBlobContainer container = client.getContainerReference(containerName);
                                     CloudBlockBlob blob = container.getBlockBlobReference(filePath);
                                     log.info("Upload start {} to {}", file.getAbsolutePath(), filePath);
-                                    blob.upload(new FileInputStream(file), file.length());
+                                    blob.upload(new BufferedInputStream(new FileInputStream(file)), file.length());
                                     log.info("Upload completed {} to {}", file.getAbsolutePath(), filePath);
                                     log.info("Delete completed local file {}", file.getAbsolutePath());
                                     if (!file.delete()) {
@@ -241,8 +239,7 @@ public class AzureBlobStorageFileOutputPlugin
                                 public void onRetry(Exception exception, int retryCount, int retryLimit, int retryWait)
                                         throws RetryGiveupException
                                 {
-                                    Class clazz = exception.getClass();
-                                    if (clazz.equals(FileNotFoundException.class) || clazz.equals(URISyntaxException.class) || clazz.equals(ConfigException.class)) {
+                                    if (exception instanceof  FileNotFoundException || exception instanceof URISyntaxException || exception instanceof ConfigException) {
                                         throw new RetryGiveupException(exception);
                                     }
                                     String message = String.format("Azure Blob Storage put request failed. Retrying %d/%d after %d seconds. Message: %s",

data/src/test/java/org/embulk/output/azure_blob_storage/TestAzureBlobStorageFileOutputPlugin.java

@@ -270,14 +270,9 @@ public class TestAzureBlobStorageFileOutputPlugin
         maxConnectionRetry.setAccessible(true);
         maxConnectionRetry.set(output, 1);
 
-        // set non-existing-container for Test
-        Method method = AzureBlobStorageFileOutputPlugin.class.getDeclaredMethod("newAzureClient", String.class, String.class);
-        method.setAccessible(true);
-        CloudBlobClient client = (CloudBlobClient) method.invoke(plugin, AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY);
-
-        Field container = AzureBlobStorageFileOutputPlugin.AzureFileOutput.class.getDeclaredField("container");
+        Field container = AzureBlobStorageFileOutputPlugin.AzureFileOutput.class.getDeclaredField("containerName");
         container.setAccessible(true);
-        container.set(output, client.getContainerReference("non-exists-container"));
+        container.set(output, "non-existing-container");
         output.finish();
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-azure_blob_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -63,9 +63,9 @@ files:
 - src/test/resources/sample_02.csv
 - classpath/azure-storage-4.0.0.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-output-azure_blob_storage-0.1.4.jar
+- classpath/embulk-output-azure_blob_storage-0.1.5.jar
 - classpath/jackson-core-2.6.0.jar
-homepage: https://github.com/sakama/embulk-output-azure_blob_storage
+homepage: https://github.com/embulk/embulk-output-azure_blob_storage
 licenses:
 - Apache-2.0
 metadata: {}