http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/OrderedGroupedMergedKVInput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/OrderedGroupedMergedKVInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/OrderedGroupedMergedKVInput.java index 08cf662..9adac54 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/OrderedGroupedMergedKVInput.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/OrderedGroupedMergedKVInput.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.PriorityQueue; 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.classification.InterfaceAudience.Public; import org.apache.hadoop.io.RawComparator; import org.apache.tez.runtime.api.Input; @@ -47,7 +47,7 @@ import org.apache.tez.runtime.library.api.KeyValuesReader; @Public public class OrderedGroupedMergedKVInput extends MergedLogicalInput { - private static final Log LOG = LogFactory.getLog(OrderedGroupedMergedKVInput.class); + private static final Logger LOG = LoggerFactory.getLogger(OrderedGroupedMergedKVInput.class); private final Set<Input> completedInputs = Collections .newSetFromMap(new IdentityHashMap<Input, Boolean>()); @@ -244,4 +244,4 @@ public class OrderedGroupedMergedKVInput extends MergedLogicalInput { } } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/UnorderedKVInput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/UnorderedKVInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/UnorderedKVInput.java index cdc0ac0..6ad58ba 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/UnorderedKVInput.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/UnorderedKVInput.java @@ -24,8 +24,8 @@ import java.util.concurrent.BlockingQueue; 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.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.conf.Configuration; @@ -61,7 +61,7 @@ import com.google.common.base.Preconditions; @Public public class UnorderedKVInput extends AbstractLogicalInput { - private static final Log LOG = LogFactory.getLog(UnorderedKVInput.class); + private static final Logger LOG = LoggerFactory.getLogger(UnorderedKVInput.class); private Configuration conf; private ShuffleManager shuffleManager; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/OrderedPartitionedKVOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/OrderedPartitionedKVOutput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/OrderedPartitionedKVOutput.java index 90147ca..01df311 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/OrderedPartitionedKVOutput.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/OrderedPartitionedKVOutput.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.annotations.VisibleForTesting; 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; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.conf.Configuration; @@ -57,7 +57,7 @@ import com.google.common.base.Preconditions; @Public public class OrderedPartitionedKVOutput extends AbstractLogicalOutput { - private static final Log LOG = LogFactory.getLog(OrderedPartitionedKVOutput.class); + private static final Logger LOG = LoggerFactory.getLogger(OrderedPartitionedKVOutput.class); protected ExternalSorter sorter; protected Configuration conf; @@ -217,4 +217,4 @@ public class OrderedPartitionedKVOutput extends AbstractLogicalOutput { public static Set<String> getConfigurationKeySet() { return Collections.unmodifiableSet(confKeys); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedKVOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedKVOutput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedKVOutput.java index 2911f0d..f455ffb 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedKVOutput.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedKVOutput.java @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.List; 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.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; @@ -61,7 +61,7 @@ import com.google.protobuf.ByteString; @Public public class UnorderedKVOutput extends AbstractLogicalOutput { - private static final Log LOG = LogFactory.getLog(UnorderedKVOutput.class); + private static final Logger LOG = LoggerFactory.getLogger(UnorderedKVOutput.class); private FileBasedKVWriter kvWriter; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedPartitionedKVOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedPartitionedKVOutput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedPartitionedKVOutput.java index 9053507..af66c62 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedPartitionedKVOutput.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/output/UnorderedPartitionedKVOutput.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.base.Preconditions; -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.conf.Configuration; @@ -51,7 +51,7 @@ import org.apache.tez.runtime.library.common.writers.UnorderedPartitionedKVWrite @Public public class UnorderedPartitionedKVOutput extends AbstractLogicalOutput { - private static final Log LOG = LogFactory.getLog(UnorderedPartitionedKVOutput.class); + private static final Logger LOG = LoggerFactory.getLogger(UnorderedPartitionedKVOutput.class); private Configuration conf; private MemoryUpdateCallbackHandler memoryUpdateCallbackHandler; @@ -134,4 +134,4 @@ public class UnorderedPartitionedKVOutput extends AbstractLogicalOutput { public static Set<String> getConfigurationKeySet() { return Collections.unmodifiableSet(confKeys); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/processor/SleepProcessor.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/processor/SleepProcessor.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/processor/SleepProcessor.java index 1b9ea11..1122bbe 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/processor/SleepProcessor.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/processor/SleepProcessor.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import com.google.common.base.Charsets; -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.tez.dag.api.UserPayload; import org.apache.tez.runtime.api.AbstractLogicalIOProcessor; @@ -44,7 +44,7 @@ import org.apache.tez.runtime.api.ProcessorContext; @Private public class SleepProcessor extends AbstractLogicalIOProcessor { - private static final Log LOG = LogFactory.getLog(SleepProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(SleepProcessor.class); private int timeToSleepMS; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/resources/WeightedScalingMemoryDistributor.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/resources/WeightedScalingMemoryDistributor.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/resources/WeightedScalingMemoryDistributor.java index 9f359de..a0f834e 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/resources/WeightedScalingMemoryDistributor.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/resources/WeightedScalingMemoryDistributor.java @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.List; 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.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Unstable; @@ -59,7 +59,7 @@ import com.google.common.collect.Maps; @Unstable public class WeightedScalingMemoryDistributor implements InitialMemoryAllocator { - private static final Log LOG = LogFactory.getLog(WeightedScalingMemoryDistributor.class); + private static final Logger LOG = LoggerFactory.getLogger(WeightedScalingMemoryDistributor.class); static final double MAX_ADDITIONAL_RESERVATION_FRACTION_PER_IO = 0.1d; static final double RESERVATION_FRACTION_PER_IO = 0.015d; @@ -301,4 +301,4 @@ public class WeightedScalingMemoryDistributor implements InitialMemoryAllocator private RequestType requestType; private int requestWeight; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestValuesIterator.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestValuesIterator.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestValuesIterator.java index 9794ac8..c483a81 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestValuesIterator.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestValuesIterator.java @@ -6,8 +6,8 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; 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.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FSDataOutputStream; @@ -88,7 +88,7 @@ import static org.mockito.Mockito.mock; @RunWith(Parameterized.class) public class TestValuesIterator { - private static final Log LOG = LogFactory.getLog(TestValuesIterator.class); + private static final Logger LOG = LoggerFactory.getLogger(TestValuesIterator.class); static final String TEZ_BYTES_SERIALIZATION = TezBytesWritableSerialization.class.getName(); http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java index fb887bf..292e912 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java @@ -22,15 +22,15 @@ import static org.junit.Assert.assertTrue; import java.nio.charset.Charset; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.io.BytesWritable; import org.junit.After; import org.junit.Before; import org.junit.Test; public class TestProxyComparator { - private static final Log LOG = LogFactory.getLog(TestProxyComparator.class); + private static final Logger LOG = LoggerFactory.getLogger(TestProxyComparator.class); final static String[] keys = { "", http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java index a125378..ffa9429 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.UUID; -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.common.TezRuntimeFrameworkConfigs; import org.apache.tez.runtime.library.api.TezRuntimeConfiguration; @@ -34,7 +34,7 @@ import org.junit.Test; public class TestSimpleFetchedInputAllocator { - private static final Log LOG = LogFactory.getLog(TestSimpleFetchedInputAllocator.class); + private static final Logger LOG = LoggerFactory.getLogger(TestSimpleFetchedInputAllocator.class); @Test(timeout = 5000) public void testInMemAllocation() throws IOException { http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java index 782f261..2e826d8 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java @@ -42,8 +42,8 @@ import java.net.URL; import java.util.Arrays; 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.fs.Path; import org.apache.tez.common.counters.TezCounters; @@ -70,7 +70,7 @@ public class TestFetcher { public static final String HOST = "localhost"; public static final int PORT = 0; - static final Log LOG = LogFactory.getLog(TestFetcher.class); + static final Logger LOG = LoggerFactory.getLogger(TestFetcher.class); @Test(timeout = 5000) public void testSetupLocalDiskFetch() throws Exception { http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java index 9be75f8..094237a 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java @@ -28,8 +28,8 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; -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; @@ -54,7 +54,7 @@ import org.junit.Test; public class TestMergeManager { - private static final Log LOG = LogFactory.getLog(TestMergeManager.class); + private static final Logger LOG = LoggerFactory.getLogger(TestMergeManager.class); private static Configuration defaultConf = new TezConfiguration(); private static FileSystem localFs = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java index 558461a..1c269bd 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java @@ -25,8 +25,8 @@ import java.util.LinkedList; 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.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -57,7 +57,7 @@ import static org.junit.Assert.*; public class TestIFile { - private static final Log LOG = LogFactory.getLog(TestIFile.class); + private static final Logger LOG = LoggerFactory.getLogger(TestIFile.class); private static Configuration defaultConf = new Configuration(); private static FileSystem localFs = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestTezMerger.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestTezMerger.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestTezMerger.java index 1e14b9b..bb932f2 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestTezMerger.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestTezMerger.java @@ -24,8 +24,8 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.TreeMultimap; -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; @@ -56,7 +56,7 @@ import static org.junit.Assert.assertTrue; public class TestTezMerger { - private static final Log LOG = LogFactory.getLog(TestTezMerger.class); + private static final Logger LOG = LoggerFactory.getLogger(TestTezMerger.class); private static Configuration defaultConf = new Configuration(); private static FileSystem localFs = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java index 995eee6..9b1318c 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/writers/TestUnorderedPartitionedKVWriter.java @@ -46,8 +46,8 @@ import java.util.Set; import java.util.UUID; 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.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; @@ -97,7 +97,7 @@ import org.mockito.stubbing.Answer; @RunWith(value = Parameterized.class) public class TestUnorderedPartitionedKVWriter { - private static final Log LOG = LogFactory.getLog(TestUnorderedPartitionedKVWriter.class); + private static final Logger LOG = LoggerFactory.getLogger(TestUnorderedPartitionedKVWriter.class); private static final String HOST_STRING = "localhost"; private static final int SHUFFLE_PORT = 4000; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java index 1f78cbd..4d9001d 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; 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.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -67,7 +67,7 @@ import org.junit.Test; public class TestOnFileUnorderedKVOutput { - private static final Log LOG = LogFactory.getLog(TestOnFileUnorderedKVOutput.class); + private static final Logger LOG = LoggerFactory.getLogger(TestOnFileUnorderedKVOutput.class); private static Configuration defaultConf = new Configuration(); private static FileSystem localFs = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml index 57c148c..1b3378c 100644 --- a/tez-tests/pom.xml +++ b/tez-tests/pom.xml @@ -104,8 +104,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>junit</groupId> http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/BroadcastLoadGen.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/BroadcastLoadGen.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/BroadcastLoadGen.java index d72cf22..d9b89c1 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/BroadcastLoadGen.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/BroadcastLoadGen.java @@ -22,8 +22,8 @@ import java.nio.ByteBuffer; import java.util.Random; 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.io.IntWritable; import org.apache.hadoop.io.NullWritable; @@ -49,7 +49,7 @@ import com.google.common.base.Preconditions; public class BroadcastLoadGen extends TezExampleBase { - private static final Log LOG = LogFactory.getLog(RPCLoadGen.class); + private static final Logger LOG = LoggerFactory.getLogger(RPCLoadGen.class); public static class InputGenProcessor extends SimpleProcessor { @@ -146,4 +146,4 @@ public class BroadcastLoadGen extends TezExampleBase { int res = ToolRunner.run(new Configuration(), new BroadcastLoadGen(), args); System.exit(res); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java index f45b3d6..36215a4 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java @@ -26,8 +26,6 @@ import java.util.TreeMap; import java.util.UUID; import org.apache.commons.cli.ParseException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileStatus; @@ -76,12 +74,14 @@ import org.apache.tez.mapreduce.hadoop.MRInputHelpers; import org.apache.tez.mapreduce.input.MRInputLegacy; import org.apache.tez.mapreduce.output.MROutput; import org.apache.tez.runtime.library.conf.UnorderedKVEdgeConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; public class FilterLinesByWord extends Configured implements Tool { - private static Log LOG = LogFactory.getLog(FilterLinesByWord.class); + private static Logger LOG = LoggerFactory.getLogger(FilterLinesByWord.class); public static final String FILTER_PARAM_NAME = "tez.runtime.examples.filterbyword.word"; @@ -240,7 +240,7 @@ public class FilterLinesByWord extends Configured implements Tool { } dagStatus = dagClient.getDAGStatus(null); } catch (TezException e) { - LOG.fatal("Failed to get application progress. Exiting"); + LOG.error("Failed to get application progress. Exiting"); return -1; } } http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java index 49cb30b..0020503 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java @@ -23,8 +23,6 @@ import java.util.TreeMap; import java.util.UUID; import org.apache.commons.cli.ParseException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileStatus; @@ -69,10 +67,12 @@ import org.apache.tez.mapreduce.hadoop.MRInputHelpers; import org.apache.tez.mapreduce.input.MRInputLegacy; import org.apache.tez.mapreduce.output.MROutput; import org.apache.tez.runtime.library.conf.UnorderedKVEdgeConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FilterLinesByWordOneToOne extends Configured implements Tool { - private static Log LOG = LogFactory.getLog(FilterLinesByWordOneToOne.class); + private static Logger LOG = LoggerFactory.getLogger(FilterLinesByWordOneToOne.class); public static final String FILTER_PARAM_NAME = "tez.runtime.examples.filterbyword.word"; @@ -231,7 +231,7 @@ public class FilterLinesByWordOneToOne extends Configured implements Tool { } dagStatus = dagClient.getDAGStatus(null); } catch (TezException e) { - LOG.fatal("Failed to get application progress. Exiting"); + LOG.error("Failed to get application progress. Exiting"); return -1; } } http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/GroupByOrderByMRRTest.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/GroupByOrderByMRRTest.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/GroupByOrderByMRRTest.java index 393faea..8e88b14 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/GroupByOrderByMRRTest.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/GroupByOrderByMRRTest.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.StringTokenizer; 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.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileAlreadyExistsException; @@ -98,7 +98,7 @@ import org.apache.tez.runtime.library.partitioner.HashPartitioner; */ public class GroupByOrderByMRRTest extends Configured implements Tool { - private static final Log LOG = LogFactory.getLog(GroupByOrderByMRRTest.class); + private static final Logger LOG = LoggerFactory.getLogger(GroupByOrderByMRRTest.class); /** * Mapper takes in a single line as input containing http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java index bbb4d64..dc5847c 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MRRSleepJob.java @@ -28,8 +28,8 @@ import java.util.Map; 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.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileStatus; @@ -97,7 +97,7 @@ import org.apache.tez.runtime.library.partitioner.HashPartitioner; */ public class MRRSleepJob extends Configured implements Tool { - private static final Log LOG = LogFactory.getLog(MRRSleepJob.class); + private static final Logger LOG = LoggerFactory.getLogger(MRRSleepJob.class); public static final String MAP_SLEEP_COUNT = "mrr.sleepjob.map.sleep.count"; public static final String REDUCE_SLEEP_COUNT = http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MapredWordCount.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MapredWordCount.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MapredWordCount.java index 91a502a..49b6d79 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MapredWordCount.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/MapredWordCount.java @@ -26,8 +26,8 @@ import java.util.Iterator; import java.util.List; 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.Configured; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IntWritable; @@ -56,7 +56,7 @@ import org.apache.hadoop.util.ToolRunner; */ public class MapredWordCount extends Configured implements Tool { - private static final Log LOG = LogFactory.getLog(MapredWordCount.class); + private static final Logger LOG = LoggerFactory.getLogger(MapredWordCount.class); /** * Counts the words in each line. http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/RPCLoadGen.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/RPCLoadGen.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/RPCLoadGen.java index 9caab18..6b8bd0d 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/RPCLoadGen.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/RPCLoadGen.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Random; import com.google.common.base.Stopwatch; -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.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -52,7 +52,7 @@ import sun.misc.IOUtils; public class RPCLoadGen extends TezExampleBase { - private static final Log LOG = LogFactory.getLog(RPCLoadGen.class); + private static final Logger LOG = LoggerFactory.getLogger(RPCLoadGen.class); private static final String VIA_RPC = "viaRpc"; private static final byte VIA_RPC_BYTE = (byte) 0x00; @@ -215,4 +215,4 @@ public class RPCLoadGen extends TezExampleBase { int res = ToolRunner.run(new Configuration(), new RPCLoadGen(), args); System.exit(res); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java index 3efc5d8..92e3a53 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java @@ -29,8 +29,6 @@ import java.util.StringTokenizer; import java.util.TreeMap; import org.apache.commons.cli.ParseException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; @@ -78,6 +76,8 @@ import org.apache.tez.mapreduce.processor.reduce.ReduceProcessor; import org.apache.tez.runtime.library.api.TezRuntimeConfiguration; import org.apache.tez.runtime.library.conf.OrderedPartitionedKVEdgeConfig; import org.apache.tez.runtime.library.partitioner.HashPartitioner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; @@ -94,7 +94,7 @@ import com.google.common.collect.Maps; */ public class TestOrderedWordCount extends Configured implements Tool { - private static Log LOG = LogFactory.getLog(TestOrderedWordCount.class); + private static Logger LOG = LoggerFactory.getLogger(TestOrderedWordCount.class); private static final String DAG_VIEW_ACLS = "tez.testorderedwordcount.view-acls"; private static final String DAG_MODIFY_ACLS = "tez.testorderedwordcount.modify-acls"; @@ -509,7 +509,7 @@ public class TestOrderedWordCount extends Configured implements Tool { } dagStatus = dagClient.getDAGStatus(statusGetOpts); } catch (TezException e) { - LOG.fatal("Failed to get application progress. Exiting"); + LOG.error("Failed to get application progress. Exiting"); return -1; } } http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordInputProcessor.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordInputProcessor.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordInputProcessor.java index cb2c5f1..884808e 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordInputProcessor.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordInputProcessor.java @@ -21,8 +21,8 @@ package org.apache.tez.mapreduce.examples.processor; 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.io.LongWritable; import org.apache.hadoop.io.Text; @@ -43,7 +43,7 @@ import org.apache.tez.runtime.library.output.UnorderedKVOutput; public class FilterByWordInputProcessor extends AbstractLogicalIOProcessor { - private static final Log LOG = LogFactory.getLog(FilterByWordInputProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(FilterByWordInputProcessor.class); private String filterWord; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordOutputProcessor.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordOutputProcessor.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordOutputProcessor.java index 1da1f29..15c17fc 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordOutputProcessor.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/processor/FilterByWordOutputProcessor.java @@ -20,8 +20,8 @@ package org.apache.tez.mapreduce.examples.processor; 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.mapreduce.output.MROutput; import org.apache.tez.mapreduce.processor.SimpleMRProcessor; import org.apache.tez.mapreduce.processor.map.MapProcessor; @@ -36,7 +36,7 @@ import org.apache.tez.runtime.library.input.UnorderedKVInput; public class FilterByWordOutputProcessor extends SimpleMRProcessor { - private static final Log LOG = LogFactory.getLog(MapProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(MapProcessor.class); public FilterByWordOutputProcessor(ProcessorContext context) { super(context); http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobs.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobs.java b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobs.java index f98f392..9ab4d34 100644 --- a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobs.java +++ b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobs.java @@ -21,8 +21,8 @@ package org.apache.tez.mapreduce; import java.io.File; 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.RandomTextWriterJob; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; @@ -47,7 +47,7 @@ import org.junit.Test; public class TestMRRJobs { - private static final Log LOG = LogFactory.getLog(TestMRRJobs.class); + private static final Logger LOG = LoggerFactory.getLogger(TestMRRJobs.class); protected static MiniTezCluster mrrTezCluster; protected static MiniDFSCluster dfsCluster; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java index c32d311..5663e62 100644 --- a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java +++ b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java @@ -46,8 +46,8 @@ import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import javax.tools.ToolProvider; -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.FileStatus; @@ -135,7 +135,7 @@ import com.google.common.collect.Sets; public class TestMRRJobsDAGApi { - private static final Log LOG = LogFactory.getLog(TestMRRJobsDAGApi.class); + private static final Logger LOG = LoggerFactory.getLogger(TestMRRJobsDAGApi.class); protected static MiniTezCluster mrrTezCluster; protected static MiniDFSCluster dfsCluster; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java b/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java index 1f747b9..d7319c5 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java +++ b/tez-tests/src/test/java/org/apache/tez/test/MiniTezCluster.java @@ -28,8 +28,8 @@ import java.util.Iterator; import java.util.List; 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.CommonConfigurationKeys; import org.apache.hadoop.fs.FileContext; @@ -66,7 +66,7 @@ public class MiniTezCluster extends MiniYARNCluster { public static final String APPJAR = JarFinder.getJar(DAGAppMaster.class); - private static final Log LOG = LogFactory.getLog(MiniTezCluster.class); + private static final Logger LOG = LoggerFactory.getLogger(MiniTezCluster.class); private static final String YARN_CLUSTER_CONFIG = "yarn-site.xml"; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java index 7ddfe59..b020055 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java @@ -27,8 +27,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.FileSystem; import org.apache.hadoop.fs.Path; @@ -83,7 +83,7 @@ import com.google.common.collect.Lists; public class TestAMRecovery { - private static final Log LOG = LogFactory.getLog(TestAMRecovery.class); + private static final Logger LOG = LoggerFactory.getLogger(TestAMRecovery.class); private static Configuration conf = new Configuration(); private static TezConfiguration tezConf; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery.java b/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery.java index 35e6dcd..a5f4025 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery.java @@ -18,8 +18,8 @@ package org.apache.tez.test; -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; @@ -62,7 +62,7 @@ import java.util.Random; public class TestDAGRecovery { - private static final Log LOG = LogFactory.getLog(TestDAGRecovery.class); + private static final Logger LOG = LoggerFactory.getLogger(TestDAGRecovery.class); private static Configuration conf = new Configuration(); private static MiniTezCluster miniTezCluster = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery2.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery2.java b/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery2.java index 4975e0f..02f93c9 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery2.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestDAGRecovery2.java @@ -19,8 +19,8 @@ package org.apache.tez.test; 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.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -51,7 +51,7 @@ import java.util.Random; public class TestDAGRecovery2 { - private static final Log LOG = LogFactory.getLog(TestDAGRecovery2.class); + private static final Logger LOG = LoggerFactory.getLogger(TestDAGRecovery2.class); private static Configuration conf = new Configuration(); private static MiniTezCluster miniTezCluster = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestExceptionPropagation.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestExceptionPropagation.java b/tez-tests/src/test/java/org/apache/tez/test/TestExceptionPropagation.java index bb9888a..70be21b 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestExceptionPropagation.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestExceptionPropagation.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Set; 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.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -94,8 +94,8 @@ import com.google.common.collect.Lists; public class TestExceptionPropagation { - private static final Log LOG = LogFactory - .getLog(TestExceptionPropagation.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestExceptionPropagation.class); private static TezConfiguration tezConf; private static Configuration conf = new Configuration(); http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java index 6750b4f..ac39a87 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java @@ -21,8 +21,8 @@ package org.apache.tez.test; import java.io.IOException; 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 org.junit.BeforeClass; import org.junit.Test; public class TestFaultTolerance { - private static final Log LOG = LogFactory.getLog(TestFaultTolerance.class); + private static final Logger LOG = LoggerFactory.getLogger(TestFaultTolerance.class); private static Configuration conf = new Configuration(); private static MiniTezCluster miniTezCluster; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestInput.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java index 1205d41..68ac8e0 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -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.common.TezUtils; import org.apache.tez.dag.api.InputDescriptor; @@ -54,8 +54,8 @@ import com.google.common.collect.Sets; * by the name of the vertex that executes this input. */ public class TestInput extends AbstractLogicalInput { - private static final Log LOG = LogFactory - .getLog(TestInput.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestInput.class); Configuration conf; int numCompletedInputs = 0; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestOutput.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestOutput.java b/tez-tests/src/test/java/org/apache/tez/test/TestOutput.java index 8998c3c..737f8e7 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestOutput.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestOutput.java @@ -22,8 +22,8 @@ import java.nio.ByteBuffer; import java.util.Collections; 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.dag.api.OutputDescriptor; import org.apache.tez.dag.api.UserPayload; import org.apache.tez.runtime.api.AbstractLogicalOutput; @@ -35,7 +35,7 @@ import org.apache.tez.runtime.api.events.DataMovementEvent; import com.google.common.collect.Lists; public class TestOutput extends AbstractLogicalOutput { - private static final Log LOG = LogFactory.getLog(TestOutput.class); + private static final Logger LOG = LoggerFactory.getLogger(TestOutput.class); public TestOutput(OutputContext outputContext, int numPhysicalOutputs) { super(outputContext, numPhysicalOutputs); http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestProcessor.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestProcessor.java b/tez-tests/src/test/java/org/apache/tez/test/TestProcessor.java index 90a4f13..43777bc 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestProcessor.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestProcessor.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; 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.tez.common.TezUtils; import org.apache.tez.dag.api.ProcessorDescriptor; @@ -46,8 +46,8 @@ import com.google.common.collect.Sets; * doRead() on all inputs to let them fail. */ public class TestProcessor extends AbstractLogicalIOProcessor { - private static final Log LOG = LogFactory - .getLog(TestProcessor.class); + private static final Logger LOG = LoggerFactory + .getLogger(TestProcessor.class); Configuration conf; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java b/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java index 407af45..3fe249c 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java @@ -39,8 +39,8 @@ import java.util.concurrent.locks.ReentrantLock; import com.google.common.base.Preconditions; 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.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -92,7 +92,7 @@ import org.junit.Test; */ public class TestTezJobs { - private static final Log LOG = LogFactory.getLog(TestTezJobs.class); + private static final Logger LOG = LoggerFactory.getLogger(TestTezJobs.class); protected static MiniTezCluster mrrTezCluster; protected static MiniDFSCluster dfsCluster; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tests/src/test/java/org/apache/tez/test/dag/MultiAttemptDAG.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/dag/MultiAttemptDAG.java b/tez-tests/src/test/java/org/apache/tez/test/dag/MultiAttemptDAG.java index ab2fef8..7244d8d 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/dag/MultiAttemptDAG.java +++ b/tez-tests/src/test/java/org/apache/tez/test/dag/MultiAttemptDAG.java @@ -23,8 +23,8 @@ import com.google.common.primitives.Ints; 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.Resource; import org.apache.tez.common.TezUtils; @@ -70,8 +70,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class MultiAttemptDAG { - private static final Log LOG = - LogFactory.getLog(MultiAttemptDAG.class); + private static final Logger LOG = + LoggerFactory.getLogger(MultiAttemptDAG.class); static Resource defaultResource = Resource.newInstance(100, 0); public static String MULTI_ATTEMPT_DAG_VERTEX_NUM_TASKS = http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileLoader.java ---------------------------------------------------------------------- diff --git a/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileLoader.java b/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileLoader.java index 9abe578..7fbcbf6 100644 --- a/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileLoader.java +++ b/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileLoader.java @@ -19,8 +19,8 @@ package org.apache.tez.tools; import com.google.common.base.Objects; -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.Path; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputFormat; @@ -55,7 +55,7 @@ import java.util.regex.Pattern; */ public class TFileLoader extends FileInputLoadFunc implements LoadMetadata { - private static final Log LOG = LogFactory.getLog(TFileLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(TFileLoader.class); private TFileRecordReader recReader = null; http://git-wip-us.apache.org/repos/asf/tez/blob/6d0b10a8/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileRecordReader.java ---------------------------------------------------------------------- diff --git a/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileRecordReader.java b/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileRecordReader.java index 16625bb..70c0ee1 100644 --- a/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileRecordReader.java +++ b/tez-tools/tez-tfile-parser/src/main/java/org/apache/tez/tools/TFileRecordReader.java @@ -19,8 +19,8 @@ package org.apache.tez.tools; import org.apache.commons.io.IOUtils; -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.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -39,7 +39,7 @@ import java.io.IOException; */ public class TFileRecordReader extends RecordReader<Text, Text> { - private static final Log LOG = LogFactory.getLog(TFileRecordReader.class); + private static final Logger LOG = LoggerFactory.getLogger(TFileRecordReader.class); private long start, end;
