HADOOP-4247. Merge -r 699091:699092 from trunk to branch 0.19.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@699093 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -724,8 +724,14 @@ Release 0.19.0 - Unreleased
     HADOOP-4249. Fix eclipse path to include the hsqldb.jar. (szetszwo via
     omalley)
 
+<<<<<<< .working
     HADOOP-4116. Balancer should provide better resource management. (hairong)
 
+=======
+    HADOOP-4247. Move InputSampler into org.apache.hadoop.mapred.lib, so that
+    examples.jar doesn't depend on tools.jar. (omalley)
+
+>>>>>>> .merge-right.r699092
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

bin/hadoop

@@ -224,8 +224,7 @@ elif [ "$COMMAND" = "archive" ] ; then
   CLASSPATH=${CLASSPATH}:${TOOL_PATH}
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 elif [ "$COMMAND" = "sampler" ] ; then
-  CLASS=org.apache.hadoop.tools.InputSampler
-  CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+  CLASS=org.apache.hadoop.mapred.lib.InputSampler
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
 else
   CLASS=$COMMAND

src/examples/org/apache/hadoop/examples/Sort.java

@@ -32,8 +32,8 @@ import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.mapred.*;
 import org.apache.hadoop.mapred.lib.IdentityMapper;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
+import org.apache.hadoop.mapred.lib.InputSampler;
 import org.apache.hadoop.mapred.lib.TotalOrderPartitioner;
-import org.apache.hadoop.tools.InputSampler;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 

src/tools/org/apache/hadoop/tools/InputSampler.java → src/mapred/org/apache/hadoop/mapred/lib/InputSampler.java

@@ -16,10 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.tools;
+package org.apache.hadoop.mapred.lib;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Random;
@@ -40,9 +39,6 @@ import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.RecordReader;
 import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.SequenceFileInputFormat;
-import org.apache.hadoop.mapred.lib.TotalOrderPartitioner;
-import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 
@@ -405,7 +401,6 @@ public class InputSampler<K,V> implements Tool {
 
     Path outf = new Path(otherArgs.remove(otherArgs.size() - 1));
     TotalOrderPartitioner.setPartitionFile(job, outf);
-    ArrayList<Path> plist = new ArrayList<Path>(otherArgs.size());
     for (String s : otherArgs) {
       FileInputFormat.addInputPath(job, new Path(s));
     }
@@ -416,7 +411,7 @@ public class InputSampler<K,V> implements Tool {
 
   public static void main(String[] args) throws Exception {
     JobConf job = new JobConf(InputSampler.class);
-    InputSampler sampler = new InputSampler(job);
+    InputSampler<?,?> sampler = new InputSampler(job);
     int res = ToolRunner.run(sampler, args);
     System.exit(res);
   }