You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2006/08/29 23:50:09 UTC

svn commit: r438242 - in /lucene/hadoop/trunk: ./ src/contrib/smallJobsBenchmark/bin/ src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/

Author: cutting
Date: Tue Aug 29 14:50:09 2006
New Revision: 438242

URL: http://svn.apache.org/viewvc?rev=438242&view=rev
Log:
HADOOP-460.  Fix contrib/smallJobsBenchmark to use Text instead of UTF8.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/bin/run.sh
    lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/BenchmarkMapper.java
    lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/MultiJobRunner.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=438242&r1=438241&r2=438242&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Aug 29 14:50:09 2006
@@ -101,6 +101,9 @@
 24. HADOOP-419. Fix a NullPointerException finding the ClassLoader
     when using libhdfs.  (omalley via cutting)
 
+25. HADOOP-460. Fix contrib/smallJobsBenchmark to use Text instead of
+    UTF8.  (Sanjay Dahiya via cutting)
+
 
 Release 0.5.0 - 2006-08-04
 

Modified: lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/bin/run.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/bin/run.sh?rev=438242&r1=438241&r2=438242&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/bin/run.sh (original)
+++ lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/bin/run.sh Tue Aug 29 14:50:09 2006
@@ -6,12 +6,6 @@
   exit 1;
 fi
 
-if [ -z $JAVA_HOME ] 
-then
-  echo "Error JAVA_HOME not defined"  ;
-  exit 1;
-fi
-
 mkdir -p logs;
 
 export TIMES=2

Modified: lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/BenchmarkMapper.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/BenchmarkMapper.java?rev=438242&r1=438241&r2=438242&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/BenchmarkMapper.java (original)
+++ lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/BenchmarkMapper.java Tue Aug 29 14:50:09 2006
@@ -23,7 +23,7 @@
   public void map(WritableComparable key, Writable value,
       OutputCollector output, Reporter reporter) throws IOException {
     
-    String line = ((UTF8)value).toString();
+    String line = value.toString();
     output.collect(new UTF8(process(line)), new UTF8(""));		
   }
   

Modified: lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/MultiJobRunner.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/MultiJobRunner.java?rev=438242&r1=438241&r2=438242&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/MultiJobRunner.java (original)
+++ lucene/hadoop/trunk/src/contrib/smallJobsBenchmark/src/java/org/apache/hadoop/benchmarks/mapred/MultiJobRunner.java Tue Aug 29 14:50:09 2006
@@ -345,7 +345,7 @@
     int numMaps = 2; 
     int numReduces = 1 ; 
     int dataLines = 1 ; 
-    int inputType = GenData.RANDOM ; 
+    int inputType = GenData.ASCENDING ; 
     boolean ignoreOutput = false ; 
     boolean verbose = false ;