HADOOP-2819. The following methods in JobConf are removed: getInputKeyClass() setInputKeyClass getInputValueClass() setInputValueClass(Class theClass) setSpeculativeExecution getSpeculativeExecution(). Contributed by Amareshwari Sri Ramadasu.

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

CHANGES.txt

@@ -120,6 +120,10 @@ Trunk (unreleased changes)
     StreamLineRecordReader StreamOutputFormat StreamSequenceRecordReader.
     (Amareshwari Sri Ramadasu via ddas)
 
+    HADOOP-2819. The following methods in JobConf are removed:
+    getInputKeyClass() setInputKeyClass getInputValueClass()
+    setInputValueClass(Class theClass) setSpeculativeExecution
+    getSpeculativeExecution() (Amareshwari Sri Ramadasu via ddas)
 
 Release 0.16.1 - Unreleased
 

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

@@ -457,27 +457,6 @@ public class JobConf extends Configuration {
     setClass("mapred.output.format.class", theClass, OutputFormat.class);
   }
 
-  /** @deprecated Call {@link RecordReader#createKey()}. */
-  public Class getInputKeyClass() {
-    return getClass("mapred.input.key.class",
-                    LongWritable.class, WritableComparable.class);
-  }
-
-  /** @deprecated Not used */
-  public void setInputKeyClass(Class theClass) {
-    setClass("mapred.input.key.class", theClass, WritableComparable.class);
-  }
-
-  /** @deprecated Call {@link RecordReader#createValue()}. */
-  public Class getInputValueClass() {
-    return getClass("mapred.input.value.class", Text.class, Writable.class);
-  }
-
-  /** @deprecated Not used */
-  public void setInputValueClass(Class theClass) {
-    setClass("mapred.input.value.class", theClass, Writable.class);
-  }
-  
   /**
    * Should the map outputs be compressed before transfer?
    * Uses the SequenceFile compression.
@@ -827,9 +806,6 @@ public class JobConf extends Configuration {
   }
   
   /**
-   * @deprecated Use {{@link #getMapSpeculativeExecution()} or
-   *             {@link #getReduceSpeculativeExecution()} instead.
-   * 
    * Should speculative execution be used for this job? 
    * Defaults to <code>true</code>.
    * 
@@ -837,20 +813,18 @@ public class JobConf extends Configuration {
    *         <code>false</code> otherwise.
    */
   public boolean getSpeculativeExecution() { 
-    return getBoolean("mapred.speculative.execution", true);
+    return (getMapSpeculativeExecution() || getReduceSpeculativeExecution());
   }
   
   /**
-   * @deprecated Use {@link #setMapSpeculativeExecution(boolean)} or
-   *                 {@link #setReduceSpeculativeExecution(boolean)} instead. 
-   * 
    * Turn speculative execution on or off for this job. 
    * 
    * @param speculativeExecution <code>true</code> if speculative execution 
    *                             should be turned on, else <code>false</code>.
    */
   public void setSpeculativeExecution(boolean speculativeExecution) {
-    setBoolean("mapred.speculative.execution", speculativeExecution);
+    setMapSpeculativeExecution(speculativeExecution);
+    setReduceSpeculativeExecution(speculativeExecution);
   }
 
   /**

src/test/org/apache/hadoop/fs/DFSCIOTest.java

@@ -269,8 +269,6 @@ public class DFSCIOTest extends TestCase {
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(mapperClass);
     job.setReducerClass(AccumulatingReducer.class);

src/test/org/apache/hadoop/fs/DistributedFSCheck.java

@@ -190,8 +190,6 @@ public class DistributedFSCheck extends TestCase {
 
     job.setInputPath(MAP_INPUT_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(DistributedFSCheckMapper.class);
     job.setReducerClass(AccumulatingReducer.class);

src/test/org/apache/hadoop/fs/TestDFSIO.java

@@ -225,8 +225,6 @@ public class TestDFSIO extends TestCase {
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(mapperClass);
     job.setReducerClass(AccumulatingReducer.class);

src/test/org/apache/hadoop/fs/TestFileSystem.java

@@ -205,8 +205,6 @@ public class TestFileSystem extends TestCase {
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(WriteMapper.class);
     job.setReducerClass(LongSumReducer.class);
@@ -305,8 +303,6 @@ public class TestFileSystem extends TestCase {
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(ReadMapper.class);
     job.setReducerClass(LongSumReducer.class);
@@ -403,8 +399,6 @@ public class TestFileSystem extends TestCase {
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
-    job.setInputKeyClass(UTF8.class);
-    job.setInputValueClass(LongWritable.class);
 
     job.setMapperClass(SeekMapper.class);
     job.setReducerClass(LongSumReducer.class);

src/test/org/apache/hadoop/mapred/MRBench.java

@@ -147,7 +147,6 @@ public class MRBench {
     jobConf.setInputFormat(TextInputFormat.class);
     jobConf.setOutputFormat(TextOutputFormat.class);
     
-    jobConf.setInputKeyClass(LongWritable.class);
     jobConf.setOutputValueClass(UTF8.class);
     
     jobConf.setMapOutputKeyClass(UTF8.class);

src/test/org/apache/hadoop/record/TestRecordMR.java

@@ -309,8 +309,6 @@ public class TestRecordMR extends TestCase {
 
     JobConf genJob = new JobConf(conf, TestRecordMR.class);
     genJob.setInputPath(randomIns);
-    genJob.setInputKeyClass(RecInt.class);
-    genJob.setInputValueClass(RecInt.class);
     genJob.setInputFormat(SequenceFileInputFormat.class);
     genJob.setMapperClass(RandomGenMapper.class);
 
@@ -356,8 +354,6 @@ public class TestRecordMR extends TestCase {
     fs.delete(intermediateOuts);
     JobConf checkJob = new JobConf(conf, TestRecordMR.class);
     checkJob.setInputPath(randomOuts);
-    checkJob.setInputKeyClass(RecInt.class);
-    checkJob.setInputValueClass(RecString.class);
     checkJob.setInputFormat(SequenceFileInputFormat.class);
     checkJob.setMapperClass(RandomCheckMapper.class);
 
@@ -381,8 +377,6 @@ public class TestRecordMR extends TestCase {
     fs.delete(finalOuts);
     JobConf mergeJob = new JobConf(conf, TestRecordMR.class);
     mergeJob.setInputPath(intermediateOuts);
-    mergeJob.setInputKeyClass(RecInt.class);
-    mergeJob.setInputValueClass(RecString.class);
     mergeJob.setInputFormat(SequenceFileInputFormat.class);
     mergeJob.setMapperClass(MergeMapper.class);