Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2BBFD844 for ; Mon, 15 Oct 2012 22:21:00 +0000 (UTC) Received: (qmail 48967 invoked by uid 500); 15 Oct 2012 22:21:00 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 48943 invoked by uid 500); 15 Oct 2012 22:21:00 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 48935 invoked by uid 99); 15 Oct 2012 22:21:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2012 22:21:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2012 22:20:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9B88923888E4 for ; Mon, 15 Oct 2012 22:20:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1398540 - in /pig/trunk: CHANGES.txt src/org/apache/pig/parser/QueryParser.g Date: Mon, 15 Oct 2012 22:20:14 -0000 To: commits@pig.apache.org From: dvryaboy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121015222014.9B88923888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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