From hcatalog-commits-return-740-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Tue Mar 13 15:06:36 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A42169B06 for ; Tue, 13 Mar 2012 15:06:36 +0000 (UTC) Received: (qmail 23050 invoked by uid 500); 13 Mar 2012 15:06:36 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 23002 invoked by uid 500); 13 Mar 2012 15:06:36 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 22992 invoked by uid 99); 13 Mar 2012 15:06:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2012 15:06:36 +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; Tue, 13 Mar 2012 15:06:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EC4FF23888EA; Tue, 13 Mar 2012 15:06:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1300173 - /incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java Date: Tue, 13 Mar 2012 15:06:14 -0000 To: hcatalog-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120313150614.EC4FF23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gates Date: Tue Mar 13 15:06:14 2012 New Revision: 1300173 URL: http://svn.apache.org/viewvc?rev=1300173&view=rev Log: HCATALOG-276 Yet more fixes for this. Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java?rev=1300173&r1=1300172&r2=1300173&view=diff ============================================================================== --- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java (original) +++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileOutputCommitterContainer.java Tue Mar 13 15:06:14 2012 @@ -95,6 +95,9 @@ class FileOutputCommitterContainer exten @Override public void abortTask(TaskAttemptContext context) throws IOException { if (!dynamicPartitioningUsed){ + // TODO: Hack! Pig messes up mapred.output.dir, when 2 Storers are used in the same Pig script. + // Workaround: Set mapred.output.dir from OutputJobInfo. + resetMapRedOutputDirFromJobInfo(context.getConfiguration()); getBaseOutputCommitter().abortTask(HCatMapRedUtil.createTaskAttemptContext(context)); } } @@ -114,6 +117,9 @@ class FileOutputCommitterContainer exten @Override public boolean needsTaskCommit(TaskAttemptContext context) throws IOException { if (!dynamicPartitioningUsed){ + // TODO: Hack! Pig messes up mapred.output.dir, when 2 Storers are used in the same Pig script. + // Workaround: Set mapred.output.dir from OutputJobInfo. + resetMapRedOutputDirFromJobInfo(context.getConfiguration()); return getBaseOutputCommitter().needsTaskCommit(HCatMapRedUtil.createTaskAttemptContext(context)); }else{ // called explicitly through FileRecordWriterContainer.close() if dynamic - return false by default @@ -126,7 +132,7 @@ class FileOutputCommitterContainer exten if(getBaseOutputCommitter() != null && !dynamicPartitioningUsed) { // TODO: Hack! Pig messes up mapred.output.dir, when 2 Storers are used in the same Pig script. // Workaround: Set mapred.output.dir from OutputJobInfo. - context.getConfiguration().set("mapred.output.dir", jobInfo.getLocation()); + resetMapRedOutputDirFromJobInfo(context.getConfiguration()); getBaseOutputCommitter().setupJob(HCatMapRedUtil.createJobContext(context)); } // in dynamic usecase, called through FileRecordWriterContainer @@ -135,6 +141,9 @@ class FileOutputCommitterContainer exten @Override public void setupTask(TaskAttemptContext context) throws IOException { if (!dynamicPartitioningUsed){ + // TODO: Hack! Pig messes up mapred.output.dir, when 2 Storers are used in the same Pig script. + // Workaround: Set mapred.output.dir from OutputJobInfo. + resetMapRedOutputDirFromJobInfo(context.getConfiguration()); getBaseOutputCommitter().setupTask(HCatMapRedUtil.createTaskAttemptContext(context)); } }