HADOOP-4184. Break the module dependencies between core, hdfs, and

mapred. 
From: Tom White <tomwhite@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@696533 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -332,6 +332,9 @@ Trunk (unreleased changes)
     HADOOP-4186. Factor LineReader out of LineRecordReader. (tomwhite via
     omalley)
 
+    HADOOP-4184. Break the module dependencies between core, hdfs, and 
+    mapred. (tomwhite via omalley)
+
   OPTIMIZATIONS
 
     HADOOP-3556. Removed lock contention in MD5Hash by changing the 

src/core/org/apache/hadoop/filecache/DistributedCache.java

@@ -24,10 +24,6 @@ import java.util.*;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.util.*;
 import org.apache.hadoop.fs.*;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Mapper;
-import org.apache.hadoop.mapred.Reducer;
 
 import java.net.URI;
 
@@ -39,7 +35,8 @@ import java.net.URI;
  * </p>
  * 
  * <p>Applications specify the files, via urls (hdfs:// or http://) to be cached 
- * via the {@link JobConf}. The <code>DistributedCache</code> assumes that the
+ * via the {@link org.apache.hadoop.mapred.JobConf}.
+ * The <code>DistributedCache</code> assumes that the
  * files specified via hdfs:// urls are already present on the 
  * {@link FileSystem} at the path specified by the url.</p>
  * 
@@ -85,7 +82,8 @@ import java.net.URI;
  *     DistributedCache.addCacheArchive(new URI("/myapp/mytgz.tgz", job);
  *     DistributedCache.addCacheArchive(new URI("/myapp/mytargz.tar.gz", job);
  *     
- *     3. Use the cached files in the {@link Mapper} or {@link Reducer}:
+ *     3. Use the cached files in the {@link org.apache.hadoop.mapred.Mapper}
+ *     or {@link org.apache.hadoop.mapred.Reducer}:
  *     
  *     public static class MapClass extends MapReduceBase  
  *     implements Mapper&lt;K, V, K, V&gt; {
@@ -111,8 +109,8 @@ import java.net.URI;
  *     
  * </pre></blockquote></p>
  * 
- * @see JobConf
- * @see JobClient
+ * @see org.apache.hadoop.mapred.JobConf
+ * @see org.apache.hadoop.mapred.JobClient
  */
 public class DistributedCache {
   // cacheID to cacheStatus mapping

src/core/org/apache/hadoop/fs/FileSystem.java

@@ -84,7 +84,9 @@ public abstract class FileSystem extends Configured implements Closeable {
    * Parse the cmd-line args, starting at i.  Remove consumed args
    * from array.  We expect param in the form:
    * '-local | -dfs <namenode:port>'
+   * @deprecated Consider using {@link GenericOptionsParser} instead.
    */
+  @Deprecated
   public static FileSystem parseArgs(String argv[], int i, Configuration conf) throws IOException {
     /**
        if (argv.length - i < 1) {

src/core/org/apache/hadoop/io/compress/CompressionCodecFactory.java

@@ -185,7 +185,7 @@ public class CompressionCodecFactory {
    * @param args
    */
   public static void main(String[] args) throws Exception {
-    Configuration conf = new org.apache.hadoop.mapred.JobConf();
+    Configuration conf = new Configuration();
     CompressionCodecFactory factory = new CompressionCodecFactory(conf);
     boolean encode = false;
     for(int i=0; i < args.length; ++i) {

src/core/org/apache/hadoop/util/NativeCodeLoader.java

@@ -18,8 +18,9 @@
 
 package org.apache.hadoop.util;
 
-import org.apache.commons.logging.*;
-import org.apache.hadoop.mapred.JobConf;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 
 /**
  * A helper to load the native hadoop code i.e. libhadoop.so.
@@ -65,24 +66,24 @@ public class NativeCodeLoader {
 
   /**
    * Return if native hadoop libraries, if present, can be used for this job.
-   * @param jobConf job configuration
+   * @param conf configuration
    * 
    * @return <code>true</code> if native hadoop libraries, if present, can be 
    *         used for this job; <code>false</code> otherwise.
    */
-  public boolean getLoadNativeLibraries(JobConf jobConf) {
-    return jobConf.getBoolean("hadoop.native.lib", true);
+  public boolean getLoadNativeLibraries(Configuration conf) {
+    return conf.getBoolean("hadoop.native.lib", true);
   }
   
   /**
    * Set if native hadoop libraries, if present, can be used for this job.
    * 
-   * @param jobConf job configuration
+   * @param conf configuration
    * @param loadNativeLibraries can native hadoop libraries be loaded
    */
-  public void setLoadNativeLibraries(JobConf jobConf, 
+  public void setLoadNativeLibraries(Configuration conf, 
                                      boolean loadNativeLibraries) {
-    jobConf.setBoolean("hadoop.native.lib", loadNativeLibraries);
+    conf.setBoolean("hadoop.native.lib", loadNativeLibraries);
   }
 
 }

src/core/org/apache/hadoop/util/Shell.java

@@ -17,15 +17,15 @@
  */
 package org.apache.hadoop.util;
 
-import java.util.Map;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.BufferedReader;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.conf.Configuration;
 
 /** 
  * A base class for running a Unix command.
@@ -65,19 +65,19 @@ abstract public class Shell {
    * 
    * It also checks to ensure that we are running on a *nix platform else 
    * (e.g. in Cygwin/Windows) it returns <code>null</code>.
-   * @param job job configuration
+   * @param conf configuration
    * @return a <code>String[]</code> with the ulimit command arguments or 
    *         <code>null</code> if we are running on a non *nix platform or
    *         if the limit is unspecified.
    */
-  public static String[] getUlimitMemoryCommand(JobConf job) {
+  public static String[] getUlimitMemoryCommand(Configuration conf) {
     // ulimit isn't supported on Windows
     if (WINDOWS) {
       return null;
     }
     
-    // get the memory limit from the JobConf
-    String ulimit = job.get("mapred.child.ulimit");
+    // get the memory limit from the configuration
+    String ulimit = conf.get("mapred.child.ulimit");
     if (ulimit == null) {
       return null;
     }