pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dvrya...@apache.org
Subject svn commit: r1398540 - in /pig/trunk: CHANGES.txt src/org/apache/pig/parser/QueryParser.g
Date Mon, 15 Oct 2012 22:20:14 GMT
Author: dvryaboy
Date: Mon Oct 15 22:20:14 2012
New Revision: 1398540

URL: http://svn.apache.org/viewvc?rev=1398540&view=rev
Log:
PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/parser/QueryParser.g

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1398540&r1=1398539&r2=1398540&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Oct 15 22:20:14 2012
@@ -30,6 +30,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24 (cheolsoo via dvryaboy)
+
 Release 0.11.0 (unreleased)
 
 INCOMPATIBLE CHANGES

Modified: pig/trunk/src/org/apache/pig/parser/QueryParser.g
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/QueryParser.g?rev=1398540&r1=1398539&r2=1398540&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/QueryParser.g (original)
+++ pig/trunk/src/org/apache/pig/parser/QueryParser.g Mon Oct 15 22:20:14 2012
@@ -392,11 +392,15 @@ or_cond : and_cond  ( OR^ and_cond )*
 and_cond : unary_cond ( AND^ unary_cond )*
 ;
 
-unary_cond : LEFT_PAREN! cond RIGHT_PAREN!
+unary_cond : expr rel_op^ expr
+           | LEFT_PAREN! cond RIGHT_PAREN!
            | not_cond
-           | expr rel_op^ expr
            | func_eval
            | null_check_cond
+           | bool_cond
+;
+
+bool_cond : expr -> ^(BOOL_COND expr)
 ;
 
 not_cond : NOT^ unary_cond
@@ -811,6 +815,7 @@ eid : rel_str_op
     | TRUE
     | FALSE
     | REALIAS
+    | BOOL_COND
 ;
 
 // relational operator



Mime
View raw message