embulk-filter-row 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5339052a179409622158694483a27d6ab80f4a80
-  data.tar.gz: 0460d1d3511ca884042e60465b40d6a8d5e41bf0
+  metadata.gz: d1a5e3ca3f112b41b011aeedc0ac215ba78c70fd
+  data.tar.gz: 8ca385ba7785b9ed44d077dc274727e621a2c380
 SHA512:
-  metadata.gz: 0b12e47564da7eabd58733723e463ac1da4523795905a19f9583839b5c3a51f2ea56230ea564d452d75c8bbf125a724497f462f4f0213ba6e82a250fa7ea4d92
-  data.tar.gz: b133c708497f4e78f09b35b35b8f11bb06d48bdf5ac5abe61ab7f9261d63abe98bb942a4c5f0bd55500516fb0076b0e7c35bbec59cf64da275999bc0fa23c5d0
+  metadata.gz: 7cfb6083eacafa6e1c235b49663569b1b9f23524dc455b947fb7da10d22039823d4f4a114dfc84e0e9432b76e9a9c27bb19b070e4b595e2b7a2dbe13d1e09cb8
+  data.tar.gz: b9f9da54d28074537d2bd655ba1d23acb67bb62bb88b7968ad7f2a384a648cb800f1fafb0aee920e725e7d35169ae751b89d56ca406516630cd784aa0098f358

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.3 (2016-08-09)
+
+Enhancements
+
+* Support REGEXP operator
+* Allow to omit TIMESTAMP keyword
+
 # 0.3.2 (2016-08-08)
 
 Changes

data/README.md

@@ -6,7 +6,7 @@ A filter plugin for Embulk to filter out rows
 
 ## Configuration
 
