Przeglądaj źródła

HADOOP-1239. Add a package name to some testjar test classes. Contributed by Jim Kellerman.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@528230 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 lat temu
rodzic
commit
9deb19f729

+ 3 - 0
CHANGES.txt

@@ -184,6 +184,9 @@ Trunk (unreleased changes)
     sometimes erased before they were reported written.
     (Dhruba Borthakur via cutting)
 
+56. HADOOP-1239.  Add a package name to some testjar test classes.
+    (Jim Kellerman via cutting)
+
 
 Release 0.12.3 - 2007-04-06
 

+ 6 - 6
src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java

@@ -63,9 +63,9 @@ public class TestMiniMRClasspath extends TestCase {
     // the values are counts (ints)
     conf.setOutputValueClass(IntWritable.class);
     
-    conf.set("mapred.mapper.class", "ClassWordCount$MapClass");        
-    conf.set("mapred.combine.class", "ClassWordCount$Reduce");
-    conf.set("mapred.reducer.class", "ClassWordCount$Reduce");
+    conf.set("mapred.mapper.class", "testjar.ClassWordCount$MapClass");        
+    conf.set("mapred.combine.class", "testjar.ClassWordCount$Reduce");
+    conf.set("mapred.reducer.class", "testjar.ClassWordCount$Reduce");
     conf.setInputPath(inDir);
     conf.setOutputPath(outDir);
     conf.setNumMapTasks(numMaps);
@@ -116,15 +116,15 @@ public class TestMiniMRClasspath extends TestCase {
     // the keys are counts
     conf.setOutputValueClass(IntWritable.class);
     // the values are the messages
-    conf.set("mapred.output.key.class", "ExternalWritable");
+    conf.set("mapred.output.key.class", "testjar.ExternalWritable");
 
     conf.setInputPath(inDir);
     conf.setOutputPath(outDir);
     conf.setNumMapTasks(numMaps);
     conf.setNumReduceTasks(numReduces);
     
-    conf.set("mapred.mapper.class", "ExternalMapperReducer"); 
-    conf.set("mapred.reducer.class", "ExternalMapperReducer");
+    conf.set("mapred.mapper.class", "testjar.ExternalMapperReducer"); 
+    conf.set("mapred.reducer.class", "testjar.ExternalMapperReducer");
 
     //pass a job.jar already included in the hadoop build
     conf.setJar("build/test/testjar/testjob.jar");

+ 1 - 0
src/test/testjar/ClassWordCount.java

@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+package testjar;
 
 import java.io.*;
 import java.util.*;

+ 2 - 0
src/test/testjar/ExternalMapperReducer.java

@@ -1,3 +1,5 @@
+package testjar;
+
 import java.io.IOException;
 import java.util.Iterator;
 

+ 2 - 0
src/test/testjar/ExternalWritable.java

@@ -1,3 +1,5 @@
+package testjar;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;