You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/08/08 01:25:12 UTC
[1/2] hbase git commit: Update POMs and CHANGES.txt for 0.98.21 RC0
Repository: hbase
Updated Branches:
refs/heads/0.98 e23fa866d -> c706e30d0
Updated Tags: refs/tags/0.98.21RC0 [created] 004cb32d8
Update POMs and CHANGES.txt for 0.98.21 RC0
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a42b58b8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a42b58b8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a42b58b8
Branch: refs/heads/0.98
Commit: a42b58b87f90133f288afb0fb2d3b95ebfe3363f
Parents: e23fa86
Author: Andrew Purtell <ap...@apache.org>
Authored: Sun Aug 7 11:46:57 2016 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sun Aug 7 11:46:57 2016 -0700
----------------------------------------------------------------------
CHANGES.txt | 69 ++++++++++++++++++++++++++++++++++++++
hbase-annotations/pom.xml | 2 +-
hbase-assembly/pom.xml | 2 +-
hbase-checkstyle/pom.xml | 4 +--
hbase-client/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-examples/pom.xml | 2 +-
hbase-hadoop-compat/pom.xml | 2 +-
hbase-hadoop1-compat/pom.xml | 2 +-
hbase-hadoop2-compat/pom.xml | 2 +-
hbase-it/pom.xml | 2 +-
hbase-prefix-tree/pom.xml | 2 +-
hbase-protocol/pom.xml | 2 +-
hbase-resource-bundle/pom.xml | 2 +-
hbase-rest/pom.xml | 2 +-
hbase-server/pom.xml | 2 +-
hbase-shell/pom.xml | 2 +-
hbase-testing-util/pom.xml | 2 +-
hbase-thrift/pom.xml | 2 +-
pom.xml | 2 +-
20 files changed, 89 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58db19b..12a5129 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,74 @@
HBase Change Log
+Release 0.98.21 - 8/15/2016
+
+** Sub-task
+ * [HBASE-15115] - Fix findbugs complaints in hbase-client
+ * [HBASE-16194] - Should count in MSLAB chunk allocation into heap size change when adding duplicate cells
+ * [HBASE-16195] - Should not add chunk into chunkQueue if not using chunk pool in HeapMemStoreLAB
+ * [HBASE-16321] - Ensure findbugs jsr305 jar isn't present
+ * [HBASE-16352] - Port HBASE-15645 (hbase.rpc.timeout is not used in operations of HTable) to 0.98
+
+** Bug
+ * [HBASE-13594] - MultiRowRangeFilter shouldn't call HBaseZeroCopyByteString.wrap() directly
+ * [HBASE-13704] - Hbase throws OutOfOrderScannerNextException when MultiRowRangeFilter is used
+ * [HBASE-14206] - MultiRowRangeFilter returns records whose rowKeys are out of allowed ranges
+ * [HBASE-15746] - Remove extra RegionCoprocessor preClose() in RSRpcServices#closeRegion
+ * [HBASE-15783] - AccessControlConstants#OP_ATTRIBUTE_ACL_STRATEGY_CELL_FIRST not used any more.
+ * [HBASE-15946] - Eliminate possible security concerns in RS web UI's store file metrics
+ * [HBASE-15975] - logic in TestHTableDescriptor#testAddCoprocessorWithSpecStr is wrong
+ * [HBASE-15976] - RegionServerMetricsWrapperRunnable will be failure when disable blockcache.
+ * [HBASE-15990] - The priority value of subsequent coprocessors in the Coprocessor.Priority.SYSTEM list are not incremented by one
+ * [HBASE-16007] - Job's Configuration should be passed to TableMapReduceUtil#addDependencyJars() in WALPlayer
+ * [HBASE-16012] - Major compaction can't work due to obsolete scanner read point in RegionServer
+ * [HBASE-16032] - Possible memory leak in StoreScanner
+ * [HBASE-16033] - Add more details in logging of responseTooSlow/TooLarge
+ * [HBASE-16045] - endtime argument for VerifyReplication was incorrectly specified in usage
+ * [HBASE-16055] - PutSortReducer loses any Visibility/acl attribute set on the Puts
+ * [HBASE-16061] - Allow logging to a buffered console
+ * [HBASE-16070] - Mapreduce Serialization classes do not have Interface audience
+ * [HBASE-16090] - ResultScanner is not closed in SyncTable#finishRemainingHashRanges()
+ * [HBASE-16091] - Canary takes lot more time when there are delete markers in the table
+ * [HBASE-16093] - Splits failed before creating daughter regions leave meta inconsistent
+ * [HBASE-16095] - Add priority to TableDescriptor and priority region open thread pool
+ * [HBASE-16129] - check_compatibility.sh is broken when using Java API Compliance Checker v1.7
+ * [HBASE-16135] - PeerClusterZnode under rs of removed peer may never be deleted
+ * [HBASE-16144] - Replication queue's lock will live forever if RS acquiring the lock has died prematurely
+ * [HBASE-16160] - Get the UnsupportedOperationException when using delegation token with encryption
+ * [HBASE-16201] - NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication
+ * [HBASE-16207] - can't restore snapshot without "Admin" permission
+ * [HBASE-16227] - [Shell] Column value formatter not working in scans
+ * [HBASE-16244] - LocalHBaseCluster start timeout should be configurable
+ * [HBASE-16272] - Overflow in ServerName's compareTo method
+ * [HBASE-16281] - TestMasterReplication is flaky
+ * [HBASE-16284] - Unauthorized client can shutdown the cluster
+ * [HBASE-16288] - HFile intermediate block level indexes might recurse forever creating multi TB files
+ * [HBASE-16296] - Reverse scan performance degrades when using filter lists
+ * [HBASE-16300] - LruBlockCache.CACHE_FIXED_OVERHEAD should calculate LruBlockCache size correctly
+ * [HBASE-16319] - Fix TestCacheOnWrite after HBASE-16288
+ * [HBASE-16350] - Undo server abort from HBASE-14968
+
+** Improvement
+ * [HBASE-11144] - Filter to support scanning multiple row key ranges
+ * [HBASE-14548] - Expand how table coprocessor jar and dependency path can be specified
+ * [HBASE-15119] - Include git SHA in check_compatibility reports
+ * [HBASE-15870] - Specify columns in REST multi gets
+ * [HBASE-16048] - Tag InternalScanner with LimitedPrivate(HBaseInterfaceAudience.COPROC)
+ * [HBASE-16052] - Improve HBaseFsck Scalability
+ * [HBASE-16085] - Add on metric for failed compactions
+ * [HBASE-16108] - RowCounter should support multiple key ranges
+ * [HBASE-16124] - Make check_compatibility.sh less verbose when building HBase
+ * [HBASE-16220] - Demote log level for "HRegionFileSystem - No StoreFiles for" messages to TRACE
+ * [HBASE-16241] - Allow specification of annotations to use when running check_compatibility.sh
+ * [HBASE-16275] - Change ServerManager#onlineServers from ConcurrentHashMap to ConcurrentSkipListMap
+
+** Task
+ * [HBASE-15729] - Remove old JDiff wrapper scripts in dev-support
+ * [HBASE-16073] - update compatibility_checker for jacc dropping comma sep args
+ * [HBASE-16154] - bring non-master branches up to date wrt check_compatibility script
+ * [HBASE-16175] - Backport HBASE-15650 (Remove TimeRangeTracker as point of contention when many threads reading a StoreFile) to 0.98
+
+
Release 0.98.20 - 6/13/2016
** Sub-task
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 055f6dd..19a666e 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 59ed96b..b154110 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index 41bc8c1..dcd1dbf 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -24,14 +24,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-checkstyle</artifactId>
-<version>0.98.21-SNAPSHOT</version>
+<version>0.98.21</version>
<name>Apache HBase - Checkstyle</name>
<description>Module to hold Checkstyle properties for HBase.</description>
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index f1ed0f3..e4d4d59 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index df1295e..d92f129 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index b9ca993..af2142b6 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-hadoop-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index bd7d391..8a60a96 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-hadoop1-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop1-compat/pom.xml b/hbase-hadoop1-compat/pom.xml
index 4a3d079..568d8f0 100644
--- a/hbase-hadoop1-compat/pom.xml
+++ b/hbase-hadoop1-compat/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-hadoop2-compat/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index 31ca530..01343f0 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index cf2d5ba..a919e5e 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-prefix-tree/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 33234cd..7a982b6 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml
index 0100e14..4bc4d76 100644
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-resource-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/pom.xml b/hbase-resource-bundle/pom.xml
index 14075ef..d8eb96d 100644
--- a/hbase-resource-bundle/pom.xml
+++ b/hbase-resource-bundle/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 6e0dc8a..7834a20 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-rest</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 980689c..3ddc2b4 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-server</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-shell/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 2d7a097..2f05dd2 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shell</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-testing-util/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index f5ff62b..c3c73f2 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-testing-util</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 9f58e99..b245900 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-thrift</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a42b58b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b7374cc..25b10c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<packaging>pom</packaging>
- <version>0.98.21-SNAPSHOT</version>
+ <version>0.98.21</version>
<name>Apache HBase</name>
<description>
Apache HBase� is the Hadoop database. Use it when you need
[2/2] hbase git commit: Amend HBASE-16321;
javac 6 does not like the replacement NonNull and Nullable annotations
Posted by ap...@apache.org.
Amend HBASE-16321; javac 6 does not like the replacement NonNull and Nullable annotations
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c706e30d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c706e30d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c706e30d
Branch: refs/heads/0.98
Commit: c706e30d02343e0ba36bdea1ac6f746da0ee5e54
Parents: a42b58b
Author: Andrew Purtell <ap...@apache.org>
Authored: Sun Aug 7 17:41:25 2016 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sun Aug 7 17:45:46 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/protobuf/ResponseConverter.java | 2 --
.../org/apache/hadoop/hbase/codec/BaseDecoder.java | 2 --
.../org/apache/hadoop/hbase/master/LoadBalancer.java | 1 -
.../hadoop/hbase/util/AbstractFileStatusFilter.java | 8 +++-----
.../java/org/apache/hadoop/hbase/util/FSUtils.java | 14 ++++++--------
.../mapreduce/TestMultiTableSnapshotInputFormat.java | 2 --
6 files changed, 9 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
index e059c31..89382dd 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
@@ -348,7 +347,6 @@ public final class ResponseConverter {
* @return exception if any, or null; Will return DoNotRetryIOException for string represented
* failure causes in controller.
*/
- @Nullable
public static IOException getControllerException(RpcController controller) throws IOException {
if (controller != null && controller.failed()) {
if (controller instanceof ServerRpcController) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
index 485b88a..62c73d8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/BaseDecoder.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
-import edu.umd.cs.findbugs.annotations.NonNull;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Cell;
@@ -98,7 +97,6 @@ public abstract class BaseDecoder implements Codec.Decoder {
* thrown if EOF is reached prematurely. Does not return null.
* @throws IOException
*/
- @NonNull
protected abstract Cell parseCell() throws IOException;
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
----------------------------------------------------------------------
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 119b01d..e24d745 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
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.master;
import java.util.List;
import java.util.Map;
-import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.hbase.ClusterStatus;
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractFileStatusFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractFileStatusFilter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractFileStatusFilter.java
index eef66bd..8ea7dbf 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractFileStatusFilter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractFileStatusFilter.java
@@ -26,8 +26,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
/**
* Typical base class for file status filter. Works more efficiently when
* filtering file statuses, otherwise implementation will need to lookup filestatus
@@ -45,7 +43,7 @@ public abstract class AbstractFileStatusFilter implements PathFilter, FileStatus
* @param isDir An optional boolean indicating whether the path is a directory or not
* @return true if the path is accepted, false if the path is filtered out
*/
- protected abstract boolean accept(Path p, @CheckForNull Boolean isDir);
+ protected abstract boolean accept(Path p, Boolean isDir);
@Override
public boolean accept(FileStatus f) {
@@ -57,11 +55,11 @@ public abstract class AbstractFileStatusFilter implements PathFilter, FileStatus
return accept(p, null);
}
- protected boolean isFile(FileSystem fs, @CheckForNull Boolean isDir, Path p) throws IOException {
+ protected boolean isFile(FileSystem fs, Boolean isDir, Path p) throws IOException {
return !isDirectory(fs, isDir, p);
}
- protected boolean isDirectory(FileSystem fs, @CheckForNull Boolean isDir, Path p) throws IOException {
+ protected boolean isDirectory(FileSystem fs, Boolean isDir, Path p) throws IOException {
return isDir != null ? isDir : fs.isDirectory(p);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
----------------------------------------------------------------------
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 218cc18..c99fa97 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
@@ -93,8 +93,6 @@ import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import com.google.common.primitives.Ints;
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-
/**
* Utility methods for interacting with the underlying file system.
*/
@@ -1173,7 +1171,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
try {
return isFile(fs, isDir, p);
} catch (IOException e) {
@@ -1205,7 +1203,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
if (!isValidName(p.getName())) {
return false;
}
@@ -1364,7 +1362,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
if (!regionDirPattern.matcher(p.getName()).matches()) {
return false;
}
@@ -1413,7 +1411,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
try {
// throws IAE if invalid
HColumnDescriptor.isLegalFamilyName(Bytes.toBytes(p.getName()));
@@ -1475,7 +1473,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
if (!StoreFileInfo.isHFile(p)) {
return false;
}
@@ -1499,7 +1497,7 @@ public abstract class FSUtils {
}
@Override
- protected boolean accept(Path p, @CheckForNull Boolean isDir) {
+ protected boolean accept(Path p, Boolean isDir) {
if (!StoreFileInfo.isReference(p)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/c706e30d/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
index 933c7f6..2b3a877 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormat.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.mapreduce;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimaps;
-import edu.umd.cs.findbugs.annotations.Nullable;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Scan;
@@ -76,7 +75,6 @@ public class TestMultiTableSnapshotInputFormat extends MultiTableInputFormatTest
protected Map<String, Collection<Scan>> getSnapshotScanMapping(final List<Scan> scans) {
return Multimaps.index(scans, new Function<Scan, String>() {
- @Nullable
@Override
public String apply(Scan input) {
return snapshotNameForTable(