-* **where**: Write conditions with SQL-like syntax. See [SQL-like Syntax](#sql-like-syntax)
+* **where**: Select only rows which matches with conditions written in SQL-like syntax. See [SQL-like Syntax](#sql-like-syntax)
 
 Following options are **deprecated**, and will be removed someday.
 
@@ -124,7 +124,8 @@ where: |-
   OR
   (
     time = TIMESTAMP '2016-01-01 +0900' AND
-    "true" = true
+    "true" = true AND
+    string REGEXP '^reg'
   )
 ```
 
@@ -159,6 +160,8 @@ String is a timestamp string which matches with one of following format:
 
 The time zone for formats without `%z` is UTC, and the time resolution is micro second (caused by limitation of Embulk TimestampParser).
 
+It is possible to omit `TIMESTAMP` keyword on comparing with `timestamp` identifier from version >= 0.3.3.
+
 ### Json Literal
 
 Not supported yet
@@ -171,12 +174,12 @@ Characters matching with a regular expression `[a-zA-Z_][a-zA-z0-9_]*` such as `
 
 ### Boolean Operator
 
-* ==
+* =
 * !=
 
 ### Number Operator (Long and Double)
 
-* ==
+* =
 * !=
 * >
 * >=
@@ -185,15 +188,16 @@ Characters matching with a regular expression `[a-zA-Z_][a-zA-z0-9_]*` such as `
 
 ### String Operator
 
-* ==
+* =
 * !=
 * START_WITH
 * END_WITH
 * INCLUDE
+* REGEXP
 
 ### Timestamp Operator
 
-* ==
+* =
 * !=
 * >
 * >=

data/build.gradle

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

data/src/main/java/org/embulk/filter/row/where/Parser.java

@@ -178,48 +178,55 @@ public final static short STRING=272;
 public final static short NUMBER=273;
 public final static short IDENTIFIER=274;
 public final static short TIMESTAMP=275;
+public final static short REGEXP=276;
 public final static short YYERRCODE=256;
 final static short yylhs[] = {                           -1,
     0,    0,    2,    2,    1,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,
 };
 final static short yylen[] = {                            2,
     0,    1,    2,    2,    3,    3,    3,    3,    3,    3,
     3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
     3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
     3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    4,    3,    3,    2,    3,
+    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+    3,    3,    4,    3,    3,    2,    3,
 };
 final static short yydefred[] = {                         0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   47,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   56,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    3,    4,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    7,    8,   26,   27,   28,
-   29,   30,   15,   16,   17,   18,   19,   20,    5,   21,
-    9,   31,    6,   22,   10,   32,   11,   33,   12,   34,
-   13,   35,   14,   36,   23,   24,   25,    0,   43,   48,
-   46,    0,   37,   38,   39,   40,   41,   42,   44,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,
+    4,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    7,    8,   30,   31,   32,   33,   34,   35,   36,   37,
+   38,   15,   16,   17,   18,   19,   20,    5,   21,    9,
+   39,    6,   22,   10,   40,   23,   11,   41,   24,   12,
+   42,   25,   13,   43,   26,   14,   44,   27,   28,   29,
+    0,   52,   51,   57,   55,    0,   45,   46,   47,   48,
+   49,   50,   53,
 };
 final static short yydgoto[] = {                          8,
     9,   10,
 };
 final static short yysindex[] = {                       -40,
-  -40, -234, -237, -228, -247, -208,  -40,    0, -202, -214,
-    0, -215, -206, -205, -204, -203, -201, -200, -199, -198,
- -197, -196, -195, -194, -267, -236, -218, -217, -213, -212,
- -265, -191, -190, -245,    0,    0,  -39,  -40,  -40, -189,
- -188, -187, -186, -185, -184,    0,    0,    0,    0,    0,
+  -40, -181, -237, -227, -247, -229,  -40,    0, -190, -221,
+    0, -200, -194, -193, -192, -191, -189, -188, -187, -186,
+ -185, -184, -183, -182, -180, -179, -178, -177, -267, -218,
+ -214, -210, -206, -202, -265, -216, -212, -195, -208,    0,
+    0,  -39,  -40,  -40, -176, -175, -174, -173, -172, -171,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0, -232,    0,    0,
-    0, -177,    0,    0,    0,    0,    0,    0,    0,
+ -166,    0,    0,    0,    0, -163,    0,    0,    0,    0,
+    0,    0,    0,
 };
-final static short yyrindex[] = {                        72,
-    0,    0,    0,    0,    0,    0,    0,    0,   83,    0,
+final static short yyrindex[] = {                        68,
+    0,    0,    0,    0,    0,    0,    0,    0,   84,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -227,27 +234,29 @@ final static short yyrindex[] = {                        72,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    1,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    1,    0,    0,    0,    0,
+    0,    0,    0,
 };
 final static short yygindex[] = {                         0,
-    2,   24,
+    2,   18,
 };
 final static int YYTABLESIZE=270;
 static short yytable[];
 static { yytable();}
 static void yytable(){
 yytable = new short[]{                          7,
-   45,   80,   11,   59,   60,   61,   75,    6,   37,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,   34,   14,
-   15,   78,   12,   13,   79,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   63,   64,   65,   89,    6,   81,
-   82,   45,   40,   41,   42,   43,   44,   45,   62,   66,
-   68,   70,   72,   74,   67,   69,    6,    6,   46,   71,
-   73,    6,    6,   35,   36,   38,   39,   47,   48,   49,
-   50,    1,   51,   52,   53,   54,   55,   56,   57,   58,
-   76,   77,    2,    0,   83,   84,   85,   86,   87,   88,
-   38,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   54,   94,   11,   68,   69,   70,   88,    6,   42,   29,
+   30,   31,   32,   33,   34,   35,   36,   37,   38,   14,
+   15,   16,   17,   18,   19,   20,   21,   22,   39,   23,
+   24,   25,   26,   27,   28,   45,   46,   47,   48,   49,
+   50,   54,   40,   41,   95,   96,   71,   75,   78,   81,
+   84,   87,   72,   73,   74,   89,    6,   76,   77,   90,
+    6,   79,   80,   93,    6,   82,   83,    1,    6,   85,
+   86,   91,    6,   51,   92,   12,   13,   43,   44,   52,
+   53,   54,   55,    2,   56,   57,   58,   59,   60,   61,
+   62,   63,    0,   64,   65,   66,   67,   97,   98,   99,
+  100,  101,  102,  103,   43,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -259,11 +268,11 @@ yytable = new short[]{                          7,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    1,    0,   38,   39,
+    0,    0,    0,    0,    0,    0,    1,    0,   43,   44,
     2,    3,    4,    5,    6,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   45,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
 };
 }
 static short yycheck[];
@@ -272,15 +281,15 @@ static void yycheck() {
 yycheck = new short[] {                         40,
     0,   41,    1,  271,  272,  273,  272,  275,    7,  257,
   258,  259,  260,  261,  262,  263,  264,  265,  266,  257,
-  258,  267,  257,  258,  270,  263,  264,  265,  257,  258,
-  259,  260,  261,  262,  271,  272,  273,  270,  275,   38,
-   39,   41,  257,  258,  259,  260,  261,  262,   25,   26,
-   27,   28,   29,   30,  273,  273,  275,  275,  274,  273,
-  273,  275,  275,  272,  273,  268,  269,  274,  274,  274,
-  274,    0,  274,  274,  274,  274,  274,  274,  274,  274,
-  272,  272,    0,   -1,  274,  274,  274,  274,  274,  274,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  258,  259,  260,  261,  262,  263,  264,  265,  276,  257,
+  258,  259,  260,  261,  262,  257,  258,  259,  260,  261,
+  262,   41,  272,  273,   43,   44,   29,   30,   31,   32,
+   33,   34,  271,  272,  273,  272,  275,  272,  273,  272,
+  275,  272,  273,  272,  275,  272,  273,    0,  275,  272,
+  273,  267,  275,  274,  270,  257,  258,  268,  269,  274,
+  274,  274,  274,    0,  274,  274,  274,  274,  274,  274,
+  274,  274,   -1,  274,  274,  274,  274,  274,  274,  274,
+  274,  274,  274,  270,  268,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
@@ -300,7 +309,7 @@ yycheck = new short[] {                         40,
 };
 }
 final static short YYFINAL=8;
-final static short YYMAXTOKEN=275;
+final static short YYMAXTOKEN=276;
 final static String yyname[] = {
 "end-of-file",null,null,null,null,null,null,null,null,null,null,null,null,null,
 null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,
@@ -320,7 +329,7 @@ null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,
 null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,
 null,null,null,null,"EQ","NEQ","GT","GE","LT","LE","START_WITH","END_WITH",
 "INCLUDE","IS","NOT","AND","OR","NULL","BOOLEAN","STRING","NUMBER","IDENTIFIER",
-"TIMESTAMP",
+"TIMESTAMP","REGEXP",
 };
 final static String yyrule[] = {
 "$accept : input",
@@ -346,11 +355,19 @@ final static String yyrule[] = {
 "exp : NUMBER LE IDENTIFIER",
 "exp : IDENTIFIER EQ STRING",
 "exp : IDENTIFIER NEQ STRING",
+"exp : IDENTIFIER GT STRING",
+"exp : IDENTIFIER GE STRING",
+"exp : IDENTIFIER LT STRING",
+"exp : IDENTIFIER LE STRING",
 "exp : IDENTIFIER START_WITH STRING",
 "exp : IDENTIFIER END_WITH STRING",
 "exp : IDENTIFIER INCLUDE STRING",
 "exp : STRING EQ IDENTIFIER",
 "exp : STRING NEQ IDENTIFIER",
+"exp : STRING GT IDENTIFIER",
+"exp : STRING GE IDENTIFIER",
+"exp : STRING LT IDENTIFIER",
+"exp : STRING LE IDENTIFIER",
 "exp : STRING START_WITH IDENTIFIER",
 "exp : STRING END_WITH IDENTIFIER",
 "exp : STRING INCLUDE IDENTIFIER",
@@ -366,6 +383,7 @@ final static String yyrule[] = {
 "exp : timestamp GE IDENTIFIER",
 "exp : timestamp LT IDENTIFIER",
 "exp : timestamp LE IDENTIFIER",
+"exp : IDENTIFIER REGEXP STRING",
 "exp : IDENTIFIER IS NULL",
 "exp : IDENTIFIER IS NOT NULL",
 "exp : exp OR exp",
@@ -374,7 +392,7 @@ final static String yyrule[] = {
 "exp : '(' exp ')'",
 };
 
-//#line 92 "src/main/java/org/embulk/filter/row/where/_parser.y"
+//#line 101 "src/main/java/org/embulk/filter/row/where/_parser.y"
 
 protected Schema schema;
 protected Yylex lexer;
@@ -413,7 +431,7 @@ void yyerror(String s)
 {
     throw new ConfigException("yyerror: " + s);
 }
-//#line 344 "Parser.java"
+//#line 362 "Parser.java"
 //###############################################################
 // method: yylexdebug : check lexer state
 //###############################################################
@@ -581,181 +599,217 @@ case 4:
 break;
 case 5:
 //#line 46 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new BooleanOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 6:
 //#line 47 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new BooleanOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 7:
 //#line 48 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new BooleanOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 8:
 //#line 49 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new BooleanOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 9:
 //#line 50 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 10:
 //#line 51 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 11:
 //#line 52 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), GT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 12:
 //#line 53 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), GE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
 break;
 case 13:
 //#line 54 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), LT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
 break;
 case 14:
 //#line 55 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), LE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
 break;
 case 15:
 //#line 56 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 16:
 //#line 57 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 17:
 //#line 58 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), GT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 18:
 //#line 59 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), GE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
 break;
 case 19:
 //#line 60 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), LT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
 break;
 case 20:
 //#line 61 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NumberOpExp(val_peek(2), val_peek(0), LE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
 break;
 case 21:
 //#line 62 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 22:
 //#line 63 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 23:
 //#line 64 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), START_WITH)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 24:
 //#line 65 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), END_WITH)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
 break;
 case 25:
 //#line 66 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), INCLUDE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
 break;
 case 26:
 //#line 67 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
 break;
 case 27:
 //#line 68 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), START_WITH)); }
 break;
 case 28:
 //#line 69 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), START_WITH)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), END_WITH)); }
 break;
 case 29:
 //#line 70 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), END_WITH)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), INCLUDE)); }
 break;
 case 30:
 //#line 71 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new StringOpExp(val_peek(2), val_peek(0), INCLUDE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 31:
 //#line 72 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 32:
 //#line 73 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 33:
 //#line 74 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), GT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
 break;
 case 34:
 //#line 75 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), GE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
 break;
 case 35:
 //#line 76 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), LT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
 break;
 case 36:
 //#line 77 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), LE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), START_WITH)); }
 break;
 case 37:
 //#line 78 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), END_WITH)); }
 break;
 case 38:
 //#line 79 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), INCLUDE)); }
 break;
 case 39:
 //#line 80 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), GT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 40:
 //#line 81 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), GE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 41:
 //#line 82 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), LT)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 42:
 //#line 83 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new TimestampOpExp(val_peek(2), val_peek(0), LE)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
 break;
 case 43:
 //#line 84 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NullOpExp(val_peek(2), EQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
 break;
 case 44:
 //#line 85 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NullOpExp(val_peek(3), NEQ)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
 break;
 case 45:
 //#line 86 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new LogicalOpExp(val_peek(2), val_peek(0), OR)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), EQ)); }
 break;
 case 46:
 //#line 87 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new LogicalOpExp(val_peek(2), val_peek(0), AND)); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), NEQ)); }
 break;
 case 47:
 //#line 88 "src/main/java/org/embulk/filter/row/where/_parser.y"
-{ yyval = new ParserVal(new NegateOpExp(val_peek(0))); }
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GT)); }
 break;
 case 48:
 //#line 89 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), GE)); }
+break;
+case 49:
+//#line 90 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LT)); }
+break;
+case 50:
+//#line 91 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(BinaryOpExp.create(val_peek(2), val_peek(0), LE)); }
+break;
+case 51:
+//#line 92 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new RegexpOpExp(val_peek(2), val_peek(0), REGEXP)); }
+break;
+case 52:
+//#line 93 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new NullOpExp(val_peek(2), EQ)); }
+break;
+case 53:
+//#line 94 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new NullOpExp(val_peek(3), NEQ)); }
+break;
+case 54:
+//#line 95 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new LogicalOpExp(val_peek(2), val_peek(0), OR)); }
+break;
+case 55:
+//#line 96 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new LogicalOpExp(val_peek(2), val_peek(0), AND)); }
+break;
+case 56:
+//#line 97 "src/main/java/org/embulk/filter/row/where/_parser.y"
+{ yyval = new ParserVal(new NegateOpExp(val_peek(0))); }
+break;
+case 57:
+//#line 98 "src/main/java/org/embulk/filter/row/where/_parser.y"
 { yyval = val_peek(1); }
 break;
-//#line 681 "Parser.java"
+//#line 735 "Parser.java"
 //########## END OF USER-SUPPLIED ACTIONS ##########
     }//switch
     //#### Now let's reduce... ####