You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/06/01 00:10:44 UTC
svn commit: r1344927 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/io/
main/java/org/apache/hadoop/hbase/mapreduce/
main/java/org/apache/hadoop/hbase/regionserver/metrics/
main/java/org/apache/hadoop/hbase/regionserver/wal/ test/java...
Author: stack
Date: Thu May 31 22:10:44 2012
New Revision: 1344927
URL: http://svn.apache.org/viewvc?rev=1344927&view=rev
Log:
HBASE-6141 InterfaceAudience breaks 0.94 on older versions of hadoop
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/HLogInputFormat.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CompressionContext.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Dictionary.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/LRUDictionary.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java Thu May 31 22:10:44 2012
@@ -21,14 +21,9 @@ import java.io.DataOutput;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
/**
* OutputStream implementation that wraps a DataOutput.
*/
-@InterfaceAudience.Private
-@InterfaceStability.Unstable
class DataOutputOutputStream extends OutputStream {
private final DataOutput out;
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/HLogInputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/HLogInputFormat.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/HLogInputFormat.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/HLogInputFormat.java Thu May 31 22:10:44 2012
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -45,7 +44,6 @@ import org.apache.hadoop.mapreduce.TaskA
/**
* Simple {@link InputFormat} for {@link HLog} files.
*/
-@InterfaceAudience.Public
public class HLogInputFormat extends InputFormat<HLogKey, WALEdit> {
private static Log LOG = LogFactory.getLog(HLogInputFormat.class);
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java Thu May 31 22:10:44 2012
@@ -23,8 +23,6 @@ import java.text.SimpleDateFormat;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
@@ -57,8 +55,6 @@ import org.apache.hadoop.util.ToolRunner
* WAL replay can also generate HFiles for later bulk importing,
* in that case the WAL is replayed for a single table only.
*/
-@InterfaceAudience.Public
-@InterfaceStability.Stable
public class WALPlayer extends Configured implements Tool {
final static String NAME = "WALPlayer";
final static String BULK_OUTPUT_CONF_KEY = "hlog.bulk.output";
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java Thu May 31 22:10:44 2012
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.regionse
import java.util.Set;
-import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.client.Append;
@@ -37,7 +36,6 @@ import org.apache.hadoop.hbase.util.Byte
* metrics are stored in {@link RegionMetricsStorage} and exposed to hadoop
* metrics through {@link RegionServerDynamicMetrics}.
*/
-@InterfaceAudience.Private
public class OperationMetrics {
private static final String DELETE_KEY = "delete_";
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java Thu May 31 22:10:44 2012
@@ -25,7 +25,6 @@ import java.util.concurrent.ConcurrentMa
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.util.Pair;
/**
@@ -34,7 +33,6 @@ import org.apache.hadoop.hbase.util.Pair
* numbers. These numbers are exposed to Hadoop metrics through
* RegionServerDynamicMetrics.
*/
-@InterfaceAudience.Private
public class RegionMetricsStorage {
// for simple numeric metrics (# of blocks read from block cache)
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CompressionContext.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CompressionContext.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CompressionContext.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/CompressionContext.java Thu May 31 22:10:44 2012
@@ -20,12 +20,10 @@ package org.apache.hadoop.hbase.regionse
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.hadoop.classification.InterfaceAudience;
/**
* Context that holds the various dictionaries for compression in HLog.
*/
-@InterfaceAudience.Private
class CompressionContext {
final Dictionary regionDict;
final Dictionary tableDict;
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java Thu May 31 22:10:44 2012
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hbase.regionserver.wal;
-import org.apache.hadoop.classification.InterfaceAudience;
import java.io.DataInput;
import java.io.DataOutput;
@@ -37,7 +36,6 @@ import com.google.common.base.Preconditi
* A set of static functions for running our custom WAL compression/decompression.
* Also contains a command line tool to compress and uncompress HLogs.
*/
-@InterfaceAudience.Private
public class Compressor {
/**
* Command line tool to compress and uncompress WALs.
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Dictionary.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Dictionary.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Dictionary.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Dictionary.java Thu May 31 22:10:44 2012
@@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.regionserver.wal;
-import org.apache.hadoop.classification.InterfaceAudience;
/**
* Dictionary interface
@@ -26,7 +25,6 @@ import org.apache.hadoop.classification.
* Dictionary indexes should be either bytes or shorts, only positive. (The
* first bit is reserved for detecting whether something is compressed or not).
*/
-@InterfaceAudience.Private
interface Dictionary {
static final byte NOT_IN_DICTIONARY = -1;
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/LRUDictionary.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/LRUDictionary.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/LRUDictionary.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/LRUDictionary.java Thu May 31 22:10:44 2012
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.regionse
import java.util.HashMap;
-import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
import com.google.common.base.Preconditions;
@@ -33,7 +32,6 @@ import com.google.common.base.Preconditi
* <code>(2 ^ 15) * 5 (Regionname, Row key, CF, Column qual, table) * 100 bytes (these are some big names) = ~16MB</code>.
* If you want to get silly, even at 1kb entries, it maxes out at 160 megabytes.
*/
-@InterfaceAudience.Private
public class LRUDictionary implements Dictionary {
private final BidirectionalLRUMap backingStore = new BidirectionalLRUMap();
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java?rev=1344927&r1=1344926&r2=1344927&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/wal/HLogPerformanceEvaluation.java Thu May 31 22:10:44 2012
@@ -32,7 +32,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -44,16 +43,13 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLog.Entry;
-import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
/**
* This class runs performance benchmarks for {@link HLog}.
* See usage for this tool by running:
* <code>$ hbase org.apache.hadoop.hbase.regionserver.wal.HLogPerformanceEvaluation -h</code>
*/
-@InterfaceAudience.Private
public final class HLogPerformanceEvaluation extends Configured implements Tool {
static final Log LOG = LogFactory.getLog(HLogPerformanceEvaluation.class.getName());