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 2438D931D for ; Mon, 19 Dec 2011 01:40:06 +0000 (UTC) Received: (qmail 17472 invoked by uid 500); 19 Dec 2011 01:40:06 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 17441 invoked by uid 500); 19 Dec 2011 01:40:06 -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 17434 invoked by uid 99); 19 Dec 2011 01:40:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Dec 2011 01:40:06 +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, 19 Dec 2011 01:40:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B092E238899C for ; Mon, 19 Dec 2011 01:39:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1220587 - in /pig/branches/branch-0.10: src/org/apache/pig/parser/AstPrinter.g test/org/apache/pig/test/data/jsonStorage1.schema Date: Mon, 19 Dec 2011 01:39:41 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111219013941.B092E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: daijy Date: Mon Dec 19 01:39:41 2011 New Revision: 1220587 URL: http://svn.apache.org/viewvc?rev=1220587&view=rev Log: Fix unit test failure caused by PIG-2427 Modified: pig/branches/branch-0.10/src/org/apache/pig/parser/AstPrinter.g pig/branches/branch-0.10/test/org/apache/pig/test/data/jsonStorage1.schema Modified: pig/branches/branch-0.10/src/org/apache/pig/parser/AstPrinter.g URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/src/org/apache/pig/parser/AstPrinter.g?rev=1220587&r1=1220586&r2=1220587&view=diff ============================================================================== --- pig/branches/branch-0.10/src/org/apache/pig/parser/AstPrinter.g (original) +++ pig/branches/branch-0.10/src/org/apache/pig/parser/AstPrinter.g Mon Dec 19 01:39:41 2011 @@ -176,7 +176,7 @@ tuple_type ; bag_type - : ^( BAG_TYPE { sb.append("bag{"); } ( { sb.append("T:"); } tuple_type )? ) { sb.append("}"); } + : ^( BAG_TYPE { sb.append("bag{"); } ( { sb.append("T:"); } IDENTIFIER? tuple_type )? ) { sb.append("}"); } ; map_type : ^( MAP_TYPE { sb.append("map["); } type? ) { sb.append("]"); } Modified: pig/branches/branch-0.10/test/org/apache/pig/test/data/jsonStorage1.schema URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/org/apache/pig/test/data/jsonStorage1.schema?rev=1220587&r1=1220586&r2=1220587&view=diff ============================================================================== --- pig/branches/branch-0.10/test/org/apache/pig/test/data/jsonStorage1.schema (original) +++ pig/branches/branch-0.10/test/org/apache/pig/test/data/jsonStorage1.schema Mon Dec 19 01:39:41 2011 @@ -1 +1 @@ -{"fields":[{"name":"a0","type":10,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a1","type":120,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":null,"type":110,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":"a10","type":10,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a11","type":55,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}}],"version":0,"sortKeys":[],"sortKeyOrders":[]}},{"name":"a2","type":110,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":"a20","type":25,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a21","type":50,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}},{"name":"a3","type":100,"description":"autogenerated from Pig Field Schema","schema":{"field s":[{"name":null,"type":55,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}}],"version":0,"sortKeys":[],"sortKeyOrders":[]} +{"fields":[{"name":"a0","type":10,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a1","type":120,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":"t","type":110,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":"a10","type":10,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a11","type":55,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}}],"version":0,"sortKeys":[],"sortKeyOrders":[]}},{"name":"a2","type":110,"description":"autogenerated from Pig Field Schema","schema":{"fields":[{"name":"a20","type":25,"description":"autogenerated from Pig Field Schema","schema":null},{"name":"a21","type":50,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}},{"name":"a3","type":100,"description":"autogenerated from Pig Field Schema","schema":{"fields ":[{"name":null,"type":55,"description":"autogenerated from Pig Field Schema","schema":null}],"version":0,"sortKeys":[],"sortKeyOrders":[]}}],"version":0,"sortKeys":[],"sortKeyOrders":[]}