embulk-filter-column 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fc561880caa7fda6f2cdd9c191a473f0e1a146
-  data.tar.gz: 14027774ddf37f4782c8b775203e4bec80bce490
+  metadata.gz: ad887d441f728829ef11a8f5e6d6e76c5abb7ebe
+  data.tar.gz: 091933497cb175efdeeb0ecef88c2654dc9dd3cd
 SHA512:
-  metadata.gz: 9197bbed4fd0ffaa6196b464a8da5fa11be8cc48bc30519ae0d54900a3e06356f1ed9221c1f902b132958be82a0d4a640d15a5d688bccdaff88d0358954fdf3e
-  data.tar.gz: 311d261b18da80495c695f695a2d15b898d18ed7acc70e100d51eb859b686324c6795bfc18c3eefe9ea5a1f7c9fe443d3a4d588cf23db4d9cc1324913232e77a
+  metadata.gz: 7a0ca14d8629cff148e580cf4f62f312fa22dbb0c6caf7fc35dea67cb4b8f699ac21f987dee17b0a497cc7310c0076613cbe1c46bc3dd9e5912c928db56101ca
+  data.tar.gz: 6c12d777e927becf2fd95fee004b9c021dd2b239db818e6bc539424db2386f62fd91aac4d4dc6ae8759ec6da88b96e1e95781c203ed62dbd63dacbf9a9dbad51

data/.travis.yml

@@ -1,6 +1,7 @@
 language: java
 jdk:
+  - openjdk7
+  - oraclejdk7
   - oraclejdk8
 script:
   - ./gradlew test
-

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0
+
+Enhancements:
+
+* Add `add_columns` option
+* Add `drop_columns` option
+
 # 0.1.6
 
 Enhancements:

data/README.md

@@ -6,26 +6,103 @@ A filter plugin for Embulk to filter out columns
 
 ## Configuration
 
-- **columns**: columns (array of hash, required)
-  - **name**: name of column
-  - **default**: default value used if input is null
+- **columns**: columns to retain (array of hash)
+  - **name**: name of column (required)
+  - **type**: type of column (required to add)
+  - **default**: default value used if input is null (required to add)
+  - **format**: special option for timestamp column, specify the format of the default timestamp (string, default is `%Y-%m-%d %H:%M:%S.%N %z`, required to add)
+  - **timezone**: special option for timestamp column, specify the timezone of the default timestamp (string, default is `UTC`, required to add)
+- **add_columns**: columns to add (array of hash)
+  - **name**: name of column (required)
+  - **type**: type of column (required)
+  - **default**: value of column (required)
   - **format**: special option for timestamp column, specify the format of the default timestamp (string, default is `%Y-%m-%d %H:%M:%S.%N %z`)
   - **timezone**: special option for timestamp column, specify the timezone of the default timestamp (string, default is `UTC`)
+- **drop_columns**: columns to drop (array of hash)
+  - **name**: name of column (required)
 
 NOTE: column type is automatically retrieved from input data (inputSchema)
 
-## Example
+## Example (columns)
+
+Say input.csv is as follows:
+
+```
+time,id,key,score
+2015-07-13,0,Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY,1370
+2015-07-13,1,VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ,3962
+2015-07-13,2,C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE,7323
+```
 
 ```yaml
 filters:
   - type: column
     columns:
-      - {name: time, default: "2015-07-13", format: "%Y-%m-%d"}
-      - {name: id}
-      - {name: name, default: "foo"}
+      - {key: time, default: "2015-07-13", format: "%Y-%m-%d"}
+      - {key: id}
+      - {key: key, default: "foo"}
+```
+
+reduces columns to only `time`, `id`, and `key` columns as:
+
+```
+2015-07-13,0,Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY
+2015-07-13,1,VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ
+2015-07-13,2,C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE
+```
+
+## Example (add_columns)
+
+Say input.csv is as follows:
+
+```
+time,id,key,score
+2015-07-13,0,Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY,1370
+2015-07-13,1,VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ,3962
+2015-07-13,2,C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE,7323
+```
+
+```yaml
+filters:
+  - type: column
+    add_columns:
+      - {key: d, default: "2015-07-13", format: "%Y-%m-%d"}
 ```
 
