embulk 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cb7ac6a07d7e8db18b43a95012b56e20ae35cc
-  data.tar.gz: 664f254e002c1d086e73412e67a9efd32c4b4787
+  metadata.gz: eaa5606c99e0324b6e5057569535386d5b9e3988
+  data.tar.gz: a55d68015412d824e5c77e310da4564488898590
 SHA512:
-  metadata.gz: 0076dcca57267d34e1474373a56addccbaec0a43b30dc8a23bd504ccca3725802f0e41d90caba94387e0db560090e076829f48bb34789cf8cebaeb4fe7bd93f4
-  data.tar.gz: c0889fa0e4a95b9adb83e4460f4e4821c2c6948ac6583649286e67af305459bd5855df03fa3784da01a048d9390c7218e739e1247ff5d1b84f353047baddd611
+  metadata.gz: 05ede9f4f6ec3578e198827ef7e26a1089c2271c3a00c5c506b9bf7b702ce1ee650c7bcf4a39f9c3c4ce877a84d8348426c728d6a34b50c5ca46a35660adb7ae
+  data.tar.gz: 8b580c8b98a182465a70a3088de6c283a6b3c80c334176f40e3b08af7b915caf0918484140532f599393e2ff302cced24e79d438b8bb7defe9c8067bfe2a807a

data/build.gradle

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

data/embulk-core/build.gradle

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

data/embulk-core/src/test/java/org/embulk/spi/MockParserPlugin.java

@@ -4,6 +4,7 @@ import org.embulk.config.Config;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
+import org.embulk.spi.json.JsonParser;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.type.Type;
 import org.embulk.spi.Column;
@@ -56,6 +57,12 @@ public class MockParserPlugin implements ParserPlugin
                             pageBuilder.setTimestamp(column,
                                     Timestamp.ofEpochMilli(678L));
                             break;
+                        case "json":
+                            pageBuilder.setJson(
+                                column,
+                                new JsonParser().parse("{\"_c1\":true,\"_c2\":10,\"_c3\":\"embulk\",\"_c4\":{\"k\":\"v\"}}")
+                            );
+                            break;
                         default:
                             throw new IllegalStateException("Unknown type: "
                                     + type.getName());

data/embulk-core/src/test/java/org/embulk/spi/TestFileInputRunner.java

@@ -121,7 +121,8 @@ public class TestFileInputRunner
                         ImmutableMap.of("name", "col2", "type", "long", "option", ImmutableMap.of()),
                         ImmutableMap.of("name", "col3", "type", "double", "option", ImmutableMap.of()),
                         ImmutableMap.of("name", "col4", "type", "string", "option", ImmutableMap.of()),
-                        ImmutableMap.of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()))));
+                        ImmutableMap.of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()),
+                        ImmutableMap.of("name", "col6", "type", "json", "option", ImmutableMap.of()))));
 
         final MockPageOutput output = new MockPageOutput();
         runner.transaction(config, new InputPlugin.Control()
@@ -145,12 +146,13 @@ public class TestFileInputRunner
         List<Object[]> records = Pages.toObjects(schema, output.pages);
         assertEquals(2, records.size());
         for (Object[] record : records) {
-            assertEquals(5, record.length);
+            assertEquals(6, record.length);
             assertEquals(true, record[0]);
             assertEquals(2L, record[1]);
             assertEquals(3.0D, (Double) record[2], 0.01D);
             assertEquals("45", record[3]);
             assertEquals(678L, ((Timestamp) record[4]).toEpochMilli());
+            assertEquals("{\"_c2\":10,\"_c1\":true,\"_c4\":{\"k\":\"v\"},\"_c3\":\"embulk\"}", record[5].toString());
         }
     }
 
@@ -171,7 +173,8 @@ public class TestFileInputRunner
                         ImmutableMap.of("name", "col2", "type", "long", "option", ImmutableMap.of()),
                         ImmutableMap.of("name", "col3", "type", "double", "option", ImmutableMap.of()),
                         ImmutableMap.of("name", "col4", "type", "string", "option", ImmutableMap.of()),
-                        ImmutableMap.of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()))));
+                        ImmutableMap.of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()),
+                        ImmutableMap.of("name", "col6", "type", "json", "option", ImmutableMap.of()))));
 
         final MockPageOutput output = new MockPageOutput();
 

data/embulk-core/src/test/java/org/embulk/spi/TestFileOutputRunner.java

