Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2826917BFF for ; Fri, 27 Mar 2015 13:58:58 +0000 (UTC) Received: (qmail 48435 invoked by uid 500); 27 Mar 2015 13:58:56 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 48323 invoked by uid 500); 27 Mar 2015 13:58:56 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 48015 invoked by uid 99); 27 Mar 2015 13:58:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Mar 2015 13:58:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72E24E2F41; Fri, 27 Mar 2015 13:58:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbertozzi@apache.org To: commits@hbase.apache.org Date: Fri, 27 Mar 2015 13:59:01 -0000 Message-Id: <29a6c25d700f49899fdc10e9335f18d8@git.apache.org> In-Reply-To: <529c6e2c2f8d4b35b919bb2f16429ddc@git.apache.org> References: <529c6e2c2f8d4b35b919bb2f16429ddc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/12] hbase git commit: HBASE-13342 Fix incorrect interface annotations HBASE-13342 Fix incorrect interface annotations Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5d2c3315 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5d2c3315 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5d2c3315 Branch: refs/heads/hbase-12439 Commit: 5d2c33158c47fc791d4973c5013d7ae50795d3bc Parents: b6b1e3b Author: Elliott Clark Authored: Thu Mar 26 11:48:19 2015 -0700 Committer: Elliott Clark Committed: Fri Mar 27 00:19:15 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 25 ++++++++++++++++++++ .../hbase/namespace/NamespaceStateManager.java | 2 +- .../namespace/NamespaceTableAndRegionInfo.java | 2 +- .../hbase/quotas/RegionStateListener.java | 2 +- .../handler/RegionReplicaFlushHandler.java | 2 +- .../hbase/regionserver/wal/ReplayHLogKey.java | 2 +- 6 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/dev-support/test-patch.sh ---------------------------------------------------------------------- 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceStateManager.java ---------------------------------------------------------------------- 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; http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceTableAndRegionInfo.java ---------------------------------------------------------------------- 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 http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionStateListener.java ---------------------------------------------------------------------- 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. http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java ---------------------------------------------------------------------- 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; http://git-wip-us.apache.org/repos/asf/hbase/blob/5d2c3315/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ReplayHLogKey.java ---------------------------------------------------------------------- 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.