You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/03/23 19:59:46 UTC
[3/4] tez git commit: TEZ-2176. Move all logging to slf4j.
Contributed by Vasanth kumar RJ.
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeTracker.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeTracker.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeTracker.java
index d9ff99a..a0be825 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeTracker.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeTracker.java
@@ -22,8 +22,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
@@ -39,7 +39,7 @@ import com.google.common.annotations.VisibleForTesting;
public class AMNodeTracker extends AbstractService implements
EventHandler<AMNodeEvent> {
- static final Log LOG = LogFactory.getLog(AMNodeTracker.class);
+ static final Logger LOG = LoggerFactory.getLogger(AMNodeTracker.class);
private final ConcurrentHashMap<NodeId, AMNode> nodeMap;
private final ConcurrentHashMap<String, Set<NodeId>> blacklistMap;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java b/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
index 440d745..909ac95 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/web/AMWebController.java
@@ -34,8 +34,8 @@ import java.util.Map;
import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.webapp.Controller;
import org.apache.hadoop.yarn.webapp.MimeType;
@@ -50,7 +50,7 @@ import org.apache.tez.dag.records.TezVertexID;
public class AMWebController extends Controller {
- private final static Log LOG = LogFactory.getLog(AMWebController.class);
+ private final static Logger LOG = LoggerFactory.getLogger(AMWebController.class);
// HTTP CORS Response Headers
static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java b/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java
index 4524e60..acb2d63 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java
@@ -24,9 +24,8 @@ import java.net.InetSocketAddress;
import com.google.common.base.Preconditions;
import com.google.inject.name.Names;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.HttpConfig;
import org.apache.hadoop.net.NetUtils;
@@ -42,7 +41,7 @@ public class WebUIService extends AbstractService {
public static final String VERTEX_ID = "vertexID";
public static final String DAG_ID = "dagID";
- private static final Log LOG = LogFactory.getLog(WebUIService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebUIService.class);
private final AppContext context;
private TezAMWebApp tezAMWebApp;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/HistoryEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/HistoryEventHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/history/HistoryEventHandler.java
index e8e45a3..9e275a2 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/HistoryEventHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/HistoryEventHandler.java
@@ -20,8 +20,8 @@ package org.apache.tez.dag.history;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.CompositeService;
import org.apache.tez.common.ReflectionUtils;
@@ -33,7 +33,7 @@ import org.apache.tez.dag.records.TezDAGID;
public class HistoryEventHandler extends CompositeService {
- private static Log LOG = LogFactory.getLog(HistoryEventHandler.class);
+ private static Logger LOG = LoggerFactory.getLogger(HistoryEventHandler.class);
private final AppContext context;
private RecoveryService recoveryService;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
index 8d8af0d..b10a876 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
@@ -23,8 +23,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.common.counters.TezCounters;
import org.apache.tez.dag.api.DagTypeConverters;
import org.apache.tez.dag.app.dag.DAGState;
@@ -41,7 +41,7 @@ import com.google.protobuf.ByteString;
public class DAGFinishedEvent implements HistoryEvent, SummaryEvent {
- private static final Log LOG = LogFactory.getLog(DAGFinishedEvent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGFinishedEvent.class);
private TezDAGID dagID;
private long startTime;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGSubmittedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGSubmittedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGSubmittedEvent.java
index ab122c8..f5d58a9 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGSubmittedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGSubmittedEvent.java
@@ -23,8 +23,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.LocalResource;
@@ -44,7 +44,7 @@ import org.apache.tez.dag.utils.ProtoUtils;
public class DAGSubmittedEvent implements HistoryEvent, SummaryEvent {
- private static final Log LOG = LogFactory.getLog(DAGSubmittedEvent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DAGSubmittedEvent.class);
private static final String CHARSET_NAME = "utf-8";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
index 2b21c89..af529bf 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.common.counters.TezCounters;
import org.apache.tez.dag.api.DagTypeConverters;
import org.apache.tez.dag.api.oldrecords.TaskAttemptState;
@@ -35,7 +35,7 @@ import org.apache.tez.dag.recovery.records.RecoveryProtos.TaskAttemptFinishedPro
public class TaskAttemptFinishedEvent implements HistoryEvent {
- private static final Log LOG = LogFactory.getLog(TaskAttemptFinishedEvent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskAttemptFinishedEvent.class);
private TezTaskAttemptID taskAttemptId;
private String vertexName;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
index c367d5c..fa4f8ca 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.common.counters.TezCounters;
import org.apache.tez.dag.api.oldrecords.TaskState;
import org.apache.tez.dag.history.HistoryEvent;
@@ -34,7 +34,7 @@ import org.apache.tez.dag.recovery.records.RecoveryProtos.TaskFinishedProto;
public class TaskFinishedEvent implements HistoryEvent {
- private static final Log LOG = LogFactory.getLog(TaskFinishedEvent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskFinishedEvent.class);
private TezTaskID taskID;
private String vertexName;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
index d6e0b79..f914165 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
@@ -23,8 +23,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.common.counters.TezCounters;
import org.apache.tez.dag.app.dag.VertexState;
import org.apache.tez.dag.app.dag.impl.VertexStats;
@@ -39,7 +39,7 @@ import org.apache.tez.dag.recovery.records.RecoveryProtos.VertexFinishedProto;
public class VertexFinishedEvent implements HistoryEvent, SummaryEvent {
- private static final Log LOG = LogFactory.getLog(VertexFinishedEvent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(VertexFinishedEvent.class);
private TezVertexID vertexID;
private String vertexName;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexRecoverableEventsGeneratedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexRecoverableEventsGeneratedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexRecoverableEventsGeneratedEvent.java
index a9f1fd2..0310a26 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexRecoverableEventsGeneratedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexRecoverableEventsGeneratedEvent.java
@@ -24,8 +24,8 @@ import java.io.OutputStream;
import java.util.EnumSet;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.common.ProtoConverters;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.HistoryEventType;
@@ -48,7 +48,7 @@ import com.google.common.collect.Lists;
// TODO PreCommit - rename this to VertexRecoverableEventGeneratedEvent
public class VertexRecoverableEventsGeneratedEvent implements HistoryEvent {
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
VertexRecoverableEventsGeneratedEvent.class);
private List<TezEvent> events;
private TezVertexID vertexID;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/logging/impl/SimpleHistoryLoggingService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/logging/impl/SimpleHistoryLoggingService.java b/tez-dag/src/main/java/org/apache/tez/dag/history/logging/impl/SimpleHistoryLoggingService.java
index 145c0e9..8852e02 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/logging/impl/SimpleHistoryLoggingService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/logging/impl/SimpleHistoryLoggingService.java
@@ -23,8 +23,8 @@ import java.util.Random;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -37,7 +37,7 @@ import org.codehaus.jettison.json.JSONObject;
public class SimpleHistoryLoggingService extends HistoryLoggingService {
- private static final Log LOG = LogFactory.getLog(SimpleHistoryLoggingService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleHistoryLoggingService.class);
private Path logFileLocation;
private FileSystem logFileFS;
private FSDataOutputStream outputStream;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java b/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
index 0034feb..23aecaa 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
@@ -28,8 +28,6 @@ import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -44,12 +42,14 @@ import org.apache.tez.dag.history.HistoryEventType;
import org.apache.tez.dag.history.SummaryEvent;
import org.apache.tez.dag.history.events.DAGSubmittedEvent;
import org.apache.tez.dag.records.TezDAGID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
public class RecoveryService extends AbstractService {
- private static final Log LOG = LogFactory.getLog(RecoveryService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RecoveryService.class);
private final AppContext appContext;
public static final String RECOVERY_FATAL_OCCURRED_DIR =
@@ -305,7 +305,7 @@ public class RecoveryService extends AbstractService {
throw ioe;
}
} catch (IOException e) {
- LOG.fatal("Failed to create fatal error flag dir "
+ LOG.error("Failed to create fatal error flag dir "
+ fatalErrorDir.toString(), e);
throw ioe;
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/utils/Simple2LevelVersionComparator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/Simple2LevelVersionComparator.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/Simple2LevelVersionComparator.java
index c36c0d0..ef0ad29 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/Simple2LevelVersionComparator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/Simple2LevelVersionComparator.java
@@ -20,8 +20,8 @@ package org.apache.tez.dag.utils;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Basic class to compare 2 version strings.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory;
*/
public class Simple2LevelVersionComparator {
- private static final Log LOG = LogFactory.getLog(Simple2LevelVersionComparator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Simple2LevelVersionComparator.class);
public static class Version {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/main/java/org/apache/tez/dag/utils/TaskSpecificLaunchCmdOption.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/TaskSpecificLaunchCmdOption.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/TaskSpecificLaunchCmdOption.java
index d164efc..1ec276d 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/TaskSpecificLaunchCmdOption.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/TaskSpecificLaunchCmdOption.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.tez.client.TezClientUtils;
import org.apache.tez.dag.api.TezConfiguration;
@@ -38,7 +38,7 @@ import com.google.common.base.Strings;
* different vertices.
*/
public class TaskSpecificLaunchCmdOption {
- private static final Log LOG = LogFactory.getLog(TaskSpecificLaunchCmdOption.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskSpecificLaunchCmdOption.class);
//To check any characters apart from "a-zA-Z_0-9 : ; , [] space" anywhere in input.
final static Pattern INVALID_TASK_NAME_REGEX = Pattern
@@ -220,4 +220,4 @@ public class TaskSpecificLaunchCmdOption {
}
return taskSet;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java
index 9943232..3390b02 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/MockDAGAppMaster.java
@@ -34,8 +34,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.service.AbstractService;
@@ -85,7 +85,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@SuppressWarnings("unchecked")
public class MockDAGAppMaster extends DAGAppMaster {
- private static final Log LOG = LogFactory.getLog(MockDAGAppMaster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MockDAGAppMaster.class);
MockContainerLauncher containerLauncher;
boolean initFailFlag;
boolean startFailFlag;
@@ -338,7 +338,7 @@ public class MockDAGAppMaster extends DAGAppMaster {
@Override
public void onFailure(Throwable t) {
- LOG.fatal("Unexpected error during processing", t);
+ LOG.error("Unexpected error during processing", t);
Worker.this.cData.remove();
completeOperation();
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
index 82a2391..62aa453 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java
@@ -33,8 +33,8 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -142,7 +142,7 @@ import com.google.protobuf.ByteString;
public class TestDAGImpl {
- private static final Log LOG = LogFactory.getLog(TestDAGImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestDAGImpl.class);
private DAGPlan dagPlan;
private TezDAGID dagId;
private static Configuration conf;
@@ -947,7 +947,7 @@ public class TestDAGImpl {
dispatcher.await();
VertexImpl v2 = (VertexImpl)dagWithCustomEdge.getVertex("vertex2");
- LOG.info(v2.getTasks().size());
+ LOG.info(String.valueOf(v2.getTasks().size()));
Task t1= v2.getTask(0);
TaskAttemptImpl ta1= (TaskAttemptImpl)t1.getAttempt(TezTaskAttemptID.getInstance(t1.getTaskId(), 0));
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
index fb1db0b..1c4b319 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
@@ -31,8 +31,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -77,7 +77,7 @@ import org.junit.Test;
public class TestTaskImpl {
- private static final Log LOG = LogFactory.getLog(TestTaskImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestTaskImpl.class);
private int taskCounter = 0;
private final int partition = 1;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
index 2c6f5e0..a4b3f1f 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
@@ -46,8 +46,8 @@ import java.util.concurrent.locks.ReentrantLock;
import com.google.protobuf.ByteString;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputByteBuffer;
@@ -192,7 +192,7 @@ import org.mockito.stubbing.Answer;
public class TestVertexImpl {
- private static final Log LOG = LogFactory.getLog(TestVertexImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestVertexImpl.class);
private ListeningExecutorService execService;
private boolean useCustomInitializer = false;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexRecovery.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexRecovery.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexRecovery.java
index 664382a..3c658d4 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexRecovery.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexRecovery.java
@@ -28,8 +28,8 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -89,7 +89,7 @@ import com.google.common.collect.Lists;
public class TestVertexRecovery {
- private static final Log LOG = LogFactory.getLog(TestVertexRecovery.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestVertexRecovery.class);
private DrainDispatcher dispatcher;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestContainerReuse.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestContainerReuse.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestContainerReuse.java
index d0d3df8..8fde49b 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestContainerReuse.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestContainerReuse.java
@@ -37,8 +37,8 @@ import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
@@ -100,7 +100,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
public class TestContainerReuse {
- private static final Log LOG = LogFactory.getLog(TestContainerReuse.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestContainerReuse.class);
@BeforeClass
public static void setup() {
@@ -1165,4 +1165,4 @@ public class TestContainerReuse {
return this.dagID;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/app/rm/node/TestAMNodeTracker.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/node/TestAMNodeTracker.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/node/TestAMNodeTracker.java
index bc9ddee..d907ea0 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/node/TestAMNodeTracker.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/node/TestAMNodeTracker.java
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.mock;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.NodeId;
@@ -55,7 +55,7 @@ import com.google.common.collect.Lists;
@SuppressWarnings({ "resource", "rawtypes" })
public class TestAMNodeTracker {
- private static final Log LOG = LogFactory.getLog(TestAMNodeTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestAMNodeTracker.class);
DrainDispatcher dispatcher;
EventHandler eventHandler;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
index 2eb02c1..a91c0f8 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
@@ -22,8 +22,8 @@ import static org.junit.Assert.fail;
import java.nio.ByteBuffer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -73,7 +73,7 @@ import java.util.Map;
public class TestHistoryEventsProtoConversion {
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
TestHistoryEventsProtoConversion.class);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/pom.xml
----------------------------------------------------------------------
diff --git a/tez-examples/pom.xml b/tez-examples/pom.xml
index 0df3275..f4924fb 100644
--- a/tez-examples/pom.xml
+++ b/tez-examples/pom.xml
@@ -64,8 +64,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/HashJoinExample.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/HashJoinExample.java b/tez-examples/src/main/java/org/apache/tez/examples/HashJoinExample.java
index aa0e3ab..403ab04 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/HashJoinExample.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/HashJoinExample.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -73,7 +73,7 @@ import com.google.common.base.Preconditions;
*/
public class HashJoinExample extends TezExampleBase {
- private static final Log LOG = LogFactory.getLog(HashJoinExample.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HashJoinExample.class);
private static final String broadcastOption = "doBroadcast";
private static final String streamingSide = "streamingSide";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/JoinDataGen.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/JoinDataGen.java b/tez-examples/src/main/java/org/apache/tez/examples/JoinDataGen.java
index 684ea5b..b4e8199 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/JoinDataGen.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/JoinDataGen.java
@@ -26,8 +26,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -50,7 +50,7 @@ import com.google.common.base.Preconditions;
public class JoinDataGen extends TezExampleBase {
- private static final Log LOG = LogFactory.getLog(JoinDataGen.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JoinDataGen.class);
private static final String STREAM_OUTPUT_NAME = "streamoutput";
private static final String HASH_OUTPUT_NAME = "hashoutput";
@@ -159,7 +159,7 @@ public class JoinDataGen extends TezExampleBase {
public static class GenDataProcessor extends SimpleMRProcessor {
- private static final Log LOG = LogFactory.getLog(GenDataProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GenDataProcessor.class);
long streamOutputFileSize;
long hashOutputFileSize;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java b/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java
index a8d4ec9..d7fc5ac 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java
@@ -20,8 +20,8 @@ package org.apache.tez.examples;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.NullWritable;
@@ -52,7 +52,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
public class JoinValidate extends TezExampleBase {
- private static final Log LOG = LogFactory.getLog(JoinValidate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JoinValidate.class);
private static final String LHS_INPUT_NAME = "lhsfile";
private static final String RHS_INPUT_NAME = "rhsfile";
@@ -167,7 +167,7 @@ public class JoinValidate extends TezExampleBase {
public static class JoinValidateProcessor extends SimpleProcessor {
- private static final Log LOG = LogFactory.getLog(JoinValidateProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JoinValidateProcessor.class);
public JoinValidateProcessor(ProcessorContext context) {
super(context);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java b/tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
index 5cb8dc8..38591a0 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
@@ -20,8 +20,8 @@ package org.apache.tez.examples;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
@@ -60,7 +60,7 @@ public class OrderedWordCount extends TezExampleBase {
private static String TOKENIZER = WordCount.TOKENIZER;
private static String SUMMATION = WordCount.SUMMATION;
private static String SORTER = "Sorter";
- private static final Log LOG = LogFactory.getLog(OrderedWordCount.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OrderedWordCount.class);
/*
* SumProcessor similar to WordCount except that it writes the count as key and the
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/SimpleSessionExample.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/SimpleSessionExample.java b/tez-examples/src/main/java/org/apache/tez/examples/SimpleSessionExample.java
index d79119c..5aa9603 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/SimpleSessionExample.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/SimpleSessionExample.java
@@ -18,8 +18,8 @@
package org.apache.tez.examples;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.util.ToolRunner;
import org.apache.tez.client.TezClient;
import org.apache.tez.dag.api.DAG;
@@ -37,7 +37,7 @@ import org.apache.tez.dag.api.TezConfiguration;
*/
public class SimpleSessionExample extends TezExampleBase {
- private static final Log LOG = LogFactory.getLog(SimpleSessionExample.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleSessionExample.class);
private static final String enablePrewarmConfig = "simplesessionexample.prewarm";
@Override
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/SortMergeJoinExample.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/SortMergeJoinExample.java b/tez-examples/src/main/java/org/apache/tez/examples/SortMergeJoinExample.java
index 87f569d..1d59a29 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/SortMergeJoinExample.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/SortMergeJoinExample.java
@@ -20,8 +20,8 @@ package org.apache.tez.examples;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -71,7 +71,7 @@ import com.google.common.base.Preconditions;
*/
public class SortMergeJoinExample extends TezExampleBase {
- private static final Log LOG = LogFactory.getLog(SortMergeJoinExample.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SortMergeJoinExample.class);
private static final String input1 = "input1";
private static final String input2 = "input2";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java b/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java
index e172ce9..78b0f28 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java
@@ -27,8 +27,8 @@ import java.util.Set;
import com.google.common.collect.Sets;
import org.apache.commons.cli.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
@@ -48,7 +48,7 @@ import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@InterfaceAudience.Private
public abstract class TezExampleBase extends Configured implements Tool {
- private static final Log LOG = LogFactory.getLog(TezExampleBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezExampleBase.class);
private TezClient tezClientInternal;
protected static final String DISABLE_SPLIT_GROUPING = "disableSplitGrouping";
@@ -121,7 +121,7 @@ public abstract class TezExampleBase extends Configured implements Tool {
* @throws InterruptedException
* @throws IOException
*/
- public int runDag(DAG dag, boolean printCounters, Log logger) throws TezException,
+ public int runDag(DAG dag, boolean printCounters, Logger logger) throws TezException,
InterruptedException, IOException {
tezClientInternal.waitTillReady();
DAGClient dagClient = tezClientInternal.submitDAG(dag);
@@ -230,7 +230,7 @@ public abstract class TezExampleBase extends Configured implements Tool {
* @param tezConf the tez configuration instance to be used while processing the DAG
* @param tezClient the tez client instance to use to run the DAG if any custom monitoring is
* required. Otherwise the utility method {@link #runDag(org.apache.tez.dag.api.DAG,
- * boolean, org.apache.commons.logging.Log)} should be used
+ * boolean, org.slf4j.Logger)} should be used
* @return Zero indicates success, non-zero indicates failure
* @throws IOException
* @throws TezException
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-examples/src/main/java/org/apache/tez/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/tez-examples/src/main/java/org/apache/tez/examples/WordCount.java b/tez-examples/src/main/java/org/apache/tez/examples/WordCount.java
index 358a7f7..6667e77 100644
--- a/tez-examples/src/main/java/org/apache/tez/examples/WordCount.java
+++ b/tez-examples/src/main/java/org/apache/tez/examples/WordCount.java
@@ -20,8 +20,8 @@ package org.apache.tez.examples;
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
@@ -60,7 +60,7 @@ public class WordCount extends TezExampleBase {
static String OUTPUT = "Output";
static String TOKENIZER = "Tokenizer";
static String SUMMATION = "Summation";
- private static final Log LOG = LogFactory.getLog(WordCount.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WordCount.class);
/*
* Example code to write a processor in Tez.
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
index a72c7ef..f2baad0 100644
--- a/tez-mapreduce/pom.xml
+++ b/tez-mapreduce/pom.xml
@@ -73,18 +73,14 @@
<artifactId>hadoop-mapreduce-client-common</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplitsInputFormat.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplitsInputFormat.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplitsInputFormat.java
index a1044f0..ddfb856 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplitsInputFormat.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplitsInputFormat.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.mapred.split;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configurable;
@@ -45,7 +45,7 @@ import com.google.common.base.Preconditions;
public class TezGroupedSplitsInputFormat<K, V>
implements InputFormat<K, V>, Configurable{
- private static final Log LOG = LogFactory.getLog(TezGroupedSplitsInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezGroupedSplitsInputFormat.class);
InputFormat<K, V> wrappedInputFormat;
int desiredNumSplits = 0;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.java
index 1bd2a66..4ef50fd 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezMapredSplitsGrouper.java
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -47,7 +47,7 @@ import com.google.common.base.Preconditions;
@Public
@Evolving
public class TezMapredSplitsGrouper {
- private static final Log LOG = LogFactory.getLog(TezMapredSplitsGrouper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezMapredSplitsGrouper.class);
static class SplitHolder {
InputSplit split;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
index 4a8372a..0d703e0 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -43,7 +43,7 @@ import org.apache.tez.mapreduce.hadoop.MRJobConfig;
@InterfaceStability.Unstable
public class SplitMetaInfoReaderTez {
- public static final Log LOG = LogFactory.getLog(SplitMetaInfoReaderTez.class);
+ public static final Logger LOG = LoggerFactory.getLogger(SplitMetaInfoReaderTez.class);
public static final int META_SPLIT_VERSION = JobSplit.META_SPLIT_VERSION;
public static final byte[] META_SPLIT_FILE_HEADER = JobSplit.META_SPLIT_FILE_HEADER;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
index 58fcf73..f5999b3 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configurable;
@@ -47,7 +47,7 @@ import com.google.common.base.Preconditions;
public class TezGroupedSplitsInputFormat<K, V> extends InputFormat<K, V>
implements Configurable{
- private static final Log LOG = LogFactory.getLog(TezGroupedSplitsInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezGroupedSplitsInputFormat.class);
InputFormat<K, V> wrappedInputFormat;
int desiredNumSplits = 0;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezMapReduceSplitsGrouper.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezMapReduceSplitsGrouper.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezMapReduceSplitsGrouper.java
index b07f42f..6caeba4 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezMapReduceSplitsGrouper.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezMapReduceSplitsGrouper.java
@@ -29,8 +29,8 @@ import java.util.TreeMap;
import javax.annotation.Nullable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -48,7 +48,7 @@ import com.google.common.base.Preconditions;
@Public
@Evolving
public class TezMapReduceSplitsGrouper {
- private static final Log LOG = LogFactory.getLog(TezMapReduceSplitsGrouper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TezMapReduceSplitsGrouper.class);
/**
* Specify the number of splits desired to be created
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
index 47ff04d..09f7dd6 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/ResourceMgrDelegate.java
@@ -23,8 +23,8 @@ import java.net.InetSocketAddress;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -50,7 +50,7 @@ import org.apache.tez.dag.api.TezConstants;
import org.apache.tez.mapreduce.hadoop.MRJobConfig;
public class ResourceMgrDelegate {
- private static final Log LOG = LogFactory.getLog(ResourceMgrDelegate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceMgrDelegate.class);
private YarnConfiguration conf;
private GetNewApplicationResponse application;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java
index 1cba105..9750baf 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/client/YARNRunner.java
@@ -31,8 +31,8 @@ import java.util.TreeMap;
import com.google.common.collect.Maps;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
@@ -126,7 +126,7 @@ import com.google.common.annotations.VisibleForTesting;
@LimitedPrivate("Mapreduce")
public class YARNRunner implements ClientProtocol {
- private static final Log LOG = LogFactory.getLog(YARNRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(YARNRunner.class);
private ResourceMgrDelegate resMgrDelegate;
private ClientCache clientCache;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
index d8bd628..5ad3136 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
@@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.combine;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputBuffer;
@@ -63,7 +63,7 @@ import org.apache.tez.runtime.library.common.sort.impl.IFile.Writer;
@SuppressWarnings({"rawtypes", "unchecked"})
public class MRCombiner implements Combiner {
- private static Log LOG = LogFactory.getLog(MRCombiner.class);
+ private static Logger LOG = LoggerFactory.getLogger(MRCombiner.class);
private final Configuration conf;
private final Class<?> keyClass;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/committer/MROutputCommitter.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/committer/MROutputCommitter.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/committer/MROutputCommitter.java
index 8852363..69237d4 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/committer/MROutputCommitter.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/committer/MROutputCommitter.java
@@ -18,8 +18,8 @@
package org.apache.tez.mapreduce.committer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.mapred.FileOutputCommitter;
import org.apache.hadoop.mapred.JobConf;
@@ -52,7 +52,7 @@ import java.io.IOException;
@Public
public class MROutputCommitter extends OutputCommitter {
- private static final Log LOG = LogFactory.getLog(MROutputCommitter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MROutputCommitter.class);
private org.apache.hadoop.mapreduce.OutputCommitter committer = null;
private JobContext jobContext = null;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
index 884054b..dbc7748 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
@@ -23,8 +23,8 @@ import java.util.List;
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -60,7 +60,7 @@ public class MRInputAMSplitGenerator extends InputInitializer {
private boolean sendSerializedEvents;
- private static final Log LOG = LogFactory.getLog(MRInputAMSplitGenerator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInputAMSplitGenerator.class);
public MRInputAMSplitGenerator(
InputInitializerContext initializerContext) {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
index 1307687..e6b70d2 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
@@ -21,8 +21,8 @@ package org.apache.tez.mapreduce.common;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -57,7 +57,7 @@ import com.google.common.collect.Lists;
@Evolving
public class MRInputSplitDistributor extends InputInitializer {
- private static final Log LOG = LogFactory.getLog(MRInputSplitDistributor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInputSplitDistributor.class);
private boolean sendSerializedEvents;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
index cea05e7..6190628 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.Map;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -47,7 +47,7 @@ import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@Evolving
public class MRHelpers {
- private static final Log LOG = LogFactory.getLog(MRHelpers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRHelpers.class);
/**
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
index baf9a86..7f5e0e3 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRInputHelpers.java
@@ -35,8 +35,8 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.protobuf.ByteString;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability;
@@ -75,7 +75,7 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos;
@Unstable
public class MRInputHelpers {
- private static final Log LOG = LogFactory.getLog(MRInputHelpers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInputHelpers.class);
private static final int SPLIT_SERIALIZED_LENGTH_ESTIMATE = 40;
static final String JOB_SPLIT_RESOURCE_NAME = "job.split";
static final String JOB_SPLIT_METAINFO_RESOURCE_NAME = "job.splitmetainfo";
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
index 2cc09b6..6563a05 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
@@ -27,7 +27,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.logging.Log;
public class MRCounters extends org.apache.hadoop.mapred.Counters {
private final org.apache.tez.common.counters.TezCounters raw;
@@ -112,18 +111,6 @@ public class MRCounters extends org.apache.hadoop.mapred.Counters {
}
@Override
- public void log(Log log) {
- log.info("Counters: " + size());
- for(Group group: this) {
- log.info(" " + group.getDisplayName());
- for (Counter counter: group) {
- log.info(" " + counter.getDisplayName() + "=" +
- counter.getCounter());
- }
- }
- }
-
- @Override
public String makeEscapedCompactString() {
return toEscapedCompactString(this);
}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
index 5c89f0e..2fb1647 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
@@ -28,8 +28,8 @@ import java.util.concurrent.locks.ReentrantLock;
import com.google.protobuf.ByteString;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.conf.Configuration;
@@ -409,7 +409,7 @@ public class MRInput extends MRInputBase {
return configurer;
}
- private static final Log LOG = LogFactory.getLog(MRInput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInput.class);
private final ReentrantLock rrLock = new ReentrantLock();
private final Condition rrInited = rrLock.newCondition();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
index 124289a..d825d53 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
@@ -36,7 +36,7 @@ import org.apache.tez.runtime.api.events.InputDataInformationEvent;
@LimitedPrivate("Hive")
public class MRInputLegacy extends MRInput {
- private static final Log LOG = LogFactory.getLog(MRInputLegacy.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInputLegacy.class);
private InputDataInformationEvent initEvent;
private volatile boolean inited = false;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
index 39dafb8..9596f07 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
@@ -34,8 +34,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.protobuf.ByteString;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
@@ -56,7 +56,7 @@ import org.apache.tez.runtime.library.api.KeyValueReader;
@Evolving
public class MultiMRInput extends MRInputBase {
- private static final Log LOG = LogFactory.getLog(MultiMRInput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultiMRInput.class);
public MultiMRInput(InputContext inputContext, int numPhysicalInputs) {
super(inputContext, numPhysicalInputs);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRInputUtils.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRInputUtils.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRInputUtils.java
index 117ef6f..bc96e38 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRInputUtils.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRInputUtils.java
@@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.lib;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -45,7 +45,7 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
@Private
public class MRInputUtils {
- private static final Log LOG = LogFactory.getLog(MRInputUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRInputUtils.class);
public static TaskSplitMetaInfo[] readSplits(Configuration conf) throws IOException {
TaskSplitMetaInfo[] allTaskSplitMetaInfo;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapReduce.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapReduce.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapReduce.java
index ae982d6..39cd79c 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapReduce.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapReduce.java
@@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.lib;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.util.ReflectionUtils;
@@ -36,7 +36,7 @@ import com.google.common.base.Preconditions;
public class MRReaderMapReduce extends MRReader {
- private static final Log LOG = LogFactory.getLog(MRReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRReader.class);
private final TezCounter inputRecordCounter;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapred.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapred.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapred.java
index 5262c24..c4ad7a4 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapred.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/lib/MRReaderMapred.java
@@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.lib;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.FileSplit;
import org.apache.hadoop.mapred.InputFormat;
@@ -38,7 +38,7 @@ import com.google.common.base.Preconditions;
public class MRReaderMapred extends MRReader {
- private static final Log LOG = LogFactory.getLog(MRReaderMapred.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MRReaderMapred.class);
Object key;
Object value;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
index 88c192d..349a894 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
@@ -30,10 +30,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -301,7 +300,7 @@ public class MROutput extends AbstractLogicalOutput {
return configurer;
}
- private static final Log LOG = LogFactory.getLog(MROutput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MROutput.class);
private final NumberFormat taskNumberFormat = NumberFormat.getInstance();
private final NumberFormat nonTaskNumberFormat = NumberFormat.getInstance();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
index cf16c7c..720af50 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
@@ -18,8 +18,8 @@
package org.apache.tez.mapreduce.partition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.JobConf;
@@ -37,7 +37,7 @@ import org.apache.tez.runtime.library.common.ConfigUtils;
@Public
public class MRPartitioner implements org.apache.tez.runtime.library.api.Partitioner {
- static final Log LOG = LogFactory.getLog(MRPartitioner.class);
+ static final Logger LOG = LoggerFactory.getLogger(MRPartitioner.class);
private final boolean useNewApi;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
index 929d348..ed9f5fc 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
@@ -31,8 +31,8 @@ import javax.crypto.SecretKey;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -88,7 +88,7 @@ import org.apache.tez.runtime.library.common.sort.impl.TezRawKeyValueIterator;
@Private
public abstract class MRTask extends AbstractLogicalIOProcessor {
- static final Log LOG = LogFactory.getLog(MRTask.class);
+ static final Logger LOG = LoggerFactory.getLogger(MRTask.class);
protected JobConf jobConf;
protected JobContext jobContext;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
index 3a13d51..d1ac107 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
@@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.processor;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.tez.mapreduce.output.MROutput;
@@ -40,7 +40,7 @@ import com.google.common.collect.Lists;
@Public
@Evolving
public abstract class SimpleMRProcessor extends SimpleProcessor {
- private static final Log LOG = LogFactory.getLog(SimpleMRProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleMRProcessor.class);
public SimpleMRProcessor(ProcessorContext context) {
super(context);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
index 4b094b9..1a12a21 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.FileSplit;
@@ -56,7 +56,7 @@ import org.apache.tez.runtime.library.output.OrderedPartitionedKVOutput;
@Private
public class MapProcessor extends MRTask{
- private static final Log LOG = LogFactory.getLog(MapProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MapProcessor.class);
public MapProcessor(ProcessorContext processorContext) {
super(processorContext, true);
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
index 1a6a3a4..996cf84 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
@@ -23,8 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.RawComparator;
@@ -58,7 +58,7 @@ import org.apache.tez.runtime.library.output.OrderedPartitionedKVOutput;
@SuppressWarnings({ "unchecked", "rawtypes" })
public class ReduceProcessor extends MRTask {
- private static final Log LOG = LogFactory.getLog(ReduceProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceProcessor.class);
private Counter reduceInputKeyCounter;
private Counter reduceInputValueCounter;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/test/java/org/apache/hadoop/mapred/split/TestGroupedSplits.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/hadoop/mapred/split/TestGroupedSplits.java b/tez-mapreduce/src/test/java/org/apache/hadoop/mapred/split/TestGroupedSplits.java
index 42b5c9f..689ea2c 100644
--- a/tez-mapreduce/src/test/java/org/apache/hadoop/mapred/split/TestGroupedSplits.java
+++ b/tez-mapreduce/src/test/java/org/apache/hadoop/mapred/split/TestGroupedSplits.java
@@ -32,8 +32,8 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
@@ -59,8 +59,8 @@ import com.google.common.collect.Sets;
import static org.mockito.Mockito.*;
public class TestGroupedSplits {
- private static final Log LOG =
- LogFactory.getLog(TestGroupedSplits.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(TestGroupedSplits.class);
private static JobConf defaultConf = new JobConf();
private static FileSystem localFs = null;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilical.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilical.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilical.java
index 9052353..5ae416a 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilical.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilical.java
@@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.runtime.api.impl.EventMetaData;
import org.apache.tez.runtime.api.impl.TezEvent;
@@ -32,7 +32,7 @@ import org.apache.tez.runtime.api.impl.TezUmbilical;
public class TestUmbilical implements TezUmbilical {
- private static final Log LOG = LogFactory.getLog(TestUmbilical.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestUmbilical.class);
private final List<TezEvent> events = Lists.newLinkedList();
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
index 47ec2b7..55f6bff 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
@@ -31,8 +31,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
@@ -59,7 +59,7 @@ import org.junit.Test;
public class TestMultiMRInput {
- private static final Log LOG = LogFactory.getLog(TestMultiMRInput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestMultiMRInput.class);
private static final JobConf defaultConf = new JobConf();
private static final String testTmpDir;
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
index 40bea0f..8841882 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -70,7 +70,7 @@ import com.google.common.collect.HashMultimap;
public class MapUtils {
- private static final Log LOG = LogFactory.getLog(MapUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MapUtils.class);
public static void configureLocalDirs(Configuration conf, String localDir)
throws IOException {
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
index 68d8cef..70f8763 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalDirAllocator;
@@ -64,7 +64,7 @@ import org.junit.Test;
@SuppressWarnings("deprecation")
public class TestMapProcessor {
- private static final Log LOG = LogFactory.getLog(TestMapProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestMapProcessor.class);
private static JobConf defaultConf = new JobConf();
private static FileSystem localFs = null;