From a24dafc022cdd01dda000305e0633ee47a3584e8 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 26 Mar 2015 11:48:19 -0700 Subject: [PATCH] HBASE-13342 Fix incorrect interface annotations --- dev-support/test-patch.sh | 25 ++++++++++++++++++++++ .../hbase/namespace/NamespaceStateManager.java | 2 +- .../namespace/NamespaceTableAndRegionInfo.java | 2 +- .../hadoop/hbase/quotas/RegionStateListener.java | 2 +- .../handler/RegionReplicaFlushHandler.java | 2 +- .../hbase/regionserver/wal/ReplayHLogKey.java | 2 +- 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 20d5f25..a735be8 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -513,6 +513,29 @@ checkAntiPatterns () { } ############################################################################### +### Check that there are no incorrect annotations +checkInterfaceAudience () { + echo "" + echo "" + echo "======================================================================" + echo "======================================================================" + echo " Checking against hadoop InterfaceAudience." + echo "======================================================================" + echo "======================================================================" + echo "" + echo "" + warnings=`$GREP 'import org.apache.hadoop.classification' $PATCH_DIR/patch` + if [[ $warnings != "" ]]; then + JIRA_COMMENT="$JIRA_COMMENT + + {color:red}-1 InterfaceAudience{color}. The patch appears to contain InterfaceAudience from hadoop rather than hbase: + $warnings." + return 1 + fi + return 0 +} + +############################################################################### ### Check there are no javadoc warnings checkJavadocWarnings () { echo "" @@ -1030,6 +1053,8 @@ checkJavadocWarnings (( RESULT = RESULT + $? )) checkCheckstyleErrors (( RESULT = RESULT + $? )) +checkInterfaceAudience +(( RESULT = RESULT + $? )) checkFindbugsWarnings (( RESULT = RESULT + $? )) checkReleaseAuditWarnings diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java index 1c8f524..981748b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java @@ -24,12 +24,12 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.master.TableNamespaceManager; import org.apache.hadoop.hbase.util.Bytes; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceTableAndRegionInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceTableAndRegionInfo.java index 66fcaa6..86651e4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceTableAndRegionInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceTableAndRegionInfo.java @@ -24,10 +24,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.TableName; import com.google.common.base.Joiner; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * NamespaceTableAndRegionInfo is a helper class that contains information diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionStateListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionStateListener.java index 6b954ac..368e21e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionStateListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionStateListener.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.quotas; import java.io.IOException; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * The listener interface for receiving region state events. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java index 9661b30..e0921b0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java @@ -23,11 +23,11 @@ import java.io.InterruptedIOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.TableNotFoundException; +import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.client.ClusterConnection; import org.apache.hadoop.hbase.client.FlushRegionCallable; import org.apache.hadoop.hbase.client.RegionReplicaUtil; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReplayHLogKey.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReplayHLogKey.java index 4506b19..55c057b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReplayHLogKey.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReplayHLogKey.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.classification.InterfaceAudience; /** * An HLogKey specific to WalEdits coming from replay. -- 2.3.0