embulk 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49862e13c81831477cfed94aea2db310b8bc51c
-  data.tar.gz: 9b59130a3b0ceca8d4980a7c32e979d84f7b5ab1
+  metadata.gz: 4548bdb9a7472a0a1f86ef346f85a0229a433111
+  data.tar.gz: bc5e863271a2fb217584a76618a7c9eac6706c05
 SHA512:
-  metadata.gz: e8d58a7659d4445c83534859d5cf8043099877b03e1544be8f531b6a644ebfd116de970ac38d92558310ed19991aa476e1a4f96a829382a0692ac57b506b1fb1
-  data.tar.gz: 52e734f97666ea28f4a3f6564f7f74001d35f85e59a0b4cf3c6f9aa3c77902ac06438184b13ee44b906ecd5760b01361f799d967167617d2a7c19f1020ce7cb2
+  metadata.gz: b47331b6a147ac624727a0e3da414c8e95cc7d74a022bdd174426572386349ecd76c2ef38ad8bdb3bf1e51e6c58967a87e4e67bb7db4f498bc4143f39799f6ee
+  data.tar.gz: 98ce9c0581f425d516d057124ee1ea435726a1447e37e8416f36635801cca3fef32d50f719cbe1e95803e7229fd950b835290dace22cbcdb6f87b3327c332cd7

data/build.gradle

