embulk-output-td 0.1.4 → 0.1.5

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

@@ -0,0 +1,146 @@
+package org.embulk.output.td.writer;
+
+import org.embulk.EmbulkTestRuntime;
+import org.embulk.config.ConfigException;
+import org.embulk.config.ConfigSource;
+import org.embulk.spi.Exec;
+import org.embulk.spi.Schema;
+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.embulk.output.td.TestTdOutputPlugin.config;
+import static org.embulk.output.td.TestTdOutputPlugin.pluginTask;
+import static org.embulk.output.td.TestTdOutputPlugin.schema;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestFieldWriterSet
+{
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    private Logger log;
+    private ConfigSource config;
+    private Schema schema;
+
+    @Before
+    public void createResources()
+    {
+        log = Exec.getLogger(TestFieldWriterSet.class);
+        config = config();
+    }
+
+    @Test
+    public void validateFieldWriterSet()
+    {
+        { // 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);
+                fail();
+            }
+            catch (Throwable t) {
+                assertTrue(t instanceof ConfigException);
+            }
+        }
+
+        { // if schema doesn't have time column and the user doesn't specify time_column option, it throws ConfigError.
+            schema = schema("_c0", Types.STRING, "_c1", Types.STRING);
+            try {
+                new FieldWriterSet(log, pluginTask(config), schema);
+                fail();
+            }
+            catch (Throwable t) {
+                assertTrue(t instanceof ConfigException);
+            }
+        }
+
+        { // 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);
+                fail();
+            }
+            catch (Throwable t) {
+                assertTrue(t instanceof ConfigException);
+            }
+        }
+
+        { // 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);
+                fail();
+            }
+            catch (Throwable t) {
+                assertTrue(t instanceof ConfigException);
+            }
+        }
+    }
+
+    @Test
+    public void hasTimeColumn()
+    {
+        { // time column (timestamp type) exists
+            Schema schema = schema("time", Types.TIMESTAMP, "_c0", Types.TIMESTAMP);
+            FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config), schema);
+
+            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);
+
+            assertTrue(writers.getFieldWriter(0) instanceof UnixTimestampLongFieldWriter);
+
+        }
+    }
+
+    @Test
+    public void specifiedTimeColumnOption()
+    {
+        { // 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);
+
+            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);
+
+            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);
+
+            assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator); // c0
+            assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // renamed column
+        }
+
+        { // 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);
+
+            assertTrue(writers.getFieldWriter(0) instanceof UnixTimestampFieldDuplicator); // c0
+            assertTrue(writers.getFieldWriter(1) instanceof TimestampStringFieldWriter); // renamed column
+        }
+    }
+
+    @Test
+    public void useFirstTimestampColumn()
+            throws Exception
+    {
+        Schema schema = schema("_c0", Types.TIMESTAMP, "_c1", Types.LONG);
+        FieldWriterSet writers = new FieldWriterSet(log, pluginTask(config), schema);
+
+        assertTrue(writers.getFieldWriter(0) instanceof TimestampFieldLongDuplicator);
+    }
+}

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 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.
 email:
 - muga.nishizawa@gmail.com
@@ -46,10 +46,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - README.md
 - build.gradle
+- config/checkstyle/checkstyle.xml
 - embulk-output-td.gemspec
+- gradle/check.gradle
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
@@ -84,10 +87,22 @@ files:
 - src/main/java/org/embulk/output/td/MsgpackGZFileBuilder.java
 - src/main/java/org/embulk/output/td/RecordWriter.java
 - src/main/java/org/embulk/output/td/TdOutputPlugin.java
+- src/main/java/org/embulk/output/td/writer/BooleanFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/DoubleFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/FieldWriter.java
+- src/main/java/org/embulk/output/td/writer/FieldWriterSet.java
+- src/main/java/org/embulk/output/td/writer/LongFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/StringFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/TimestampFieldLongDuplicator.java
+- src/main/java/org/embulk/output/td/writer/TimestampLongFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/TimestampStringFieldWriter.java
+- src/main/java/org/embulk/output/td/writer/UnixTimestampFieldDuplicator.java
+- src/main/java/org/embulk/output/td/writer/UnixTimestampLongFieldWriter.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/TestRecordWriter.java
 - src/test/java/org/embulk/output/td/TestTdOutputPlugin.java
-- classpath/embulk-output-td-0.1.4.jar
+- src/test/java/org/embulk/output/td/writer/TestFieldWriterSet.java
+- classpath/embulk-output-td-0.1.5.jar
 - classpath/javassist-3.18.1-GA.jar
 - classpath/jetty-client-9.2.2.v20140723.jar
 - classpath/jetty-http-9.2.2.v20140723.jar

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

@@ -1,105 +0,0 @@
-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);
-        }
-    }
-}