embulk-executor-mapreduce 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f93e6df3aba9f8ca575092d4a3878abe484a452
-  data.tar.gz: d42c206f46d13885733f6e048eb4249b22ed7d29
+  metadata.gz: 995cd8754f48d4d4e0d222bbad7d39dfdad6648f
+  data.tar.gz: 901b6a9298e76ed45ab7840ca4e4135bb68a9d8d
 SHA512:
-  metadata.gz: 0f250d3cd401e52c149eac498a3549d25240c1f5091cca170aab53d95432a8463d77aacc1c9b33a3a3bd95005970186b511a7c60bbf03a1b0cf8c62ca54b7ab6
-  data.tar.gz: 43f8de24c547fdf4eb004e15a4bee6164401d7a4abefa79a1fa5f62ec7696279b9fe7ae80eab1d25f39104d1331d64c58ade74d19117dc6fa06f421843062eaa
+  metadata.gz: 02cbb013f7b83f51c787e649d1efd0e69b726af56636b2487b5d1b277bb285521db44a5b4b1ee45c59d7e5c0a71515bc9b590cdb5a3f90f5fd871581e4d23286
+  data.tar.gz: f66984fd6801ee826b6c4a46db1c326aa699584497224daed575e11c6f83348f5cbf2ee469c26a856bf4d9479d57e609613abdc7fec69f3f2ccbde8ac612340c

data/src/main/java/org/embulk/executor/mapreduce/EmbulkMapReduce.java

@@ -14,9 +14,7 @@ import java.lang.reflect.InvocationTargetException;
 import com.google.inject.Injector;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jruby.embed.ScriptingContainer;
 import org.apache.hadoop.fs.Path;
@@ -28,7 +26,6 @@ import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.JobContext;
 import org.apache.hadoop.mapreduce.Counters;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.apache.hadoop.mapreduce.Mapper;
@@ -233,6 +230,9 @@ public class EmbulkMapReduce
         });
     }
 
+    public static class GemSpecListType extends ArrayList<PluginArchive.GemSpec>
+    { }
+
     public static PluginArchive readPluginArchive(final File localDirectory, final Configuration config,
             Path stateDir, final ModelManager modelManager) throws IOException
     {
@@ -241,7 +241,7 @@ public class EmbulkMapReduce
                 public PluginArchive call() throws IOException
                 {
                     List<PluginArchive.GemSpec> specs = modelManager.readObject(
-                            new ArrayList<PluginArchive.GemSpec>() {}.getClass(),
+                            GemSpecListType.class,
                             config.get(CK_PLUGIN_ARCHIVE_SPECS));
                     try (FSDataInputStream in = path.getFileSystem(config).open(path)) {
                         return PluginArchive.load(localDirectory, specs, in);

data/src/main/java/org/embulk/executor/mapreduce/EmbulkPartitioningMapReduce.java

@@ -156,11 +156,12 @@ public class EmbulkPartitioningMapReduce
         {
             this.context = context;
             this.runner = new SessionRunner(context);
-            runner.readPluginArchive().restoreLoadPathsTo(runner.getScriptingContainer());
 
             runner.execSession(new ExecAction<Void>() {
                 public Void run() throws Exception
                 {
+                    runner.readPluginArchive().restoreLoadPathsTo(runner.getScriptingContainer());
+
                     int taskIndex = context.getTaskAttemptID().getTaskID().getId();
 
                     ProcessTask task = runner.getMapReduceExecutorTask().getProcessTask();

data/src/main/java/org/embulk/executor/mapreduce/MapReduceExecutor.java

@@ -374,7 +374,7 @@ public class MapReduceExecutor
         }
 
         for (AttemptReport report : reportSet.getLatestOutputAttemptReports()) {
-            updateTaskState(state.getOutputTaskState(report.getOutputTaskIndex().get()), report.getAttemptState(), true);
+            updateTaskState(state.getOutputTaskState(report.getOutputTaskIndex().get()), report.getAttemptState(), false);
         }
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-executor-mapreduce
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies: []
 description: Executes tasks on Hadoop.
 email:
@@ -60,7 +60,7 @@ files:
 - classpath/curator-client-2.6.0.jar
 - classpath/curator-framework-2.6.0.jar
 - classpath/curator-recipes-2.6.0.jar
-- classpath/embulk-executor-mapreduce-0.1.4.jar
+- classpath/embulk-executor-mapreduce-0.1.5.jar
 - classpath/gson-2.2.4.jar
 - classpath/hadoop-annotations-2.6.0.jar
 - classpath/hadoop-auth-2.6.0.jar