You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/11/25 14:20:52 UTC
svn commit: r1545257 - in
/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase: ./
io/encoding/ io/hfile/ util/
Author: nkeywal
Date: Mon Nov 25 13:20:51 2013
New Revision: 1545257
URL: http://svn.apache.org/r1545257
Log:
HBASE-10023 Fix/Suppress all the 10 findbug warnings under hbase-common (Liang Xie)
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumType.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/KeyLocker.java
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java Mon Nov 25 13:20:51 2013
@@ -82,7 +82,7 @@ public class CellComparator implements C
if (c != 0) return c;
//timestamp: later sorts first
- c = -Longs.compare(a.getTimestamp(), b.getTimestamp());
+ c = Longs.compare(b.getTimestamp(), a.getTimestamp());
if (c != 0) return c;
//type
@@ -90,7 +90,7 @@ public class CellComparator implements C
if (c != 0) return c;
//mvccVersion: later sorts first
- return -Longs.compare(a.getMvccVersion(), b.getMvccVersion());
+ return Longs.compare(b.getMvccVersion(), a.getMvccVersion());
}
@@ -197,7 +197,7 @@ public class CellComparator implements C
if (c != 0) return c;
//timestamp: later sorts first
- c = -Longs.compare(a.getTimestamp(), b.getTimestamp());
+ c = Longs.compare(b.getTimestamp(), a.getTimestamp());
if (c != 0) return c;
//type
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java Mon Nov 25 13:20:51 2013
@@ -2055,7 +2055,7 @@ public class KeyValue implements Cell, H
// compare Mvcc Version
// Negate this comparison so later edits show up first
- return -Longs.compare(left.getMvccVersion(), right.getMvccVersion());
+ return Longs.compare(right.getMvccVersion(), left.getMvccVersion());
}
public int compareTimestamps(final KeyValue left, final KeyValue right) {
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/BufferedDataBlockEncoder.java Mon Nov 25 13:20:51 2013
@@ -156,11 +156,7 @@ abstract class BufferedDataBlockEncoder
public BufferedEncodedSeeker(KVComparator comparator,
HFileBlockDecodingContext decodingCtx) {
this.comparator = comparator;
- if (comparator instanceof SamePrefixComparator) {
- this.samePrefixComparator = (SamePrefixComparator<byte[]>) comparator;
- } else {
- this.samePrefixComparator = null;
- }
+ this.samePrefixComparator = comparator;
this.decodingCtx = decodingCtx;
if (decodingCtx.getHFileContext().isCompressTags()) {
try {
@@ -468,9 +464,7 @@ abstract class BufferedDataBlockEncoder
HFileBlockDefaultEncodingContext encodingCtx =
(HFileBlockDefaultEncodingContext) blkEncodingCtx;
encodingCtx.prepareEncoding();
- DataOutputStream dataOut =
- ((HFileBlockDefaultEncodingContext) encodingCtx)
- .getOutputStreamForEncoder();
+ DataOutputStream dataOut = encodingCtx.getOutputStreamForEncoder();
if (encodingCtx.getHFileContext().isCompressTags()) {
try {
TagCompressionContext tagCompressionContext = new TagCompressionContext(LRUDictionary.class);
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileContext.java Mon Nov 25 13:20:51 2013
@@ -155,16 +155,10 @@ public class HFileContext implements Hea
@Override
public HFileContext clone() {
- HFileContext clonnedCtx = new HFileContext();
- clonnedCtx.usesHBaseChecksum = this.usesHBaseChecksum;
- clonnedCtx.includesMvcc = this.includesMvcc;
- clonnedCtx.includesTags = this.includesTags;
- clonnedCtx.compressAlgo = this.compressAlgo;
- clonnedCtx.compressTags = this.compressTags;
- clonnedCtx.checksumType = this.checksumType;
- clonnedCtx.bytesPerChecksum = this.bytesPerChecksum;
- clonnedCtx.blocksize = this.blocksize;
- clonnedCtx.encoding = this.encoding;
- return clonnedCtx;
+ try {
+ return (HFileContext)(super.clone());
+ } catch (CloneNotSupportedException e) {
+ throw new AssertionError(); // Won't happen
+ }
}
}
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java Mon Nov 25 13:20:51 2013
@@ -190,14 +190,12 @@ public class Bytes {
/**
* Pass this to TreeMaps where byte [] are keys.
*/
- public static Comparator<byte []> BYTES_COMPARATOR =
- new ByteArrayComparator();
+ public final static Comparator<byte []> BYTES_COMPARATOR = new ByteArrayComparator();
/**
* Use comparing byte arrays, byte-by-byte
*/
- public static RawComparator<byte []> BYTES_RAWCOMPARATOR =
- new ByteArrayComparator();
+ public final static RawComparator<byte []> BYTES_RAWCOMPARATOR = new ByteArrayComparator();
/**
* Read byte-array written with a WritableableUtils.vint prefix.
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumType.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumType.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumType.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ChecksumType.java Mon Nov 25 13:20:51 2013
@@ -49,7 +49,7 @@ public enum ChecksumType {
},
CRC32((byte)1) {
- private volatile Constructor<?> ctor;
+ private transient Constructor<?> ctor;
@Override
public String getName() {
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ConcatenatedLists.java Mon Nov 25 13:20:51 2013
@@ -129,6 +129,9 @@ public class ConcatenatedLists<T> implem
return new Iterator();
}
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+ value="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD",
+ justification="nextWasCalled is using by StripeStoreFileManager")
public class Iterator implements java.util.Iterator<T> {
protected int currentComponent = 0;
protected int indexWithinComponent = -1;
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java Mon Nov 25 13:20:51 2013
@@ -184,6 +184,9 @@ public class JVM {
* Workaround to get the current number of process running. Approach is the one described here:
* http://stackoverflow.com/questions/54686/how-to-get-a-list-of-current-open-windows-process-with-java
*/
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+ value="RV_DONT_JUST_NULL_CHECK_READLINE",
+ justification="used by testing")
public int getNumberOfRunningProcess(){
if (!isUnix()){
return 0;
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/KeyLocker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/KeyLocker.java?rev=1545257&r1=1545256&r2=1545257&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/KeyLocker.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/util/KeyLocker.java Mon Nov 25 13:20:51 2013
@@ -117,7 +117,7 @@ public class KeyLocker<K extends Compara
static class KeyLock<K extends Comparable<? super K>> extends ReentrantLock {
private static final long serialVersionUID = -12432857283423584L;
- private final KeyLocker<K> locker;
+ private final transient KeyLocker<K> locker;
private final K lockId;
private KeyLock(KeyLocker<K> locker, K lockId) {