embulk-formatter-single_value 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d69182fd9f26bd44547e3423b7a9291c7fde64
-  data.tar.gz: a988cb81d92efdc69df47459c030b661937577da
+  metadata.gz: f017d50a25129c53993d3f8df50932a5ab4ea586
+  data.tar.gz: 32c0550e9eeefe6184f6578a430f96c3db120cdb
 SHA512:
-  metadata.gz: 23fad82ccdd061d8c02310fc28cb764aa0b71a46b55c189f267a2a4f3e23dbf2a738d76dac98f2a6d2bed1354f07182daa5acdb818990e4fc8ccf71f78524b43
-  data.tar.gz: fd42f7f0e8310e93efe0b84a442a937c8d1e1774291a0b75a413fd80e032ecd2557c51405d0b25859976da5dfb5d226d5f11fec1461ddd5e4946b4368673616c
+  metadata.gz: c8b0d3a8d94a883374d25825f5e135f0a765af1b7e53e523f54dc63e4a51aeec091f544b2c67f9cdb9e530224abdf1cdc99b13dfc9d47c38144c854e241c0dec
+  data.tar.gz: dce163316c84bfc4ab2f1f1d4c993485ad3398b6e4ce8f7a22980c9ddee52d4caba0dc68526aeed7c28f9fb64319b1eb396b7cef35016bd718a76bc63a89ddf7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.1 (2016-02-19)
+
+Fixes:
+
+* Fix for cases there are multiple input columns
+
 # 0.1.0 (2016-02-19)
 
 Initial release
+

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/example/example.csv

@@ -0,0 +1,5 @@
+id,account,time,purchase,comment
+1,32864,2015-01-27 19:23:49,20150127,embulk
+2,14824,2015-01-27 19:01:23,20150127,embulk jruby
+3,27559,2015-01-28 02:20:02,20150128,"Embulk ""csv"" parser plugin"
+4,11270,2015-01-29 11:54:36,20150129,NULL

data/example/example.yml

@@ -6,7 +6,7 @@ in:
     message_key: message
 out:
   type: file
-  path_prefix: /tmp/signle_value_
+  path_prefix: /tmp/single_value_
   file_ext: txt
   formatter:
     type: single_value

data/example/first_column.yml

@@ -0,0 +1,26 @@
+in:
+  type: file
+  path_prefix: example/example.csv
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: '"'
+    escape: '"'
+    trim_if_not_quoted: false
+    skip_header_lines: 1
+    allow_extra_columns: false
+    allow_optional_columns: false
+    columns:
+    - {name: id, type: long}
+    - {name: account, type: long}
+    - {name: time, type: timestamp, format: '%Y-%m-%d %H:%M:%S'}
+    - {name: purchase, type: timestamp, format: '%Y%m%d'}
+    - {name: comment, type: string}
+out:
+  type: file
+  path_prefix: /tmp/single_value_
+  file_ext: txt
+  formatter:
+    type: single_value

data/example/message_key.yml

@@ -0,0 +1,27 @@
+in:
+  type: file
+  path_prefix: example/example.csv
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: '"'
+    escape: '"'
+    trim_if_not_quoted: false
+    skip_header_lines: 1
+    allow_extra_columns: false
+    allow_optional_columns: false
+    columns:
+    - {name: id, type: long}
+    - {name: account, type: long}
+    - {name: time, type: timestamp, format: '%Y-%m-%d %H:%M:%S'}
+    - {name: purchase, type: timestamp, format: '%Y%m%d'}
+    - {name: comment, type: string}
+out:
+  type: file
+  path_prefix: /tmp/single_value_
+  file_ext: txt
+  formatter:
+    type: single_value
+    message_key: comment

data/example/timestamp.yml

@@ -8,7 +8,7 @@ in:
       - {name: time, type: timestamp, format: '%Y-%m-%d %H:%M:%S', timezone: "Asia/Tokyo"}
 out:
   type: file
-  path_prefix: /tmp/signle_value_
+  path_prefix: /tmp/single_value_
   file_ext: txt
   formatter:
     type: single_value

data/src/main/java/org/embulk/formatter/single_value/SingleValueFormatterPlugin.java

@@ -57,29 +57,32 @@ public class SingleValueFormatterPlugin
         control.run(task.dump());
     }
 
