embulk 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f4ce6246c951b41b33a123f74e33d54324a865
-  data.tar.gz: 7c7bb33676ac7bcad4bc03dec3b843242b5ebf15
+  metadata.gz: 7a7102ccd2c44833976bac88ae9d0e9817be8743
+  data.tar.gz: 77b0075a55fe8afb19da2afb7f1cb7ce7e7ecb90
 SHA512:
-  metadata.gz: e4921463f2ec39d4f47981692059f2221eb98003d94a063a09b0fda6cae4fb697053a5199ce2abfc31d29e43d172d24b01eacacbb1b287e80f0a93abe4d698af
-  data.tar.gz: bb264a3a0528502f42222d6c86ec8d5d06214bdfd7bb29c06e9c1fd9252900a7a93b70c1316423a7338672ec05bff6382c1412fed8585a4461ebc1d9340b2997
+  metadata.gz: 17bf7846353ee95ea5f8378534ea89d44ec18e2bb10a06073c803bef75bb8b2563437fa4d752f6e506569a78ab80018abb6c66b146ca144cf9bc3e18b08b44ba
+  data.tar.gz: df8153562d5d64f596ba1a004e38dd2461bbd0809be27013d20d2cc25fd8da4b35a69fde260531ac8cb7b323a1f12232b8c7b7b4f5470471f3b7a8ca2fa80012

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    embulk (0.8.0)
-      jruby-jars (= 9.0.4.0)
+    embulk (0.8.9)
+      jruby-jars (= 9.1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    jruby-jars (9.0.4.0)
+    jruby-jars (9.1.2.0)
     kramdown (1.5.0)
     power_assert (0.2.2)
     rake (10.4.2)
@@ -27,4 +27,4 @@ DEPENDENCIES
   yard (~> 0.8.7)
 
 BUNDLED WITH
-   1.10.6
+   1.12.4

data/build.gradle

@@ -16,10 +16,10 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.8.9'
+    version = '0.8.10'
 
     ext {
-        jrubyVersion = '9.0.5.0'
+        jrubyVersion = '9.1.2.0'
     }
 
     apply plugin: 'java'

data/embulk-core/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     compile 'joda-time:joda-time:2.9.2'
     compile 'io.netty:netty-buffer:5.0.0.Alpha1'
     compile 'org.fusesource.jansi:jansi:1.11'
-    compile 'org.msgpack:msgpack-core:0.8.7'
+    compile 'org.msgpack:msgpack-core:0.8.8'
 
     // For embulk/guess/charset.rb. See also embulk.gemspec
     compile 'com.ibm.icu:icu4j:54.1.1'

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

@@ -0,0 +1,88 @@
+package org.embulk.exec;
+
+import org.embulk.config.ConfigDiff;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.TaskReport;
+import org.embulk.config.TaskSource;
+import org.embulk.spi.Buffer;
+import org.embulk.spi.Exec;
+import org.embulk.spi.FileInputPlugin;
+import org.embulk.spi.TransactionalFileInput;
+
+import java.util.List;
+
+public class BufferFileInputPlugin
+        implements FileInputPlugin
+{
+    private Buffer buffer;
+
+    public BufferFileInputPlugin(Buffer buffer)
+    {
+        this.buffer = buffer;
+    }
+
+    public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control)
+    {
+        control.run(Exec.newTaskSource(), 1);
+        return Exec.newConfigDiff();
+    }
+
+    public ConfigDiff resume(TaskSource taskSource,
+            int taskCount,
+            FileInputPlugin.Control control)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void cleanup(TaskSource taskSource,
+            int taskCount,
+            List<TaskReport> successTaskReports)
+    {
+        if (buffer != null) {
+            buffer.release();
+            buffer = null;
+        }
+    }
+
+    public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
+    {
+        return new BufferTransactionalFileInput(buffer);
+    }
+
+    private static class BufferTransactionalFileInput
+            implements TransactionalFileInput
+    {
+        private Buffer buffer;
+
+        public BufferTransactionalFileInput(Buffer buffer)
+        {
+            this.buffer = buffer;
+        }
+
+        @Override
+        public Buffer poll()
+        {
+            Buffer b = buffer;
+            buffer = null;
+            return b;
+        }
+
+        @Override
+        public boolean nextFile()
+        {
+            return buffer != null;
+        }
+
+        @Override
+        public void close() { }
+
+        @Override
+        public void abort() { }
+
+        @Override
+        public TaskReport commit()
+        {
+            return null;
+        }
+    }
+}

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

