embulk-filter-add_time 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d4e2b549cb21e8c80956270dffd3a7d3fde0a96
-  data.tar.gz: da794c2b1309cf71015a035876eb142e0056dfdb
+  metadata.gz: 47c3533da9505293335ec892ae49e06b462f3b39
+  data.tar.gz: 3332208c1f09e1b0da0d2d9638730083f679159d
 SHA512:
-  metadata.gz: 14cff8010192c946d9349fe1d22198784205f4ddbc8d4537b2b9ceb98269553abeeff028fea808300a7c13489ddded45966ea39e81add2835cf36b474bbe9e6e
-  data.tar.gz: 66d5eada349e6502a170d05236d4f92223083b131a424bb3b946d856b5462523b19d923df03c2b73e60646e57995f0da3aa2977e4d268d108d364d6934feb0d7
+  metadata.gz: bcd078c499649c2ae4be4e2c527626058cf9cad68511385e269535b25835dde192e2744340014eef1833aaeb1848e31d0c1447c6af8286641d935e7795ec91aa
+  data.tar.gz: 64cfc9c742ff32955508ffe75dd8a83e393102bcb6c80db7b45bf0869a5e6b5863d0d34e8694d596c5e12ff157c60256e1d807e731ef6707fe11b3d755e3adfb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 - 2016-02-05
+
+* [maintenance] Throw ConfigException if from_column doesn't exist in input schema [#5](https://github.com/treasure-data/embulk-filter-add_time/pull/5)
+
 ## 0.1.0 - 2016-01-28
 
 The first release!!

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/src/main/java/org/embulk/filter/add_time/converter/SchemaConverter.java

@@ -50,6 +50,9 @@ public class SchemaConverter
         if (!fromColumnConfig.isPresent() && !fromValueConfig.isPresent()) {
             throw new ConfigException("Setting from_column or from_value is required.");
         }
+        if (fromColumnConfig.isPresent() && !hasColumn(fromColumnConfig.get().getName(), inputSchema)) {
+            throw new ConfigException(String.format("from_column '%s' doesn't exist in the schema.", fromColumnConfig.get().getName()));
+        }
 
         converters = new ColumnConverter[inputSchema.size() + 1];
 
@@ -102,6 +105,16 @@ public class SchemaConverter
         }
     }
 
+    private static boolean hasColumn(String columnName, Schema schema)
+    {
+        for (Column c : schema.getColumns()) {
+            if (c.getName().equals(columnName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static String newColumnUniqueName(String originalName, Schema schema)
     {
         String name = originalName;

data/src/test/java/org/embulk/filter/add_time/converter/TestSchemaConverter.java

@@ -61,6 +61,14 @@ public class TestSchemaConverter
             failSchemaConverterCreation(log, conf, schema("c0", Types.TIMESTAMP));
         }
 
+        // the column specified as from_column doesn't exist in the schema, throws ConfigException
+        {
+            ConfigSource conf = this.config.deepCopy()
+                    .set("to_column", ImmutableMap.of("name", "time"))
+                    .set("from_column", ImmutableMap.of("name", "c1"));;
+            failSchemaConverterCreation(log, conf, schema("c0", Types.TIMESTAMP));
+        }
+
         // if from_value type is not string or long, throws ConfigException
         {
             ConfigSource conf = this.config.deepCopy()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-add_time
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ files:
 - src/main/java/org/embulk/filter/add_time/reader/TimestampColumnReader.java
 - src/test/java/org/embulk/filter/add_time/TestAddTimeFilterPlugin.java
 - src/test/java/org/embulk/filter/add_time/converter/TestSchemaConverter.java
-- classpath/embulk-filter-add_time-0.1.0.jar
+- classpath/embulk-filter-add_time-0.1.1.jar
 homepage: https://github.com/treasure-data/embulk-filter-add_time
 licenses:
 - Apache 2.0