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 om...@apache.org on 2008/06/19 09:13:07 UTC
svn commit: r669408 - in /hadoop/core/trunk: ./
src/core/org/apache/hadoop/ipc/ src/core/org/apache/hadoop/metrics/util/
src/mapred/org/apache/hadoop/mapred/ src/test/org/apache/hadoop/dfs/
src/test/org/apache/hadoop/fs/
Author: omalley
Date: Thu Jun 19 00:13:07 2008
New Revision: 669408
URL: http://svn.apache.org/viewvc?rev=669408&view=rev
Log:
HADOOP-3533. Add deprecated methods to provide API compatibility
between 0.18 and 0.17. Remove the deprecated methods in trunk.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/ipc/Client.java
hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java
hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskLog.java
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java
hadoop/core/trunk/src/test/org/apache/hadoop/fs/AccumulatingReducer.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Jun 19 00:13:07 2008
@@ -612,6 +612,9 @@
HADOOP-3586. Provide deprecated, backwards compatibile semantics for the
combiner to be run once and only once on each record. (cdouglas)
+ HADOOP-3533. Add deprecated methods to provide API compatibility
+ between 0.18 and 0.17. Remove the deprecated methods in trunk. (omalley)
+
Release 0.17.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/ipc/Client.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/ipc/Client.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/ipc/Client.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/ipc/Client.java Thu Jun 19 00:13:07 2008
@@ -79,7 +79,7 @@
private int refCount = 1;
final private static String PING_INTERVAL_NAME = "ipc.ping.interval";
- final public static int DEFAULT_PING_INTERVAL = 60000; // 1 min
+ final static int DEFAULT_PING_INTERVAL = 60000; // 1 min
final static int PING_CALL_ID = -1;
/**
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java Thu Jun 19 00:13:07 2008
@@ -32,7 +32,7 @@
*/
public class MetricsIntValue {
- protected static final Log LOG =
+ private static final Log LOG =
LogFactory.getLog("org.apache.hadoop.metrics.util");
private String name;
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java Thu Jun 19 00:13:07 2008
@@ -34,7 +34,7 @@
*/
public class MetricsTimeVaryingInt {
- protected static final Log LOG =
+ private static final Log LOG =
LogFactory.getLog("org.apache.hadoop.metrics.util");
private String name;
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Thu Jun 19 00:13:07 2008
@@ -34,7 +34,7 @@
*/
public class MetricsTimeVaryingRate {
- protected static final Log LOG =
+ private static final Log LOG =
LogFactory.getLog("org.apache.hadoop.metrics.util");
static class Metrics {
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskLog.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskLog.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskLog.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskLog.java Thu Jun 19 00:13:07 2008
@@ -116,7 +116,7 @@
}
}
- public static class Reader extends InputStream {
+ static class Reader extends InputStream {
private long bytesRemaining;
private FileInputStream file;
/**
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/NNBench.java Thu Jun 19 00:13:07 2008
@@ -57,7 +57,6 @@
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapred.TaskTracker;
/**
* This program executes a specified operation that applies load to
@@ -79,7 +78,7 @@
*/
public class NNBench {
- protected static final Log LOG = LogFactory.getLog(
+ private static final Log LOG = LogFactory.getLog(
"org.apache.hadoop.dfs.NNBench");
protected static String CONTROL_DIR_NAME = "control";
@@ -655,7 +654,7 @@
// If the sleep time is greater than 0, then sleep and return
if (sleepTime > 0) {
- TaskTracker.LOG.info("Waiting in barrier for: " + sleepTime + " ms");
+ LOG.info("Waiting in barrier for: " + sleepTime + " ms");
try {
Thread.sleep(sleepTime);
@@ -773,7 +772,7 @@
reporter.setStatus("Finish "+ l + " files");
} catch (IOException e) {
- TaskTracker.LOG.info("Exception recorded in op: " +
+ LOG.info("Exception recorded in op: " +
"Create/Write/Close");
numOfExceptions++;
@@ -816,7 +815,7 @@
reporter.setStatus("Finish "+ l + " files");
} catch (IOException e) {
- TaskTracker.LOG.info("Exception recorded in op: OpenRead " + e);
+ LOG.info("Exception recorded in op: OpenRead " + e);
numOfExceptions++;
}
}
@@ -848,7 +847,7 @@
reporter.setStatus("Finish "+ l + " files");
} catch (IOException e) {
- TaskTracker.LOG.info("Exception recorded in op: Rename");
+ LOG.info("Exception recorded in op: Rename");
numOfExceptions++;
}
@@ -879,7 +878,7 @@
reporter.setStatus("Finish "+ l + " files");
} catch (IOException e) {
- TaskTracker.LOG.info("Exception in recorded op: Delete");
+ LOG.info("Exception in recorded op: Delete");
numOfExceptions++;
}
@@ -897,13 +896,13 @@
protected String hostName;
public NNBenchReducer () {
- TaskTracker.LOG.info("Starting NNBenchReducer !!!");
+ LOG.info("Starting NNBenchReducer !!!");
try {
hostName = java.net.InetAddress.getLocalHost().getHostName();
} catch(Exception e) {
hostName = "localhost";
}
- TaskTracker.LOG.info("Starting NNBenchReducer on " + hostName);
+ LOG.info("Starting NNBenchReducer on " + hostName);
}
/**
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/fs/AccumulatingReducer.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/fs/AccumulatingReducer.java?rev=669408&r1=669407&r2=669408&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/fs/AccumulatingReducer.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/fs/AccumulatingReducer.java Thu Jun 19 00:13:07 2008
@@ -20,13 +20,14 @@
import java.io.IOException;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.UTF8;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.TaskTracker;
/**
* Reducer that accumulates values based on their type.
@@ -46,17 +47,18 @@
*/
public class AccumulatingReducer extends MapReduceBase
implements Reducer<UTF8, UTF8, UTF8, UTF8> {
+ private static final Log LOG = LogFactory.getLog(AccumulatingReducer.class);
protected String hostName;
public AccumulatingReducer () {
- TaskTracker.LOG.info("Starting AccumulatingReducer !!!");
+ LOG.info("Starting AccumulatingReducer !!!");
try {
hostName = java.net.InetAddress.getLocalHost().getHostName();
} catch(Exception e) {
hostName = "localhost";
}
- TaskTracker.LOG.info("Starting AccumulatingReducer on " + hostName);
+ LOG.info("Starting AccumulatingReducer on " + hostName);
}
public void reduce(UTF8 key,