embulk-output-td 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063c7abaa3b8821de5ab2e8ccdabaa7b9bcfa301
-  data.tar.gz: 60d13492de0d417e94fc80bb5ac1cd65e0b7810f
+  metadata.gz: ecdc89638bd881305f9a2103c0f93949487fd7cf
+  data.tar.gz: fbb66bd29c049357f814baf21c649dc0ba6aab1f
 SHA512:
-  metadata.gz: 5e3d7967b0d474e0077c153fc13ccd451b6672aebfa3258398911c897b8bb5d86c034525bca0e015c53c45e8b7df350d0976f92a96d51dcb4e0a66db5548d07a
-  data.tar.gz: 7c03578dd33048e89376f185bbf161bc1773b7f660e0c68a6cc0e95ad71d7f68465c979d001eb57168af48c67536f96020aef5db2c128be3870a6e940f52791e
+  metadata.gz: ff210b5c00c02e08392c162f5c8ddeb1bebf7ae3432074ce7a17d8a7890692664799ea667262f00548ac9c9e4cc775191138a7f6ec0cd9d835279b615d1594f8
+  data.tar.gz: 2146190b46c8eb9ec89337ff4c03aab16097e9d82bc2c55f36271d0501eef986f8a1d23bcea1dc2db8d7222d90a00501356f4e4f8a9864643a16dd78d264599c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.6 - 2016-07-11
+
+* [new feature] Http proxy config from system properties [#47](https://github.com/treasure-data/embulk-output-td/pull/47)
+* [maintenance] Remove redundant logging during run stage [#48](https://github.com/treasure-data/embulk-output-td/pull/48)
+
 ## 0.3.5 - 2016-06-29
 
 * [new feature] Enable user/password for `http_proxy` option [#46](https://github.com/treasure-data/embulk-output-td/pull/46)

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
     provided
 }
 
-version = "0.3.5"
+version = "0.3.6"
 
 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.5"
+  spec.version       = "0.3.6"
   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

@@ -58,7 +58,7 @@ public class RecordWriter
 
     public static void validateSchema(Logger log, TdOutputPlugin.PluginTask task, Schema schema)
     {
-        new FieldWriterSet(log, task, schema);
+        new FieldWriterSet(log, task, schema, false);
     }
 
     @VisibleForTesting

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

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
 import java.nio.charset.StandardCharsets;
+import java.util.Properties;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
@@ -17,6 +18,8 @@ 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.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -57,6 +60,9 @@ import org.msgpack.core.MessageUnpacker;
 import org.msgpack.value.Value;
 import org.slf4j.Logger;
 
+import static com.google.common.base.Optional.fromNullable;
+import static java.lang.Integer.parseInt;
+
 public class TdOutputPlugin
         implements OutputPlugin
 {
@@ -436,14 +442,42 @@ public class TdOutputPlugin
         builder.setApiKey(task.getApiKey());
         builder.setEndpoint(task.getEndpoint());
         builder.setUseSSL(task.getUseSsl());
-        if (task.getHttpProxy().isPresent()) {
-            HttpProxyTask proxyTask = task.getHttpProxy().get();
-            builder.setProxy(new ProxyConfig(proxyTask.getHost(), proxyTask.getPort(), proxyTask.getUseSsl(),
-                    proxyTask.getUser(), proxyTask.getPassword()));
+
+        Optional<ProxyConfig> proxyConfig = newProxyConfig(task.getHttpProxy());
+        if (proxyConfig.isPresent()) {
+            builder.setProxy(proxyConfig.get());
         }
+
         return builder.build();
     }
 
+    @VisibleForTesting
+    Optional<ProxyConfig> newProxyConfig(Optional<HttpProxyTask> task)
+    {
+        // This plugin searches http proxy settings and configures them to TDClient. The order of proxy setting searching is:
+        // 1. System properties
+        // 2. http_proxy config option provided by this plugin
+
+        Properties props = System.getProperties();
+        if (props.containsKey("http.proxyHost") || props.containsKey("https.proxyHost")) {
+            boolean useSsl = props.containsKey("https.proxyHost");
+            String proto = !useSsl ? "http" : "https";
+            String host = props.getProperty(proto + ".proxyHost");
+            int port = parseInt(props.getProperty(proto + ".proxyPort", !useSsl ? "80" : "443"));
+            Optional<String> user = fromNullable(props.getProperty(proto + ".proxyUser"));
+            Optional<String> password = fromNullable(props.getProperty(proto + ".proxyPassword"));
+            return Optional.of(new ProxyConfig(host, port, useSsl, user, password));
+        }
+        else if (task.isPresent()) {
+            HttpProxyTask proxyTask = task.get();
+            return Optional.of(new ProxyConfig(proxyTask.getHost(), proxyTask.getPort(), proxyTask.getUseSsl(),
+                    proxyTask.getUser(), proxyTask.getPassword()));
+        }
+        else {
+            return Optional.absent();
+        }
+    }
+
     @VisibleForTesting
     void createTableIfNotExists(TDClient client, String databaseName, String tableName)
     {
@@ -795,7 +829,7 @@ public class TdOutputPlugin
 
         RecordWriter closeLater = null;
         try {
-            FieldWriterSet fieldWriters = new FieldWriterSet(log, task, schema);
+            FieldWriterSet fieldWriters = new FieldWriterSet(log, task, schema, true);
             closeLater = new RecordWriter(task, taskIndex, newTDClient(task), fieldWriters);
             RecordWriter recordWriter = closeLater;
             recordWriter.open(schema);

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

@@ -41,7 +41,7 @@ public class FieldWriterSet
     private final IFieldWriter[] fieldWriters;
     private final Optional<TimeValueGenerator> staticTimeValue;
 
-    public FieldWriterSet(Logger log, TdOutputPlugin.PluginTask task, Schema schema)
+    public FieldWriterSet(Logger log, TdOutputPlugin.PluginTask task, Schema schema, boolean runStage)
     {
         Optional<String> userDefinedPrimaryKeySourceColumnName = task.getTimeColumn();
         ConvertTimestampType convertTimestampType = task.getConvertTimestampType();
@@ -79,14 +79,18 @@ public class FieldWriterSet
                 if (userDefinedPrimaryKeySourceColumnName.isPresent()) {
                     columnName = newColumnUniqueName(columnName, schema);
                     mode = ColumnWriterMode.SIMPLE_VALUE;
-                    log.warn("time_column '{}' is set but 'time' column also exists. The existent 'time' column is renamed to {}",
-                            userDefinedPrimaryKeySourceColumnName.get(), columnName);
+                    if (!runStage) {
+                        log.warn("time_column '{}' is set but 'time' column also exists. The existent 'time' column is renamed to {}",
+                                userDefinedPrimaryKeySourceColumnName.get(), columnName);
+                    }
                 }
                 else if (timeValueConfig.isPresent()) {
                     columnName = newColumnUniqueName(columnName, schema);
                     mode = ColumnWriterMode.SIMPLE_VALUE;
-                    log.warn("time_value is set but 'time' column also exists. The existent 'time' column is renamed to {}",
-                            columnName);
+                    if (!runStage) {
+                        log.warn("time_value is set but 'time' column also exists. The existent 'time' column is renamed to {}",
+                                columnName);
+                    }
                 }
                 else {
                     mode = ColumnWriterMode.PRIMARY_KEY;
@@ -101,10 +105,14 @@ public class FieldWriterSet
 
             switch (mode) {
                 case PRIMARY_KEY:
-                    log.info("Using {}:{} column as the data partitioning key", columnName, columnType);
+                    if (!runStage) {
+                        log.info("Using {}:{} column as the data partitioning key", columnName, columnType);
+                    }
                     if (columnType instanceof LongType) {
                         if (task.getUnixTimestampUnit() != TdOutputPlugin.UnixTimestampUnit.SEC) {
-                            log.warn("time column is converted from {} to seconds", task.getUnixTimestampUnit());
+                            if (!runStage) {
+                                log.warn("time column is converted from {} to seconds", task.getUnixTimestampUnit());
+                            }
                         }
                         writer = new UnixTimestampLongFieldWriter(columnName, task.getUnixTimestampUnit().getFractionUnit());
                         foundPrimaryKey = true;
@@ -160,14 +168,18 @@ public class FieldWriterSet
 
             IFieldWriter writer;
             if (columnType instanceof LongType) {
-                log.info("Duplicating {}:{} column (unix timestamp {}) to 'time' column as seconds for the data partitioning",
-                        columnName, columnType, task.getUnixTimestampUnit());
+                if (!runStage) {
+                    log.info("Duplicating {}:{} column (unix timestamp {}) to 'time' column as seconds for the data partitioning",
+                            columnName, columnType, task.getUnixTimestampUnit());
+                }
                 IFieldWriter fw = new LongFieldWriter(columnName);
                 writer = new UnixTimestampFieldDuplicator(fw, "time", task.getUnixTimestampUnit().getFractionUnit());
             }
             else if (columnType instanceof TimestampType) {
-                log.info("Duplicating {}:{} column to 'time' column as seconds for the data partitioning",
-                        columnName, columnType);
+                if (!runStage) {
+                    log.info("Duplicating {}:{} column to 'time' column as seconds for the data partitioning",
+                            columnName, columnType);
+                }
                 IFieldWriter fw = newSimpleTimestampFieldWriter(columnName, columnType, convertTimestampType, timestampFormatters[duplicatePrimaryKeySourceIndex]);
                 writer = new TimestampFieldLongDuplicator(fw, "time");
             }
@@ -191,7 +203,9 @@ public class FieldWriterSet
             }
 
             long uploadTime = System.currentTimeMillis() / 1000;
-            log.info("'time' column is generated and is set to a unix time {}", uploadTime);
+            if (!runStage) {
+                log.info("'time' column is generated and is set to a unix time {}", uploadTime);
+            }
             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));

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

@@ -1,8 +1,10 @@
 package org.embulk.output.td;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 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.TDClientHttpConflictException;
 import com.treasuredata.client.TDClientHttpNotFoundException;
@@ -18,6 +20,7 @@ import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskSource;
 import org.embulk.output.td.TdOutputPlugin.PluginTask;
+import org.embulk.output.td.TdOutputPlugin.HttpProxyTask;
 import org.embulk.output.td.TdOutputPlugin.TimestampColumnOption;
 import org.embulk.output.td.TdOutputPlugin.UnixTimestampUnit;
 import org.embulk.output.td.writer.FieldWriterSet;
@@ -390,6 +393,30 @@ public class TestTdOutputPlugin
         }
     }
 
+    @Test
+    public void newProxyConfig()
+    {
+        // confirm if proxy system properties override proxy setting by http_proxy config option.
+
+        HttpProxyTask proxyTask = Exec.newConfigSource()
+                .set("host", "option_host")
+                .set("port", 8080)
+                .loadConfig(HttpProxyTask.class);
+
+        String originalProxyHost = System.getProperty("http.proxyHost");
+        try {
+            System.setProperty("http.proxyHost", "property_host");
+            Optional<ProxyConfig> proxyConfig = plugin.newProxyConfig(Optional.of(proxyTask));
+            assertEquals("property_host", proxyConfig.get().getHost());
+            assertEquals(80, proxyConfig.get().getPort());
+        }
+        finally {
+            if (originalProxyHost != null) {
+                System.setProperty("http.proxyHost", originalProxyHost);
+            }
+        }
+    }
+
     @Test
     public void completeBulkImportSession()
     {
@@ -533,7 +560,7 @@ public class TestTdOutputPlugin
 
     public static FieldWriterSet fieldWriters(Logger log, PluginTask task, Schema schema)
     {
-        return spy(new FieldWriterSet(log, task, schema));
+        return spy(new FieldWriterSet(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);
+            new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+            new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+            new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+                new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+            FieldWriterSet writers = new FieldWriterSet(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);
+        FieldWriterSet writers = new FieldWriterSet(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.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-11 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.5.jar
+- classpath/embulk-output-td-0.3.6.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/jackson-annotations-2.6.2.jar
 - classpath/jackson-core-2.6.2.jar