-reduces columns to only `time`, `id`, and `name` columns.
+add `d` column as:
+
+```
+2015-07-13,0,Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY,1370,2015-07-13
+2015-07-13,1,VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ,3962,2015-07-13
+2015-07-13,2,C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE,7323,2015-07,13
+```
+
+## Example (drop_columns)
+
+Say input.csv is as follows:
+
+```
+time,id,key,score
+2015-07-13,0,Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY,1370
+2015-07-13,1,VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ,3962
+2015-07-13,2,C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE,7323
+```
+
+```yaml
+filters:
+  - type: column
+    drop_columns:
+      - {key: time}
+      - {key: id}
+```
+
+add `time` and `id` columns as:
+
+```
+Vqjht6YEUBsMPXmoW1iOGFROZF27pBzz0TUkOKeDXEY,1370
+VmjbjAA0tOoSEPv_vKAGMtD_0aXZji0abGe7_VXHmUQ,3962
+C40P5H1WcBx-aWFDJCI8th6QPEI2DOUgupt_gB8UutE,7323
+```
 
 ## ToDo
 

data/build.gradle

@@ -12,13 +12,13 @@ configurations {
     provided
 }
 
-version = "0.1.6"
+version = "0.2.0"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.6.16"
-    provided "org.embulk:embulk-core:0.6.16"
+    compile  "org.embulk:embulk-core:0.7.0"
+    provided "org.embulk:embulk-core:0.7.0"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
 }

data/example/add_columns.yml

@@ -0,0 +1,22 @@
+in:
+  type: file
+  path_prefix: example/example.csv
+  parser:
+    type: csv
+    charset: UTF-8
+    newline: CRLF
+    null_string: 'NULL'
+    skip_header_lines: 1
+    comment_line_marker: '#'
+    columns:
+      - {name: time,  type: timestamp, format: "%Y-%m-%d"}
+      - {name: id, type: long}
+      - {name: name, type: string}
+      - {name: score, type: double}
+filters:
+  - type: column
+    add_columns:
+      - {name: foo, type: long, default: 1 }
+      - {name: d, type: timestamp, default: "2015-07-13", format: "%Y-%m-%d" }
+out:
+  type: stdout

data/{example.yml → example/columns.yml}

@@ -7,7 +7,7 @@
 #     score: integer
 in:
   type: file
-  path_prefix: example.csv
+  path_prefix: example/example.csv
   parser:
     type: csv
     charset: UTF-8
@@ -25,7 +25,7 @@ filters:
     columns:
       - {name: time, default: "2015-07-13", format: "%Y-%m-%d"}
       - {name: name, default: "foo"}
-      - {name: foo,  default: 1}
+      - {name: foo,  default: 1, type: long}
       - {name: id}
 out:
   type: stdout

data/example/drop_columns.yml

@@ -0,0 +1,22 @@
+in:
+  type: file
+  path_prefix: example/example.csv
+  parser:
+    type: csv
+    charset: UTF-8
+    newline: CRLF
+    null_string: 'NULL'
+    skip_header_lines: 1
+    comment_line_marker: '#'
+    columns:
+      - {name: time,  type: timestamp, format: "%Y-%m-%d"}
+      - {name: id, type: long}
+      - {name: name, type: string}
+      - {name: score, type: double}
+filters:
+  - type: column
+    drop_columns:
+      - {name: time }
+      - {name: id }
+out:
+  type: stdout

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 04 13:46:12 PST 2015
+#Mon Aug 10 13:48:48 UTC 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip

data/src/main/java/org/embulk/filter/ColumnFilterPlugin.java

@@ -9,6 +9,7 @@ import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
+import org.embulk.config.ConfigException;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
 
@@ -29,7 +30,6 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.SchemaConfig;
 import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
-import org.embulk.filter.column.ColumnConfig; // note: different with spi.ColumnConfig
 
 import org.joda.time.DateTimeZone;
 import org.embulk.spi.time.Timestamp;
@@ -37,6 +37,12 @@ import org.embulk.spi.time.TimestampParser;
 import org.embulk.spi.time.TimestampParseException;
 import com.google.common.base.Throwables;
 
