embulk-filter-row 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4362a57be3339dd46cc6be453703748c71755617
-  data.tar.gz: 1c2b2044e7421793aac99c774010a6285e3ddc33
+  metadata.gz: 5339052a179409622158694483a27d6ab80f4a80
+  data.tar.gz: 0460d1d3511ca884042e60465b40d6a8d5e41bf0
 SHA512:
-  metadata.gz: 71237877bcfbfeca795113e388268187bbcdec03d98d7e196d24db2fd046c71515765771d0162f0a253579c29cafad354c7b9e86357b4fdb35aa011394a1fb22
-  data.tar.gz: 71a585f664ac93a3f82c726333b471e20e1377d7d21c7f685978a78324e22922ab24be634c01ca8466af2a3d8a74f017df00dc3f9b2c3085a767cd772bac5309
+  metadata.gz: 0b12e47564da7eabd58733723e463ac1da4523795905a19f9583839b5c3a51f2ea56230ea564d452d75c8bbf125a724497f462f4f0213ba6e82a250fa7ea4d92
+  data.tar.gz: b133c708497f4e78f09b35b35b8f11bb06d48bdf5ac5abe61ab7f9261d63abe98bb942a4c5f0bd55500516fb0076b0e7c35bbec59cf64da275999bc0fa23c5d0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.3.2 (2016-08-08)
+
+Changes
+
+* `conditions` option is now deprecated. Show deprecation warning messages.
+
+Fxies:
+
+* Fix NullPointerException for `where` option
+
 # 0.3.1 (2016-08-08)
 
 Changes:

data/README.md

@@ -6,6 +6,10 @@ A filter plugin for Embulk to filter out rows
 
 ## Configuration
 
+* **where**: Write conditions with SQL-like syntax. See [SQL-like Syntax](#sql-like-syntax)
+
+Following options are **deprecated**, and will be removed someday.
+
 * **condition**: AND or OR (string, default: AND).
 * **conditions**: select only rows which matches with conditions.
   * **column**: column name (string, required)
@@ -33,12 +37,13 @@ A filter plugin for Embulk to filter out rows
   * **not**: not (boolean, optional, default: false)
   * **format**: special option for timestamp column, specify the format of timestamp argument, parsed argument is compared with the column value as Timestamp object (string, default is `%Y-%m-%d %H:%M:%S.%N %z`)
   * **timezone**: special option for timestamp column, specify the timezone of timestamp argument (string, default is `UTC`)
-* **where** (experimental): Write conditions with SQL-like syntax. See [SQL-like Syntax](#sql-like-syntax)
 
 NOTE: column type is automatically retrieved from input data (inputSchema)
 
 ## Example (AND)
 
+**Deprecated**
+
 ```yaml
 filters:
   - type: row
@@ -53,6 +58,8 @@ filters:
 
 ## Example (OR)
 
+**Deprecated**
+
 ```yaml
 filters:
   - type: row
@@ -64,6 +71,8 @@ filters:
 
 ## Example (AND of OR)
 
+**Deprecated**
+
 You can express a condition such as `(A OR B) AND (C OR D)` by combining multiple filters like
 
 ```yaml
@@ -80,7 +89,7 @@ filters:
       - {column: d, operator: "IS NOT NULL"}
 ```
 
-## Example (WHERE) (Experimental)
+## Example (WHERE)
 
 Versions >= 0.3.0 suppors SQL-like syntax like
 

data/build.gradle

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

data/src/main/java/org/embulk/filter/row/RowFilterPlugin.java

@@ -30,7 +30,6 @@ import java.util.List;
 public class RowFilterPlugin implements FilterPlugin
 {
     private static final Logger logger = Exec.getLogger(RowFilterPlugin.class);
-    private ParserExp parserExp = null;
 
     public RowFilterPlugin() {}
 
@@ -38,10 +37,12 @@ public class RowFilterPlugin implements FilterPlugin
     {
         @Config("condition")
         @ConfigDefault("\"AND\"")
+        @Deprecated
         public String getCondition();
 
         @Config("conditions")
         @ConfigDefault("null")
+        @Deprecated
         public Optional<List<ConditionConfig>> getConditions();
 
         @Config("where")
@@ -65,6 +66,7 @@ public class RowFilterPlugin implements FilterPlugin
     void configure(PluginTask task, Schema inputSchema) throws ConfigException
     {
         if (task.getConditions().isPresent()) {
+            logger.warn("embulk-filter-row: \"conditions\" is deprecated, use \"where\" instead.");
             for (ConditionConfig conditionConfig : task.getConditions().get()) {
                 String columnName = conditionConfig.getColumn();
                 inputSchema.lookupColumn(columnName); // throw SchemaConfigException if not found
@@ -78,7 +80,8 @@ public class RowFilterPlugin implements FilterPlugin
         else if (task.getWhere().isPresent()) {
             String where = task.getWhere().get();
             Parser parser = new Parser(inputSchema);
-            parserExp = parser.parse(where); // throw ConfigException if something wrong
+            // objects must be created in open since plugin instances in transaction and open are different
+            parser.parse(where); // throws ConfigException if something wrong
         }
         else {
             throw new ConfigException("Either of `conditions` or `where` must be set.");
@@ -96,6 +99,7 @@ public class RowFilterPlugin implements FilterPlugin
 
         final AbstractGuardColumnVisitor guradVisitor;
         if (task.getWhere().isPresent()) {
+            ParserExp parserExp = new Parser(inputSchema).parse(task.getWhere().get());
             guradVisitor = new GuardColumnVisitorWhereImpl(task, inputSchema, outputSchema, pageReader, parserExp);
         }
         else if (orCondition) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-row
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -94,7 +94,7 @@ files:
 - src/test/java/org/embulk/filter/row/condition/TestTimestampCondition.java
 - src/test/java/org/embulk/filter/row/where/TestParser.java
 - src/test/java/org/embulk/filter/row/where/TestYylex.java
-- classpath/embulk-filter-row-0.3.1.jar
+- classpath/embulk-filter-row-0.3.2.jar
 homepage: https://github.com/sonots/embulk-filter-row
 licenses:
 - MIT