embulk 0.4.3 → 0.4.4

data/lib/embulk/data/new/java/file_output.java.erb

@@ -27,13 +27,13 @@ public class <%= java_class_name %>
     }
 
     @Override
-    public ConfigDiff transaction(ConfigSource config, int processorCount,
+    public ConfigDiff transaction(ConfigSource config, int taskCount,
             FileOutputPlugin.Control control)
     {
         PluginTask task = config.loadConfig(PluginTask.class);
 
         // retryable (idempotent) output:
-        // return resume(task.dump(), processorCount, control);
+        // return resume(task.dump(), taskCount, control);
 
         // non-retryable (non-idempotent) output:
         control.run(task.dump());
@@ -42,7 +42,7 @@ public class <%= java_class_name %>
 
     @Override
     public ConfigDiff resume(TaskSource taskSource,
-            int processorCount,
+            int taskCount,
             FileOutputPlugin.Control control)
     {
         throw new UnsupportedOperationException("<%= name %> output plugin does not support resuming");
@@ -50,13 +50,13 @@ public class <%= java_class_name %>
 
     @Override
     public void cleanup(TaskSource taskSource,
-            int processorCount,
+            int taskCount,
             List<CommitReport> successCommitReports)
     {
     }
 
     @Override
-    public TransactionalFileOutput open(TaskSource taskSource, final int processorIndex)
+    public TransactionalFileOutput open(TaskSource taskSource, final int taskIndex)
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 

data/lib/embulk/data/new/java/input.java.erb

@@ -38,27 +38,27 @@ public class <%= java_class_name %>
         PluginTask task = config.loadConfig(PluginTask.class);
 
         Schema schema = task.getColumns().toSchema();
-        int processorCount = 1;  // number of run() method calls
+        int taskCount = 1;  // number of run() method calls
 
-        return resume(task.dump(), schema, processorCount, control);
+        return resume(task.dump(), schema, taskCount, control);
     }
 
     public ConfigDiff resume(TaskSource taskSource,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             InputPlugin.Control control)
     {
-        control.run(taskSource, schema, processorCount);
+        control.run(taskSource, schema, taskCount);
         return Exec.newConfigDiff();
     }
 
     public void cleanup(TaskSource taskSource,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             List<CommitReport> successCommitReports)
     {
     }
 
     public CommitReport run(TaskSource taskSource,
-            Schema schema, int processorIndex,
+            Schema schema, int taskIndex,
             PageOutput output)
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);

data/lib/embulk/data/new/java/output.java.erb

@@ -29,13 +29,13 @@ public class <%= java_class_name %>
     }
 
     public ConfigDiff transaction(ConfigSource config,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             OutputPlugin.Control control)
     {
         PluginTask task = config.loadConfig(PluginTask.class);
 
         // retryable (idempotent) output:
-        // return resume(task.dump(), schema, processorCount, control);
+        // return resume(task.dump(), schema, taskCount, control);
 
         // non-retryable (non-idempotent) output:
         control.run(task.dump());
@@ -43,19 +43,19 @@ public class <%= java_class_name %>
     }
 
     public ConfigDiff resume(TaskSource taskSource,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             OutputPlugin.Control control)
     {
         throw new UnsupportedOperationException("<%= name %> output plugin does not support resuming");
     }
 
     public void cleanup(TaskSource taskSource,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             List<CommitReport> successCommitReports)
     {
     }
 
-    public TransactionalPageOutput open(TaskSource taskSource, Schema schema, int processorIndex)
+    public TransactionalPageOutput open(TaskSource taskSource, Schema schema, int taskIndex)
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 

data/lib/embulk/data_source.rb

@@ -12,15 +12,15 @@ module Embulk
           when :float
             Float(v)
           when :string
-            String(v)
+            String(v).dup
           when :bool
             !!v  # TODO validation
           when :hash
             raise ArgumentError, "Invalid value for :hash" unless v.is_a?(Hash)
-            v
+            DataSource.new.merge!(v)
           when :array
             raise ArgumentError, "Invalid value for :array" unless v.is_a?(Array)
