incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tof...@apache.org
Subject svn commit: r1388158 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm src/test/e2e/hcatalog/tools/generate/java/build.xml
Date Thu, 20 Sep 2012 18:56:53 GMT
Author: toffer
Date: Thu Sep 20 18:56:53 2012
New Revision: 1388158

URL: http://svn.apache.org/viewvc?rev=1388158&view=rev
Log:
HCAT-507 e2e harness failing on 0.23 (toffer)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1388158&r1=1388157&r2=1388158&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Sep 20 18:56:53 2012
@@ -111,6 +111,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-507 e2e harness failing on 0.23 (toffer)
+
   HCAT-502 HCatalog dependency resolution fails due to missing repo (traviscrawford)
 
   HCAT-490 HCatStorer() throws error when the same partition key is present in records in
more than one tasks running as part of the same job (amalakar via traviscrawford)

Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm?rev=1388158&r1=1388157&r2=1388158&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
(original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
Thu Sep 20 18:56:53 2012
@@ -184,7 +184,11 @@ sub generateData
 #   }
 
     # Create the HDFS directories
-    Util::runHadoopCmd($cfg, $log, "fs -mkdir $cfg->{'hcat_data_dir'}");
+    my $mkdirCmd = "fs -mkdir";
+    if ($ENV{'HCAT_HADOOPVERSION'} eq "23") {
+        $mkdirCmd = "fs -mkdir -p"
+    }
+    Util::runHadoopCmd($cfg, $log, "$mkdirCmd $cfg->{'hcat_data_dir'}");
 
     foreach my $table (@tables) {
         print "Generating data for $table->{'name'}\n";
@@ -200,12 +204,12 @@ sub generateData
         $self->runCmd($log, \@cmd);
 
         # Copy the data to HDFS
-        my $hadoop = "fs -mkdir $cfg->{'hcat_data_dir'}/$table->{'hdfs'}";
+        my $hadoop = "$mkdirCmd $cfg->{'hcat_data_dir'}/$table->{'hdfs'}";
         Util::runHadoopCmd($cfg, $log, $hadoop);
 
         if (defined($table->{'partitions'})) {
             foreach my $part (@{$table->{'partitions'}}) {
-                my $hadoop = "fs -mkdir
+                my $hadoop = "$mkdirCmd
                     $cfg->{'hcat_data_dir'}/$table->{'hdfs'}/$table->{'name'}.$part";
                 Util::runHadoopCmd($cfg, $log, $hadoop);
                 my $hadoop = "fs -copyFromLocal $table->{'name'}.$part " .

Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml?rev=1388158&r1=1388157&r2=1388158&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml (original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/java/build.xml Thu Sep 20
18:56:53 2012
@@ -23,7 +23,7 @@
     <path id="generator-classpath">
         <fileset file="${hive.serde.jarfile}"/>
         <fileset file="${hive.ql.jarfile}"/>
-        <fileset file="${hadoop.core.jarfile}"/>
+        <pathelement path="${hadoop.core.jarfile}" />
     </path>
 
     <target name="init">



Mime
View raw message