@@ -16,7 +16,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.8.2'
+    version = '0.8.3'
 
     ext {
         jrubyVersion = '9.0.4.0'

data/embulk-core/src/main/java/org/embulk/exec/SetCurrentThreadName.java

@@ -1,5 +1,7 @@
 package org.embulk.exec;
 
+import static java.util.Locale.ENGLISH;
+
 public class SetCurrentThreadName
         implements AutoCloseable
 {
@@ -8,7 +10,8 @@ public class SetCurrentThreadName
     public SetCurrentThreadName(String name)
     {
         this.original = Thread.currentThread().getName();
-        Thread.currentThread().setName(name);
+        Thread thread = Thread.currentThread();
+        thread.setName(String.format(ENGLISH, "%04d:", thread.getId()) + name);
     }
 
     @Override

data/embulk-core/src/main/java/org/embulk/spi/util/InputStreamFileInput.java

@@ -134,7 +134,6 @@ public class InputStreamFileInput
 
     public Buffer poll()
     {
-        // TODO check current != null and throw Illegal State - file is not opened
         if (current == null) {
             throw new IllegalStateException("nextFile() must be called before poll()");
         }

data/embulk-docs/src/built-in.rst

@@ -410,14 +410,14 @@ Example
       ...
       formatter:
         type: csv
-        delimiter: '\t'
+        delimiter: "\t"
         newline: CRLF
         newline_in_field: LF
         charset: UTF-8
         quote_policy: MINIMAL
         quote: '"'
-        escape: '\\'
-        null_string: '\\N'
+        escape: "\\"
+        null_string: "\\N"
         default_timezone: 'UTC'
         column_options:
           mycol1: {format: '%Y-%m-%d %H:%M:%S'}

data/embulk-docs/src/release.rst

@@ -4,9 +4,11 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.3
     release/release-0.8.2
     release/release-0.8.1
     release/release-0.8.0
+    release/release-0.7.11
     release/release-0.7.10
     release/release-0.7.9
     release/release-0.7.8

data/embulk-docs/src/release/release-0.7.11.rst

@@ -0,0 +1,12 @@
+Release 0.7.11
+==================================
+
+General Changes
+------------------
+
+* Added a workaround for https://github.com/jruby/jruby/issues/3652
+
+
+Release Date
+------------------
+2016-02-08

data/embulk-docs/src/release/release-0.8.3.rst

@@ -0,0 +1,15 @@
+Release 0.8.3
+==================================
+
+General Changes
+------------------
+
+* Fixed unexpected error when ``-c`` option is set and file doesn't exist yet (@hiroyuki-sato++)
+* Added a workaround for https://github.com/jruby/jruby/issues/3652
+* Adds thread ID to thread name so that stacktrace shown by SIGQUIT can distinguish multiple threads running the same stage (transaction, guess, preview).
+* Embulk::Guess::SchemaGuess returns ``"json"`` type if a given value is a Hash or Array.
+
+
+Release Date
+------------------
+2016-02-08

data/lib/embulk/guess/schema_guess.rb

@@ -37,7 +37,7 @@ module Embulk::Guess
       def types_from_array_records(samples)
         columnar_types = []
         samples.each do |record|
-          record.each_with_index {|value,i| (columnar_types[i] ||= []) << guess_type(value.to_s) }
+          record.each_with_index {|value,i| (columnar_types[i] ||= []) << guess_type(value) }
         end
         columnar_types.map {|types| merge_types(types) }
       end
@@ -45,6 +45,11 @@ module Embulk::Guess
       private
 
       def guess_type(str)
+        if str.is_a?(Hash) || str.is_a?(Array)
+          return "json"
+        end
+        str = str.to_s
+
         if TRUE_STRINGS[str] || FALSE_STRINGS[str]
           return "boolean"
         end

data/lib/embulk/plugin_registry.rb

@@ -58,8 +58,10 @@ module Embulk
 
       # search gems
       if defined?(::Gem::Specification) && ::Gem::Specification.respond_to?(:find_all)
-        specs = Gem::Specification.find_all do |spec|
-          spec.contains_requirable_file? name
+        specs = Kernel::RUBYGEMS_ACTIVATION_MONITOR.synchronize do  # this lock is added as a workaround of https://github.com/jruby/jruby/issues/3652
+          Gem::Specification.find_all do |spec|
+            spec.contains_requirable_file? name
+          end
         end
 
         # prefer newer version
@@ -78,10 +80,12 @@ module Embulk
     def require_and_show(path, spec=nil)
       require path
       unless spec
-        name, spec = Gem.loaded_specs.find {|name,spec|
-          #spec.files.include?(path)
-          spec.contains_requirable_file?(path)
-        }
+        name, spec = Kernel::RUBYGEMS_ACTIVATION_MONITOR.synchronize do  # this lock is added as a workaround of https://github.com/jruby/jruby/issues/3652
+          Gem.loaded_specs.find {|name,spec|
+            #spec.files.include?(path)
+            spec.contains_requirable_file?(path)
+          }
+        end
       end
       if spec
         unless @loaded_gems[spec.name]

data/lib/embulk/runner.rb

@@ -61,7 +61,7 @@ module Embulk
       check_file_writable(config_diff_path)
       check_file_writable(resume_state_path)
 
-      if config_diff_path
+      if config_diff_path && File.size(config_diff_path) > 0
         lastConfigDiff = read_config(config_diff_path, options)
         configSource = configSource.merge(lastConfigDiff)
       end

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -107,8 +107,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.8.2.jar
-- classpath/embulk-standards-0.8.2.jar
+- classpath/embulk-core-0.8.3.jar
+- classpath/embulk-standards-0.8.3.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -409,6 +409,7 @@ files:
 - embulk-docs/src/release/release-0.7.0.rst
 - embulk-docs/src/release/release-0.7.1.rst
 - embulk-docs/src/release/release-0.7.10.rst
+- embulk-docs/src/release/release-0.7.11.rst
 - embulk-docs/src/release/release-0.7.2.rst
 - embulk-docs/src/release/release-0.7.3.rst
 - embulk-docs/src/release/release-0.7.4.rst
@@ -420,6 +421,7 @@ files:
 - embulk-docs/src/release/release-0.8.0.rst
 - embulk-docs/src/release/release-0.8.1.rst
 - embulk-docs/src/release/release-0.8.2.rst
+- embulk-docs/src/release/release-0.8.3.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