@@ -18,6 +18,11 @@ import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import org.msgpack.value.ImmutableMapValue;
+import static org.msgpack.value.ValueFactory.newBoolean;
+import static org.msgpack.value.ValueFactory.newInteger;
+import static org.msgpack.value.ValueFactory.newMap;
+import static org.msgpack.value.ValueFactory.newString;
 
 public class TestFileOutputRunner
 {
@@ -110,7 +115,8 @@ public class TestFileOutputRunner
                 ImmutableMap.<String,Object>of("name", "col2", "type", "long", "option", ImmutableMap.of()),
                 ImmutableMap.<String,Object>of("name", "col3", "type", "double", "option", ImmutableMap.of()),
                 ImmutableMap.<String,Object>of("name", "col4", "type", "string", "option", ImmutableMap.of()),
-                ImmutableMap.<String,Object>of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()));
+                ImmutableMap.<String,Object>of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()),
+                ImmutableMap.<String,Object>of("name", "col6", "type", "json", "option", ImmutableMap.of()));
         ConfigSource config = Exec
                 .newConfigSource()
                 .set("type", "unused?")
@@ -128,10 +134,16 @@ public class TestFileOutputRunner
                         1);
                 boolean committed = false;
                 try {
+                    ImmutableMapValue jsonValue = newMap(
+                            newString("_c1"), newBoolean(true),
+                            newString("_c2"), newInteger(10),
+                            newString("_c3"), newString("embulk"),
+                            newString("_c4"), newMap(newString("k"), newString("v"))
+                    );
                     for (Page page : PageTestUtils.buildPage(
                             runtime.getBufferAllocator(), schema, true, 2L,
-                            3.0D, "45", Timestamp.ofEpochMilli(678L), true, 2L,
-                            3.0D, "45", Timestamp.ofEpochMilli(678L))) {
+                            3.0D, "45", Timestamp.ofEpochMilli(678L), jsonValue, true, 2L,
+                            3.0D, "45", Timestamp.ofEpochMilli(678L), jsonValue)) {
                         tran.add(page);
                     }
                     tran.commit();
@@ -154,6 +166,7 @@ public class TestFileOutputRunner
             assertEquals(3.0D, (Double) record.get(2), 0.1D);
             assertEquals("45", record.get(3));
             assertEquals(678L, ((Timestamp) record.get(4)).toEpochMilli());
+            assertEquals("{\"_c1\":true,\"_c2\":10,\"_c3\":\"embulk\",\"_c4\":{\"k\":\"v\"}}", record.get(5).toString());
         }
     }
 
@@ -168,7 +181,8 @@ public class TestFileOutputRunner
                 ImmutableMap.<String,Object>of("name", "col2", "type", "long", "option", ImmutableMap.of()),
                 ImmutableMap.<String,Object>of("name", "col3", "type", "double", "option", ImmutableMap.of()),
                 ImmutableMap.<String,Object>of("name", "col4", "type", "string", "option", ImmutableMap.of()),
-                ImmutableMap.<String,Object>of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()));
+                ImmutableMap.<String,Object>of("name", "col5", "type", "timestamp", "option", ImmutableMap.of()),
+                ImmutableMap.<String,Object>of("name", "col6", "type", "json", "option", ImmutableMap.of()));
         ConfigSource config = Exec
                 .newConfigSource()
                 .set("type", "unused?")

data/embulk-core/src/test/java/org/embulk/spi/TestPageBuilderReader.java

@@ -2,17 +2,25 @@ package org.embulk.spi;
 
 import static org.embulk.spi.type.Types.BOOLEAN;
 import static org.embulk.spi.type.Types.DOUBLE;
+import static org.embulk.spi.type.Types.JSON;
 import static org.embulk.spi.type.Types.LONG;
 import static org.embulk.spi.type.Types.STRING;
 import static org.embulk.spi.type.Types.TIMESTAMP;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import org.msgpack.value.ImmutableMapValue;
+import static org.msgpack.value.ValueFactory.newBoolean;
+import static org.msgpack.value.ValueFactory.newInteger;
+import static org.msgpack.value.ValueFactory.newMap;
+import static org.msgpack.value.ValueFactory.newString;
 import java.util.ArrayList;
 import java.util.List;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.Schema;
 import org.embulk.EmbulkTestRuntime;
+import org.msgpack.value.ImmutableMapValue;
+import org.msgpack.value.Value;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -124,6 +132,12 @@ public class TestPageBuilderReader
                 Timestamp.ofEpochMilli(0), Timestamp.ofEpochMilli(10));
     }
 