-    private Schema getOutputSchema(Optional<String> columnName, Schema inputSchema)
+    private int getInputColumnIndex(Optional<String> columnName, Schema inputSchema)
     {
-        Column outputColumn;
         if (columnName.isPresent()) {
-            outputColumn = inputSchema.lookupColumn(columnName.get());
-        }
-        else {
-            outputColumn = inputSchema.getColumn(0);
+            return inputSchema.lookupColumn(columnName.get()).getIndex();
         }
+        return 0; // default is the first column
+    }
+
+    private Schema getOutputSchema(int inputColumnIndex, Schema inputSchema)
+    {
+        Column outputColumn = inputSchema.getColumn(inputColumnIndex);
         ImmutableList.Builder<Column> builder = ImmutableList.builder();
         builder.add(outputColumn);
         return new Schema(builder.build());
     }
 
     @Override
-    public PageOutput open(final TaskSource taskSource, final Schema schema,
+    public PageOutput open(final TaskSource taskSource, final Schema inputSchema,
             final FileOutput output)
     {
         final PluginTask task = taskSource.loadTask(PluginTask.class);
         final LineEncoder encoder = new LineEncoder(output, task);
         final String nullString = task.getNullString();
 
-        final Schema outputSchema = getOutputSchema(task.getMessageKey(), schema);
+        final int inputColumnIndex = getInputColumnIndex(task.getMessageKey(), inputSchema);
+        final Schema outputSchema = getOutputSchema(inputColumnIndex, inputSchema);
         final DateTimeZone timezone  = DateTimeZone.forID(task.getTimezone());
         final TimestampFormatter timestampFormatter =
             new TimestampFormatter(task.getJRuby(), task.getTimestampFormat(), timezone);
@@ -88,17 +91,17 @@ public class SingleValueFormatterPlugin
         encoder.nextFile();
 
         return new PageOutput() {
-            private final PageReader pageReader = new PageReader(outputSchema);
+            private final PageReader pageReader = new PageReader(inputSchema);
 
             public void add(Page page)
             {
                 pageReader.setPage(page);
                 while (pageReader.nextRecord()) {
-                    schema.visitColumns(new ColumnVisitor() {
+                    outputSchema.visitColumns(new ColumnVisitor() {
                         public void booleanColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                addValue(Boolean.toString(pageReader.getBoolean(column)));
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                addValue(Boolean.toString(pageReader.getBoolean(inputColumnIndex)));
                             }
                             else {
                                 addNullString();
@@ -107,8 +110,8 @@ public class SingleValueFormatterPlugin
 
                         public void longColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                addValue(Long.toString(pageReader.getLong(column)));
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                addValue(Long.toString(pageReader.getLong(inputColumnIndex)));
                             }
                             else {
                                 addNullString();
@@ -117,8 +120,8 @@ public class SingleValueFormatterPlugin
 
                         public void doubleColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                addValue(Double.toString(pageReader.getDouble(column)));
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                addValue(Double.toString(pageReader.getDouble(inputColumnIndex)));
                             }
                             else {
                                 addNullString();
@@ -127,8 +130,8 @@ public class SingleValueFormatterPlugin
 
                         public void stringColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                addValue(pageReader.getString(column));
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                addValue(pageReader.getString(inputColumnIndex));
                             }
                             else {
                                 addNullString();
@@ -137,8 +140,8 @@ public class SingleValueFormatterPlugin
 
                         public void timestampColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                Timestamp value = pageReader.getTimestamp(column);
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                Timestamp value = pageReader.getTimestamp(inputColumnIndex);
                                 addValue(timestampFormatter.format(value));
                             }
                             else {
@@ -148,8 +151,8 @@ public class SingleValueFormatterPlugin
 
                         public void jsonColumn(Column column)
                         {
-                            if (!pageReader.isNull(column)) {
-                                Value value = pageReader.getJson(column);
+                            if (!pageReader.isNull(inputColumnIndex)) {
+                                Value value = pageReader.getJson(inputColumnIndex);
                                 addValue(value.toJson());
                             }
                             else {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-formatter-single_value
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sonots
@@ -52,8 +52,11 @@ files:
 - build.gradle
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
+- example/example.csv
 - example/example.txt
 - example/example.yml
+- example/first_column.yml
+- example/message_key.yml
 - example/timestamp.txt
 - example/timestamp.yml
 - gradle/wrapper/gradle-wrapper.jar
@@ -63,7 +66,7 @@ files:
 - lib/embulk/formatter/single_value.rb
 - src/main/java/org/embulk/formatter/single_value/SingleValueFormatterPlugin.java
 - src/test/java/org/embulk/formatter/single_value/TestSingleValueFormatterPlugin.java
-- classpath/embulk-formatter-single_value-0.1.0.jar
+- classpath/embulk-formatter-single_value-0.1.1.jar
 homepage: https://github.com/sonots/embulk-formatter-single_value
 licenses:
 - MIT