embulk-output-azure_blob_storage 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f151194182d73b78ec9b2b82ab9647b10678d0
-  data.tar.gz: cb78773244114d953c9f5b377fe3cc58ef1d4972
+  metadata.gz: 8871fd8a62b364fdfedbf7c6002012e2883dcaf1
+  data.tar.gz: 3e16f5d3af521d09332d525db0b9840abc20d424
 SHA512:
-  metadata.gz: 5e14c9a755cb3ad1c5fae3ffe0e13cd74a3f926ef97218ab05cc41a990f6de1090c97ed309030615dcd3c6a08788aa90694d427ae37ea50ca0563737af8e62a4
-  data.tar.gz: 79f11b084a54773c1ebb56916f7977fb7714bd8a6dd9166ada5fa12a69e4c9bc0b4ccd13636869057fc985f88dfa66f3f246c00bf8444455bf6f1b76c19d054d
+  metadata.gz: 6e774a201f2a403917acf2a3c4b26e570dcf6033a05d31bec70b25450d7cbc49c6d7908db7d8ea21ee74004fc776bca0a5f55384136b32b124d52fc113f51ced
+  data.tar.gz: dc2c7bf3ad64e781281bf189df5a1e664217e032760230710c875b35ad129a0c9140dd8ac6203b430d5cc90ef4af47b5e76ce4d72adc5cf61b783eea090c4faf

data/.travis.yml

@@ -1,3 +1,5 @@
+dist: trusty
+
 language: java
 
 jdk:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.8 - 2018-12-04
+* [maintenance] Always delete temporary file [#15](https://github.com/embulk/embulk-output-azure_blob_storage/pull/15)
+
 ## 0.1.7 - 2018-10-19
 * [maintenance] Close BufferedInputStream before delete temporary file [#14](https://github.com/sakama/embulk-output-azure_blob_storage/pull/14)
 

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = "0.1.7"
+version = "0.1.8"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.9.8"

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

@@ -1,5 +1,6 @@
 package org.embulk.output.azure_blob_storage;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
@@ -224,11 +225,6 @@ public class AzureBlobStorageFileOutputPlugin
                                         blob.upload(in, file.length());
                                         log.info("Upload completed {} to {}", file.getAbsolutePath(), filePath);
                                     }
-                                    if (file.exists()) {
-                                        if (!file.delete()) {
-                                            log.warn("Couldn't delete local file " + file.getAbsolutePath());
-                                        }
-                                    }
                                     return null;
                                 }
 
@@ -268,6 +264,13 @@ public class AzureBlobStorageFileOutputPlugin
                 catch (InterruptedException ex) {
                     throw Throwables.propagate(ex);
                 }
+                finally {
+                    if (file.exists()) {
+                        if (!file.delete()) {
+                            log.warn("Couldn't delete local file " + file.getAbsolutePath());
+                        }
+                    }
+                }
             }
             return null;
         }
@@ -286,5 +289,11 @@ public class AzureBlobStorageFileOutputPlugin
         {
             return Exec.newTaskReport();
         }
+
+        @VisibleForTesting
+        public boolean isTempFileExist()
+        {
+            return file.exists();
+        }
     }
 }

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

@@ -19,7 +19,6 @@ import org.embulk.spi.FileOutputPlugin;
 import org.embulk.spi.FileOutputRunner;
 import org.embulk.spi.OutputPlugin;
 import org.embulk.spi.Schema;
-import org.embulk.spi.TransactionalFileOutput;
 import org.embulk.standards.CsvParserPlugin;
 
 import org.junit.Before;
@@ -27,6 +26,7 @@ import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeNotNull;
 
 import java.io.BufferedReader;
@@ -203,7 +203,7 @@ public class TestAzureBlobStorageFileOutputPlugin
         Schema schema = configSource.getNested("parser").loadConfig(CsvParserPlugin.PluginTask.class).getSchemaConfig().toSchema();
         runner.transaction(configSource, schema, 0, new Control());
 
-        TransactionalFileOutput output = plugin.open(task.dump(), 0);
+        AzureBlobStorageFileOutputPlugin.AzureFileOutput output = (AzureBlobStorageFileOutputPlugin.AzureFileOutput) plugin.open(task.dump(), 0);
 
         output.nextFile();
 
@@ -217,6 +217,7 @@ public class TestAzureBlobStorageFileOutputPlugin
 
         String remotePath = AZURE_PATH_PREFIX + String.format(task.getSequenceFormat(), 0, 0) + task.getFileNameExtension();
         assertRecords(remotePath);
+        assertTrue(!output.isTempFileExist());
     }
 
     @Test
@@ -227,7 +228,7 @@ public class TestAzureBlobStorageFileOutputPlugin
         Schema schema = configSource.getNested("parser").loadConfig(CsvParserPlugin.PluginTask.class).getSchemaConfig().toSchema();
         runner.transaction(configSource, schema, 0, new Control());
 
-        TransactionalFileOutput output = plugin.open(task.dump(), 0);
+        AzureBlobStorageFileOutputPlugin.AzureFileOutput output = (AzureBlobStorageFileOutputPlugin.AzureFileOutput) plugin.open(task.dump(), 0);
 
         output.nextFile();
 
@@ -246,10 +247,11 @@ public class TestAzureBlobStorageFileOutputPlugin
         }
         catch (Exception ex) {
             assertEquals(FileNotFoundException.class, ex.getCause().getClass());
+            assertTrue(!output.isTempFileExist());
         }
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void testAzureFileOutputByOpenWithRetry() throws Exception
     {
         ConfigSource configSource = config();
@@ -257,7 +259,7 @@ public class TestAzureBlobStorageFileOutputPlugin
         Schema schema = configSource.getNested("parser").loadConfig(CsvParserPlugin.PluginTask.class).getSchemaConfig().toSchema();
         runner.transaction(configSource, schema, 0, new Control());
 
-        TransactionalFileOutput output = plugin.open(task.dump(), 0);
+        AzureBlobStorageFileOutputPlugin.AzureFileOutput output = (AzureBlobStorageFileOutputPlugin.AzureFileOutput) plugin.open(task.dump(), 0);
 
         output.nextFile();
 
@@ -274,7 +276,12 @@ public class TestAzureBlobStorageFileOutputPlugin
         Field container = AzureBlobStorageFileOutputPlugin.AzureFileOutput.class.getDeclaredField("containerName");
         container.setAccessible(true);
         container.set(output, "non-existing-container");
-        output.finish();
+        try {
+            output.finish();
+        }
+        catch (RuntimeException e) {
+            assertTrue(!output.isTempFileExist());
+        }
     }
 
     public ConfigSource config()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-azure_blob_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -62,10 +62,10 @@ files:
 - src/test/java/org/embulk/output/azure_blob_storage/TestAzureBlobStorageFileOutputPlugin.java
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
+- classpath/embulk-output-azure_blob_storage-0.1.8.jar
 - classpath/azure-storage-8.0.0.jar
 - classpath/guava-20.0.jar
 - classpath/azure-keyvault-core-1.0.0.jar
-- classpath/embulk-output-azure_blob_storage-0.1.7.jar
 - classpath/jackson-core-2.9.4.jar
 homepage: https://github.com/embulk/embulk-output-azure_blob_storage
 licenses: