embulk-output-td 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dca2ba87c0d5e8ab816f0ffb035fdf9ee169178
-  data.tar.gz: 038410038ad54325b47e7c112cfb150c9a117639
+  metadata.gz: 80ebc07da65f75960a956328d90265a2c5414162
+  data.tar.gz: da6b1c3415ee725a3297381522054e99e531398d
 SHA512:
-  metadata.gz: a7c77498336cb6843b6b93e58e31b1cd277cbb485f113c31942a521a672f4ed681165bd1c1be6d5e82ed9ccdd2c278383a3da37ef4d7da6fc7be83e714e60c49
-  data.tar.gz: 1cea8f9b475f1e6d6a57b67b66fcaa92a59146352420df2de0f09009f8b9cefdc76303fb8775b7b30fca4ced0c68cdabd0ca21f3ec107721eb2fa382e38a85f9
+  metadata.gz: 5a5580b4e73b52ff38aadc9d72ffac05f2d7477c6c6580a9925f3f688dcd17a73afe1699ad001c4bc091b04edb0899825b93e3069e7bee4ae7af5e81979ffde0
+  data.tar.gz: 8f4737df24ffb6775e17e6c3b9dcfd330492c988c7bfbd8c71faec993f69923267cd84ddfda0d43aa4946f9bcb5299c320b7e7ea07d0d6a8384a33dd1944a36c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.11 - 2016-11-18
+
+* [maintenance] Refactor TdOutputPlugin, FieldWriterSet and else [#56](https://github.com/treasure-data/embulk-output-td/pull/56)
+
 ## 0.3.10 - 2016-11-16
 
 * [maintenance] Setup bintray repo [#55](https://github.com/treasure-data/embulk-output-td/pull/55)

data/README.md

@@ -92,3 +92,22 @@ $ ./gradlew gem classpath
 
 ### Run on Embulk
 $ bin/embulk run -I embulk-output-td/lib/ config.yml
+
+## Release
+
+### Upload gem to Rubygems.org
+
+```
+$ ./gradlew gem     # create .gem file under pkg/ directory
+$ ./gradlew gemPush # create and publish .gem file
+```
+
+Repo URL: https://rubygems.org/gems/embulk-output-td
+
+### Upload jars to Bintray.com
+
+```
+$ ./gradlew bintrayUpload
+```
+
+Repo URL: https://bintray.com/embulk-output-td/maven/embulk-output-td

data/build.gradle

@@ -19,7 +19,7 @@ configurations {
 }
 
 group = "org.embulk.output.td"
-version = "0.3.10"
+version = "0.3.11"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.3.10"
+  spec.version       = "0.3.11"
   spec.authors       = ["Muga Nishizawa"]
   spec.summary       = %[TreasureData output plugin for Embulk]
   spec.description   = %[TreasureData output plugin is an Embulk plugin that loads records to TreasureData read by any input plugins. Search the input plugins by 'embulk-output' keyword.]

data/src/main/java/org/embulk/output/td/RecordWriter.java

@@ -56,11 +56,6 @@ public class RecordWriter
         this.fileSplitSize = task.getFileSplitSize() * 1024;
     }
 
-    public static void validateSchema(Logger log, TdOutputPlugin.PluginTask task, Schema schema)
-    {
-        new FieldWriterSet(log, task, schema, false);
-    }
-
     @VisibleForTesting
     public void open(final Schema schema)
             throws IOException

data/src/main/java/org/embulk/output/td/TdOutputPlugin.java

@@ -1,6 +1,5 @@
 package org.embulk.output.td;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -18,13 +17,11 @@ import javax.validation.constraints.Max;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import com.treasuredata.client.ProxyConfig;
 import com.treasuredata.client.TDClient;
 import com.treasuredata.client.TDClientBuilder;
@@ -382,7 +379,7 @@ public class TdOutputPlugin
             }
 
             // validate FieldWriterSet configuration before transaction is started
-            RecordWriter.validateSchema(log, task, schema);
+            validateFieldWriterSet(log, task, schema);
 
             return doRun(client, schema, task, control);
         }
@@ -695,7 +692,7 @@ public class TdOutputPlugin
 
             public void longColumn(Column column)
             {
-                guessedSchema.put(column.getName(), TDColumnType.LONG);;
+                guessedSchema.put(column.getName(), TDColumnType.LONG);
             }
 
             public void doubleColumn(Column column)
@@ -741,7 +738,8 @@ public class TdOutputPlugin
 
             if (!usedNames.containsKey(key)) {
                 usedNames.put(key, 1);
-            } else {
+            }
+            else {
                 int next = usedNames.get(key);
                 key = key + "_" + next;
                 usedNames.put(key, next + 1);
@@ -846,7 +844,7 @@ public class TdOutputPlugin
 
         RecordWriter closeLater = null;
         try {
-            FieldWriterSet fieldWriters = new FieldWriterSet(log, task, schema, true);
+            FieldWriterSet fieldWriters = createFieldWriterSet(log, task, schema);
             closeLater = new RecordWriter(task, taskIndex, newTDClient(task), fieldWriters);
             RecordWriter recordWriter = closeLater;
             recordWriter.open(schema);
@@ -869,4 +867,14 @@ public class TdOutputPlugin
     {
         return System.getProperty("java.io.tmpdir");
     }
+
+    protected FieldWriterSet createFieldWriterSet(Logger log, PluginTask task, Schema schema)
+    {
+        return FieldWriterSet.createWithValidation(log, task, schema, true);
+    }
+
+    protected void validateFieldWriterSet(Logger log, PluginTask task, Schema schema)
+    {
+        FieldWriterSet.createWithValidation(log, task, schema, false);
+    }
 }

data/src/main/java/org/embulk/output/td/TimeValueGenerator.java

@@ -42,8 +42,9 @@ public abstract class TimeValueGenerator
 
         public IncrementalTimeValueGenerator(final TimeValueConfig config)
         {
-            current = from = config.getFrom().get();
-            to = config.getTo().get();
+            this.from = config.getFrom().get();
+            this.to = config.getTo().get();
+            this.current = from;
         }
 
         @Override

data/src/main/java/org/embulk/output/td/writer/FieldWriterSet.java

@@ -6,7 +6,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.embulk.config.ConfigException;
-import org.embulk.config.ConfigSource;
 import org.embulk.output.td.TdOutputPlugin;
 import org.embulk.output.td.TdOutputPlugin.ConvertTimestampType;
 import org.embulk.output.td.TimeValueConfig;
@@ -41,7 +40,14 @@ public class FieldWriterSet
     private final IFieldWriter[] fieldWriters;
     private final Optional<TimeValueGenerator> staticTimeValue;
 
-    public FieldWriterSet(Logger log, TdOutputPlugin.PluginTask task, Schema schema, boolean runStage)
+    protected FieldWriterSet(int fieldCount, IFieldWriter[] fieldWriters, Optional<TimeValueGenerator> staticTimeValue)
+    {
+        this.fieldCount = fieldCount;
+        this.fieldWriters = fieldWriters;
+        this.staticTimeValue = staticTimeValue;
+    }
+
+    public static FieldWriterSet createWithValidation(Logger log, TdOutputPlugin.PluginTask task, Schema schema, boolean runStage)
     {
         Optional<String> userDefinedPrimaryKeySourceColumnName = task.getTimeColumn();
         ConvertTimestampType convertTimestampType = task.getConvertTimestampType();
@@ -54,7 +60,7 @@ public class FieldWriterSet
         int duplicatePrimaryKeySourceIndex = -1;
 
         int fc = 0;
-        fieldWriters = new IFieldWriter[schema.size()];
+        IFieldWriter[] createdFieldWriters = new IFieldWriter[schema.size()];
         TimestampFormatter[] timestampFormatters = Timestamps.newTimestampColumnFormatters(task, schema, task.getColumnOptions());
 
         for (int i = 0; i < schema.size(); i++) {
@@ -140,24 +146,18 @@ public class FieldWriterSet
                     throw new AssertionError();
             }
 
-            fieldWriters[i] = writer;
+            createdFieldWriters[i] = writer;
             fc += 1;
         }
 
         if (foundPrimaryKey) {
             // appropriate 'time' column is found
-
-            staticTimeValue = Optional.absent();
-            fieldCount = fc;
-            return;
+            return new FieldWriterSet(fc, createdFieldWriters, Optional.<TimeValueGenerator>absent());
         }
 
         if (timeValueConfig.isPresent()) {
             // 'time_value' option is specified
-
-            staticTimeValue = Optional.of(TimeValueGenerator.newGenerator(timeValueConfig.get()));
-            fieldCount = fc + 1;
-            return;
+            return new FieldWriterSet(fc + 1, createdFieldWriters, Optional.of(TimeValueGenerator.newGenerator(timeValueConfig.get())));
         }
 
         if (!foundPrimaryKey && duplicatePrimaryKeySourceIndex >= 0) {
@@ -189,10 +189,8 @@ public class FieldWriterSet
             }
 
             // replace existint writer
-            fieldWriters[duplicatePrimaryKeySourceIndex] = writer;
-            staticTimeValue = Optional.absent();
-            fieldCount = fc + 1;
-            return;
+            createdFieldWriters[duplicatePrimaryKeySourceIndex] = writer;
+            return new FieldWriterSet(fc + 1, createdFieldWriters, Optional.<TimeValueGenerator>absent());
         }
 
         if (!foundPrimaryKey) {
@@ -208,9 +206,7 @@ public class FieldWriterSet
             }
             TimeValueConfig newConfig = Exec.newConfigSource().set("mode", "fixed_time").set("value", uploadTime).loadConfig(TimeValueConfig.class);
             task.setTimeValue(Optional.of(newConfig));