@@ -31,7 +31,7 @@ public class ExecModule
         binder.bind(BufferAllocator.class).to(PooledBufferAllocator.class).in(Scopes.SINGLETON);
         binder.bind(TempFileAllocator.class).in(Scopes.SINGLETON);
 
-        // GuessExecutor
+        // GuessExecutor, PreviewExecutor
         registerPluginTo(binder, ParserPlugin.class, "system_guess", GuessExecutor.GuessParserPlugin.class);
         registerPluginTo(binder, ParserPlugin.class, "system_sampling", SamplingParserPlugin.class);
 

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

@@ -191,82 +191,6 @@ public class GuessExecutor
         return lastGuessed;
     }
 
-    private static class BufferFileInputPlugin
-            implements FileInputPlugin
-    {
-        private Buffer buffer;
-
-        public BufferFileInputPlugin(Buffer buffer)
-        {
-            this.buffer = buffer;
-        }
-
-        public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control)
-        {
-            control.run(Exec.newTaskSource(), 1);
-            return Exec.newConfigDiff();
-        }
-
-        public ConfigDiff resume(TaskSource taskSource,
-                int taskCount,
-                FileInputPlugin.Control control)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        public void cleanup(TaskSource taskSource,
-                int taskCount,
-                List<TaskReport> successTaskReports)
-        {
-            if (buffer != null) {
-                buffer.release();
-                buffer = null;
-            }
-        }
-
-        public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
-        {
-            return new BufferTransactionalFileInput(buffer);
-        }
-    }
-
-    private static class BufferTransactionalFileInput
-            implements TransactionalFileInput
-    {
-        private Buffer buffer;
-
-        public BufferTransactionalFileInput(Buffer buffer)
-        {
-            this.buffer = buffer;
-        }
-
-        @Override
-        public Buffer poll()
-        {
-            Buffer b = buffer;
-            buffer = null;
-            return b;
-        }
-
-        @Override
-        public boolean nextFile()
-        {
-            return buffer != null;
-        }
-
-        @Override
-        public void close() { }
-
-        @Override
-        public void abort() { }
-
-        @Override
-        public TaskReport commit()
-        {
-            return null;
-        }
-    }
-
     public static class GuessParserPlugin
             implements ParserPlugin
     {

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

@@ -301,6 +301,7 @@ public class LocalExecutorPlugin
 
                     // outputCommitted
                     tran.commit();
+                    aborter.dontAbort();
                 }
             }
             finally {
@@ -551,6 +552,7 @@ public class LocalExecutorPlugin
                     catch (InterruptedException ex) {
                         error = ex;
                     }
+                    outputWorkers[i] = null;
                     if (error != null) {
                         throw Throwables.propagate(error);
                     }

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

@@ -13,6 +13,9 @@ import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
 import org.embulk.plugin.PluginType;
+import org.embulk.spi.Buffer;
+import org.embulk.spi.FileInputPlugin;
+import org.embulk.spi.FileInputRunner;
 import org.embulk.spi.Schema;
 import org.embulk.spi.Page;
 import org.embulk.spi.PageOutput;
@@ -85,10 +88,22 @@ public class PreviewExecutor
 
     private PreviewResult doPreview(ConfigSource config)
     {
-        final PreviewTask task = config.loadConfig(PreviewTask.class);
-        final InputPlugin input = newInputPlugin(task);
-        final List<FilterPlugin> filterPlugins = newFilterPlugins(task);
+        PreviewTask task = config.loadConfig(PreviewTask.class);
+        InputPlugin inputPlugin = newInputPlugin(task);
+        List<FilterPlugin> filterPlugins = newFilterPlugins(task);
+
+        if (inputPlugin instanceof FileInputRunner) { // file input runner
+            Buffer sample = SamplingParserPlugin.runFileInputSampling((FileInputRunner)inputPlugin, config.getNested("in"));
+            FileInputRunner previewRunner = new FileInputRunner(new BufferFileInputPlugin(sample));
+            return doPreview(task, previewRunner, filterPlugins);
+        }
+        else {
+            return doPreview(task, inputPlugin, filterPlugins);
+        }
+    }
 
+    private PreviewResult doPreview(final PreviewTask task, final InputPlugin input, final List<FilterPlugin> filterPlugins)
+    {
         try {
             input.transaction(task.getInputConfig(), new InputPlugin.Control() {
                 public List<TaskReport> run(final TaskSource inputTask, Schema inputSchema, final int taskCount)
@@ -96,8 +111,6 @@ public class PreviewExecutor
                     Filters.transaction(filterPlugins, task.getFilterConfigs(), inputSchema, new Filters.Control() {
                         public void run(final List<TaskSource> filterTasks, final List<Schema> filterSchemas)
                         {
-                            InputPlugin input = newInputPlugin(task);
-                            List<FilterPlugin> filterPlugins = newFilterPlugins(task);
                             Schema inputSchema = filterSchemas.get(0);
                             Schema outputSchema = filterSchemas.get(filterSchemas.size() - 1);
 

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

@@ -83,9 +83,8 @@ public class FileInputRunner
     public ConfigDiff guess(ConfigSource execConfig, ConfigSource config)
     {
         Buffer sample = SamplingParserPlugin.runFileInputSampling(this, config);
-        if (sample.limit() == 0) {
-            throw new NoSampleException("Can't get sample data because the first input file is empty");
-        }
+        // SamplingParserPlugin.runFileInputSampling throws NoSampleException if there're
+        // no files or all files are smaller than minSampleSize (40 bytes).
 
         GuessExecutor guessExecutor = Exec.getInjector().getInstance(GuessExecutor.class);
         return guessExecutor.guessParserConfig(sample, config, execConfig);

data/embulk-docs/build.gradle

@@ -9,24 +9,24 @@ dependencies {
     jrubyExec 'rubygems:yard:0.8.7.6'
 }
 
-task sphinx_html(type: Exec) {
+task sphinxHtml(type: Exec) {
     workingDir '.'
     commandLine 'make'
     args 'html'
 }
 
-task javadoc_html(type: Copy, dependsOn: [':embulk-core:javadoc']) {
+task javadocHtml(type: Copy, dependsOn: [':embulk-core:javadoc']) {
     doFirst { file('build/html/javadoc').mkdirs() }
     from project(':embulk-core').javadoc.destinationDir
     into 'build/html/javadoc'
 }
 
-task rdoc_html(type: JRubyExec) {
+task rdocHtml(type: JRubyExec) {
     workingDir '..'
     jrubyArgs '-ryard', '-eYARD::CLI::Yardoc.run(*ARGV)'
     script './lib/embulk/version.rb'  // dummy
     scriptArgs 'lib', '-o', 'embulk-docs/build/html/rdoc'
 }
 
-task site(type: Copy, dependsOn: ['sphinx_html', 'rdoc_html', 'javadoc_html']) {
+task site(type: Copy, dependsOn: ['sphinxHtml', 'rdocHtml', 'javadocHtml']) {
 }

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.10
     release/release-0.8.9
     release/release-0.8.8
     release/release-0.8.7

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

@@ -0,0 +1,35 @@
+Release 0.8.10
+==================================
+
+General Changes
+------------------
+
+* Fixed 'IllegalArgumentException: Self-suppression not permitted' error (@hata++) [#446]
+
+* Fixed preview not to read the entire file when the parser doesn't produce records. Now preview reads first 32KB.
+
+* Updated JRuby from 9.0.4.0 to 9.1.2.0. Release notes:
+
+  * http://jruby.org/2016/01/26/jruby-9-0-5-0.html
+
+  * http://jruby.org/2016/05/03/jruby-9-1-0-0.html
+
+  * http://jruby.org/2016/05/19/jruby-9-1-1-0.html
+
+  * http://jruby.org/2016/05/27/jruby-9-1-2-0.html
+
+* Updated msgpack-java from 0.8.7 to 0.8.8. Release notes
+
+  * https://github.com/msgpack/msgpack-java/blob/0.8.8/RELEASE_NOTES.md
+
+Built-in plugins
+------------------
+
+* ``csv`` parser plugin supports delimiters longer than 1 character.
+
+* ``csv`` parser doesn't convert non-quoted empty string into NULL any more when null_string is set. Default behavior is not changed (convert non-quoted empty string into NULL).
+
+
+Release Date
+------------------
+2016-07-21

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

@@ -57,7 +57,7 @@ public class CsvParserPlugin
 
         @Config("delimiter")
         @ConfigDefault("\",\"")
-        char getDelimiterChar();
+        String getDelimiter();
 
         @Config("quote")
         @ConfigDefault("\"\\\"\"")
@@ -233,7 +233,6 @@ public class CsvParserPlugin
         final TimestampParser[] timestampParsers = Timestamps.newTimestampColumnParsers(task, task.getSchemaConfig());
         final JsonParser jsonParser = new JsonParser();
         final CsvTokenizer tokenizer = new CsvTokenizer(new LineDecoder(input, task), task);
-        final String nullStringOrNull = task.getNullString().orNull();
         final boolean allowOptionalColumns = task.getAllowOptionalColumns();
         final boolean allowExtraColumns = task.getAllowExtraColumns();
         final boolean stopOnInvalidRecord = task.getStopOnInvalidRecord();
@@ -344,17 +343,7 @@ public class CsvParserPlugin
                                     //TODO warning
                                     return null;
                                 }
-                                String v = tokenizer.nextColumn();
-                                if (!v.isEmpty()) {
-                                    if (v.equals(nullStringOrNull)) {
-                                        return null;
-                                    }
-                                    return v;
-                                } else if (tokenizer.wasQuotedColumn()) {
-                                    return "";
-                                } else {
-                                    return null;
-                                }
+                                return tokenizer.nextColumnOrNull();
                             }
                         });
 

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

@@ -7,6 +7,7 @@ import java.util.Deque;
 import java.util.ArrayDeque;
 import org.embulk.spi.DataException;
 import org.embulk.spi.util.LineDecoder;
+import org.embulk.config.ConfigException;
 
 public class CsvTokenizer
 {
@@ -24,7 +25,8 @@ public class CsvTokenizer
     static final char NO_QUOTE = '\0';
     static final char NO_ESCAPE = '\0';
 
-    private final char delimiter;
+    private final char delimiterChar;
+    private final String delimiterFollowingString;
     private final char quote;
     private final char escape;
     private final String newline;
@@ -32,6 +34,7 @@ public class CsvTokenizer
     private final long maxQuotedSizeLimit;
     private final String commentLineMarker;
     private final LineDecoder input;
+    private final String nullStringOrNull;
 
     private RecordState recordState = RecordState.END;  // initial state is end of a record. nextRecord() must be called first
     private long lineNumber = 0;
@@ -44,13 +47,24 @@ public class CsvTokenizer
 
     public CsvTokenizer(LineDecoder input, CsvParserPlugin.PluginTask task)
     {
-        delimiter = task.getDelimiterChar();
+        String delimiter = task.getDelimiter();
+        if (delimiter.length() == 0) {
+            throw new ConfigException("Empty delimiter is not allowed");
+        } else {
+            this.delimiterChar = delimiter.charAt(0);
+            if (delimiter.length() > 1) {
+                delimiterFollowingString = delimiter.substring(1);
+            } else {
+                delimiterFollowingString = null;
+            }
+        }
         quote = task.getQuoteChar().or(CsvParserPlugin.QuoteCharacter.noQuote()).getCharacter();
         escape = task.getEscapeChar().or(CsvParserPlugin.EscapeCharacter.noEscape()).getCharacter();
         newline = task.getNewline().getString();
         trimIfNotQuoted = task.getTrimIfNotQuoted();
         maxQuotedSizeLimit = task.getMaxQuotedSizeLimit();
         commentLineMarker = task.getCommentLineMarker().orNull();
+        nullStringOrNull = task.getNullString().orNull();
         this.input = input;
     }
 
@@ -91,7 +105,11 @@ public class CsvTokenizer
 
     public boolean nextFile()
     {
-        return input.nextFile();
+        boolean next = input.nextFile();
+        if (next) {
+            lineNumber = 0;
+        }
+        return next;
     }
 
     // used by guess-csv
@@ -169,9 +187,15 @@ public class CsvTokenizer
                     //      this block can be out of the looop.
                     if (isDelimiter(c)) {
                         // empty value
-                        return "";
-
-                    } else if (isEndOfLine(c)) {
+                        if (delimiterFollowingString == null) {
+                            return "";
+                        } else if (isDelimiterFollowingFrom(linePos)) {
+                            linePos += delimiterFollowingString.length();
+                            return "";
+                        }
+                        // not a delimiter
+                    }
+                    if (isEndOfLine(c)) {
                         // empty value
                         recordState = RecordState.END;
                         return "";
@@ -193,9 +217,15 @@ public class CsvTokenizer
                 case FIRST_TRIM:
                     if (isDelimiter(c)) {
                         // empty value
-                        return "";
-
-                    } else if (isEndOfLine(c)) {
+                        if (delimiterFollowingString == null) {
+                            return "";
+                        } else if (isDelimiterFollowingFrom(linePos)) {
+                            linePos += delimiterFollowingString.length();
+                            return "";
+                        }
+                        // not a delimiter
+                    }
+                    if (isEndOfLine(c)) {
                         // empty value
                         recordState = RecordState.END;
                         return "";
@@ -218,9 +248,16 @@ public class CsvTokenizer
 
                 case VALUE:
                     if (isDelimiter(c)) {
-                        return line.substring(valueStartPos, linePos - 1);
-
-                    } else if (isEndOfLine(c)) {
+                        if (delimiterFollowingString == null) {
+                            return line.substring(valueStartPos, linePos - 1);
+                        } else if (isDelimiterFollowingFrom(linePos)) {
+                            String value = line.substring(valueStartPos, linePos - 1);
+                            linePos += delimiterFollowingString.length();
+                            return value;
+                        }
+                        // not a delimiter
+                    }
+                    if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return line.substring(valueStartPos, linePos);
 
@@ -241,9 +278,16 @@ public class CsvTokenizer
 
                 case LAST_TRIM_OR_VALUE:
                     if (isDelimiter(c)) {
-                        return line.substring(valueStartPos, valueEndPos);
-
-                    } else if (isEndOfLine(c)) {
+                        if (delimiterFollowingString == null) {
+                            return line.substring(valueStartPos, valueEndPos);
+                        } else if (isDelimiterFollowingFrom(linePos)) {
+                            linePos += delimiterFollowingString.length();
+                            return line.substring(valueStartPos, valueEndPos);
+                        } else {
+                            // not a delimiter
+                        }
+                    }
+                    if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return line.substring(valueStartPos, valueEndPos);
 
@@ -304,9 +348,15 @@ public class CsvTokenizer
 
                 case AFTER_QUOTED_VALUE:
                     if (isDelimiter(c)) {
-                        return quotedValue.toString();
-
-                    } else if (isEndOfLine(c)) {
+                        if (delimiterFollowingString == null) {
+                            return quotedValue.toString();
+                        } else if (isDelimiterFollowingFrom(linePos)) {
+                            linePos += delimiterFollowingString.length();
+                            return quotedValue.toString();
+                        }
+                        // not a delimiter
+                    }
+                    if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return quotedValue.toString();
 
@@ -324,6 +374,32 @@ public class CsvTokenizer
         }
     }
 
+    public String nextColumnOrNull()
+    {
+        String v = nextColumn();
+        if (nullStringOrNull == null) {
+            if (v.isEmpty()) {
+                if (wasQuotedColumn) {
+                    return "";
+                }
+                else {
+                    return null;
+                }
+            }
+            else {
+                return v;
+            }
+        }
+        else {
+            if (v.equals(nullStringOrNull)) {
+                return null;
+            }
+            else {
+                return v;
+            }
+        }
+    }
+
     public boolean wasQuotedColumn()
     {
         return wasQuotedColumn;
@@ -356,9 +432,22 @@ public class CsvTokenizer
         return c == ' ';
     }
 
+    private boolean isDelimiterFollowingFrom(int pos)
+    {
+        if (line.length() < pos + delimiterFollowingString.length()) {
+            return false;
+        }
+        for (int i = 0; i < delimiterFollowingString.length(); i++) {
+            if (delimiterFollowingString.charAt(i) != line.charAt(pos + i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private boolean isDelimiter(char c)
     {
-        return c == delimiter;
+        return c == delimiterChar;
     }
 
     private boolean isEndOfLine(char c)

data/embulk-standards/src/test/java/org/embulk/standards/TestCsvParserPlugin.java

@@ -33,7 +33,7 @@ public class TestCsvParserPlugin
         assertEquals(Charset.forName("utf-8"), task.getCharset());
         assertEquals(Newline.CRLF, task.getNewline());
         assertEquals(false, task.getHeaderLine().or(false));
-        assertEquals(',', task.getDelimiterChar());
+        assertEquals(",", task.getDelimiter());
         assertEquals(Optional.of(new CsvParserPlugin.QuoteCharacter('\"')), task.getQuoteChar());
         assertEquals(false, task.getAllowOptionalColumns());
         assertEquals(DateTimeZone.UTC, task.getDefaultTimeZone());
@@ -68,7 +68,7 @@ public class TestCsvParserPlugin
         assertEquals(Charset.forName("utf-16"), task.getCharset());
         assertEquals(Newline.LF, task.getNewline());
         assertEquals(true, task.getHeaderLine().or(false));
-        assertEquals('\t', task.getDelimiterChar());
+        assertEquals("\t", task.getDelimiter());
         assertEquals(Optional.of(new CsvParserPlugin.QuoteCharacter('\\')), task.getQuoteChar());
         assertEquals(true, task.getAllowOptionalColumns());
     }

data/embulk-standards/src/test/java/org/embulk/standards/TestCsvTokenizer.java

@@ -88,12 +88,8 @@ public class TestCsvTokenizer
         while (tokenizer.nextRecord()) {
             List<String> record = new ArrayList<>();
             for (Column c : schema.getColumns()) {
-                String v = tokenizer.nextColumn();
-                if (!v.isEmpty()) {
-                    record.add(v);
-                } else {
-                    record.add(tokenizer.wasQuotedColumn() ? "" : null);
-                }
+                String v = tokenizer.nextColumnOrNull();
+                record.add(v);
             }
             records.add(record);
         }
@@ -202,6 +198,31 @@ public class TestCsvTokenizer
                     "ccc\tddd"));
     }
 
+    @Test
+    public void testDefaultNullString() throws Exception
+    {
+        reloadPluginTask();
+        assertEquals(expectedRecords(2,
+                        null, "",
+                        "NULL", "NULL"),
+                parse(task,
+                        ",\"\"",
+                        "NULL,\"NULL\""));
+    }
+
+    @Test
+    public void testChangeNullString() throws Exception
+    {
+        config.set("null_string", "NULL");
+        reloadPluginTask();
+        assertEquals(expectedRecords(2,
+                        "", "",
+                        null, null),
+                parse(task,
+                        ",\"\"",
+                        "NULL,\"NULL\""));
+    }
+
     @Test
     public void testQuotedValues() throws Exception
     {

data/embulk.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
     gem.platform = 'java'
 
   else
-    gem.add_dependency "jruby-jars", '= 9.0.4.0'
+    gem.add_dependency "jruby-jars", '= 9.1.2.0'
   end
 
   gem.add_development_dependency "rake", [">= 0.10.0"]

data/lib/embulk/command/embulk_migrate_plugin.rb

@@ -122,7 +122,7 @@ EOF
     # add rules...
     ##
 
-    migrator.write(".ruby-version", "jruby-9.0.4.0")
+    migrator.write(".ruby-version", "jruby-9.1.2.0")
 
     # update version at the end
     if from_ver <= version("0.1.0")

data/lib/embulk/data/bundle/.ruby-version

@@ -1 +1 @@
-jruby-9.0.5.0
+jruby-9.1.2.0

data/lib/embulk/data/new/ruby/.ruby-version

@@ -1 +1 @@
-jruby-9.0.4.0
+jruby-9.1.2.0

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.8.9'
+  VERSION = '0.8.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.4.0
+        version: 9.1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.4.0
+        version: 9.1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,9 +108,9 @@ files:
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-cli-0.8.9.jar
-- classpath/embulk-core-0.8.9.jar
-- classpath/embulk-standards-0.8.9.jar
+- classpath/embulk-cli-0.8.10.jar
+- classpath/embulk-core-0.8.10.jar
+- classpath/embulk-standards-0.8.10.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -126,7 +126,7 @@ files:
 - classpath/joda-time-2.9.2.jar
 - classpath/logback-classic-1.1.3.jar
 - classpath/logback-core-1.1.3.jar
-- classpath/msgpack-core-0.8.7.jar
+- classpath/msgpack-core-0.8.8.jar
 - classpath/netty-buffer-5.0.0.Alpha1.jar
 - classpath/netty-common-5.0.0.Alpha1.jar
 - classpath/slf4j-api-1.7.12.jar
@@ -167,6 +167,7 @@ files:
 - 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/config/YamlTagResolver.java
+- embulk-core/src/main/java/org/embulk/exec/BufferFileInputPlugin.java
 - embulk-core/src/main/java/org/embulk/exec/BulkLoader.java
 - embulk-core/src/main/java/org/embulk/exec/ConfigurableGuessInputPlugin.java
 - embulk-core/src/main/java/org/embulk/exec/ExecModule.java
@@ -422,6 +423,7 @@ files:
 - embulk-docs/src/release/release-0.7.9.rst
 - 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.10.rst
 - embulk-docs/src/release/release-0.8.2.rst
 - embulk-docs/src/release/release-0.8.3.rst
 - embulk-docs/src/release/release-0.8.4.rst