-            v
+            v.dup
           else
             unless type.respond_to?(:load)
               raise ArgumentError, "Unknown type #{type.to_s.dump}"

data/lib/embulk/guess_plugin.rb

@@ -47,7 +47,7 @@ module Embulk
     def guess(config, sample)
       # TODO pure-ruby LineDecoder implementation?
       begin
-        task = config.load_config(Java::LineDecoder::DecoderTask)
+        parser_task = config.param("parser", :hash, default: {}).load_config(Java::LineDecoder::DecoderTask)
       rescue
         # TODO log?
         p $!
@@ -55,7 +55,7 @@ module Embulk
         return DataSource.new
       end
 
-      decoder = Java::LineDecoder.new(Java::ListFileInput.new([[sample.to_java]]), task)
+      decoder = Java::LineDecoder.new(Java::ListFileInput.new([[sample.to_java]]), parser_task)
       sample_text = ''
       while decoder.nextFile
         first = true
@@ -63,7 +63,7 @@ module Embulk
           if first
             first = false
           else
-            sample_text << task.getNewline().getString()
+            sample_text << parser_task.getNewline().getString()
           end
           sample_text << line
         end
@@ -81,7 +81,7 @@ module Embulk
     def guess(config, sample)
       # TODO pure-ruby LineDecoder implementation?
       begin
-        task = config.load_config(Java::LineDecoder::DecoderTask)
+        parser_task = config.param("parser", :hash, default: {}).load_config(Java::LineDecoder::DecoderTask)
       rescue
         # TODO log?
         p $!
@@ -89,7 +89,7 @@ module Embulk
         return DataSource.new
       end
 
-      decoder = Java::LineDecoder.new(Java::ListFileInput.new([[sample.to_java]]), task)
+      decoder = Java::LineDecoder.new(Java::ListFileInput.new([[sample.to_java]]), parser_task)
       sample_lines = []
       while decoder.nextFile
         while line = decoder.poll

data/lib/embulk/input_plugin.rb

@@ -46,10 +46,10 @@ module Embulk
 
         def transaction(java_config, java_control)
           config = DataSource.from_java(java_config)
-          config_diff_hash = @ruby_class.transaction(config) do |task_source_hash,columns,processor_count|
+          config_diff_hash = @ruby_class.transaction(config) do |task_source_hash,columns,task_count|
             java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
             java_schema = Schema.new(columns).to_java
-            java_commit_reports = java_control.run(java_task_source, java_schema, processor_count)
+            java_commit_reports = java_control.run(java_task_source, java_schema, task_count)
             java_commit_reports.map {|java_commit_report|
               DataSource.from_java(java_commit_report)
             }
@@ -58,13 +58,13 @@ module Embulk
           return DataSource.from_ruby_hash(config_diff_hash).to_java
         end
 
-        def resume(java_task_source, java_schema, processor_count, java_control)
+        def resume(java_task_source, java_schema, task_count, java_control)
           task_source = DataSource.from_java(java_task_source)
           schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.resume(task_source, schema, processor_count) do |task_source_hash,columns,processor_count|
+          config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
             java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
             java_schema = Schema.new(columns).to_java
-            java_commit_reports = java_control.run(java_task_source, java_schema, processor_count)
+            java_commit_reports = java_control.run(java_task_source, java_schema, task_count)
             java_commit_reports.map {|java_commit_report|
               DataSource.from_java(java_commit_report)
             }
@@ -73,11 +73,11 @@ module Embulk
           return DataSource.from_ruby_hash(config_diff_hash).to_java
         end
 
-        def cleanup(java_task_source, java_schema, processor_count, java_commit_reports)
+        def cleanup(java_task_source, java_schema, task_count, java_commit_reports)
           task_source = DataSource.from_java(java_task_source)
           schema = Schema.from_java(java_schema)
           commit_reports = java_commit_reports.map {|c| DataSource.from_java(c) }
