Return-Path: Delivered-To: apmail-incubator-pig-commits-archive@locus.apache.org Received: (qmail 24919 invoked from network); 15 Jan 2008 00:52:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jan 2008 00:52:09 -0000 Received: (qmail 28520 invoked by uid 500); 15 Jan 2008 00:51:59 -0000 Delivered-To: apmail-incubator-pig-commits-archive@incubator.apache.org Received: (qmail 28503 invoked by uid 500); 15 Jan 2008 00:51:59 -0000 Mailing-List: contact pig-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: pig-dev@incubator.apache.org Delivered-To: mailing list pig-commits@incubator.apache.org Received: (qmail 28494 invoked by uid 99); 15 Jan 2008 00:51:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jan 2008 16:51:59 -0800 X-ASF-Spam-Status: No, hits=-98.0 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2008 00:51:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 599611A983A; Mon, 14 Jan 2008 16:51:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r611983 - in /incubator/pig/trunk: CHANGES.txt src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java src/org/apache/pig/impl/physicalLayer/POMapreduce.java Date: Tue, 15 Jan 2008 00:51:45 -0000 To: pig-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080115005146.599611A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gates Date: Mon Jan 14 16:51:44 2008 New Revision: 611983 URL: http://svn.apache.org/viewvc?rev=611983&view=rev Log: PIG-61: Fixed MapreducePlanCompiler to use PigContext to load up the comparator function instead of Class.forName. Modified: incubator/pig/trunk/CHANGES.txt incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POMapreduce.java Modified: incubator/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=611983&r1=611982&r2=611983&view=diff ============================================================================== --- incubator/pig/trunk/CHANGES.txt (original) +++ incubator/pig/trunk/CHANGES.txt Mon Jan 14 16:51:44 2008 @@ -62,3 +62,6 @@ PIG-30: Rewrote DataBags to better handle decisions of when to spill to disk and to spill more intelligently. (gates) + PIG-61: Fixed MapreducePlanCompiler to use PigContext to load up the + comparator function instead of Class.forName. (gates) + Modified: incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java URL: http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java?rev=611983&r1=611982&r2=611983&view=diff ============================================================================== --- incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java (original) +++ incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/MapreducePlanCompiler.java Mon Jan 14 16:51:44 2008 @@ -310,12 +310,9 @@ String comparatorFuncName = loSort.getSortSpec().getComparatorName(); if (comparatorFuncName != null) { - try { - sortJob.userComparator = - (Class)Class.forName(comparatorFuncName); - } catch (ClassNotFoundException e) { - throw new RuntimeException("Unable to find user comparator " + comparatorFuncName, e); - } + sortJob.userComparator = + (Class)PigContext.resolveClassName( + comparatorFuncName); } return sortJob; Modified: incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POMapreduce.java URL: http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POMapreduce.java?rev=611983&r1=611982&r2=611983&view=diff ============================================================================== --- incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POMapreduce.java (original) +++ incubator/pig/trunk/src/org/apache/pig/impl/physicalLayer/POMapreduce.java Mon Jan 14 16:51:44 2008 @@ -165,15 +165,16 @@ void print() { Logger log = PigLogger.getLogger(); - log.debug("Input: " + inputFileSpecs); - log.debug("Map: " + toMap); - log.debug("Group: " + groupFuncs); - log.debug("Combine: " + toCombine); - log.debug("Reduce: " + toReduce); - log.debug("Output: " + outputFileSpec); - log.debug("Split: " + toSplit); - log.debug("Map parallelism: " + mapParallelism); - log.debug("Reduce parallelism: " + reduceParallelism); + log.info("----- MapReduce Job -----"); + log.info("Input: " + inputFileSpecs); + log.info("Map: " + toMap); + log.info("Group: " + groupFuncs); + log.info("Combine: " + toCombine); + log.info("Reduce: " + toReduce); + log.info("Output: " + outputFileSpec); + log.info("Split: " + toSplit); + log.info("Map parallelism: " + mapParallelism); + log.info("Reduce parallelism: " + reduceParallelism); } public POMapreduce copy(){