embulk-output-multi 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133f0b4290cb49bc787590e22edacf2e4f4df4e1
-  data.tar.gz: bb8c9a01232bb0ab43bc845af45a66039988133d
+  metadata.gz: 393cc1011ef55ee4b9cd9cead95df2112598ece9
+  data.tar.gz: 985ff4fefca3c02811b77a7199fe2059751b97b9
 SHA512:
-  metadata.gz: 7a63b03b9c0d566b49c88fb666390d94ddab230ef21d1fe4254f7131fc4fb6977610b6b95d9966e98631ec8d842dbdcbfc1639d076f6f7bd394f076a4dbe913d
-  data.tar.gz: 754f5fe52bb5b00f87eebdbaef36157dc4d1e9c1ddcbc541f66d9d6cb54af134c02010a50684f5114a3107ea2dfb2f3ec087807da5aa2b411e13bbd2d1889f7a
+  metadata.gz: fd9f992fb29aaa68c5ca6e7a06a824ce24535e0663936a6c556f1701ecb6c28b802bdf4a1a910bb10b571828900f1d8688715552558727eb128b39c3076d44bf
+  data.tar.gz: 001124b4d112105d3c345d10bec63a97b62e501f9c56abf2a77d16d918fa8d42e4cb32f959a669dd0d906e6580ebc1470aa5387c185913bb4f523ce7d6f3e8f1

data/gradle.properties

@@ -1 +1 @@
-version=0.2.2
+version=0.3.0

data/src/main/java/org/embulk/output/multi/AsyncRunControl.java

@@ -22,10 +22,10 @@ class AsyncRunControl {
     private final CountDownLatch latch;
     private final ConcurrentMap<String, TaskSource> taskSources;
     private final ExecutorService executorService;
-    private Future<List<TaskReport>> result;
+    private final Future<List<TaskReport>> result;
 
     static AsyncRunControl start(MultiOutputPlugin.PluginTask task, OutputPlugin.Control control) {
-        return new AsyncRunControl(task, control).start();
+        return new AsyncRunControl(task, control);
     }
 
     private AsyncRunControl(MultiOutputPlugin.PluginTask task, OutputPlugin.Control control) {
@@ -36,6 +36,7 @@ class AsyncRunControl {
         this.executorService = Executors.newSingleThreadExecutor(
                 new ThreadFactoryBuilder().setNameFormat(THREAD_NAME_FORMAT).build()
         );
+        this.result = executorService.submit(new RunControl());
     }
 
     void cancel() {
@@ -55,11 +56,6 @@ class AsyncRunControl {
         }
     }
 
-    private AsyncRunControl start() {
-        this.result = executorService.submit(new RunControl());
-        return this;
-    }
-
     private class RunControl implements Callable<List<TaskReport>> {
         @Override
         public List<TaskReport> call() throws Exception {

data/src/main/java/org/embulk/output/multi/MultiOutputPlugin.java

@@ -83,7 +83,7 @@ public class MultiOutputPlugin implements OutputPlugin {
         final PluginTask task = taskSource.loadTask(PluginTask.class);
         final ExecSession session = Exec.session();
         final List<TransactionalPageOutputDelegate> delegates = mapWithPluginDelegate(task, session, delegate ->
-                new TransactionalPageOutputDelegate(taskIndex, delegate, delegate.open(schema, taskIndex))
+                TransactionalPageOutputDelegate.open(schema, taskIndex, delegate)
         );
 
         return new TransactionalPageOutput() {

data/src/main/java/org/embulk/output/multi/TransactionalPageOutputDelegate.java

@@ -3,6 +3,7 @@ package org.embulk.output.multi;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.embulk.config.TaskReport;
 import org.embulk.spi.Page;
+import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalPageOutput;
 
 import java.util.concurrent.BlockingQueue;
@@ -20,9 +21,14 @@ class TransactionalPageOutputDelegate {
     private final TransactionalPageOutput delegate;
     private final BlockingQueue<Supplier<Object>> taskQueue;
     private final ExecutorService executorService;
-    private final Future<TaskReport> result;
+    private final Future<TaskReport> worker;
+    private boolean isFailed;
 
-    TransactionalPageOutputDelegate(
+    static TransactionalPageOutputDelegate open(Schema schema, int taskIndex, OutputPluginDelegate delegate) {
+        return new TransactionalPageOutputDelegate(taskIndex, delegate, delegate.open(schema, taskIndex));
+    }
+
+    private TransactionalPageOutputDelegate(
             int taskIndex,
             OutputPluginDelegate source,
             TransactionalPageOutput delegate
@@ -33,7 +39,8 @@ class TransactionalPageOutputDelegate {
         this.executorService = Executors.newSingleThreadExecutor(
                 new ThreadFactoryBuilder().setNameFormat(String.format(THREAD_NAME_FORMAT, source.getTag(), taskIndex)).build()
         );
-        this.result = executorService.submit(new Worker());
+        this.worker = executorService.submit(new Worker());
+        this.isFailed = false;
     }
 
     void add(Page page) {
@@ -58,20 +65,22 @@ class TransactionalPageOutputDelegate {
     }
 
     void abort() {
-        taskQueue.add(() -> {
+        // Run abort only if the output failed.
+        if (isFailed) {
             delegate.abort();
-            return null;
-        });
+        }
     }
 
     TaskReport commit() {
         taskQueue.add(delegate::commit);
         try {
-            return result.get();
+            return worker.get();
         } catch (InterruptedException e) {
+            isFailed = true;
             Thread.currentThread().interrupt();
             throw new RuntimeException(e);
         } catch (ExecutionException e) {
+            isFailed = true;
             throw new PluginExecutionException(source, e.getCause());
         } finally {
             executorService.shutdown();

data/src/test/java/org/embulk/output/multi/TestMultiOutputPlugin.java

@@ -115,7 +115,7 @@ class TestMultiOutputPlugin extends EmbulkPluginTest {
     }
 
     @Test
-    void testAnOutputFailedFailedAfterOpen() throws IOException {
+    void testAnOutputFailedAfterOpen() throws IOException {
         final ConfigSource inConfig = configFromResource("yaml/in_base.yml");
         final ConfigSource outConfig = configFromResource("yaml/out_failed_output_after_open.yml");
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -138,7 +138,7 @@ class TestMultiOutputPlugin extends EmbulkPluginTest {
     }
 
     @Test
-    void testAnOutputFailedFailedBeforeOpen() throws IOException {
+    void testAnOutputFailedBeforeOpen() throws IOException {
         final ConfigSource inConfig = configFromResource("yaml/in_base.yml");
         final ConfigSource outConfig = configFromResource("yaml/out_failed_output_before_open.yml");
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-multi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Shinichi ISHIMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ files:
 - LICENSE
 - README.md
 - build.gradle
-- classpath/embulk-output-multi-0.2.2.jar
+- classpath/embulk-output-multi-0.3.0.jar
 - gradle.properties
 - gradle/dependency-locks/compileClasspath.lockfile
 - gradle/dependency-locks/testCompileClasspath.lockfile