-          @ruby_class.cleanup(task_source, schema, processor_count, commit_reports)
+          @ruby_class.cleanup(task_source, schema, task_count, commit_reports)
           return nil
         end
 

data/lib/embulk/output_plugin.rb

@@ -5,7 +5,7 @@ module Embulk
   require 'embulk/page'
 
   class OutputPlugin
-    def self.transaction(config, schema, processor_count, &control)
+    def self.transaction(config, schema, task_count, &control)
       yield(config)
       return {}
     end
@@ -59,10 +59,10 @@ module Embulk
           @ruby_class = ruby_class
         end
 
-        def transaction(java_config, java_schema, processor_count, java_control)
+        def transaction(java_config, java_schema, task_count, java_control)
           config = DataSource.from_java(java_config)
           schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.transaction(config, schema, processor_count) do |task_source_hash|
+          config_diff_hash = @ruby_class.transaction(config, schema, task_count) do |task_source_hash|
             java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
             java_commit_reports = java_control.run(java_task_source)
             java_commit_reports.map {|java_commit_report|
@@ -73,10 +73,10 @@ module Embulk
           return DataSource.from_ruby_hash(config_diff_hash).to_java
         end
 
-        def resume(java_task_source, java_schema, processor_count, java_control)
+        def resume(java_task_source, java_schema, task_count, java_control)
           task_source = DataSource.from_java(java_task_source)
           schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.resume(task_source, schema, processor_count) do |task_source_hash,columns,processor_count|
+          config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
             java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
             java_commit_reports = java_control.run(java_task_source)
             java_commit_reports.map {|java_commit_report|
@@ -87,11 +87,11 @@ module Embulk
           return DataSource.from_ruby_hash(config_diff_hash).to_java
         end
 
-        def cleanup(java_task_source, java_schema, processor_count, java_commit_reports)
+        def cleanup(java_task_source, java_schema, task_count, java_commit_reports)
           task_source = DataSource.from_java(java_task_source)
           schema = Schema.from_java(java_schema)
           commit_reports = java_commit_reports.map {|c| DataSource.from_java(c) }
-          @ruby_class.cleanup(task_source, schema, processor_count, commit_reports)
+          @ruby_class.cleanup(task_source, schema, task_count, commit_reports)
           return nil
         end
 

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = "0.4.3"
+  VERSION = '0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - embulk-core/src/main/java/org/embulk/exec/PreviewedNoticeError.java
 - embulk-core/src/main/java/org/embulk/exec/ResumeState.java
 - embulk-core/src/main/java/org/embulk/exec/SamplingParserPlugin.java
+- embulk-core/src/main/java/org/embulk/exec/SetCurrentThreadName.java
 - embulk-core/src/main/java/org/embulk/exec/SystemConfigModule.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyPluginSource.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyScriptingModule.java
@@ -226,6 +227,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/util/LineEncoder.java
 - embulk-core/src/main/java/org/embulk/spi/util/ListFileInput.java
 - embulk-core/src/main/java/org/embulk/spi/util/Newline.java
+- embulk-core/src/main/java/org/embulk/spi/util/OutputStreamFileOutput.java
 - embulk-core/src/main/java/org/embulk/spi/util/PagePrinter.java
 - embulk-core/src/main/java/org/embulk/spi/util/Pages.java
 - embulk-core/src/test/java/org/embulk/EmbulkTestRuntime.java
@@ -268,6 +270,7 @@ files:
 - embulk-docs/src/release/release-0.4.1.rst
 - embulk-docs/src/release/release-0.4.2.rst
 - embulk-docs/src/release/release-0.4.3.rst
+- embulk-docs/src/release/release-0.4.4.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java
@@ -362,8 +365,8 @@ files:
 - classpath/bval-jsr303-0.5.jar
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-core-0.4.3.jar
-- classpath/embulk-standards-0.4.3.jar
+- classpath/embulk-core-0.4.4.jar
+- classpath/embulk-standards-0.4.4.jar
 - classpath/guava-18.0.jar
 - classpath/guice-3.0.jar
 - classpath/guice-multibindings-3.0.jar