embulk-output-elasticsearch 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775d2c8e4628c2c21f2cfcf707ed138fbc2ab55b
-  data.tar.gz: 7956e4ddf4ec168484598f50f3a31f8305cf7780
+  metadata.gz: 4e69eededaa3567e928cfb6edd1879607ba8b7f3
+  data.tar.gz: 014e076a87a6c6adde4b8d6fa2177f0f0966e81d
 SHA512:
-  metadata.gz: f4283bed7a28688b10d1577d0f601c9102f02b49a0d2c79df25a4a5e3ff8b83fa03300cbd6f8a251f8c65da287df6ec2ae6e81a3797958477ae86d1f37af028b
-  data.tar.gz: 4db5b4ca8f467f0c3ae77ed6fdeeea579fca25252885eea99d4fce818c61bad3a8fe7659f7fea29cdd0e1f90836ea39197a3a0f561364fbd1bd5652f1bb0bee5
+  metadata.gz: 8e9fbcd1b6632993a74896d35609df6d6153ab2369292d26e90496d475d30a5530a88478f4ea964dba50f483bdd47f30f58a3ccac02f850bf543ff21cfe0c544
+  data.tar.gz: a9d9b764357a8d11693c0d93f745a57aecce0a68e5265bd82a2ee79b9ce89ac0a3df2c2b344a846018a2ecf6f24fb9bf0549c92e6bafc0fb58a045a22c52400c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 - 2016-02-22
+
+* [maintenance] Upgrade Embulk v08 [#21](https://github.com/muga/embulk-output-elasticsearch/pull/21)
+
 ## 0.2.1 - 2016-02-05
 
 * [maintenance] Fix bug. Force to fail jobs if nodes down while executing [#19](https://github.com/muga/embulk-output-elasticsearch/pull/19)
@@ -40,4 +44,4 @@
 
 ## 0.1.1 - 2015-02-16
 
-## 0.1.0 - 2015-02-16
+## 0.1.0 - 2015-02-16

data/build.gradle

@@ -14,20 +14,20 @@ configurations {
     provided
 }
 
-version = "0.2.1"
+version = "0.3.0"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.7.7"
-    provided  "org.embulk:embulk-core:0.7.7"
+    compile  "org.embulk:embulk-core:0.8.5"
+    provided  "org.embulk:embulk-core:0.8.5"
     compile 'org.elasticsearch:elasticsearch:2.0.0'
 
     testCompile "junit:junit:4.+"
-    testCompile "org.embulk:embulk-core:0.7.7:tests"
-    testCompile "org.embulk:embulk-standards:0.7.7"
+    testCompile "org.embulk:embulk-core:0.8.5:tests"
+    testCompile "org.embulk:embulk-standards:0.8.5"
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchOutputPlugin.java

@@ -363,6 +363,23 @@ public class ElasticsearchOutputPlugin
                             }
                         }
 
+                        @Override
+                        public void jsonColumn(Column column) {
+                            try {
+                                if (pageReader.isNull(column)) {
+                                    contextBuilder.nullField(column.getName());
+                                } else {
+                                    contextBuilder.field(column.getName(), pageReader.getJson(column).toJson());
+                                }
+                            } catch (IOException e) {
+                                try {
+                                    contextBuilder.nullField(column.getName());
+                                } catch (IOException ex) {
+                                    throw Throwables.propagate(ex);
+                                }
+                            }
+                        }
+
                         @Override
                         public void timestampColumn(Column column) {
                             try {
@@ -406,6 +423,8 @@ public class ElasticsearchOutputPlugin
                 idValue = pageReader.getDouble(inputColumn) + "";
             } else if (Types.LONG.equals(inputColumn.getType())) {
                 idValue = pageReader.getLong(inputColumn) + "";
+            } else if (Types.JSON.equals(inputColumn.getType())) {
+                idValue = pageReader.getJson(inputColumn).toJson();
             } else if (Types.TIMESTAMP.equals(inputColumn.getType())) {
                 idValue = pageReader.getTimestamp(inputColumn).toString();
             } else {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ files:
 - classpath/commons-cli-1.3.1.jar
 - classpath/compress-lzf-1.0.2.jar
 - classpath/elasticsearch-2.0.0.jar
-- classpath/embulk-output-elasticsearch-0.2.1.jar
+- classpath/embulk-output-elasticsearch-0.3.0.jar
 - classpath/HdrHistogram-2.1.6.jar
 - classpath/hppc-0.7.1.jar
 - classpath/jackson-dataformat-cbor-2.5.3.jar