From hcatalog-commits-return-1105-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Tue Nov 27 20:20:01 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 776ABE395 for ; Tue, 27 Nov 2012 20:20:01 +0000 (UTC) Received: (qmail 79526 invoked by uid 500); 27 Nov 2012 20:20:01 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 79463 invoked by uid 500); 27 Nov 2012 20:20:00 -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 79454 invoked by uid 99); 27 Nov 2012 20:20:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2012 20:20: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; Tue, 27 Nov 2012 20:19:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9BE762388A66; Tue, 27 Nov 2012 20:19:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1414372 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/drivers/TestDriverHCat.pm Date: Tue, 27 Nov 2012 20:19:39 -0000 To: hcatalog-commits@incubator.apache.org From: toffer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121127201939.9BE762388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: toffer Date: Tue Nov 27 20:19:38 2012 New Revision: 1414372 URL: http://svn.apache.org/viewvc?rev=1414372&view=rev Log: HCAT-534 HCat_Drop_Table_3 dfs mkdir failing on hadoop23 (cdrome via toffer) Modified: incubator/hcatalog/trunk/CHANGES.txt incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm Modified: incubator/hcatalog/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1414372&r1=1414371&r2=1414372&view=diff ============================================================================== --- incubator/hcatalog/trunk/CHANGES.txt (original) +++ incubator/hcatalog/trunk/CHANGES.txt Tue Nov 27 20:19:38 2012 @@ -145,6 +145,8 @@ Trunk (unreleased changes) OPTIMIZATIONS BUG FIXES + HCAT-534 HCat_Drop_Table_3 dfs mkdir failing on hadoop23 (cdrome via toffer) + HCAT-453 HCatalog queries fail due to exceeding max jobconf size (pengfeng via traviscrawford) HCAT-523 PigHCatUtil should not assume map key type can be casted to String (pengfeng via traviscrawford) Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm?rev=1414372&r1=1414371&r2=1414372&view=diff ============================================================================== --- incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm (original) +++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/drivers/TestDriverHCat.pm Tue Nov 27 20:19:38 2012 @@ -133,6 +133,13 @@ sub runHCatCmdLine $outfiles[0] = $testCmd->{'thisResultsPath'} . "/" . $testCmd->{'group'} . "_" . $testCmd->{'num'} . ".0.out"; + # Append -p to dfs -mkdir to work with Hadoop23. + if ($ENV{'HCAT_HADOOPVERSION'} eq "23") { + if ($hcatCmd =~ /\bdfs -mkdir/) { + $hcatCmd=~s/\bdfs\s+-mkdir\s+(-p\s+)?/dfs -mkdir -p /g; + } + } + open(FH, "> $hcatfiles[0]") or die "Unable to open file $hcatfiles[0] to write SQL script, $ERRNO\n"; print FH $hcatCmd . "\n";