svn commit: r1414372 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/drivers/TestDriverHCat.pm

[to...@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";