embulk-output-td 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5610036db652164098fcc3f828b8fb3f95542329
-  data.tar.gz: a297a28131574b748d20c49097774b6bdb607552
+  metadata.gz: 666d33ca9f399f704557254a12fe57a64cea15e1
+  data.tar.gz: 39f9653363277e171d68efea0c522f8f1df7b823
 SHA512:
-  metadata.gz: 18bd27aedf3f1585c2c1fbbdc881f2e50157bfe61eb5d820363dd7896dc9c63f2c7fc2abae1ff1ef57c3b338b4672ee86bb1b57c097f073f0a1489a67800b3c4
-  data.tar.gz: 2d25527c5fb487970c90386c343c3dab2e4a0ad630698c9c772af247949f5affc5cae09d7edcd6ecdd43e21dc92d5c7a99055c4e9d5fc42d86b5643808867c0b
+  metadata.gz: 2f369e3e6b25df31d0275f17006a5670eab7b73ed495a4dd2240253d13b58bed2481cfe1f3d03e2926bf1c18aefc6477b39320f120cadc1c484239fa85563892
+  data.tar.gz: d426f8baff389eaa8fb81e1f1b9692d7587a45bb0d39bfe8dbf05e21c827d71b3800d075d1ec4a11bb224c94858ed49d9d3b8e6f2a2ca3d9d04a4314cb6da539

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.1.4 - 2015-XX-XX
+## 0.1.4 - 2015-08-17
+
+* [maintenance] Upgrade Embulk v0.6.25
+* [fixed] Change a field writer for 'time' column [#13](https://github.com/treasure-data/embulk-output-td/pull/13)
+
 
 ## 0.1.3 - 2015-08-05
 

data/build.gradle

@@ -13,22 +13,23 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile     "org.embulk:embulk-core:0.6.19"
-    provided    "org.embulk:embulk-core:0.6.19"
-    compile     "org.embulk:embulk-standards:0.6.19"
-    provided    "org.embulk:embulk-standards:0.6.19"
+    compile     "org.embulk:embulk-core:0.6.25"
+    provided    "org.embulk:embulk-core:0.6.25"
+    compile     "org.embulk:embulk-standards:0.6.25"
+    provided    "org.embulk:embulk-standards:0.6.25"
     compile     "org.eclipse.jetty:jetty-client:9.2.2.v20140723"
     compile     "org.msgpack:msgpack:0.6.11"
 
     testCompile "junit:junit:4.+"
     testCompile "org.bigtesting:fixd:1.0.0"
+    testCompile  "org.embulk:embulk-core:0.6.25:tests"
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   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

@@ -317,7 +317,8 @@ public class RecordWriter
                             writer = new UnixTimestampLongFieldWriter(columnName, task.getUnixTimestampUnit().getFractionUnit());
                             hasPkWriter = true;
                         } else if (columnType instanceof TimestampType) {
-                            writer = new TimestampStringFieldWriter(timestampFormatters[i], columnName);
+                            writer = new TimestampLongFieldWriter(columnName);
+
                             hasPkWriter = true;
                         } else {
                             throw new ConfigException(String.format("Type of '%s' column must be long or timestamp but got %s",

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

@@ -0,0 +1,105 @@
+package org.embulk.output.td;
+
+import com.google.common.collect.ImmutableList;
+import org.embulk.EmbulkTestRuntime;
+import org.embulk.config.ConfigLoader;
+import org.embulk.config.ConfigSource;
+import org.embulk.output.td.RecordWriter.FieldWriterSet;
+import org.embulk.spi.Column;
+import org.embulk.spi.ColumnConfig;
+import org.embulk.spi.Exec;
+import org.embulk.spi.Schema;
+import org.embulk.spi.SchemaConfig;
+import org.embulk.spi.type.Type;
+import org.embulk.spi.type.Types;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.slf4j.Logger;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TestFieldWriter
+{
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    private Logger log;
+
+    @Before
+    public void createLogger()
+    {
+        log = Exec.getLogger(TestFieldWriter.class);
+    }
+
+    private ConfigSource config()
+    {
+        return new ConfigLoader(runtime.getModelManager()).newConfigSource();
+    }
+
+    private Schema schema(Column... columns)
+    {
+        ImmutableList.Builder<Column> builder = new ImmutableList.Builder<Column>();
+        for (Column col : columns) {
+            builder.add(col);
+        }
+        return new Schema(builder.build());
+    }
+
+    private Column column(int index, String name, Type type)
+    {
+        return new Column(index, name, type);
+    }
+
+    private TdOutputPlugin.PluginTask task(ConfigSource outConfig)
+    {
+        return outConfig.loadConfig(TdOutputPlugin.PluginTask.class);
+    }
+
+    @Test
+    public void test()
+    {
+        { // time column exists
+            // out: config
+            ConfigSource outConfig = config()
+                    .set("apikey", "xxx")
+                    .set("database", "mydb")
+                    .set("table", "mytbl");
+
+            // schema
+            Schema schema = schema(
+                    column(0, "time", Types.TIMESTAMP),
+                    column(1, "c1", Types.TIMESTAMP));
+
+            // create field writers
+            FieldWriterSet writers = new FieldWriterSet(log, task(outConfig), schema);
+
+            assertEquals(schema.getColumnCount(), writers.getFieldCount());
+            assertTrue(writers.getFieldWriter(0) instanceof RecordWriter.TimestampLongFieldWriter);
+            assertTrue(writers.getFieldWriter(1) instanceof RecordWriter.TimestampStringFieldWriter);
+        }
+
+        { // time column doesn't exists. users need to specify another column as time column
+            // out: config
+            ConfigSource outConfig = config()
+                    .set("apikey", "xxx")
+                    .set("database", "mydb")
+                    .set("table", "mytbl")
+                    .set("time_column", "c1");
+            TdOutputPlugin.PluginTask task = outConfig.loadConfig(TdOutputPlugin.PluginTask.class);
+
+            // schema
+            Schema schema = schema(
+                    column(0, "c0", Types.TIMESTAMP),
+                    column(1, "c1", Types.TIMESTAMP));
+
+            // create field writers
+            FieldWriterSet writers = new FieldWriterSet(log, task(outConfig), schema);
+
+            assertEquals(schema.getColumnCount() + 1, writers.getFieldCount());
+            assertTrue(writers.getFieldWriter(0) instanceof RecordWriter.TimestampStringFieldWriter);
+            assertTrue(writers.getFieldWriter(1) instanceof RecordWriter.TimestampFieldLongDuplicator);
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,8 +85,9 @@ files:
 - src/main/java/org/embulk/output/td/RecordWriter.java
 - src/main/java/org/embulk/output/td/TdOutputPlugin.java
 - src/test/java/com/treasuredata/api/TestTdApiClient.java
+- src/test/java/org/embulk/output/td/TestFieldWriter.java
 - src/test/java/org/embulk/output/td/TestTdOutputPlugin.java
-- classpath/embulk-output-td-0.1.3.jar
+- classpath/embulk-output-td-0.1.4.jar
 - classpath/javassist-3.18.1-GA.jar
 - classpath/jetty-client-9.2.2.v20140723.jar
 - classpath/jetty-http-9.2.2.v20140723.jar