From e44d0d8083e5d4087f1c3a32058daa779c1d3fbb Mon Sep 17 00:00:00 2001 From: Enis Soztutar Date: Thu, 27 Mar 2014 00:54:15 +0000 Subject: [PATCH] HBASE-10842 Some loggers not declared static final (Richard Ding) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1582142 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/mapred/HRegionPartitioner.java | 2 +- .../java/org/apache/hadoop/hbase/mapred/TableInputFormat.java | 2 +- .../org/apache/hadoop/hbase/mapred/TableInputFormatBase.java | 2 +- .../org/apache/hadoop/hbase/mapred/TableOutputFormat.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TableInputFormat.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java | 2 +- .../java/org/apache/hadoop/hbase/master/OfflineCallback.java | 4 ++-- .../org/apache/hadoop/hbase/util/RegionSizeCalculator.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/HRegionPartitioner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/HRegionPartitioner.java index 76729db0418..b6419b81aa1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/HRegionPartitioner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/HRegionPartitioner.java @@ -45,7 +45,7 @@ import org.apache.hadoop.mapred.Partitioner; @InterfaceStability.Stable public class HRegionPartitioner implements Partitioner { - private final Log LOG = LogFactory.getLog(TableInputFormat.class); + private static final Log LOG = LogFactory.getLog(HRegionPartitioner.class); private HTable table; private byte[][] startKeys; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java index cf90165396b..020bc743137 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java @@ -41,7 +41,7 @@ import org.apache.hadoop.util.StringUtils; @InterfaceStability.Stable public class TableInputFormat extends TableInputFormatBase implements JobConfigurable { - private final Log LOG = LogFactory.getLog(TableInputFormat.class); + private static final Log LOG = LogFactory.getLog(TableInputFormat.class); /** * space delimited list of columns diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java index 95b6f284e71..ed4cf34b361 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java @@ -70,7 +70,7 @@ import org.apache.hadoop.mapred.Reporter; @InterfaceStability.Stable public abstract class TableInputFormatBase implements InputFormat { - final Log LOG = LogFactory.getLog(TableInputFormatBase.class); + private static final Log LOG = LogFactory.getLog(TableInputFormatBase.class); private byte [][] inputColumns; private HTable table; private TableRecordReader tableRecordReader; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java index fe9cfc34c13..327e4045350 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java @@ -48,7 +48,7 @@ FileOutputFormat { /** JobConf parameter that specifies the output table */ public static final String OUTPUT_TABLE = "hbase.mapred.outputtable"; - private final Log LOG = LogFactory.getLog(TableOutputFormat.class); + private static final Log LOG = LogFactory.getLog(TableOutputFormat.class); /** * Convert Reduce output (key, value) to (HStoreKey, KeyedDataArrayWritable) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java index bd63fdd9704..02727cc0c2a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java @@ -51,7 +51,7 @@ public class HRegionPartitioner extends Partitioner implements Configurable { - private final Log LOG = LogFactory.getLog(TableInputFormat.class); + private static final Log LOG = LogFactory.getLog(HRegionPartitioner.class); private Configuration conf = null; private HTable table; private byte[][] startKeys; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java index 0085834feb9..9859308bb5d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormat.java @@ -40,7 +40,7 @@ import org.apache.hadoop.util.StringUtils; public class TableInputFormat extends TableInputFormatBase implements Configurable { - private final Log LOG = LogFactory.getLog(TableInputFormat.class); + private static final Log LOG = LogFactory.getLog(TableInputFormat.class); /** Job parameter that specifies the input table. */ public static final String INPUT_TABLE = "hbase.mapreduce.inputtable"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java index d06232e41b7..903387183e3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java @@ -51,7 +51,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; public class TableOutputFormat extends OutputFormat implements Configurable { - private final Log LOG = LogFactory.getLog(TableOutputFormat.class); + private static final Log LOG = LogFactory.getLog(TableOutputFormat.class); /** Job parameter that specifies the output table. */ public static final String OUTPUT_TABLE = "hbase.mapred.outputtable"; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/OfflineCallback.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/OfflineCallback.java index 1805abbebb5..c93dbe1359d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/OfflineCallback.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/OfflineCallback.java @@ -37,7 +37,7 @@ import org.apache.zookeeper.data.Stat; */ @InterfaceAudience.Private public class OfflineCallback implements StringCallback { - private final Log LOG = LogFactory.getLog(OfflineCallback.class); + private static final Log LOG = LogFactory.getLog(OfflineCallback.class); private final ExistCallback callBack; private final ZooKeeperWatcher zkw; private final ServerName destination; @@ -79,7 +79,7 @@ public class OfflineCallback implements StringCallback { * Used during bulk assign on startup. */ static class ExistCallback implements StatCallback { - private final Log LOG = LogFactory.getLog(ExistCallback.class); + private static final Log LOG = LogFactory.getLog(ExistCallback.class); private final Map offlineNodesVersions; private final AtomicInteger counter; private ServerName destination; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java index 0b94c8ca816..fa5500b20aa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSizeCalculator.java @@ -48,7 +48,7 @@ import java.util.TreeSet; @InterfaceAudience.Private public class RegionSizeCalculator { - private final Log LOG = LogFactory.getLog(RegionSizeCalculator.class); + private static final Log LOG = LogFactory.getLog(RegionSizeCalculator.class); /** * Maps each region to its size in bytes.