Author: toffer
Date: Thu Sep 20 18:59:52 2012
New Revision: 1388162
URL: http://svn.apache.org/viewvc?rev=1388162&view=rev
Log:
merged from trunk: HCAT-507 e2e harness failing on 0.23 (toffer)
Modified:
incubator/hcatalog/branches/branch-0.4/ (props changed)
incubator/hcatalog/branches/branch-0.4/CHANGES.txt
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/java/build.xml
Propchange: incubator/hcatalog/branches/branch-0.4/
------------------------------------------------------------------------------
Merged /incubator/hcatalog/trunk:r1388158
Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/CHANGES.txt?rev=1388162&r1=1388161&r2=1388162&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.4/CHANGES.txt Thu Sep 20 18:59:52 2012
@@ -63,6 +63,8 @@ Trunk (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-507 e2e harness failing on 0.23 (toffer)
+
HCAT-499 Multiple store commands does not work with Hadoop23 (rohinip via
avandana)
HCAT-445 Clover builds broken on trunk (rohinip via avandana)
Modified:
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm?rev=1388162&r1=1388161&r2=1388162&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
(original)
+++
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/deployers/HCatExistingClusterDeployer.pm
Thu Sep 20 18:59:52 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/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/java/build.xml?rev=1388162&r1=1388161&r2=1388162&view=diff
==============================================================================
---
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/java/build.xml
(original)
+++
incubator/hcatalog/branches/branch-0.4/src/test/e2e/hcatalog/tools/generate/java/build.xml
Thu Sep 20 18:59:52 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">
