You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by dv...@apache.org on 2012/10/16 00:21:46 UTC
svn commit: r1398542 - in /pig/branches/branch-0.11: CHANGES.txt
src/org/apache/pig/parser/QueryParser.g
Author: dvryaboy
Date: Mon Oct 15 22:21:45 2012
New Revision: 1398542
URL: http://svn.apache.org/viewvc?rev=1398542&view=rev
Log:
PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24
Modified:
pig/branches/branch-0.11/CHANGES.txt
pig/branches/branch-0.11/src/org/apache/pig/parser/QueryParser.g
Modified: pig/branches/branch-0.11/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/CHANGES.txt?rev=1398542&r1=1398541&r2=1398542&view=diff
==============================================================================
--- pig/branches/branch-0.11/CHANGES.txt (original)
+++ pig/branches/branch-0.11/CHANGES.txt Mon Oct 15 22:21:45 2012
@@ -297,6 +297,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24 (cheolsoo via dvryaboy)
+
PIG-2971: Add new parameter to specify the streaming environment (jcoveney)
PIG-2963: Illustrate command and POPackageLite (cheolsoo via jcoveney)
Modified: pig/branches/branch-0.11/src/org/apache/pig/parser/QueryParser.g
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/src/org/apache/pig/parser/QueryParser.g?rev=1398542&r1=1398541&r2=1398542&view=diff
==============================================================================
--- pig/branches/branch-0.11/src/org/apache/pig/parser/QueryParser.g (original)
+++ pig/branches/branch-0.11/src/org/apache/pig/parser/QueryParser.g Mon Oct 15 22:21:45 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