+    @Test
+    public void testJson()
+    {
+        check(Schema.builder().add("col1", JSON).build(), getJsonSampleData());
+    }
+
     @Test
     public void testNull()
     {
@@ -133,9 +147,10 @@ public class TestPageBuilderReader
                     .add("col3", LONG)
                     .add("col3", BOOLEAN)
                     .add("col2", TIMESTAMP)
+                    .add("col4", JSON)
                     .build(),
-                null, null, null, null, null,
-                null, null, null, null, null);
+                null, null, null, null, null, null,
+                null, null, null, null, null, null);
     }
 
     @Test
@@ -147,9 +162,10 @@ public class TestPageBuilderReader
                     .add("col3", LONG)
                     .add("col3", BOOLEAN)
                     .add("col2", TIMESTAMP)
+                    .add("col4", JSON)
                     .build(),
-                8122.0, "val1", 3L, false, Timestamp.ofEpochMilli(0),
-                140.15, "val2", Long.MAX_VALUE, true, Timestamp.ofEpochMilli(10));
+                8122.0, "val1", 3L, false, Timestamp.ofEpochMilli(0), getJsonSampleData(),
+                140.15, "val2", Long.MAX_VALUE, true, Timestamp.ofEpochMilli(10), getJsonSampleData());
     }
 
     private void check(Schema schema, Object... objects)
@@ -185,6 +201,8 @@ public class TestPageBuilderReader
                     builder.setString(column, (String) value);
                 } else if (value instanceof Timestamp) {
                     builder.setTimestamp(column, (Timestamp) value);
+                } else if (value instanceof Value) {
+                    builder.setJson(column, (Value) value);
                 } else {
                     throw new IllegalStateException(
                             "Unsupported type in test utils: "
@@ -218,6 +236,8 @@ public class TestPageBuilderReader
                     assertEquals(value, reader.getString(column));
                 } else if (value instanceof Timestamp) {
                     assertEquals(value, reader.getTimestamp(column));
+                } else if (value instanceof Value) {
+                    assertEquals(value, reader.getJson(column));
                 } else {
                     throw new IllegalStateException(
                             "Unsupported type in test utils: "
@@ -227,6 +247,16 @@ public class TestPageBuilderReader
         }
     }
 
+    private ImmutableMapValue getJsonSampleData()
+    {
+        return newMap(
+                newString("_c1"), newBoolean(true),
+                newString("_c2"), newInteger(10),
+                newString("_c3"), newString("embulk"),
+                newString("_c4"), newMap(newString("k"), newString("v"))
+        );
+    }
+
     @Test
     public void testEmptySchema()
     {

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.6
     release/release-0.8.5
     release/release-0.8.4
     release/release-0.8.3

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

@@ -0,0 +1,14 @@
+Release 0.8.6
+==================================
+
+General Changes
+------------------
+
+* Upgraded JRuby from 9.0.4.0 to 9.0.5.0. See `JRuby 9.0.5.0 release notes <http://jruby.org/2016/01/26/jruby-9-0-5-0.html>`_ for details.
+
+* Upgraded msgpack-java from 0.8.1 to 0.8.3. See `MessagePack Java release notes <https://github.com/msgpack/msgpack-java/blob/develop/RELEASE_NOTES.md>`_ for details.
+
+
+Release Date
+------------------
+2016-02-24

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

@@ -156,7 +156,7 @@ public class TestJsonParserPlugin
             sb.append(line).append("\n");
         }
 
-        ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes());
+        ByteArrayInputStream in = new ByteArrayInputStream(sb.toString().getBytes("UTF-8"));
         return new InputStreamFileInput(runtime.getBufferAllocator(), provider(in));
     }
 

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -108,8 +108,8 @@ files:
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-core-0.8.5.jar
-- classpath/embulk-standards-0.8.5.jar
+- classpath/embulk-core-0.8.6.jar
+- classpath/embulk-standards-0.8.6.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -125,7 +125,7 @@ files:
 - classpath/joda-time-2.8.1.jar
 - classpath/logback-classic-1.1.3.jar
 - classpath/logback-core-1.1.3.jar
-- classpath/msgpack-core-0.8.1.jar
+- classpath/msgpack-core-0.8.3.jar
 - classpath/netty-buffer-5.0.0.Alpha1.jar
 - classpath/netty-common-5.0.0.Alpha1.jar
 - classpath/slf4j-api-1.7.12.jar
@@ -425,6 +425,7 @@ files:
 - embulk-docs/src/release/release-0.8.3.rst
 - embulk-docs/src/release/release-0.8.4.rst
 - embulk-docs/src/release/release-0.8.5.rst
+- embulk-docs/src/release/release-0.8.6.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/Bzip2FileDecoderPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/Bzip2FileEncoderPlugin.java