hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject hbase git commit: HBASE-14100 Fix high priority findbugs warnings
Date Fri, 17 Jul 2015 01:04:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 1b49343aa -> 17829bbb5


HBASE-14100 Fix high priority findbugs warnings

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/17829bbb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/17829bbb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/17829bbb

Branch: refs/heads/branch-1.1
Commit: 17829bbb5474047a748fc39d934328d947c7791a
Parents: 1b49343
Author: zhangduo <zhangduo@wandoujia.com>
Authored: Thu Jul 16 21:43:47 2015 +0800
Committer: zhangduo <zhangduo@wandoujia.com>
Committed: Fri Jul 17 09:01:33 2015 +0800

----------------------------------------------------------------------
 .../hadoop/hbase/quotas/AverageIntervalRateLimiter.java  |  2 ++
 .../hadoop/hbase/quotas/FixedIntervalRateLimiter.java    |  2 ++
 .../java/org/apache/hadoop/hbase/quotas/RateLimiter.java | 11 ++++-------
 3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/17829bbb/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/AverageIntervalRateLimiter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/AverageIntervalRateLimiter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/AverageIntervalRateLimiter.java
index 1fb721a..75e6aea 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/AverageIntervalRateLimiter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/AverageIntervalRateLimiter.java
@@ -53,11 +53,13 @@ public class AverageIntervalRateLimiter extends RateLimiter {
 
   // This method is for strictly testing purpose only
   @VisibleForTesting
+  @Override
   public void setNextRefillTime(long nextRefillTime) {
     this.nextRefillTime = nextRefillTime;
   }
 
   @VisibleForTesting
+  @Override
   public long getNextRefillTime() {
     return this.nextRefillTime;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/17829bbb/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FixedIntervalRateLimiter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FixedIntervalRateLimiter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FixedIntervalRateLimiter.java
index 475f778..5eb7e13 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FixedIntervalRateLimiter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FixedIntervalRateLimiter.java
@@ -45,11 +45,13 @@ public class FixedIntervalRateLimiter extends RateLimiter {
 
   // This method is for strictly testing purpose only
   @VisibleForTesting
+  @Override
   public void setNextRefillTime(long nextRefillTime) {
     this.nextRefillTime = nextRefillTime;
   }
 
   @VisibleForTesting
+  @Override
   public long getNextRefillTime() {
     return this.nextRefillTime;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/17829bbb/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RateLimiter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RateLimiter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RateLimiter.java
index e359601..45089e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RateLimiter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RateLimiter.java
@@ -191,13 +191,10 @@ public abstract class RateLimiter {
     return (amount <= avail) ? 0 : getWaitInterval(limit, avail, amount);
   }
 
-  // This method is for strictly testing purpose only
+  // These two method are for strictly testing purpose only
   @VisibleForTesting
-  public void setNextRefillTime(long nextRefillTime) {
-    this.setNextRefillTime(nextRefillTime);
-  }
+  public abstract void setNextRefillTime(long nextRefillTime);
 
-  public long getNextRefillTime() {
-    return this.getNextRefillTime();
-  }
+  @VisibleForTesting
+  public abstract long getNextRefillTime();
 }


Mime
View raw message