Index: src/java/org/apache/hadoop/hbase/util/MurmurHash.java =================================================================== --- src/java/org/apache/hadoop/hbase/util/MurmurHash.java (revision 736069) +++ src/java/org/apache/hadoop/hbase/util/MurmurHash.java (working copy) @@ -32,6 +32,7 @@ return _instance; } + @Override public int hash(byte[] data, int length, int seed) { int m = 0x5bd1e995; int r = 24; @@ -62,13 +63,13 @@ if (left != 0) { if (left >= 3) { - h ^= (int) data[length - 3] << 16; + h ^= data[length - 3] << 16; } if (left >= 2) { - h ^= (int) data[length - 2] << 8; + h ^= data[length - 2] << 8; } if (left >= 1) { - h ^= (int) data[length - 1]; + h ^= data[length - 1]; } h *= m; Index: src/java/org/apache/hadoop/hbase/util/Pair.java =================================================================== --- src/java/org/apache/hadoop/hbase/util/Pair.java (revision 736069) +++ src/java/org/apache/hadoop/hbase/util/Pair.java (working copy) @@ -68,6 +68,7 @@ return (x == null && y == null) || (x != null && x.equals(y)); } + @Override @SuppressWarnings("unchecked") public boolean equals(Object other) { @@ -75,6 +76,7 @@ equals(second, ((Pair)other).second); } + @Override public int hashCode() { if (first == null) @@ -85,6 +87,7 @@ return first.hashCode() * 17 + second.hashCode(); } + @Override public String toString() { return "{" + getFirst() + "," + getSecond() + "}"; Index: src/java/org/apache/hadoop/hbase/util/SoftValueMap.java =================================================================== --- src/java/org/apache/hadoop/hbase/util/SoftValueMap.java (revision 736069) +++ src/java/org/apache/hadoop/hbase/util/SoftValueMap.java (working copy) @@ -68,7 +68,7 @@ } @SuppressWarnings("unchecked") - public void putAll(@SuppressWarnings("unused") Map map) { + public void putAll(Map map) { throw new RuntimeException("Not implemented"); } @@ -96,7 +96,7 @@ return this.internalMap.containsKey(key); } - public boolean containsValue(@SuppressWarnings("unused") Object value) { + public boolean containsValue(Object value) { /* checkReferences(); return internalMap.containsValue(value);*/ throw new UnsupportedOperationException("Don't support containsValue!"); Index: src/java/org/apache/hadoop/hbase/util/MetaUtils.java =================================================================== --- src/java/org/apache/hadoop/hbase/util/MetaUtils.java (revision 736069) +++ src/java/org/apache/hadoop/hbase/util/MetaUtils.java (working copy) @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.util; -import java.io.FileNotFoundException; //TODO: remove import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -430,7 +429,6 @@ scanRootRegion(new ScannerListener() { private final Log SL_LOG = LogFactory.getLog(this.getClass()); - @SuppressWarnings("unused") public boolean processRow(HRegionInfo info) throws IOException { SL_LOG.debug("Testing " + info); if (Bytes.equals(info.getTableDesc().getName(), Index: src/java/org/apache/hadoop/hbase/util/JenkinsHash.java =================================================================== --- src/java/org/apache/hadoop/hbase/util/JenkinsHash.java (revision 736069) +++ src/java/org/apache/hadoop/hbase/util/JenkinsHash.java (working copy) @@ -78,6 +78,7 @@ *
Use for hash table lookup, or anything where one collision in 2^^32 is
* acceptable. Do NOT use for cryptographic purposes.
*/
+ @Override
@SuppressWarnings("fallthrough")
public int hash(byte[] key, int nbytes, int initval) {
int length = nbytes;
Index: src/java/org/apache/hadoop/hbase/util/SoftValue.java
===================================================================
--- src/java/org/apache/hadoop/hbase/util/SoftValue.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/util/SoftValue.java (working copy)
@@ -43,7 +43,7 @@
return get();
}
- public V setValue(@SuppressWarnings("unused") V value) {
+ public V setValue(V value) {
throw new RuntimeException("Not implemented");
}
}
\ No newline at end of file
Index: src/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java
===================================================================
--- src/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java (working copy)
@@ -82,7 +82,7 @@
}
@SuppressWarnings("unchecked")
- public void putAll(@SuppressWarnings("unused") Map map) {
+ public void putAll(Map map) {
throw new RuntimeException("Not implemented");
}
@@ -110,7 +110,7 @@
return this.internalMap.containsKey(key);
}
- public boolean containsValue(@SuppressWarnings("unused") Object value) {
+ public boolean containsValue(Object value) {
/* checkReferences();
return internalMap.containsValue(value);*/
throw new UnsupportedOperationException("Don't support containsValue!");
Index: src/java/org/apache/hadoop/hbase/util/Bytes.java
===================================================================
--- src/java/org/apache/hadoop/hbase/util/Bytes.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/util/Bytes.java (working copy)
@@ -8,7 +8,6 @@
import java.util.Comparator;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.io.WritableComparator;
import org.apache.hadoop.io.WritableUtils;
@@ -239,9 +238,7 @@
*/
public static boolean equals(final byte [] left, final byte [] right) {
return left == null && right == null? true:
- left == null && right != null? false:
- left != null && right == null? false:
- left.length != right.length? false:
+ (left == null || right == null || (left.length != right.length))? false:
compareTo(left, right) == 0;
}
Index: src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java (working copy)
@@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.thrift;
-import java.io.IOException;
import java.util.Map;
import java.util.TreeMap;
@@ -27,9 +26,7 @@
import org.apache.hadoop.hbase.io.Cell;
import org.apache.hadoop.hbase.io.RowResult;
import org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor;
-import org.apache.hadoop.hbase.thrift.generated.IOError;
import org.apache.hadoop.hbase.thrift.generated.IllegalArgument;
-import org.apache.hadoop.hbase.thrift.generated.NotFound;
import org.apache.hadoop.hbase.thrift.generated.TCell;
import org.apache.hadoop.hbase.thrift.generated.TRowResult;
import org.apache.hadoop.hbase.util.Bytes;
Index: src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (working copy)
@@ -327,11 +327,10 @@
if (columns == null) {
return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row),
timestamp));
- } else {
- byte[][] columnArr = columns.toArray(new byte[columns.size()][]);
- return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row),
- columnArr, timestamp));
}
+ byte[][] columnArr = columns.toArray(new byte[columns.size()][]);
+ return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row),
+ columnArr, timestamp));
} catch (IOException e) {
throw new IOError(e.getMessage());
}
Index: src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java (working copy)
@@ -23,16 +23,10 @@
*/
package org.apache.hadoop.hbase.thrift.generated;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
+
import com.facebook.thrift.*;
-
import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+
/**
* An AlreadyExists exceptions signals that a table with the specified
@@ -38,7 +32,9 @@
* An AlreadyExists exceptions signals that a table with the specified
* name already exists
*/
-public class AlreadyExists extends Exception implements TBase, java.io.Serializable {
+public class AlreadyExists extends Exception implements TBase {
+ private static final long serialVersionUID = 8675549793789131156L;
+
public String message;
public final Isset __isset = new Isset();
@@ -43,6 +39,7 @@
public final Isset __isset = new Isset();
public static final class Isset implements java.io.Serializable {
+ private static final long serialVersionUID = -6316548126261428272L;
public boolean message = false;
}
@@ -57,6 +54,7 @@
this.__isset.message = true;
}
+ @Override
public boolean equals(Object that) {
if (that == null)
return false;
@@ -81,6 +79,7 @@
return true;
}
+ @Override
public int hashCode() {
return 0;
}
@@ -129,6 +128,7 @@
oprot.writeStructEnd();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("AlreadyExists(");
sb.append("message:");
Index: src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java (working copy)
@@ -23,16 +23,9 @@
*/
package org.apache.hadoop.hbase.thrift.generated;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
import com.facebook.thrift.*;
+import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
/**
* An IllegalArgument exception indicates an illegal or invalid
@@ -38,7 +31,9 @@
* An IllegalArgument exception indicates an illegal or invalid
* argument was passed into a procedure.
*/
-public class IllegalArgument extends Exception implements TBase, java.io.Serializable {
+public class IllegalArgument extends Exception implements TBase {
+ private static final long serialVersionUID = 7805955702671398699L;
+
public String message;
public final Isset __isset = new Isset();
@@ -43,6 +38,7 @@
public final Isset __isset = new Isset();
public static final class Isset implements java.io.Serializable {
+ private static final long serialVersionUID = 2811515646965429616L;
public boolean message = false;
}
@@ -57,6 +53,7 @@
this.__isset.message = true;
}
+ @Override
public boolean equals(Object that) {
if (that == null)
return false;
@@ -81,6 +78,7 @@
return true;
}
+ @Override
public int hashCode() {
return 0;
}
@@ -129,6 +127,7 @@
oprot.writeStructEnd();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("IllegalArgument(");
sb.append("message:");
Index: src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java (working copy)
@@ -23,16 +23,9 @@
*/
package org.apache.hadoop.hbase.thrift.generated;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
import com.facebook.thrift.*;
+import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
/**
* An HColumnDescriptor contains information about a column family
@@ -40,6 +33,7 @@
* used as input when creating a table or adding a column.
*/
public class ColumnDescriptor implements TBase, java.io.Serializable {
+ private static final long serialVersionUID = -3094729576337495308L;
public byte[] name;
public int maxVersions;
public String compression;
@@ -53,6 +47,7 @@
public final Isset __isset = new Isset();
public static final class Isset implements java.io.Serializable {
+ private static final long serialVersionUID = -6487552021783142134L;
public boolean name = false;
public boolean maxVersions = false;
public boolean compression = false;
@@ -121,6 +116,7 @@
this.__isset.timeToLive = true;
}
+ @Override
public boolean equals(Object that) {
if (that == null)
return false;
@@ -226,6 +222,7 @@
return true;
}
+ @Override
public int hashCode() {
return 0;
}
@@ -404,6 +401,7 @@
oprot.writeStructEnd();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("ColumnDescriptor(");
sb.append("name:");
Index: src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java
===================================================================
--- src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java (revision 736069)
+++ src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java (working copy)
@@ -25,14 +25,9 @@
import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.HashSet;
import com.facebook.thrift.*;
+import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
/**
* A BatchMutation object is used to apply a number of Mutations to a single row.
@@ -38,6 +33,7 @@
* A BatchMutation object is used to apply a number of Mutations to a single row.
*/
public class BatchMutation implements TBase, java.io.Serializable {
+ private static final long serialVersionUID = 2856439423876215654L;
public byte[] row;
public List
Index: src/java/org/onelab/filter/DynamicBloomFilter.java
===================================================================
--- src/java/org/onelab/filter/DynamicBloomFilter.java (revision 736069)
+++ src/java/org/onelab/filter/DynamicBloomFilter.java (working copy)
@@ -51,8 +51,6 @@
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.hadoop.hbase.util.Hash;
-
/**
* Implements a dynamic Bloom filter, as defined in the INFOCOM 2006 paper.
*
Index: src/java/org/onelab/filter/BloomFilter.java
===================================================================
--- src/java/org/onelab/filter/BloomFilter.java (revision 736069)
+++ src/java/org/onelab/filter/BloomFilter.java (working copy)
@@ -50,10 +50,8 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-
import java.util.BitSet;
-import org.apache.hadoop.hbase.util.Hash;
/**
* Implements a Bloom filter, as defined by Bloom in 1970.
Index: src/java/org/onelab/filter/Key.java
===================================================================
--- src/java/org/onelab/filter/Key.java (revision 736069)
+++ src/java/org/onelab/filter/Key.java (working copy)
@@ -58,7 +58,7 @@
*
* @see org.onelab.filter.Filter The general behavior of a filter
*/
-public class Key implements WritableComparable {
+public class Key implements WritableComparable