You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2008/03/03 13:39:07 UTC
svn commit: r633070 - in /hadoop/core/trunk: ./
src/java/org/apache/hadoop/mapred/ src/test/org/apache/hadoop/fs/
src/test/org/apache/hadoop/mapred/ src/test/org/apache/hadoop/record/
Author: ddas
Date: Mon Mar 3 04:39:06 2008
New Revision: 633070
URL: http://svn.apache.org/viewvc?rev=633070&view=rev
Log:
HADOOP-2819. The following methods in JobConf are removed: getInputKeyClass() setInputKeyClass getInputValueClass() setInputValueClass(Class theClass) setSpeculativeExecution getSpeculativeExecution(). Contributed by Amareshwari Sri Ramadasu.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobConf.java
hadoop/core/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java
hadoop/core/trunk/src/test/org/apache/hadoop/fs/DistributedFSCheck.java
hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestDFSIO.java
hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MRBench.java
hadoop/core/trunk/src/test/org/apache/hadoop/record/TestRecordMR.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Mar 3 04:39:06 2008
@@ -120,6 +120,10 @@
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
Modified: hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobConf.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobConf.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobConf.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/mapred/JobConf.java Mon Mar 3 04:39:06 2008
@@ -457,27 +457,6 @@
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 @@
}
/**
- * @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 @@
* <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);
}
/**
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java Mon Mar 3 04:39:06 2008
@@ -269,8 +269,6 @@
job.setInputPath(CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
- job.setInputKeyClass(UTF8.class);
- job.setInputValueClass(LongWritable.class);
job.setMapperClass(mapperClass);
job.setReducerClass(AccumulatingReducer.class);
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/fs/DistributedFSCheck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/fs/DistributedFSCheck.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/fs/DistributedFSCheck.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/fs/DistributedFSCheck.java Mon Mar 3 04:39:06 2008
@@ -190,8 +190,6 @@
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);
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestDFSIO.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestDFSIO.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestDFSIO.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestDFSIO.java Mon Mar 3 04:39:06 2008
@@ -225,8 +225,6 @@
job.setInputPath(CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
- job.setInputKeyClass(UTF8.class);
- job.setInputValueClass(LongWritable.class);
job.setMapperClass(mapperClass);
job.setReducerClass(AccumulatingReducer.class);
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/fs/TestFileSystem.java Mon Mar 3 04:39:06 2008
@@ -205,8 +205,6 @@
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 @@
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 @@
job.setInputPath(CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
- job.setInputKeyClass(UTF8.class);
- job.setInputValueClass(LongWritable.class);
job.setMapperClass(SeekMapper.class);
job.setReducerClass(LongSumReducer.class);
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MRBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MRBench.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MRBench.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MRBench.java Mon Mar 3 04:39:06 2008
@@ -147,7 +147,6 @@
jobConf.setInputFormat(TextInputFormat.class);
jobConf.setOutputFormat(TextOutputFormat.class);
- jobConf.setInputKeyClass(LongWritable.class);
jobConf.setOutputValueClass(UTF8.class);
jobConf.setMapOutputKeyClass(UTF8.class);
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/record/TestRecordMR.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/record/TestRecordMR.java?rev=633070&r1=633069&r2=633070&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/record/TestRecordMR.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/record/TestRecordMR.java Mon Mar 3 04:39:06 2008
@@ -309,8 +309,6 @@
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 @@
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 @@
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);