You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/01/05 07:06:49 UTC
svn commit: r895913 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/client/
src/java/org/apache/hadoop/hbase/regionserver/
src/java/org/apache/hadoop/hbase/thrift/generated/
src/test/org/apache/hadoop/hbase/regionserver/ src/test/org/apac...
Author: stack
Date: Tue Jan 5 06:06:46 2010
New Revision: 895913
URL: http://svn.apache.org/viewvc?rev=895913&view=rev
Log:
HBASE-2090 findbugs issues
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jan 5 06:06:46 2010
@@ -284,6 +284,7 @@
HBASE-2086 Job(configuration,String) deprecated (Kay Kay via Stack)
HBASE-1996 Configure scanner buffer in bytes instead of number of rows
(Erik Rozendaal and Dave Latham via Stack)
+ HBASE-2090 findbugs issues (Kay Kay via Stack)
NEW FEATURES
HBASE-1901 "General" partitioner for "hbase-48" bulk (behind the api, write
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java Tue Jan 5 06:06:46 2010
@@ -595,26 +595,26 @@
* @deprecated
*/
public String getInputColumns() {
- String cols = "";
+ StringBuilder cols = new StringBuilder("");
for (Map.Entry<byte[], NavigableSet<byte[]>> e :
familyMap.entrySet()) {
byte[] fam = e.getKey();
- if (cols.length() > 0) cols += " ";
+ if (cols.length() > 0) cols.append(" ");
NavigableSet<byte[]> quals = e.getValue();
// check if this family has qualifiers
if (quals != null && quals.size() > 0) {
- String cs = "";
+ StringBuilder cs = new StringBuilder("");
for (byte[] qual : quals) {
- if (cs.length() > 0) cs += " ";
+ if (cs.length() > 0) cs.append(" ");
// encode values to make parsing easier later
- cs += Bytes.toStringBinary(fam) + ":" + Bytes.toStringBinary(qual);
+ cs.append(Bytes.toStringBinary(fam) + ":" + Bytes.toStringBinary(qual));
}
- cols += cs;
+ cols.append(cs);
} else {
// only add the family but with old style delimiter
- cols += Bytes.toStringBinary(fam) + ":";
+ cols.append(Bytes.toStringBinary(fam) + ":");
}
}
- return cols;
+ return cols.toString();
}
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java Tue Jan 5 06:06:46 2010
@@ -130,7 +130,7 @@
return next(result, -1);
}
- private class KVScannerComparator implements Comparator<KeyValueScanner> {
+ private static class KVScannerComparator implements Comparator<KeyValueScanner> {
private KVComparator kvComparator;
/**
* Constructor
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java Tue Jan 5 06:06:46 2010
@@ -3666,7 +3666,7 @@
public Object getFieldValue(int fieldID) {
switch (fieldID) {
case SUCCESS:
- return new Boolean(isSuccess());
+ return Boolean.valueOf(isSuccess());
case IO:
return getIo();
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java Tue Jan 5 06:06:46 2010
@@ -40,8 +40,8 @@
private Path dir;
private MiniDFSCluster cluster;
- private final String TABLE = "testtable";
- private final int TOTAL_EDITS = 10000;
+ private static final String TABLE = "testtable";
+ private static final int TOTAL_EDITS = 10000;
private HBaseConfiguration conf;
/**
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java Tue Jan 5 06:06:46 2010
@@ -34,7 +34,7 @@
import org.apache.hadoop.hbase.util.Bytes;
public class TestStoreScanner extends TestCase {
- private final String CF_STR = "cf";
+ private static final String CF_STR = "cf";
final byte [] CF = Bytes.toBytes(CF_STR);
/**
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestWideScanner.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestWideScanner.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestWideScanner.java Tue Jan 5 06:06:46 2010
@@ -21,7 +21,7 @@
public class TestWideScanner extends HBaseTestCase {
private final Log LOG = LogFactory.getLog(this.getClass());
- final int BATCH = 1000;
+ static final int BATCH = 1000;
private MiniDFSCluster cluster = null;
private HRegion r;
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=895913&r1=895912&r2=895913&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Tue Jan 5 06:06:46 2010
@@ -193,7 +193,7 @@
public void testFindMemstoresWithEditsOlderThan() throws IOException {
Map<byte [], Long> regionsToSeqids = new HashMap<byte [], Long>();
for (int i = 0; i < 10; i++) {
- Long l = new Long(i);
+ Long l = Long.valueOf(i);
regionsToSeqids.put(l.toString().getBytes(), l);
}
byte [][] regions =