+import org.embulk.config.Config;
+import org.embulk.config.ConfigDefault;
+import com.google.common.base.Optional;
+import org.jruby.embed.ScriptingContainer;
+import org.embulk.spi.SchemaConfigException;
+
 public class ColumnFilterPlugin implements FilterPlugin
 {
     private static final Logger logger = Exec.getLogger(ColumnFilterPlugin.class);
@@ -45,10 +51,42 @@ public class ColumnFilterPlugin implements FilterPlugin
     {
     }
 
+    // NOTE: This is not spi.ColumnConfig
+    private interface ColumnConfig extends Task
+    {
+        @Config("name")
+        public String getName();
+
+        @Config("type")
+        @ConfigDefault("null")
+        public Optional<Type> getType(); // required only for addColumns
+
+        @Config("default")
+        @ConfigDefault("null")
+        public Optional<Object> getDefault();
+
+        @Config("format")
+        @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
+        public Optional<String> getFormat();
+
+        @Config("timezone")
+        @ConfigDefault("\"UTC\"")
+        public Optional<String> getTimezone();
+    }
+
     public interface PluginTask extends Task, TimestampParser.Task
     {
         @Config("columns")
+        @ConfigDefault("[]")
         public List<ColumnConfig> getColumns();
+
+        @Config("add_columns")
+        @ConfigDefault("[]")
+        public List<ColumnConfig> getAddColumns();
+
+        @Config("drop_columns")
+        @ConfigDefault("[]")
+        public List<ColumnConfig> getDropColumns();
     }
 
     @Override
@@ -57,25 +95,137 @@ public class ColumnFilterPlugin implements FilterPlugin
     {
         PluginTask task = config.loadConfig(PluginTask.class);
 
-        // Automatically get column type from inputSchema
-        List<ColumnConfig> columnConfigs = task.getColumns();
+        List<ColumnConfig> columns = task.getColumns();
+        List<ColumnConfig> addColumns = task.getAddColumns();
+        List<ColumnConfig> dropColumns = task.getDropColumns();
+
+        if (columns.size() == 0 && addColumns.size() == 0 && dropColumns.size() == 0) {
+            throw new ConfigException("One of \"columns\", \"add_columns\", \"drop_columns\" must be specified.");
+        }
+
+        if (columns.size() > 0 && dropColumns.size() > 0) {
+            throw new ConfigException("Either of \"columns\", \"drop_columns\" can be specified.");
+        }
+
+        // Automatically get column type from inputSchema for columns and dropColumns
         ImmutableList.Builder<Column> builder = ImmutableList.builder();
         int i = 0;
-        for (ColumnConfig columnConfig : columnConfigs) {
-            String columnName = columnConfig.getName();
+        if (dropColumns.size() > 0) {
             for (Column inputColumn: inputSchema.getColumns()) {
-                if (inputColumn.getName().equals(columnName)) {
-                    Column outputColumn = new Column(i++, columnName, inputColumn.getType());
+                String name = inputColumn.getName();
+                boolean matched = false;
+                for (ColumnConfig dropColumn : dropColumns) {
+                    if (dropColumn.getName().equals(name)) {
+                        matched = true;
+                        break;
+                    }
+                }
+                if (! matched) {
+                    Column outputColumn = new Column(i++, name, inputColumn.getType());
+                    builder.add(outputColumn);
+                }
+            }
+        } else if (columns.size() > 0) {
+            for (ColumnConfig column : columns) {
+                String name                   = column.getName();
+                Optional<Type>   type         = column.getType();
+                Optional<Object> defaultValue = column.getDefault();
+
+                Column inputColumn = getColumn(name, inputSchema);
+                if (inputColumn != null) { // filter column
+                    Column outputColumn = new Column(i++, name, inputColumn.getType());
+                    builder.add(outputColumn);
+                }
+                else if (type.isPresent() && defaultValue.isPresent()) { // add column
+                    Column outputColumn = new Column(i++, name, type.get());
+                    builder.add(outputColumn);
+                }
+                else {
+                    throw new SchemaConfigException(String.format("columns: Column '%s' is not found in inputSchema. Column '%s' does not have \"type\" and \"default\"", name, name));
+                }
+            }
+        } else {
+            for (Column inputColumn: inputSchema.getColumns()) {
+                Column outputColumn = new Column(i++, inputColumn.getName(), inputColumn.getType());
+                builder.add(outputColumn);
+            }
+        }
+
+        // Add columns to last. If you want to add to head or middle, you can use `columns` option
+        if (addColumns.size() > 0) {
+            for (ColumnConfig column : addColumns) {
+                String name                   = column.getName();
+                Optional<Type> type           = column.getType();
+                Optional<Object> defaultValue = column.getDefault();
+
+                if (type.isPresent() && defaultValue.isPresent()) { // add column
+                    Column outputColumn = new Column(i++, name, type.get());
                     builder.add(outputColumn);
-                    break;
+                }
+                else {
+                    throw new SchemaConfigException(String.format("add_columns: Column '%s' does not have \"type\" and \"default\"", name));
                 }
             }
         }
+
         Schema outputSchema = new Schema(builder.build());
 
         control.run(task.dump(), outputSchema);
     }
 
+    private Column getColumn(String name, Schema schema) {
+        // hash should be faster, though
+        for (Column column: schema.getColumns()) {
+            if (column.getName().equals(name)) {
+                return column;
+            }
+        }
+        return null;
+    }
+
+    private Object getDefault(String name, Type type, List<ColumnConfig> columnConfigs, ScriptingContainer jruby) {
+        for (ColumnConfig columnConfig : columnConfigs) {
+            if (columnConfig.getName().equals(name)) {
+                if (type instanceof BooleanType) {
+                    if (columnConfig.getDefault().isPresent()) {
+                        return (Boolean)columnConfig.getDefault().get();
+                    }
+                }
+                else if (type instanceof LongType) {
+                    if (columnConfig.getDefault().isPresent()) {
+                        return new Long(columnConfig.getDefault().get().toString());
+                    }
+                }
+                else if (type instanceof DoubleType) {
+                    if (columnConfig.getDefault().isPresent()) {
+                        return new Double(columnConfig.getDefault().get().toString());
+                    }
+                }
+                else if (type instanceof StringType) {
+                    if (columnConfig.getDefault().isPresent()) {
+                        return (String)columnConfig.getDefault().get();
+                    }
+                }
+                else if (type instanceof TimestampType) {
+                    if (columnConfig.getDefault().isPresent()) {
+                        String time            = (String)columnConfig.getDefault().get();
+                        String format          = (String)columnConfig.getFormat().get();
+                        DateTimeZone timezone  = DateTimeZone.forID((String)columnConfig.getTimezone().get());
+                        TimestampParser parser = new TimestampParser(jruby, format, timezone);
+                        try {
+                            Timestamp default_value = parser.parse(time);
+                            return default_value;
+                        } catch(TimestampParseException ex) {
+                            throw Throwables.propagate(ex);
+                        }
+                    }
+                }
+                return null;
+            }
+        }
+        return null;
+    }
+
     @Override
     public PageOutput open(final TaskSource taskSource, final Schema inputSchema,
             final Schema outputSchema, final PageOutput output)
@@ -85,67 +235,29 @@ public class ColumnFilterPlugin implements FilterPlugin
         // Map outputColumn => inputColumn
         final HashMap<Column, Column> outputInputColumnMap = new HashMap<Column, Column>();
         for (Column outputColumn: outputSchema.getColumns()) {
-            for (Column inputColumn: inputSchema.getColumns()) {
-                if (inputColumn.getName().equals(outputColumn.getName())) {
-                    outputInputColumnMap.put(outputColumn, inputColumn);
-                    break;
-                }
-            }
+            Column inputColumn = getColumn(outputColumn.getName(), inputSchema);
+            outputInputColumnMap.put(outputColumn, inputColumn); // NOTE: inputColumn would be null
         }
 
         // Map outputColumn => default value if present
         final HashMap<Column, Object> outputDefaultMap = new HashMap<Column, Object>();
         for (Column outputColumn: outputSchema.getColumns()) {
-            Type columnType = outputColumn.getType();
+            String name = outputColumn.getName();
+            Type   type = outputColumn.getType();
 
-            for (ColumnConfig columnConfig : task.getColumns()) {
-                if (columnConfig.getName().equals(outputColumn.getName())) {
-
-                    if (columnType instanceof BooleanType) {
-                        if (columnConfig.getDefault().isPresent()) {
-                            Boolean default_value = (Boolean)columnConfig.getDefault().get();
-                            outputDefaultMap.put(outputColumn, default_value);
-                        }
-                    }
-                    else if (columnType instanceof LongType) {
-                        if (columnConfig.getDefault().isPresent()) {
-                            Long default_value = new Long(columnConfig.getDefault().get().toString());
-                            outputDefaultMap.put(outputColumn, default_value);
-                        }
-                    }
-                    else if (columnType instanceof DoubleType) {
-                        if (columnConfig.getDefault().isPresent()) {
-                            Double default_value = new Double(columnConfig.getDefault().get().toString());
-                            outputDefaultMap.put(outputColumn, default_value);
-                        }
-                    }
-                    else if (columnType instanceof StringType) {
-                        if (columnConfig.getDefault().isPresent()) {
-                            String default_value = (String)columnConfig.getDefault().get();
-                            outputDefaultMap.put(outputColumn, default_value);
-                        }
-                    }
-                    else if (columnType instanceof TimestampType) {
-                        if (columnConfig.getDefault().isPresent()) {
-                            String time            = (String)columnConfig.getDefault().get();
-                            String format          = (String)columnConfig.getFormat().get();
-                            DateTimeZone timezone  = DateTimeZone.forID((String)columnConfig.getTimezone().get());
-                            TimestampParser parser = new TimestampParser(task.getJRuby(), format, timezone);
-                            try {
-                                Timestamp default_value = parser.parse(time);
-                                outputDefaultMap.put(outputColumn, default_value);
-                            } catch(TimestampParseException ex) {
-                                throw Throwables.propagate(ex);
-                            }
-                        }
-                    }
-                }
+            Object default_value = getDefault(name, type, task.getColumns(), task.getJRuby());
+            if (default_value == null) {
+                default_value = getDefault(name, type, task.getAddColumns(), task.getJRuby());
+            }
+            if (default_value != null) {
+                outputDefaultMap.put(outputColumn, default_value);
             }
         }
 
         return new PageOutput() {
             private PageReader pageReader = new PageReader(inputSchema);
             private PageBuilder pageBuilder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, output);
+            private ColumnVisitorImpl visitor = new ColumnVisitorImpl(pageBuilder);
 
             @Override
             public void finish() {
@@ -161,7 +273,6 @@ public class ColumnFilterPlugin implements FilterPlugin
             public void add(Page page) {
                 pageReader.setPage(page);
 
-                ColumnVisitorImpl visitor = new ColumnVisitorImpl(pageBuilder);
                 while (pageReader.nextRecord()) {
                     outputSchema.visitColumns(visitor);
                     pageBuilder.addRecord();
@@ -178,7 +289,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 @Override
                 public void booleanColumn(Column outputColumn) {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
-                    if (pageReader.isNull(inputColumn)) {
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
                         Boolean default_value = (Boolean)outputDefaultMap.get(outputColumn);
                         if (default_value != null) {
                             pageBuilder.setBoolean(outputColumn, default_value.booleanValue());
@@ -193,7 +304,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 @Override
                 public void longColumn(Column outputColumn) {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
-                    if (pageReader.isNull(inputColumn)) {
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
                         Long default_value = (Long)outputDefaultMap.get(outputColumn);
                         if (default_value != null) {
                             pageBuilder.setLong(outputColumn, default_value.longValue());
@@ -208,7 +319,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 @Override
                 public void doubleColumn(Column outputColumn) {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
-                    if (pageReader.isNull(inputColumn)) {
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
                         Double default_value = (Double)outputDefaultMap.get(outputColumn);
                         if (default_value != null) {
                             pageBuilder.setDouble(outputColumn, default_value.doubleValue());
@@ -223,7 +334,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 @Override
                 public void stringColumn(Column outputColumn) {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
-                    if (pageReader.isNull(inputColumn)) {
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
                         String default_value = (String)outputDefaultMap.get(outputColumn);
                         if (default_value != null) {
                             pageBuilder.setString(outputColumn, default_value);
@@ -238,7 +349,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 @Override
                 public void timestampColumn(Column outputColumn) {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
-                    if (pageReader.isNull(inputColumn)) {
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
                         Timestamp default_value = (Timestamp)outputDefaultMap.get(outputColumn);
                         if (default_value != null) {
                             pageBuilder.setTimestamp(outputColumn, default_value);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-column
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,17 +51,17 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
-- example.csv
-- example.yml
+- example/add_columns.yml
+- example/columns.yml
+- example/drop_columns.yml
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
 - gradlew.bat
 - lib/embulk/filter/column.rb
 - src/main/java/org/embulk/filter/ColumnFilterPlugin.java
-- src/main/java/org/embulk/filter/column/ColumnConfig.java
 - src/test/java/org/embulk/filter/TestColumnFilterPlugin.java
-- classpath/embulk-filter-column-0.1.6.jar
+- classpath/embulk-filter-column-0.2.0.jar
 homepage: https://github.com/sonots/embulk-filter-column
 licenses:
 - MIT

data/src/main/java/org/embulk/filter/column/ColumnConfig.java

@@ -1,24 +0,0 @@
-package org.embulk.filter.column;
-
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.Task;
-import com.google.common.base.Optional;
-
-public interface ColumnConfig extends Task
-{
-    @Config("name")
-    public String getName();
-
-    @Config("default")
-    @ConfigDefault("null")
-    public Optional<Object> getDefault();
-
-    @Config("format")
-    @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
-    public Optional<String> getFormat();
-
-    @Config("timezone")
-    @ConfigDefault("\"UTC\"")
-    public Optional<String> getTimezone();
-}