From d2ddf0986aa109f064970f3cc77faa80c6457b48 Mon Sep 17 00:00:00 2001 From: Jonathan Hsieh Date: Fri, 20 Sep 2013 17:09:39 +0000 Subject: [PATCH] HBASE-9579 Sanity check visiblity and audience for server-side modules git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1525055 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/hadoop/hbase/client/Action.java | 4 +-- .../hadoop/hbase/HBaseInterfaceAudience.java | 30 +++++++++++++++++++ .../thrift/MetricsThriftServerSource.java | 2 +- .../metrics2/lib/MetricMutableQuantiles.java | 3 +- .../MetricsHBaseServerSourceFactoryImpl.java | 3 ++ .../ipc/MetricsHBaseServerSourceImpl.java | 2 ++ .../MetricsAssignmentManagerSourceImpl.java | 3 +- .../MetricsMasterFilesystemSourceImpl.java | 2 ++ .../MetricsMasterSourceFactoryImpl.java | 3 ++ .../hbase/master/MetricsMasterSourceImpl.java | 5 ++-- .../master/MetricsSnapshotSourceImpl.java | 2 ++ .../balancer/MetricsBalancerSourceImpl.java | 2 ++ .../hadoop/hbase/metrics/BaseSourceImpl.java | 2 ++ .../hadoop/hbase/metrics/MBeanSourceImpl.java | 6 ++-- .../MetricsRegionAggregateSourceImpl.java | 8 +++-- .../MetricsRegionServerSourceFactoryImpl.java | 3 ++ .../MetricsRegionServerSourceImpl.java | 2 ++ .../regionserver/MetricsRegionSourceImpl.java | 2 ++ .../wal/MetricsEditsReplaySourceImpl.java | 2 ++ .../wal/MetricsWALSourceImpl.java | 2 ++ .../MetricsReplicationSourceImpl.java | 2 ++ .../hbase/rest/MetricsRESTSourceImpl.java | 2 ++ .../MetricsThriftServerSourceFactoryImpl.java | 3 ++ .../thrift/MetricsThriftServerSourceImpl.java | 2 ++ .../hadoop/metrics2/impl/JmxCacheBuster.java | 8 +++-- .../metrics2/lib/DynamicMetricsRegistry.java | 9 +++--- .../metrics2/lib/MetricMutableQuantiles.java | 17 +++++------ .../metrics2/lib/MetricsExecutorImpl.java | 6 ++-- .../hadoop/metrics2/lib/MutableHistogram.java | 11 ++++--- .../scanner/CellScannerPosition.java | 4 +-- .../apache/hadoop/hbase/TableDescriptors.java | 3 +- .../backup/example/ZKTableArchiveClient.java | 2 +- .../coprocessor/RowProcessorClient.java | 3 +- .../hadoop/hbase/codec/MessageCodec.java | 3 +- .../coprocessor/AggregateImplementation.java | 4 +-- .../hbase/coprocessor/BaseMasterObserver.java | 3 +- .../hbase/coprocessor/BaseRegionObserver.java | 3 +- .../coprocessor/BaseRowProcessorEndpoint.java | 3 +- .../hbase/coprocessor/CoprocessorHost.java | 3 +- .../hbase/coprocessor/CoprocessorService.java | 3 +- .../MasterCoprocessorEnvironment.java | 3 +- .../hbase/coprocessor/MasterObserver.java | 3 +- .../coprocessor/MultiRowMutationEndpoint.java | 3 +- .../hbase/coprocessor/ObserverContext.java | 3 +- .../RegionCoprocessorEnvironment.java | 3 +- .../hbase/coprocessor/RegionObserver.java | 3 +- .../WALCoprocessorEnvironment.java | 3 +- .../hadoop/hbase/coprocessor/WALObserver.java | 3 +- .../ForeignExceptionDispatcher.java | 4 +-- .../errorhandling/ForeignExceptionSnare.java | 3 +- .../TimeoutExceptionInjector.java | 3 +- .../hbase/io/hfile/bucket/UniqueIndexMap.java | 2 +- .../apache/hadoop/hbase/mapred/Driver.java | 4 +++ .../hadoop/hbase/mapred/GroupingTableMap.java | 4 +++ .../hbase/mapred/HRegionPartitioner.java | 4 +++ .../hadoop/hbase/mapred/IdentityTableMap.java | 4 +++ .../hbase/mapred/IdentityTableReduce.java | 4 +++ .../hadoop/hbase/mapred/RowCounter.java | 8 +++-- .../hadoop/hbase/mapred/TableInputFormat.java | 4 +++ .../hbase/mapred/TableInputFormatBase.java | 4 +++ .../apache/hadoop/hbase/mapred/TableMap.java | 7 +++-- .../hbase/mapred/TableMapReduceUtil.java | 4 +++ .../hbase/mapred/TableOutputFormat.java | 4 +++ .../hbase/mapred/TableRecordReader.java | 5 ++++ .../hbase/mapred/TableRecordReaderImpl.java | 5 ++++ .../hadoop/hbase/mapred/TableReduce.java | 5 +++- .../hadoop/hbase/mapred/TableSplit.java | 4 +++ .../hadoop/hbase/master/LoadBalancer.java | 2 +- .../hadoop/hbase/procedure/Procedure.java | 4 +-- .../hbase/procedure/ProcedureCoordinator.java | 4 +-- .../procedure/ProcedureCoordinatorRpcs.java | 4 +-- .../hbase/procedure/ProcedureMember.java | 4 +-- .../hbase/procedure/ProcedureMemberRpcs.java | 3 +- .../hbase/procedure/SubprocedureFactory.java | 4 +-- .../procedure/ZKProcedureCoordinatorRpcs.java | 3 +- .../procedure/ZKProcedureMemberRpcs.java | 4 +-- .../hbase/procedure/ZKProcedureUtil.java | 4 +-- .../MiniBatchOperationInProgress.java | 5 ++-- .../hbase/regionserver/RowProcessor.java | 4 +-- .../hbase/security/access/AuthResult.java | 6 ++-- .../hadoop/hbase/util/DirectMemoryUtils.java | 2 +- .../org/apache/hadoop/hbase/util/FSUtils.java | 3 +- .../hadoop/hbase/util/HBaseFsckRepair.java | 4 +-- .../apache/hadoop/hbase/util/HashedBytes.java | 2 +- .../apache/hadoop/hbase/util/JvmVersion.java | 2 +- .../hbase/util/SortedCopyOnWriteSet.java | 3 +- 86 files changed, 232 insertions(+), 123 deletions(-) create mode 100644 hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseInterfaceAudience.java diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java index 24bb3b8c243..49836170c3b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Action.java @@ -19,15 +19,13 @@ package org.apache.hadoop.hbase.client; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; /** * A Get, Put or Delete associated with it's region. Used internally by * {@link HTable#batch} to associate the action with it's region and maintain * the index from the original request. */ -@InterfaceAudience.Public -@InterfaceStability.Stable +@InterfaceAudience.Private public class Action implements Comparable { // TODO: This class should not be visible outside of the client package. private Row action; diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseInterfaceAudience.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseInterfaceAudience.java new file mode 100644 index 00000000000..2f1ad9b0107 --- /dev/null +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseInterfaceAudience.java @@ -0,0 +1,30 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + +/** + * This class defines constants for different classes of hbase limited private apis + */ +@InterfaceAudience.Public +@InterfaceStability.Evolving +public class HBaseInterfaceAudience { + public static final String COPROC = "Coprocesssor"; +} diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java index 4520f8cc1f1..a25df56e7c1 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.thrift; import org.apache.hadoop.hbase.metrics.BaseSource; /** - * Inteface of a class that will export metrics about Thrift to hadoop's metrics2. + * Interface of a class that will export metrics about Thrift to hadoop's metrics2. */ public interface MetricsThriftServerSource extends BaseSource { diff --git a/hbase-hadoop1-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java b/hbase-hadoop1-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java index e80095f96fb..67e4e9c7bd1 100644 --- a/hbase-hadoop1-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java +++ b/hbase-hadoop1-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java @@ -35,8 +35,7 @@ import java.util.concurrent.TimeUnit; * low error bounds. This is particularly useful for accurate high-percentile (e.g. 95th, 99th) * latency metrics. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class MetricMutableQuantiles extends MetricMutable implements MetricHistogram { static final MetricQuantile[] quantiles = {new MetricQuantile(0.50, 0.050), diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java index 0f39422b97f..174edd4a8a9 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.java @@ -21,6 +21,9 @@ package org.apache.hadoop.hbase.ipc; import java.util.HashMap; +import org.apache.hadoop.classification.InterfaceAudience; + +@InterfaceAudience.Private public class MetricsHBaseServerSourceFactoryImpl extends MetricsHBaseServerSourceFactory { private static enum SourceStorage { INSTANCE; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java index 42a3e661886..afe0bfb0368 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.ipc; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsRecordBuilder; @@ -26,6 +27,7 @@ import org.apache.hadoop.metrics2.lib.Interns; import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; +@InterfaceAudience.Private public class MetricsHBaseServerSourceImpl extends BaseSourceImpl implements MetricsHBaseServerSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java index 0d0c43a659b..a615324e803 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsAssignmentManagerSourceImpl.java @@ -18,11 +18,12 @@ package org.apache.hadoop.hbase.master; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableGaugeLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; - +@InterfaceAudience.Private public class MetricsAssignmentManagerSourceImpl extends BaseSourceImpl implements MetricsAssignmentManagerSource { private MutableGaugeLong ritGauge; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java index 2e062c2e3c1..a43f3fc06e8 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFilesystemSourceImpl.java @@ -18,9 +18,11 @@ package org.apache.hadoop.hbase.master; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableHistogram; +@InterfaceAudience.Private public class MetricsMasterFilesystemSourceImpl extends BaseSourceImpl implements MetricsMasterFileSystemSource { private MutableHistogram splitSizeHisto; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.java index 350c39d9152..2136923de03 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.master; +import org.apache.hadoop.classification.InterfaceAudience; + /** * Factory to create MetricsMasterSource when given a MetricsMasterWrapper */ +@InterfaceAudience.Private public class MetricsMasterSourceFactoryImpl implements MetricsMasterSourceFactory { private static enum FactoryStorage { INSTANCE; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java index 01026acb94b..aee907f024e 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterSourceImpl.java @@ -18,20 +18,19 @@ package org.apache.hadoop.hbase.master; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.lib.Interns; import org.apache.hadoop.metrics2.lib.MutableCounterLong; -import org.apache.hadoop.metrics2.lib.MutableGaugeLong; -import org.apache.hadoop.metrics2.lib.MutableHistogram; -import org.apache.hadoop.metrics2.lib.MutableStat; /** * Hadoop2 implementation of MetricsMasterSource. * * Implements BaseSource through BaseSourceImpl, following the pattern */ +@InterfaceAudience.Private public class MetricsMasterSourceImpl extends BaseSourceImpl implements MetricsMasterSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java index 29c9c0a2686..18752405c0c 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsSnapshotSourceImpl.java @@ -18,9 +18,11 @@ package org.apache.hadoop.hbase.master; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableHistogram; +@InterfaceAudience.Private public class MetricsSnapshotSourceImpl extends BaseSourceImpl implements MetricsSnapshotSource { private MutableHistogram snapshotTimeHisto; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java index 6e43e58eac2..5dedceac454 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java @@ -18,10 +18,12 @@ package org.apache.hadoop.hbase.master.balancer; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableHistogram; +@InterfaceAudience.Private public class MetricsBalancerSourceImpl extends BaseSourceImpl implements MetricsBalancerSource{ private MutableHistogram blanceClusterHisto; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java index 13a1f7387df..edc39e7d747 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/BaseSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.metrics; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsSource; import org.apache.hadoop.metrics2.impl.JmxCacheBuster; @@ -35,6 +36,7 @@ import org.apache.hadoop.metrics2.source.JvmMetrics; * * All MetricsSource's in hbase-hadoop2-compat should derive from this class. */ +@InterfaceAudience.Private public class BaseSourceImpl implements BaseSource, MetricsSource { private static enum DefaultMetricsSystemInitializer { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java index 036c9a65da0..a84a4ac8694 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/metrics/MBeanSourceImpl.java @@ -18,13 +18,15 @@ package org.apache.hadoop.hbase.metrics; -import org.apache.hadoop.metrics2.util.MBeans; - import javax.management.ObjectName; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.metrics2.util.MBeans; + /** * Hadoop2 metrics2 implementation of an object that registers MBeans. */ +@InterfaceAudience.Private public class MBeanSourceImpl implements MBeanSource { /** diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java index a9f57bf7a25..743c188c890 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionAggregateSourceImpl.java @@ -18,13 +18,15 @@ package org.apache.hadoop.hbase.regionserver; +import java.util.TreeSet; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import java.util.TreeSet; -import java.util.concurrent.locks.ReentrantReadWriteLock; - +@InterfaceAudience.Private public class MetricsRegionAggregateSourceImpl extends BaseSourceImpl implements MetricsRegionAggregateSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java index c5cc8b4fdd6..34badecd7fb 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.hadoop.classification.InterfaceAudience; + /** * Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper */ +@InterfaceAudience.Private public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServerSourceFactory { public static enum FactoryStorage { INSTANCE; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java index 6f8f3dcc771..1387d397f90 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.regionserver; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.MetricsCollector; @@ -30,6 +31,7 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; * * Implements BaseSource through BaseSourceImpl, following the pattern */ +@InterfaceAudience.Private public class MetricsRegionServerSourceImpl extends BaseSourceImpl implements MetricsRegionServerSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java index b6a270abab4..05eadfce4f7 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.impl.JmxCacheBuster; import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry; @@ -27,6 +28,7 @@ import org.apache.hadoop.metrics2.lib.Interns; import org.apache.hadoop.metrics2.lib.MutableCounterLong; import org.apache.hadoop.metrics2.lib.MutableStat; +@InterfaceAudience.Private public class MetricsRegionSourceImpl implements MetricsRegionSource { private final MetricsRegionWrapper regionWrapper; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsEditsReplaySourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsEditsReplaySourceImpl.java index 6420f40f6c0..d39c96342f4 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsEditsReplaySourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsEditsReplaySourceImpl.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricHistogram; @@ -27,6 +28,7 @@ import org.apache.hadoop.metrics2.MetricHistogram; * Hadoop1 implementation of MetricsMasterSource. Implements BaseSource through BaseSourceImpl, * following the pattern */ +@InterfaceAudience.Private public class MetricsEditsReplaySourceImpl extends BaseSourceImpl implements MetricsEditsReplaySource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java index 8bd893fdd32..8ebfe052b9e 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWALSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.regionserver.wal; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.lib.MutableCounterLong; @@ -28,6 +29,7 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; * * Implements BaseSource through BaseSourceImpl, following the pattern. */ +@InterfaceAudience.Private public class MetricsWALSourceImpl extends BaseSourceImpl implements MetricsWALSource { private final MetricHistogram appendSizeHisto; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java index f0fc794d3db..1c5841b61cd 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.replication.regionserver; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; /** @@ -26,6 +27,7 @@ import org.apache.hadoop.hbase.metrics.BaseSourceImpl; * * Implements BaseSource through BaseSourceImpl, following the pattern */ +@InterfaceAudience.Private public class MetricsReplicationSourceImpl extends BaseSourceImpl implements MetricsReplicationSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java index 5f3578c0a3f..4a4eb080012 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.rest; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableCounterLong; @@ -27,6 +28,7 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong; * * Implements BaseSource through BaseSourceImpl, following the pattern */ +@InterfaceAudience.Private public class MetricsRESTSourceImpl extends BaseSourceImpl implements MetricsRESTSource { private MutableCounterLong request; diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.java index b6015403745..fcf10e36e78 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.java @@ -18,9 +18,12 @@ package org.apache.hadoop.hbase.thrift; +import org.apache.hadoop.classification.InterfaceAudience; + /** * Class used to create metrics sources for Thrift and Thrift2 servers. */ +@InterfaceAudience.Private public class MetricsThriftServerSourceFactoryImpl implements MetricsThriftServerSourceFactory { /** diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java index 97c6fb414e2..0c625606ff2 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceImpl.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.thrift; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.metrics.BaseSourceImpl; import org.apache.hadoop.metrics2.lib.MutableGaugeLong; import org.apache.hadoop.metrics2.lib.MutableStat; @@ -27,6 +28,7 @@ import org.apache.hadoop.metrics2.lib.MutableStat; * * Implements BaseSource through BaseSourceImpl, following the pattern */ +@InterfaceAudience.Private public class MetricsThriftServerSourceImpl extends BaseSourceImpl implements MetricsThriftServerSource { diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java index e51f6d5079a..707dc4cefdc 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java @@ -18,15 +18,16 @@ package org.apache.hadoop.metrics2.impl; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsExecutor; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.lib.MetricsExecutorImpl; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - /** * JMX caches the beans that have been exported; even after the values are removed from hadoop's * metrics system the keys and old values will still remain. This class stops and restarts the @@ -38,6 +39,7 @@ import java.util.concurrent.TimeUnit; @edu.umd.cs.findbugs.annotations.SuppressWarnings( value="LI_LAZY_INIT_STATIC", justification="Yeah, its weird but its what we want") +@InterfaceAudience.Private public class JmxCacheBuster { private static final Log LOG = LogFactory.getLog(JmxCacheBuster.class); private static Object lock = new Object(); diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DynamicMetricsRegistry.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DynamicMetricsRegistry.java index 080bd4d52f0..8314c92f43f 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DynamicMetricsRegistry.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/DynamicMetricsRegistry.java @@ -21,16 +21,16 @@ package org.apache.hadoop.metrics2.lib; import java.util.Collection; import java.util.concurrent.ConcurrentMap; -import com.google.common.base.Objects; -import com.google.common.collect.Maps; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.metrics2.MetricsException; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.MetricsTag; import org.apache.hadoop.metrics2.impl.MsInfo; +import com.google.common.base.Objects; +import com.google.common.collect.Maps; + /** * An optional metrics registry class for creating and maintaining a * collection of MetricsMutables, making writing metrics source easier. @@ -42,8 +42,7 @@ import org.apache.hadoop.metrics2.impl.MsInfo; * Another difference is that metricsMap implementation is substituted with * thread-safe map, as we allow dynamic metrics additions/removals. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class DynamicMetricsRegistry { private final ConcurrentMap metricsMap = Maps.newConcurrentMap(); diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java index 766cf9609f7..b01f88b16c3 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricMutableQuantiles.java @@ -18,10 +18,14 @@ package org.apache.hadoop.metrics2.lib; -import com.google.common.annotations.VisibleForTesting; +import static org.apache.hadoop.metrics2.lib.Interns.info; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.TimeUnit; + import org.apache.commons.lang.StringUtils; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.MetricsExecutor; import org.apache.hadoop.metrics2.MetricsInfo; @@ -29,19 +33,14 @@ import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.util.MetricQuantile; import org.apache.hadoop.metrics2.util.MetricSampleQuantiles; -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import static org.apache.hadoop.metrics2.lib.Interns.info; +import com.google.common.annotations.VisibleForTesting; /** * Watches a stream of long values, maintaining online estimates of specific quantiles with provably * low error bounds. This is particularly useful for accurate high-percentile (e.g. 95th, 99th) * latency metrics. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class MetricMutableQuantiles extends MutableMetric implements MetricHistogram { static final MetricQuantile[] quantiles = {new MetricQuantile(0.50, 0.050), diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java index d47912c273c..935811867e4 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java @@ -18,16 +18,18 @@ package org.apache.hadoop.metrics2.lib; -import org.apache.hadoop.metrics2.MetricsExecutor; - import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.metrics2.MetricsExecutor; + /** * Class to handle the ScheduledExecutorService{@link ScheduledExecutorService} used by MetricMutableQuantiles{@link MetricMutableQuantiles} */ +@InterfaceAudience.Private public class MetricsExecutorImpl implements MetricsExecutor { @Override diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java index 3b012e9001f..2423b958a89 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MutableHistogram.java @@ -18,19 +18,22 @@ package org.apache.hadoop.metrics2.lib; -import com.yammer.metrics.stats.ExponentiallyDecayingSample; -import com.yammer.metrics.stats.Sample; -import com.yammer.metrics.stats.Snapshot; +import java.util.concurrent.atomic.AtomicLong; + import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricHistogram; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; -import java.util.concurrent.atomic.AtomicLong; +import com.yammer.metrics.stats.ExponentiallyDecayingSample; +import com.yammer.metrics.stats.Sample; +import com.yammer.metrics.stats.Snapshot; /** * A histogram implementation that runs in constant space, and exports to hadoop2's metrics2 system. */ +@InterfaceAudience.Private public class MutableHistogram extends MutableMetric implements MetricHistogram { private static final int DEFAULT_SAMPLE_SIZE = 2046; diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java index f820258917d..a5ae9243214 100644 --- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java +++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/scanner/CellScannerPosition.java @@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.codec.prefixtree.scanner; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; /** * An indicator of the state of the scanner after an operation such as nextCell() or @@ -33,8 +32,7 @@ import org.apache.hadoop.classification.InterfaceStability; * next region. * */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public enum CellScannerPosition { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java index 0a8e817fc6c..a0c246b71f7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/TableDescriptors.java @@ -27,8 +27,7 @@ import org.apache.hadoop.classification.InterfaceStability; * Get, remove and modify table descriptors. * Used by servers to host descriptors. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public interface TableDescriptors { /** * @param tableName diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java index 353a0b266dd..4ab16e776a6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java @@ -31,7 +31,7 @@ import org.apache.zookeeper.KeeperException; /** * Example class for how to use the table archiving coordinated via zookeeper */ -@InterfaceAudience.Public +@InterfaceAudience.Private public class ZKTableArchiveClient extends Configured { /** Configuration key for the archive node. */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java index 13a1bb6ff31..5c3ce87f470 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java @@ -22,6 +22,7 @@ import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest; import org.apache.hadoop.hbase.regionserver.RowProcessor; @@ -31,7 +32,7 @@ import com.google.protobuf.Message; * For example usage, refer TestRowProcessorEndpoint * */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class RowProcessorClient { public static diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java index 250a46122dc..fcd8c3f729f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/codec/MessageCodec.java @@ -36,8 +36,7 @@ import org.apache.hadoop.classification.InterfaceStability; * Codec that just writes out Cell as a protobuf Cell Message. Does not write the mvcc stamp. * Use a different codec if you want that in the stream. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class MessageCodec implements Codec { static class MessageEncoder extends BaseEncoder { MessageEncoder(final OutputStream out) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/AggregateImplementation.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/AggregateImplementation.java index 656ca4354e2..fdb87ef9c75 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/AggregateImplementation.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/AggregateImplementation.java @@ -27,7 +27,6 @@ import java.util.NavigableSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; @@ -58,8 +57,7 @@ import com.google.protobuf.Service; * @param PB message that is used to transport Cell () instance * @param PB message that is used to transport Promoted () instance */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class AggregateImplementation extends AggregateService implements CoprocessorService, Coprocessor { protected static final Log log = LogFactory.getLog(AggregateImplementation.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java index 6b5e95c34bf..4739da8f2c7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.coprocessor; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; @@ -34,7 +35,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio import java.io.IOException; import java.util.List; -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class BaseMasterObserver implements MasterObserver { @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java index dc39a1df26e..8ef76e3ddbd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java @@ -26,6 +26,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; @@ -66,7 +67,7 @@ import com.google.common.collect.ImmutableList; * By extending it, you can create your own region observer without * overriding all abstract methods of RegionObserver. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public abstract class BaseRegionObserver implements RegionObserver { @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRowProcessorEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRowProcessorEndpoint.java index 9bdec2fcb5b..3d1b9357e8d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRowProcessorEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRowProcessorEndpoint.java @@ -25,6 +25,7 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.protobuf.ResponseConverter; import org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest; import org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse; @@ -42,7 +43,7 @@ import com.google.protobuf.Service; * This class demonstrates how to implement atomic read-modify-writes * using {@link HRegion#processRowsWithLocks} and Coprocessor endpoints. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public abstract class BaseRowProcessorEndpoint extends RowProcessorService implements CoprocessorService, Coprocessor { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java index b769abeec1b..2ba8e714e1b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java @@ -40,6 +40,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.TableName; @@ -75,7 +76,7 @@ import com.google.protobuf.ServiceException; * @param the specific environment extension that a concrete implementation * provides */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public abstract class CoprocessorHost { public static final String REGION_COPROCESSOR_CONF_KEY = diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorService.java index 2f78e11134f..42cbfdd1f6b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorService.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorService.java @@ -21,12 +21,13 @@ package org.apache.hadoop.hbase.coprocessor; import com.google.protobuf.Service; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; /** * Coprocessor endpoints providing protobuf services should implement this * interface and return the {@link Service} instance via {@link #getService()}. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface CoprocessorService { Service getService(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.java index 7733d97685d..54ee9729a78 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterCoprocessorEnvironment.java @@ -22,9 +22,10 @@ package org.apache.hadoop.hbase.coprocessor; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.master.MasterServices; -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface MasterCoprocessorEnvironment extends CoprocessorEnvironment { /** @return reference to the HMaster services */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java index 701d5b82bd7..edcce380b6f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Coprocessor; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; @@ -38,7 +39,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio * Defines coprocessor hooks for interacting with operations on the * {@link org.apache.hadoop.hbase.master.HMaster} process. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface MasterObserver extends Coprocessor { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MultiRowMutationEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MultiRowMutationEndpoint.java index e1e4a665fa3..504c29557c3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MultiRowMutationEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MultiRowMutationEndpoint.java @@ -27,6 +27,7 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -73,7 +74,7 @@ import com.google.protobuf.Service; * service.mutateRows(null, mrm); * */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class MultiRowMutationEndpoint extends MultiRowMutationService implements CoprocessorService, Coprocessor { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java index efd3af8915d..c5fc26b2f40 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/ObserverContext.java @@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.coprocessor; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; /** * Carries the execution state for a given invocation of an Observer coprocessor @@ -33,7 +34,7 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment; * @param The {@link CoprocessorEnvironment} subclass applicable to the * revelant Observer interface. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class ObserverContext { private E env; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java index c9e6233c5b5..f0e4c5184c2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionCoprocessorEnvironment.java @@ -24,10 +24,11 @@ import java.util.concurrent.ConcurrentMap; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerServices; -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface RegionCoprocessorEnvironment extends CoprocessorEnvironment { /** @return the region associated with this coprocessor */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java index fe5189653f3..b1455c565ba 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java @@ -25,6 +25,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Coprocessor; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Append; @@ -62,7 +63,7 @@ import org.apache.hadoop.hbase.util.Pair; * Coprocessors implement this interface to observe and mediate client actions * on the region. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface RegionObserver extends Coprocessor { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALCoprocessorEnvironment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALCoprocessorEnvironment.java index da329a982a0..5a99f9c13c0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALCoprocessorEnvironment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALCoprocessorEnvironment.java @@ -22,9 +22,10 @@ package org.apache.hadoop.hbase.coprocessor; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.regionserver.wal.HLog; -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface WALCoprocessorEnvironment extends CoprocessorEnvironment { /** @return reference to the region server services */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALObserver.java index b003558b508..55377ce940d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/WALObserver.java @@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.coprocessor; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Coprocessor; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; @@ -38,7 +39,7 @@ import java.io.IOException; * Defines coprocessor hooks for interacting with operations on the * {@link org.apache.hadoop.hbase.regionserver.wal.HLog}. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public interface WALObserver extends Coprocessor { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java index ceb3b840a7b..c861f37ff8d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java @@ -23,7 +23,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.classification.InterfaceStability; /** * The dispatcher acts as the state holding entity for foreign error handling. The first @@ -39,8 +38,7 @@ import org.apache.hadoop.classification.InterfaceStability; * This is thread-safe and must be because this is expected to be used to propagate exceptions * from foreign threads. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class ForeignExceptionDispatcher implements ForeignExceptionListener, ForeignExceptionSnare { public static final Log LOG = LogFactory.getLog(ForeignExceptionDispatcher.class); protected final String name; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionSnare.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionSnare.java index 1e97796d63a..2212d435950 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionSnare.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/ForeignExceptionSnare.java @@ -36,8 +36,7 @@ import org.apache.hadoop.classification.InterfaceStability; * the snare. The snare is referenced and checked by multiple threads which enables exception * notification in all the involved threads/processes. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public interface ForeignExceptionSnare { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java index 9f40cbfb575..79bfcdea290 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java @@ -33,8 +33,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; * The timer won't start tracking time until calling {@link #start()}. If {@link #complete()} or * {@link #trigger()} is called before {@link #start()}, calls to {@link #start()} will fail. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class TimeoutExceptionInjector { private static final Log LOG = LogFactory.getLog(TimeoutExceptionInjector.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/UniqueIndexMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/UniqueIndexMap.java index 3c7301ac9dd..d2c936115aa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/UniqueIndexMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/UniqueIndexMap.java @@ -28,7 +28,7 @@ import org.apache.hadoop.classification.InterfaceAudience; * Map from type T to int and vice-versa. Used for reducing bit field item * counts. */ -@InterfaceAudience.Public +@InterfaceAudience.Private public final class UniqueIndexMap implements Serializable { private static final long serialVersionUID = -1145635738654002342L; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java index ddab06904ca..3c501c5a0b7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/Driver.java @@ -18,6 +18,8 @@ */ package org.apache.hadoop.hbase.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.ProgramDriver; /** @@ -25,6 +27,8 @@ import org.apache.hadoop.util.ProgramDriver; * name of job to this main. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class Driver { /** * @param args diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java index f36ebb0c4ab..08631e393aa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java @@ -21,6 +21,8 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; import java.util.ArrayList; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; @@ -37,6 +39,8 @@ import org.apache.hadoop.mapred.Reporter; * Extract grouping columns from input record */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class GroupingTableMap extends MapReduceBase implements TableMap { 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 e330632ec22..76729db0418 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 @@ -22,6 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -39,6 +41,8 @@ import org.apache.hadoop.mapred.Partitioner; * @param */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class HRegionPartitioner implements Partitioner { private final Log LOG = LogFactory.getLog(TableInputFormat.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java index 5d83e440970..1eada5f9e2d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.mapred.JobConf; @@ -31,6 +33,8 @@ import org.apache.hadoop.mapred.Reporter; * Pass the given key and record as-is to reduce */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class IdentityTableMap extends MapReduceBase implements TableMap { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java index 8476d08ed1f..babaa68f216 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java @@ -23,6 +23,8 @@ import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.mapred.MapReduceBase; @@ -33,6 +35,8 @@ import org.apache.hadoop.mapred.Reporter; * Write to table each key, record pair */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class IdentityTableReduce extends MapReduceBase implements TableReduce { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/RowCounter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/RowCounter.java index cfa3539d61c..5deadfc608c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/RowCounter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/RowCounter.java @@ -19,14 +19,14 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; -import java.util.Map; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.mapred.FileOutputFormat; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; @@ -42,6 +42,8 @@ import org.apache.hadoop.util.ToolRunner; * Uses an {@link IdentityReducer} */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class RowCounter extends Configured implements Tool { // Name of this 'program' static final String NAME = "rowcounter"; 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 9682e888c5a..cf90165396b 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 @@ -22,6 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.HTable; @@ -35,6 +37,8 @@ import org.apache.hadoop.util.StringUtils; * Convert HBase tabular data into a format that is consumable by Map/Reduce. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TableInputFormat extends TableInputFormatBase implements JobConfigurable { private final Log LOG = LogFactory.getLog(TableInputFormat.class); 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 99de91c60ab..95b6f284e71 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 @@ -22,6 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; @@ -64,6 +66,8 @@ import org.apache.hadoop.mapred.Reporter; */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public abstract class TableInputFormatBase implements InputFormat { final Log LOG = LogFactory.getLog(TableInputFormatBase.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMap.java index 132a94eddca..87c1bf021cb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMap.java @@ -18,9 +18,10 @@ */ package org.apache.hadoop.hbase.mapred; -import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.io.Writable; +import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapred.Mapper; @@ -32,6 +33,8 @@ import org.apache.hadoop.mapred.Mapper; * @param Writable value class */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface TableMap, V> extends Mapper { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java index ff6168338bf..637e47df806 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.catalog.MetaReader; import org.apache.hadoop.hbase.client.Put; @@ -39,6 +41,8 @@ import org.apache.hadoop.mapred.jobcontrol.Job; * Utility for {@link TableMap} and {@link TableReduce} */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable @SuppressWarnings("unchecked") public class TableMapReduceUtil { 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 1616542c5bd..fe9cfc34c13 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 @@ -22,6 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.client.HTable; @@ -39,6 +41,8 @@ import org.apache.hadoop.util.Progressable; * Convert Map/Reduce output and write it to an HBase table */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TableOutputFormat extends FileOutputFormat { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReader.java index 5dec23de7e3..7713180dd73 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReader.java @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.filter.Filter; @@ -30,6 +32,9 @@ import org.apache.hadoop.mapred.RecordReader; /** * Iterate over an HBase table data, return (Text, RowResult) pairs */ +@Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TableRecordReader implements RecordReader { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java index 36e00e61894..08c1873dbaa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java @@ -22,6 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; @@ -39,6 +41,9 @@ import static org.apache.hadoop.hbase.mapreduce.TableRecordReaderImpl.LOG_PER_RO /** * Iterate over an HBase table data, return (Text, RowResult) pairs */ +@Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TableRecordReaderImpl { static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableReduce.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableReduce.java index 369c6444476..ebed009579d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableReduce.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableReduce.java @@ -18,9 +18,10 @@ */ package org.apache.hadoop.hbase.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapred.Reducer; @@ -31,6 +32,8 @@ import org.apache.hadoop.mapred.Reducer; * @param value class */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable @SuppressWarnings("unchecked") public interface TableReduce extends Reducer { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java index 79bd7fddf6f..9083586ea49 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableSplit.java @@ -22,6 +22,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.util.Bytes; @@ -31,6 +33,8 @@ import org.apache.hadoop.mapred.InputSplit; * A table split corresponds to a key range [low, high) */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TableSplit implements InputSplit, Comparable { private TableName m_tableName; private byte [] m_startRow; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java index 56dd9713715..379babef94b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java @@ -45,7 +45,7 @@ import org.apache.hadoop.hbase.Stoppable; * *

This classes produces plans for the {@link AssignmentManager} to execute. */ -@InterfaceAudience.Public +@InterfaceAudience.Private public interface LoadBalancer extends Configurable, Stoppable { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java index ab4dfdadb53..37eae44126c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/Procedure.java @@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener; @@ -65,8 +64,7 @@ import com.google.common.collect.Lists; * for them implicitly via {@link ProcedureCoordinator#startProcedure(ForeignExceptionDispatcher, * String, byte[], List)}} */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class Procedure implements Callable, ForeignExceptionListener { private static final Log LOG = LogFactory.getLog(Procedure.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java index fdb454ba565..7658b608583 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java @@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.DaemonThreadFactory; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; @@ -46,8 +45,7 @@ import com.google.common.collect.MapMaker; * The {@link Procedure} is generic and subclassing or customization shouldn't be * necessary -- any customization should happen just in {@link Subprocedure}s. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class ProcedureCoordinator { private static final Log LOG = LogFactory.getLog(ProcedureCoordinator.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinatorRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinatorRpcs.java index dff892c998a..344df9ecba2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinatorRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinatorRpcs.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.util.List; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.errorhandling.ForeignException; /** @@ -30,8 +29,7 @@ import org.apache.hadoop.hbase.errorhandling.ForeignException; * distributed members. * @see ProcedureCoordinator */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public interface ProcedureCoordinatorRpcs extends Closeable { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java index 09f9738e071..5ef118e1a00 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMember.java @@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.DaemonThreadFactory; import org.apache.hadoop.hbase.errorhandling.ForeignException; @@ -46,8 +45,7 @@ import com.google.common.collect.MapMaker; * currently running subprocedures are notify to failed since there is no longer a way to reach any * other members or coordinators since the rpcs are down. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class ProcedureMember implements Closeable { private static final Log LOG = LogFactory.getLog(ProcedureMember.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.java index 7264865b42c..e6b391979ce 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.java @@ -28,8 +28,7 @@ import org.apache.hadoop.hbase.errorhandling.ForeignException; * This is the notification interface for Procedures that encapsulates message passing from * members to a coordinator. Each of these calls should send a message to the coordinator. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public interface ProcedureMemberRpcs extends Closeable { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/SubprocedureFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/SubprocedureFactory.java index ccabc801f73..148613a36c3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/SubprocedureFactory.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/SubprocedureFactory.java @@ -18,13 +18,11 @@ package org.apache.hadoop.hbase.procedure; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; /** * Task builder to build instances of a {@link ProcedureMember}'s {@link Subprocedure}s. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public interface SubprocedureFactory { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java index 56c6d5b4450..8a0cff099fd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java @@ -36,8 +36,7 @@ import com.google.protobuf.InvalidProtocolBufferException; /** * ZooKeeper based {@link ProcedureCoordinatorRpcs} for a {@link ProcedureCoordinator} */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class ZKProcedureCoordinatorRpcs implements ProcedureCoordinatorRpcs { public static final Log LOG = LogFactory.getLog(ZKProcedureCoordinatorRpcs.class); private ZKProcedureUtil zkProc = null; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java index 04bce5b80c3..937baaca4eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java @@ -24,7 +24,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.classification.InterfaceStability; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.util.Bytes; @@ -52,8 +51,7 @@ import com.google.protobuf.InvalidProtocolBufferException; * its re-initialization will delete the znodes and require all in progress subprocedures to start * anew. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs { private static final Log LOG = LogFactory.getLog(ZKProcedureMemberRpcs.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java index e073da876d1..7d46625cc30 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java @@ -24,7 +24,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.classification.InterfaceStability; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -48,8 +47,7 @@ import org.apache.zookeeper.KeeperException; * * Assumption here that procedure names are unique */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public abstract class ZKProcedureUtil extends ZooKeeperListener implements Closeable { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java index 1858884e5c7..73609469eb8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; @@ -29,8 +29,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; * @see RegionObserver#postBatchMutate(ObserverContext, MiniBatchOperationInProgress) * @param Pair pair of Mutations and associated rowlock ids . */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class MiniBatchOperationInProgress { private final T[] operations; private final OperationStatus[] retCodeDetails; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RowProcessor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RowProcessor.java index 72ac84cf14d..fb1bc3da467 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RowProcessor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RowProcessor.java @@ -23,15 +23,13 @@ import java.util.List; import java.util.UUID; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import com.google.protobuf.Message; -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private /** * Defines the procedure to atomically perform multiple scans and mutations diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthResult.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthResult.java index 3c8dc877c90..adcf49bdbdd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthResult.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthResult.java @@ -22,9 +22,8 @@ import java.util.Collection; import java.util.Map; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; @@ -32,8 +31,7 @@ import org.apache.hadoop.hbase.util.Bytes; * Represents the result of an authorization check for logging and error * reporting. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class AuthResult { private final boolean allowed; private final String namespace; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/DirectMemoryUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/DirectMemoryUtils.java index 8e833a08457..2c28125cc50 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/DirectMemoryUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/DirectMemoryUtils.java @@ -31,7 +31,7 @@ import org.apache.hadoop.classification.InterfaceStability; import com.google.common.base.Preconditions; -@InterfaceAudience.Public +@InterfaceAudience.Private @InterfaceStability.Evolving public class DirectMemoryUtils { /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java index 523aaf8e3f7..13fe6f9d18f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java @@ -85,8 +85,7 @@ import com.google.protobuf.InvalidProtocolBufferException; /** * Utility methods for interacting with the underlying file system. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public abstract class FSUtils { private static final Log LOG = LogFactory.getLog(FSUtils.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java index 57b02ea81d4..1b97d6903c3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java @@ -25,7 +25,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HRegionInfo; @@ -48,8 +47,7 @@ import org.apache.zookeeper.KeeperException; * This class contains helper methods that repair parts of hbase's filesystem * contents. */ -@InterfaceAudience.Public -@InterfaceStability.Evolving +@InterfaceAudience.Private public class HBaseFsckRepair { public static final Log LOG = LogFactory.getLog(HBaseFsckRepair.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HashedBytes.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HashedBytes.java index 2e768ed1aa2..2ad204793fe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HashedBytes.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HashedBytes.java @@ -27,7 +27,7 @@ import org.apache.hadoop.classification.InterfaceStability; * This class encapsulates a byte array and overrides hashCode and equals so * that it's identity is based on the data rather than the array instance. */ -@InterfaceAudience.Public +@InterfaceAudience.Private @InterfaceStability.Stable public class HashedBytes { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java index 8b1c0ccb3aa..ffcca76e20c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java @@ -29,7 +29,7 @@ import org.apache.hadoop.classification.InterfaceStability; * class has a utility function to determine whether the current JVM * is known to be unstable. */ -@InterfaceAudience.Public +@InterfaceAudience.Private @InterfaceStability.Stable public abstract class JvmVersion { private static Set BAD_JVM_VERSIONS = new HashSet(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/SortedCopyOnWriteSet.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/SortedCopyOnWriteSet.java index 768d805603b..d086680b7ab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/SortedCopyOnWriteSet.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/SortedCopyOnWriteSet.java @@ -45,8 +45,7 @@ import org.apache.hadoop.classification.InterfaceStability; * @param A class implementing {@link java.lang.Comparable} or able to be * compared by a provided comparator. */ -@InterfaceAudience.Public -@InterfaceStability.Stable +@InterfaceAudience.Private public class SortedCopyOnWriteSet implements SortedSet { private volatile SortedSet internalSet;