embulk-filter-expand_json 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8c5e6cae24c44c66c9db8dcef9e9ec14325e05
-  data.tar.gz: 461d263c4d02a2b225ff05199d9a84f7e4ae15ef
+  metadata.gz: 4eb62c73f09245613f9c6950d72f840434d6cc16
+  data.tar.gz: b46a7998eeab53f56fe524a6746d9c266ee45a53
 SHA512:
-  metadata.gz: f033d39efd8b1532bf305bc338a17686c7195c9d9ec1c5e67f476554ba98326e1f90531794d85f589ad01526cb03a7a499664600832e0091a5b659bddb4a4bbd
-  data.tar.gz: 500294bd0331ca19a6a3c26bf704bbbf0f1694afe5b6a64ff5c54df877a7236e76a26c55b15a2b8cec9081bdb36bcdf95d9f3e25b831db135647f789f741cba0
+  metadata.gz: dd2395c19f4113da5d4c98624ebc8d4c3a2b268bb68a9e0091cc4955ea5fb1696665c1541d9bcf183ba6b8e9b2f76291c340face70e17c6ffbfdd949024beb31
+  data.tar.gz: d1005e506f9f61dcb06e08da8c396983ed04797a25d8d5add72828a14fe19ee1b77ec7c391dfd0518d6f1717a1e1c436769ddedc413ad068e1b343cee2102124

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.2 (2016-05-31)
+==================
+- [Enhancement] Add a validation to check column duplication
+  - https://github.com/civitaspo/embulk-filter-expand_json/pull/21
+
 0.1.1 (2016-05-02)
 ==================
 - [New Feature] Add keep_expanding_json_column option

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/filter/expand_json/ExpandJsonFilterPlugin.java

@@ -17,6 +17,7 @@ import org.embulk.spi.time.TimestampParser;
 import org.embulk.spi.type.Types;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ExpandJsonFilterPlugin
@@ -64,8 +65,10 @@ public class ExpandJsonFilterPlugin
             throw new ConfigException(String.format("A column specified as json_column_name option must be string or json type: %s",
                     new Object[] {jsonColumn.toString()}));
         }
+        validateExpandedColumns(task.getExpandedColumns());
 
         Schema outputSchema = buildOutputSchema(task, inputSchema);
+        validateOutputSchema(outputSchema);
         control.run(task.dump(), outputSchema);
     }
 
@@ -124,4 +127,27 @@ public class ExpandJsonFilterPlugin
         return new Schema(builder.build());
     }
 
+    private void validateExpandedColumns(List<ColumnConfig> expandedColumns)
+    {
+        List<String> columnList = new ArrayList<>();
+        for (ColumnConfig columnConfig: expandedColumns) {
+            String columnName = columnConfig.getName();
+            if (columnList.contains(columnName)) {
+                throw new ConfigException(String.format("Column config for '%s' is duplicated at 'expanded_columns' option", columnName));
+            }
+            columnList.add(columnName);
+        }
+    }
+
+    private void validateOutputSchema(Schema outputSchema)
+    {
+        List<String> columnList = new ArrayList<>();
+        for (Column column: outputSchema.getColumns()) {
+            String columnName = column.getName();
+            if (columnList.contains(columnName)) {
+                throw new ConfigException(String.format("Output column '%s' is duplicated. Please check 'expanded_columns' option and Input plugin's settings.", columnName));
+            }
+            columnList.add(columnName);
+        }
+    }
 }

data/src/test/java/org/embulk/filter/expand_json/TestExpandJsonFilterPlugin.java

@@ -164,6 +164,51 @@ public class TestExpandJsonFilterPlugin
         config.loadConfig(PluginTask.class);
     }
 
+    @Test
+    public void testThrowExceptionDuplicatedExpandedColumns()
+    {
+        String configYaml = "" +
+                "type: expand_json\n" +
+                "json_column_name: _c0\n" +
+                "expanded_columns:\n" +
+                "  - {name: _c1, type: string}\n" +
+                "  - {name: _c1, type: string}";
+        ConfigSource config = getConfigFromYaml(configYaml);
+        schema = schema("_c0", STRING, "_c1", STRING);
+
+        exception.expect(ConfigException.class);
+        exception.expectMessage("Column config for '_c1' is duplicated at 'expanded_columns' option");
+        expandJsonFilterPlugin.transaction(config, schema, new Control() {
+            @Override
+            public void run(TaskSource taskSource, Schema schema)
+            {
+                // do nothing
+            }
+        });
+    }
+
+    @Test
+    public void testThrowExceptionDuplicatedOutputColumns()
+    {
+        String configYaml = "" +
+                "type: expand_json\n" +
+                "json_column_name: _c0\n" +
+                "expanded_columns:\n" +
+                "  - {name: _c1, type: string}";
+        ConfigSource config = getConfigFromYaml(configYaml);
+        schema = schema("_c0", STRING, "_c0", STRING, "_c1", STRING);
+
+        exception.expect(ConfigException.class);
+        exception.expectMessage("Output column '_c1' is duplicated. Please check 'expanded_columns' option and Input plugin's settings.");
+        expandJsonFilterPlugin.transaction(config, schema, new Control() {
+            @Override
+            public void run(TaskSource taskSource, Schema schema)
+            {
+                // do nothing
+            }
+        });
+    }
+
     @Test
     public void testDefaultValue()
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-expand_json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Civitaspo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ files:
 - src/test/java/org/embulk/filter/expand_json/TestExpandJsonFilterPlugin.java
 - classpath/accessors-smart-1.1.jar
 - classpath/asm-5.0.3.jar
-- classpath/embulk-filter-expand_json-0.1.1.jar
+- classpath/embulk-filter-expand_json-0.1.2.jar
 - classpath/json-path-2.2.0.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/slf4j-api-1.7.16.jar