HADOOP-1843. Removed code from Configuration and JobConf deprecated by HADOOP-785 and a minor fix to Configuration.toString. Specifically the important change is that mapred-default.xml is no longer supported and Configuration no longer supports the notion of default/final resources.

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

CHANGES.txt

@@ -10,6 +10,12 @@ Trunk (unreleased changes)
     the value configured on the jobtracker. InterTrackerProtocol
     version changed from 5 to 6. (Michael Bieniosek via omalley)
 
+    HADOOP-1843. Removed code from Configuration and JobConf deprecated by 
+    HADOOP-785 and a minor fix to Configuration.toString. Specifically the 
+    important change is that mapred-default.xml is no longer supported and 
+    Configuration no longer supports the notion of default/final resources.
+    (acmurthy) 
+
   NEW FEATURES
 
     HADOOP-1857.  Ability to run a script when a task fails to capture stack

src/contrib/abacus/src/java/org/apache/hadoop/abacus/ValueAggregatorJob.java

@@ -133,7 +133,7 @@ public class ValueAggregatorJob {
     
     JobConf theJob = new JobConf(ValueAggregatorJob.class);
     if (specFile != null) {
-      theJob.addDefaultResource(specFile);
+      theJob.addResource(specFile);
     }
     FileSystem fs = FileSystem.get(theJob);
     theJob.setJobName("ValueAggregatorJob: " + jobName);

src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

@@ -656,18 +656,18 @@ public class StreamJob {
     msg("hadoopAliasConf_ = " + hadoopAliasConf_);
     config_ = new Configuration();
     if (!cluster_.equals("default")) {
-      config_.addFinalResource(new Path(getHadoopAliasConfFile()));
+      config_.addResource(new Path(getHadoopAliasConfFile()));
     } else {
       // use only defaults: hadoop-default.xml and hadoop-site.xml
     }
     System.out.println("additionalConfSpec_:" + additionalConfSpec_);
     if (additionalConfSpec_ != null) {
-      config_.addDefaultResource(new Path(additionalConfSpec_));
+      config_.addResource(new Path(additionalConfSpec_));
     }
     Iterator it = configPath_.iterator();
     while (it.hasNext()) {
       String pathName = (String) it.next();
-      config_.addFinalResource(new Path(pathName));
+      config_.addResource(new Path(pathName));
     }
 
     // general MapRed job properties

src/java/org/apache/hadoop/conf/Configuration.java

@@ -128,17 +128,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
 
   private boolean quietmode = true;
   
-  /**
-   * @deprecated Remove in hadoop-0.16.0 via HADOOP-1843
-   */
-  @Deprecated
-  private ArrayList<Object> defaultResources = new ArrayList<Object>();
-  /**
-   * @deprecated Remove in hadoop-0.16.0 via HADOOP-1843
-   */
-  @Deprecated
-  private ArrayList<Object> finalResources = new ArrayList<Object>();
-  
   /**
    * List of configuration resources.
    */
@@ -164,8 +153,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
     if (LOG.isDebugEnabled()) {
       LOG.debug(StringUtils.stringifyException(new IOException("config()")));
     }
-    defaultResources.add("hadoop-default.xml");
-    finalResources.add("hadoop-site.xml");
+    resources.add("hadoop-default.xml");
+    resources.add("hadoop-site.xml");
   }
 
   /** 
@@ -179,8 +168,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
       LOG.debug(StringUtils.stringifyException
                 (new IOException("config(config)")));
     }
-    this.defaultResources = (ArrayList)other.defaultResources.clone();
-    this.finalResources = (ArrayList)other.finalResources.clone();
     this.resources = (ArrayList)other.resources.clone();
     if (other.properties != null)
       this.properties = (Properties)other.properties.clone();
@@ -189,60 +176,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
     this.finalParameters = new HashSet<String>(other.finalParameters);
   }
 
-  /** 
-   * Add a default resource.
-   * @deprecated Use {@link #addResource(String)} instead  
-   */
-  @Deprecated
-  public void addDefaultResource(String name) {
-    addResource(defaultResources, name);
-  }
-
-  /** 
-   * Add a default resource.
-   * @deprecated Use {@link #addResource(URL)} instead
-   */
-  @Deprecated
-  public void addDefaultResource(URL url) {
-    addResource(defaultResources, url);
-  }
-
-  /** 
-   * Add a default resource.
-   * @deprecated Use {@link #addResource(Path)} instead  
-   */
-  @Deprecated
-  public void addDefaultResource(Path file) {
-    addResource(defaultResources, file);
-  }
-
-  /** 
-   * Add a final resource.
-   * @deprecated Use {@link #addResource(String)} instead
-   */
-  @Deprecated
-  public void addFinalResource(String name) {
-    addResource(finalResources, name);
-  }
-
-  /** 
-   * Add a final resource.
-   * @deprecated Use {@link #addResource(URL)} instead  
-   */
-  @Deprecated
-  public void addFinalResource(URL url) {
-    addResource(finalResources, url);
-  }
-
-  /** 
-   * Add a final resource.
-   * @deprecated Use {@link #addResource(Path)} instead
-   */
-  @Deprecated
-  public void addFinalResource(Path file) {
-    addResource(finalResources, file);
-  }
-
   /**
    * Add a configuration resource. 
    * 
@@ -743,8 +676,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
   private synchronized Properties getProps() {
     if (properties == null) {
       properties = new Properties();
-      loadResources(properties, defaultResources, quietmode);
-      loadResources(properties, finalResources, quietmode);
       loadResources(properties, resources, quietmode);
       if (overlay!= null)
         properties.putAll(overlay);
@@ -956,10 +887,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
   public String toString() {
     StringBuffer sb = new StringBuffer();
     sb.append("Configuration: ");
-    sb.append("defaults: ");
-    toString(defaultResources, sb);
-    sb.append("final: ");
-    toString(finalResources, sb);
+    toString(resources, sb);
     return sb.toString();
   }
 
@@ -967,7 +895,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
     ListIterator i = resources.listIterator();
     while (i.hasNext()) {
       if (i.nextIndex() != 0) {
-        sb.append(" , ");
+        sb.append(", ");
       }
       sb.append(i.next());
     }

src/java/org/apache/hadoop/mapred/JobConf.java

@@ -112,9 +112,7 @@ public class JobConf extends Configuration {
   /**
    * Construct a map/reduce job configuration.
    */
-  public JobConf() {
-	  checkWarnAndLoadMapredDefault();
-  }
+  public JobConf() {}
 
   /** 
    * Construct a map/reduce job configuration.
@@ -122,7 +120,6 @@ public class JobConf extends Configuration {
    * @param exampleClass a class whose containing jar is used as the job's jar.
    */
   public JobConf(Class exampleClass) {
-    checkWarnAndLoadMapredDefault();
     setJarByClass(exampleClass);
   }
   
@@ -133,7 +130,6 @@ public class JobConf extends Configuration {
    */
   public JobConf(Configuration conf) {
     super(conf);
-    checkWarnAndLoadMapredDefault();
   }
 
 
@@ -162,25 +158,9 @@ public class JobConf extends Configuration {
    */
   public JobConf(Path config) {
     super();
-    checkWarnAndLoadMapredDefault();
     addResource(config);
   }
 
-  /**
-   * Checks if <b>mapred-default.xml</b> is on the CLASSPATH, if so
-   * it warns the user and loads it as a {@link Configuration} resource.
-   * 
-   * @deprecated Remove in hadoop-0.16.0 via HADOOP-1843
-   */
-  private void checkWarnAndLoadMapredDefault() {
-    URL mapredDefaultConf = getClassLoader().getResource("mapred-default.xml");
-    if (mapredDefaultConf != null) {
-      LOG.warn("Deprecated resource 'mapred-default.xml' is being loaded, " +
-          "please discontinue its usage!");
-      addResource("mapred-default.xml");
-    }
-  }
-  
   /**
    * Get the user jar for the map-reduce job.
    * 

src/test/org/apache/hadoop/conf/TestConfiguration.java

@@ -185,6 +185,19 @@ public class TestConfiguration extends TestCase {
     //two spaces one after "this", one before "contains"
     assertEquals("this  contains a comment", conf.get("my.comment"));
   }
+  
+  public void testToString() throws IOException {
+    out=new BufferedWriter(new FileWriter(CONFIG));
+    startConfig();
+    endConfig();
+    Path fileResource = new Path(CONFIG);
+    conf.addResource(fileResource);
+    
+    String expectedOutput = 
+      "Configuration: hadoop-default.xml, hadoop-site.xml, " + 
+      fileResource.toString();
+    assertEquals(expectedOutput, conf.toString());
+  }
 
   BufferedWriter out;