embulk 0.7.0-java → 0.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8c4435b7efc6bed5410df4855329fa2b4a10d2d
-  data.tar.gz: e6ca52300e459ab476be4d4c63d3e5288a5a4f5d
+  metadata.gz: 4caef0e11a979edc6d12dc23d1bc89c4796cf869
+  data.tar.gz: 83ca9285638a2de602cae9e21341e8e63ffdfdef
 SHA512:
-  metadata.gz: 95e963ff9bb277488d64f17d8d79eed664d3200534508b63d0eb72c9f1cf0ea01643ac2c29a27fb316d9f811368de7ff4f0c235212462c9eba0d3c131423eb5e
-  data.tar.gz: 7a84fa41e977cc1d9be79d554ba3e8d91b3ce83bc204a9ff51a043ea779ed49eac893e6b442a26fba64fc01c35d48dd582b8072cc086947165f90c99f96dc7b3
+  metadata.gz: 9a5a51d2cb2ebeba9ec15892cd70e12595813920906f23478d4ebb88baaf7b497b2bc5a3d6e8faaa08c0e85ff455f158345a59246d0180128b08065d2e956d04
+  data.tar.gz: c3409ea3f3c3534c6e70d9b25bbc7ed6a0b3c30c73bddc719d576eea5698246cfec650b7716d373782a3a1befaaf4021e49d24826922abadf82948524a2926ad

data/build.gradle

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

data/embulk-core/src/main/java/org/embulk/config/ConfigException.java

@@ -2,6 +2,7 @@ package org.embulk.config;
 
 public class ConfigException
         extends RuntimeException
+        implements UserDataException
 {
     public ConfigException(String message)
     {

data/embulk-core/src/main/java/org/embulk/config/UserDataException.java

@@ -0,0 +1,4 @@
+package org.embulk.config;
+
+public interface UserDataException
+{ }

data/embulk-core/src/main/java/org/embulk/config/UserDataExceptions.java

@@ -0,0 +1,17 @@
+package org.embulk.config;
+
+public class UserDataExceptions
+{
+    private UserDataExceptions() { }
+
+    public boolean isUserDataException(Throwable exception)
+    {
+        while (exception != null) {
+            if (exception instanceof UserDataException) {
+                return true;
+            }
+            exception = exception.getCause();
+        }
+        return false;
+    }
+}

data/embulk-core/src/main/java/org/embulk/spi/DataException.java

@@ -0,0 +1,23 @@
+package org.embulk.spi;
+
+import org.embulk.config.UserDataException;
+
+public class DataException
+        extends RuntimeException
+        implements UserDataException
+{
+    public DataException(String message)
+    {
+        super(message);
+    }
+
+    public DataException(Throwable cause)
+    {
+        super(cause);
+    }
+
+    public DataException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+}

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampParseException.java

@@ -1,7 +1,10 @@
 package org.embulk.spi.time;
 
+import org.embulk.config.UserDataException;
+
 public class TimestampParseException
         extends Exception
+        implements UserDataException
 {
     public TimestampParseException(String message)
     {

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.7.1
     release/release-0.7.0
     release/release-0.6.25
     release/release-0.6.24

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

@@ -0,0 +1,22 @@
+Release 0.7.1
+==================================
+
+General Changes
+------------------
+
+* Fixed ``no such file to load`` error when embulk is installed as a single jar file.
+
+Java API
+------------------
+
+* Added exception class ``DataException`` and exception tag interface ``UserDataExceptoin``. If those exceptions are thrown, applications are suggested not to retry this bulk load because retried bulk import will fail again unless user's input data is fixed.
+
+Ruby API
+------------------
+
+* ``ConfigError`` includes org.embulk.config.UserDataExceptoin interface.
+
+
+Release Date
+------------------
+2015-08-18

data/embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java

@@ -22,6 +22,7 @@ import org.embulk.spi.ParserPlugin;
 import org.embulk.spi.Exec;
 import org.embulk.spi.FileInput;
 import org.embulk.spi.PageOutput;
+import org.embulk.spi.DataException;
 import org.embulk.spi.util.LineDecoder;
 import org.embulk.spi.util.Timestamps;
 import org.slf4j.Logger;
@@ -369,7 +370,7 @@ public class CsvParserPlugin
     }
 
     static class CsvRecordValidateException
-            extends RuntimeException
+            extends DataException
     {
         CsvRecordValidateException(Throwable cause)
         {

data/embulk-standards/src/main/java/org/embulk/standards/CsvTokenizer.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.ArrayDeque;
+import org.embulk.spi.DataException;
 import org.embulk.spi.util.LineDecoder;
 
 public class CsvTokenizer
@@ -365,7 +366,7 @@ public class CsvTokenizer
     }
 
     public static class InvalidFormatException
-            extends RuntimeException
+            extends DataException
     {
         public InvalidFormatException(String message)
         {
@@ -374,7 +375,7 @@ public class CsvTokenizer
     }
 
     public static class InvalidValueException
-            extends RuntimeException
+            extends DataException
     {
         public InvalidValueException(String message)
         {

data/lib/embulk.rb

@@ -31,7 +31,11 @@ module Embulk
     if __FILE__.include?("!")
       # single jar
       jar, resource = __FILE__.split("!", 2)
-      require jar
+      begin
+        require File.expand_path(jar)
+      rescue LoadError
+        # TODO fails if jar doesn't end with ".rb" or ".jar" but ignorable
+      end
 
     elsif __FILE__ =~ /^classpath:/
       # already in classpath

data/lib/embulk/error.rb

@@ -1,6 +1,15 @@
 
 module Embulk
+  module UserDataError
+    include Java::Config::UserDataException
+  end
+
   class ConfigError < StandardError
+    include UserDataError
+  end
+
+  class DataError < StandardError
+    include UserDataError
   end
 
   class PluginLoadError < StandardError

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: java
 authors:
 - Sadayuki Furuhashi
@@ -133,8 +133,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.7.0.jar
-- classpath/embulk-standards-0.7.0.jar
+- classpath/embulk-core-0.7.1.jar
+- classpath/embulk-standards-0.7.1.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar
@@ -186,6 +186,8 @@ files:
 - embulk-core/src/main/java/org/embulk/config/TaskSource.java
 - embulk-core/src/main/java/org/embulk/config/TaskValidationException.java
 - embulk-core/src/main/java/org/embulk/config/TaskValidator.java
+- embulk-core/src/main/java/org/embulk/config/UserDataException.java
+- embulk-core/src/main/java/org/embulk/config/UserDataExceptions.java
 - embulk-core/src/main/java/org/embulk/exec/BulkLoader.java
 - embulk-core/src/main/java/org/embulk/exec/ExecModule.java
 - embulk-core/src/main/java/org/embulk/exec/ExecutionInterruptedException.java
@@ -238,6 +240,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/Column.java
 - embulk-core/src/main/java/org/embulk/spi/ColumnConfig.java
 - embulk-core/src/main/java/org/embulk/spi/ColumnVisitor.java
+- embulk-core/src/main/java/org/embulk/spi/DataException.java
 - embulk-core/src/main/java/org/embulk/spi/DecoderPlugin.java
 - embulk-core/src/main/java/org/embulk/spi/EncoderPlugin.java
 - embulk-core/src/main/java/org/embulk/spi/Exec.java
@@ -426,6 +429,7 @@ files:
 - embulk-docs/src/release/release-0.6.8.rst
 - embulk-docs/src/release/release-0.6.9.rst
 - embulk-docs/src/release/release-0.7.0.rst
+- embulk-docs/src/release/release-0.7.1.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