svn commit: r1232132 - in /incubator/hcatalog/branches/branch-0.3: CHANGES.txt src/test/e2e/hcatalog/tools/generate/generate_data.pl

[khorgath]

Author: khorgath
Date: Mon Jan 16 19:59:46 2012
New Revision: 1232132

URL: http://svn.apache.org/viewvc?rev=1232132&view=rev
Log:
HCATALOG-197 Data generator for e2e assumes hadoop tarball installation 
(arpitgupta via khorgath)

Modified:
    incubator/hcatalog/branches/branch-0.3/CHANGES.txt
    
incubator/hcatalog/branches/branch-0.3/src/test/e2e/hcatalog/tools/generate/generate_data.pl

Modified: incubator/hcatalog/branches/branch-0.3/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/CHANGES.txt?rev=1232132&r1=1232131&r2=1232132&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.3/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.3/CHANGES.txt Mon Jan 16 19:59:46 2012
@@ -95,6 +95,8 @@ Release 0.3.0 (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-197. Data generator for e2e assumes hadoop tarball installation 
(arpitgupta via khorgath)
+
   HCAT-199. HCatOutputCommitter::cleanupJob() fails : Unable to connect to 
metastore. (mithun via khorgath)
 
   HCAT-202. ant clean target is failing (thw via toffer)

Modified: 
incubator/hcatalog/branches/branch-0.3/src/test/e2e/hcatalog/tools/generate/generate_data.pl
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.3/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1232132&r1=1232131&r2=1232132&view=diff
==============================================================================
--- 
incubator/hcatalog/branches/branch-0.3/src/test/e2e/hcatalog/tools/generate/generate_data.pl
 (original)
+++ 
incubator/hcatalog/branches/branch-0.3/src/test/e2e/hcatalog/tools/generate/generate_data.pl
 Mon Jan 16 19:59:46 2012
@@ -336,20 +336,20 @@ our $hadoopCoreJar = undef;
 
 sub findHadoopJars()
 {
-    my $hadoopClassRoot;
-    if (defined $ENV{'HADOOP_HOME'}) {
-        $hadoopClassRoot = $ENV{'HADOOP_HOME'};
-    } else {
-        $hadoopClassRoot = "/usr/share/hadoop";
+    my $hadoopClassRoot=$ENV{'HADOOP_HOME'};
+    my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
+    #if you do not find hadoop core jar under hadoop home change the path for 
rpm's
+    if (! $coreJar) {
+      $hadoopClassRoot="$hadoopClassRoot/share/hadoop";
+      $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`; 
     }
 
-    my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
     my $loggingJar = `ls $hadoopClassRoot/lib/commons-logging-*.jar | grep -v 
api`;
     my $cfgJar = `ls $hadoopClassRoot/lib/commons-configuration-*.jar`;
     my $langJar = `ls $hadoopClassRoot/lib/commons-lang-*.jar`;
     my $cliJar = `ls $hadoopClassRoot/lib/commons-cli-*.jar`;
 
-    if ($coreJar=="") {
+    if (! $coreJar) {
         die 'Please set $HADOOP_HOME\n';
     }