Repository: hadoop Updated Branches: refs/heads/branch-2 3bb23f4be -> 7d747df52
Revert "MAPREDUCE-6947. Moving logging APIs over to slf4j in hadoop-mapreduce-examples. Contributed by Gergery Novák." This reverts commit e61baf94965e25b6a7ab2264523142d066b490b2. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d747df5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d747df5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d747df5 Branch: refs/heads/branch-2 Commit: 7d747df52d0a5ff77c0694db36c2da816bbe2779 Parents: 3bb23f4 Author: Akira Ajisaka <[email protected]> Authored: Thu Sep 21 11:16:48 2017 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Thu Sep 21 11:16:48 2017 +0900 ---------------------------------------------------------------------- .../java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java | 7 +++---- .../main/java/org/apache/hadoop/examples/DBCountPageView.java | 7 +++---- .../java/org/apache/hadoop/examples/dancing/DancingLinks.java | 7 ++++--- .../src/main/java/org/apache/hadoop/examples/pi/DistSum.java | 6 +++--- .../java/org/apache/hadoop/examples/terasort/TeraGen.java | 6 +++--- .../org/apache/hadoop/examples/terasort/TeraScheduler.java | 7 +++---- .../java/org/apache/hadoop/examples/terasort/TeraSort.java | 6 +++--- .../org/apache/hadoop/examples/terasort/TestTeraSort.java | 6 +++--- 8 files changed, 25 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java index da4ec79..7e98d7d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/BaileyBorweinPlouffe.java @@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +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; @@ -49,8 +51,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; @@ -83,8 +83,7 @@ public class BaileyBorweinPlouffe extends Configured implements Tool { private static final String DIGIT_SIZE_PROPERTY = NAME + ".digit.size"; private static final String DIGIT_PARTS_PROPERTY = NAME + ".digit.parts"; - private static final Logger LOG = - LoggerFactory.getLogger(BaileyBorweinPlouffe.class); + private static final Log LOG = LogFactory.getLog(BaileyBorweinPlouffe.class); /** Mapper class computing digits of Pi. */ public static class BbpMapper extends http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java index 54a5ba4..1ec8739 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/DBCountPageView.java @@ -30,6 +30,8 @@ import java.sql.Statement; import java.util.Iterator; import java.util.Random; +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.io.LongWritable; @@ -48,8 +50,6 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; import org.hsqldb.server.Server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This is a demonstrative program, which uses DBInputFormat for reading @@ -78,8 +78,7 @@ import org.slf4j.LoggerFactory; */ public class DBCountPageView extends Configured implements Tool { - private static final Logger LOG = - LoggerFactory.getLogger(DBCountPageView.class); + private static final Log LOG = LogFactory.getLog(DBCountPageView.class); private Connection connection; private boolean initialized = false; http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java index 537b4d4..94d2c83 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java @@ -19,8 +19,8 @@ package org.apache.hadoop.examples.dancing; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * A generic solver for tile laying problems using Knuth's dancing link @@ -35,7 +35,8 @@ import org.slf4j.LoggerFactory; * The type parameter ColumnName is the class of application's column names. */ public class DancingLinks<ColumnName> { - private static final Logger LOG = LoggerFactory.getLogger(DancingLinks.class); + private static final Log LOG = + LogFactory.getLog(DancingLinks.class.getName()); /** * A cell in the table with up/down and left/right links that form doubly http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/DistSum.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/DistSum.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/DistSum.java index ffe63fe..99f7c24 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/DistSum.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/DistSum.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +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.examples.pi.math.Summation; @@ -53,8 +55,6 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The main class for computing sums using map/reduce jobs. @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * a mix-type job may be executed on either side. */ public final class DistSum extends Configured implements Tool { - private static final Logger LOG = LoggerFactory.getLogger(DistSum.class); + private static final Log LOG = LogFactory.getLog(DistSum.class); private static final String NAME = DistSum.class.getSimpleName(); private static final String N_PARTS = "mapreduce.pi." + NAME + ".nParts"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraGen.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraGen.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraGen.java index 0a21718..22fe344 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraGen.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraGen.java @@ -25,6 +25,8 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.Checksum; +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.Path; @@ -47,8 +49,6 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.PureJavaCrc32; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Generate the official GraySort input data set. @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * <b>bin/hadoop jar hadoop-*-examples.jar teragen 10000000000 in-dir</b> */ public class TeraGen extends Configured implements Tool { - private static final Logger LOG = LoggerFactory.getLogger(TeraGen.class); + private static final Log LOG = LogFactory.getLog(TeraGen.class); public static enum Counters {CHECKSUM} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraScheduler.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraScheduler.java index 7a9e44b..3e12a3d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraScheduler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraScheduler.java @@ -21,18 +21,17 @@ package org.apache.hadoop.examples.terasort; import java.io.*; import java.util.*; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; class TeraScheduler { - private static final Logger LOG = - LoggerFactory.getLogger(TeraScheduler.class); + private static final Log LOG = LogFactory.getLog(TeraScheduler.class); private Split[] splits; private List<Host> hosts = new ArrayList<Host>(); private int slotsPerHost; http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java index 379c9e0..9beff3e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraSort.java @@ -23,6 +23,8 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URI; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; @@ -36,8 +38,6 @@ import org.apache.hadoop.mapreduce.Partitioner; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Generates the sampled split points, launches the job, and waits for it to @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * <b>bin/hadoop jar hadoop-*-examples.jar terasort in-dir out-dir</b> */ public class TeraSort extends Configured implements Tool { - private static final Logger LOG = LoggerFactory.getLogger(TeraSort.class); + private static final Log LOG = LogFactory.getLog(TeraSort.class); /** * A partitioner that splits text keys into roughly equal partitions http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d747df5/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java index b301659..b835a3b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java @@ -20,6 +20,8 @@ package org.apache.hadoop.examples.terasort; import java.io.File; import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.FileAlreadyExistsException; @@ -27,14 +29,12 @@ import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.util.ToolRunner; import org.junit.After; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; public class TestTeraSort extends HadoopTestCase { - private static final Logger LOG = LoggerFactory.getLogger(TestTeraSort.class); + private static Log LOG = LogFactory.getLog(TestTeraSort.class); public TestTeraSort() throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