-            staticTimeValue = Optional.of(TimeValueGenerator.newGenerator(newConfig));
-            fieldCount = fc + 1;
-            return;
+            return new FieldWriterSet(fc + 1, createdFieldWriters, Optional.of(TimeValueGenerator.newGenerator(newConfig)));
         }
 
         throw new AssertionError("Cannot select primary key");
@@ -236,7 +232,7 @@ public class FieldWriterSet
         return false;
     }
 
-    private static FieldWriter newSimpleFieldWriter(String columnName, Type columnType, ConvertTimestampType convertTimestampType, TimestampFormatter timestampFormatter)
+    protected static FieldWriter newSimpleFieldWriter(String columnName, Type columnType, ConvertTimestampType convertTimestampType, TimestampFormatter timestampFormatter)
     {
         if (columnType instanceof BooleanType) {
             return new BooleanFieldWriter(columnName);
@@ -261,7 +257,7 @@ public class FieldWriterSet
         }
     }
 
-    private static FieldWriter newSimpleTimestampFieldWriter(String columnName, Type columnType, ConvertTimestampType convertTimestampType, TimestampFormatter timestampFormatter)
+    protected static FieldWriter newSimpleTimestampFieldWriter(String columnName, Type columnType, ConvertTimestampType convertTimestampType, TimestampFormatter timestampFormatter)
     {
         switch (convertTimestampType) {
         case STRING:

data/src/main/java/org/embulk/output/td/writer/LongFieldWriter.java

@@ -9,7 +9,7 @@ import java.io.IOException;
 public class LongFieldWriter
         extends FieldWriter
 {
-    LongFieldWriter(String keyName)
+    public LongFieldWriter(String keyName)
     {
         super(keyName);
     }

data/src/main/java/org/embulk/output/td/writer/TimestampFieldLongDuplicator.java

@@ -3,7 +3,6 @@ package org.embulk.output.td.writer;
 import org.embulk.output.td.MsgpackGZFileBuilder;
 import org.embulk.spi.Column;
 import org.embulk.spi.PageReader;
-import org.embulk.spi.time.TimestampFormatter;
 
 import java.io.IOException;
 

data/src/main/java/org/embulk/output/td/writer/UnixTimestampLongFieldWriter.java

@@ -11,7 +11,7 @@ public class UnixTimestampLongFieldWriter
 {
     private final int fractionUnit;
 
-    UnixTimestampLongFieldWriter(String keyName, int fractionUnit)
+    public UnixTimestampLongFieldWriter(String keyName, int fractionUnit)
     {
         super(keyName);
         this.fractionUnit = fractionUnit;

data/src/test/java/org/embulk/output/td/TestTdOutputPlugin.java

@@ -257,26 +257,22 @@ public class TestTdOutputPlugin
     {
         { // no proxy setting
             PluginTask task = pluginTask(config);
-            try (TDClient client = plugin.newTDClient(task)) {
-            }
-            // no error happens
+            TDClient client = plugin.newTDClient(task);
+            // Expect no error happens
         }
 
         { // proxy setting
             PluginTask task = pluginTask(config.deepCopy()
                     .set("http_proxy", ImmutableMap.of("host", "xxx", "port", "8080", "user", "foo", "password", "PASSWORD")));
-            try (TDClient client = plugin.newTDClient(task)) {
-            }
-            // no error happens
+            TDClient client = plugin.newTDClient(task);
+            // Expect no error happens
         }
 
-
         { // proxy setting without user/password
             PluginTask task = pluginTask(config.deepCopy()
                     .set("http_proxy", ImmutableMap.of("host", "xxx", "port", "8080")));
-            try (TDClient client = plugin.newTDClient(task)) {
-            }
-            // no error happens
+            TDClient client = plugin.newTDClient(task);
+            // Expect no error happens
         }
     }
 
@@ -552,10 +548,8 @@ public class TestTdOutputPlugin
         task.setTempDir(plugin.getEnvironmentTempDirectory());
         Schema schema = schema("time", Types.LONG, "c0", Types.STRING, "c1", Types.STRING);
 
-        try (TransactionalPageOutput output = plugin.open(task.dump(), schema, 0)) {
-        }
-
-        // no error happens.
+        TransactionalPageOutput output = plugin.open(task.dump(), schema, 0);
+        // Expect no error happens.
     }
 
     public static ConfigSource config()
@@ -600,7 +594,7 @@ public class TestTdOutputPlugin
 
     public static FieldWriterSet fieldWriters(Logger log, PluginTask task, Schema schema)
     {
-        return spy(new FieldWriterSet(log, task, schema, false));
+        return spy(FieldWriterSet.createWithValidation(log, task, schema, false));
     }
 
     public static RecordWriter recordWriter(PluginTask task, TDClient client, FieldWriterSet fieldWriters)

data/src/test/java/org/embulk/output/td/TestTimeValueGenerator.java

@@ -41,12 +41,12 @@ public class TestTimeValueGenerator
         // incremental_time
         { // {from: 0, to: 0} # default incremental_time
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
-            new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "to", 0L))), schema, false);
+            FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "to", 0L))), schema, false);
         }
         { // {from: 0} # default incremental_time
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -56,7 +56,7 @@ public class TestTimeValueGenerator
         { // {to: 0} # default incremental_time
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("to", 0L))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("to", 0L))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -65,12 +65,12 @@ public class TestTimeValueGenerator
         }
         { // {from: 0, to: 0, mode: incremental_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
-            new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "to", 0L, "mode", "incremental_time"))), schema, false);
+            FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "to", 0L, "mode", "incremental_time"))), schema, false);
         }
         { // {from: 0, mode: incremental_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "mode", "incremental_time"))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("from", 0L, "mode", "incremental_time"))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -80,7 +80,7 @@ public class TestTimeValueGenerator
         { // {to: 0, mode: incremental_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("to", 0L, "mode", "incremental_time"))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("to", 0L, "mode", "incremental_time"))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -90,7 +90,7 @@ public class TestTimeValueGenerator
         { // {mode: incremental_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("mode", "incremental_time"))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("mode", "incremental_time"))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -101,12 +101,12 @@ public class TestTimeValueGenerator
         // fixed_time
         { // {value: 0, mode: fixed_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
-            new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("value", 0L, "mode", "fixed_time"))), schema, false);
+            FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("value", 0L, "mode", "fixed_time"))), schema, false);
         }
         { // {mode: fixed_time}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("mode", "fixed_time"))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("mode", "fixed_time"))), schema, false);
             }
             catch (Throwable t) {
                 assertTrue(t instanceof ConfigException);
@@ -115,7 +115,7 @@ public class TestTimeValueGenerator
         { // {value: 0}
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.set("time_value", ImmutableMap.of("value", 0L))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.set("time_value", ImmutableMap.of("value", 0L))), schema, false);
             }
             catch (Throwable t) {
                 assertTrue(t instanceof ConfigException);

data/src/test/java/org/embulk/output/td/writer/TestFieldWriterSet.java

@@ -40,7 +40,7 @@ public class TestFieldWriterSet
         { // if schema doesn't have appropriate time column, it throws ConfigError.
             schema = schema("_c0", Types.STRING, "time", Types.STRING); // not long or timestamp
             try {
-                new FieldWriterSet(log, pluginTask(config), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -51,7 +51,7 @@ public class TestFieldWriterSet
         { // if schema doesn't have a column specified as time_column column, it throws ConfigError
             schema = schema("_c0", Types.STRING, "_c1", Types.STRING);
             try {
-                new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c2")), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c2")), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -62,7 +62,7 @@ public class TestFieldWriterSet
         { // if time_column column is not appropriate column type, it throws ConfigError.
             schema = schema("_c0", Types.STRING, "_c1", Types.STRING);
             try {
-                new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c1")), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c1")), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -73,7 +73,7 @@ public class TestFieldWriterSet
         { // if both of time_column and time_value are specified, it throws ConfigError.
             schema = schema("_c0", Types.STRING, "_c1", Types.LONG);
             try {
-                new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c1").set("time_value", ImmutableMap.of("from", 0L, "to", 0L))), schema, false);
+                FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c1").set("time_value", ImmutableMap.of("from", 0L, "to", 0L))), schema, false);
                 fail();
             }
             catch (Throwable t) {
@@ -87,14 +87,14 @@ public class TestFieldWriterSet
     {
         { // time column (timestamp type) exists
             Schema schema = schema("time", Types.TIMESTAMP, "_c0", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampLongFieldWriter);
         }
 
         { // time column (long type) exists
             Schema schema = schema("time", Types.LONG, "_c0", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof UnixTimestampLongFieldWriter);
 
@@ -106,21 +106,21 @@ public class TestFieldWriterSet
     {
         { // time_column option (timestamp type)
             Schema schema = schema("_c0", Types.TIMESTAMP, "_c1", Types.STRING);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator);
         }
 
         { // time_column option (long type)
             Schema schema = schema("_c0", Types.LONG, "_c1", Types.STRING);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof UnixTimestampFieldDuplicator);
         }
 
         { // time_column option (typestamp type) if time column exists
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // renamed column
@@ -128,7 +128,7 @@ public class TestFieldWriterSet
 
         { // time_column option (long type) if time column exists
             Schema schema = schema("_c0", Types.LONG, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof UnixTimestampFieldDuplicator); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // renamed column
@@ -140,7 +140,7 @@ public class TestFieldWriterSet
     {
         { // if not specify default_timestamp_type_convert_to, use string by default
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy()), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy()), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampStringFieldWriter); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampLongFieldWriter); // time
@@ -148,7 +148,7 @@ public class TestFieldWriterSet
 
         { // and use time_column option
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // time renamed
@@ -156,7 +156,7 @@ public class TestFieldWriterSet
 
         { // if default_timestamp_type_convert_to is string, use string
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "string")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "string")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampStringFieldWriter); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampLongFieldWriter); // time
@@ -164,7 +164,7 @@ public class TestFieldWriterSet
 
         { // and use time_column option
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "string").set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "string").set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // time renamed
@@ -172,7 +172,7 @@ public class TestFieldWriterSet
 
         { // if default_timestamp_type_conver_to is sec, use long
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "sec")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "sec")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampLongFieldWriter); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampLongFieldWriter); // time
@@ -180,7 +180,7 @@ public class TestFieldWriterSet
 
         { // and use time_column option
             Schema schema = schema("_c0", Types.TIMESTAMP, "time", Types.TIMESTAMP);
-            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "sec").set("time_column", "_c0")), schema, false);
+            FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config.deepCopy().set("default_timestamp_type_convert_to", "sec").set("time_column", "_c0")), schema, false);
 
             assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator); // c0
             assertTrue(writers.getFieldWriter(1) instanceof TimestampLongFieldWriter); // time renamed
@@ -192,7 +192,7 @@ public class TestFieldWriterSet
             throws Exception
     {
         Schema schema = schema("_c0", Types.TIMESTAMP, "_c1", Types.LONG);
-        FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config), schema, false);
+        FieldWriterSet writers = FieldWriterSet.createWithValidation(log, pluginTask(config), schema, false);
 
         assertTrue(writers.getFieldWriter(0) instanceof TimestampStringFieldWriter); // c0
         assertTrue(writers.getFieldWriter(1) instanceof LongFieldWriter); // c1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ files:
 - src/test/java/org/embulk/output/td/TestTdOutputPlugin.java
 - src/test/java/org/embulk/output/td/TestTimeValueGenerator.java
 - src/test/java/org/embulk/output/td/writer/TestFieldWriterSet.java
-- classpath/embulk-output-td-0.3.10.jar
+- classpath/embulk-output-td-0.3.11.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/jackson-annotations-2.6.7.jar
 - classpath/jackson-core-2.6.7.jar