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 2009/10/19 04:46:09 UTC
svn commit: r826580 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase: KeyValue.java
regionserver/KeyValueHeap.java util/Bytes.java
Author: apurtell
Date: Mon Oct 19 02:46:08 2009
New Revision: 826580
URL: http://svn.apache.org/viewvc?rev=826580&view=rev
Log:
HBASE-1916 FindBugs and javac warnings cleanup; back out 'Serializable' additions
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java?rev=826580&r1=826579&r2=826580&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java Mon Oct 19 02:46:08 2009
@@ -22,7 +22,6 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.Comparator;
@@ -63,7 +62,7 @@
* <p>TODO: Group Key-only comparators and operations into a Key class, just
* for neatness sake, if can figure what to call it.
*/
-public class KeyValue implements Writable, HeapSize, Cloneable {
+public class KeyValue implements Writable, HeapSize {
static final Log LOG = LogFactory.getLog(KeyValue.class);
/**
@@ -1225,11 +1224,9 @@
* A {@link KVComparator} for <code>-ROOT-</code> catalog table
* {@link KeyValue}s.
*/
- public static class RootComparator extends MetaComparator
- implements Serializable {
- private static final long serialVersionUID = 1L;
+ public static class RootComparator extends MetaComparator {
private final KeyComparator rawcomparator = new RootKeyComparator();
-
+
public KeyComparator getRawComparator() {
return this.rawcomparator;
}
@@ -1244,9 +1241,7 @@
* A {@link KVComparator} for <code>.META.</code> catalog table
* {@link KeyValue}s.
*/
- public static class MetaComparator extends KVComparator
- implements Serializable {
- private static final long serialVersionUID = 1L;
+ public static class MetaComparator extends KVComparator {
private final KeyComparator rawcomparator = new MetaKeyComparator();
public KeyComparator getRawComparator() {
@@ -1265,9 +1260,7 @@
* considered the same as far as this Comparator is concerned.
* Hosts a {@link KeyComparator}.
*/
- public static class KVComparator implements java.util.Comparator<KeyValue>,
- Serializable {
- private static final long serialVersionUID = 1L;
+ public static class KVComparator implements java.util.Comparator<KeyValue> {
private final KeyComparator rawcomparator = new KeyComparator();
/**
@@ -1564,10 +1557,7 @@
* Compare key portion of a {@link KeyValue} for keys in <code>-ROOT-<code>
* table.
*/
- public static class RootKeyComparator extends MetaKeyComparator
- implements Serializable {
- private static final long serialVersionUID = 1L;
-
+ public static class RootKeyComparator extends MetaKeyComparator {
public int compareRows(byte [] left, int loffset, int llength,
byte [] right, int roffset, int rlength) {
// Rows look like this: .META.,ROW_FROM_META,RID
@@ -1610,10 +1600,7 @@
/**
* Comparator that compares row component only of a KeyValue.
*/
- public static class RowComparator implements Comparator<KeyValue>,
- Serializable {
- private static final long serialVersionUID = 1L;
-
+ public static class RowComparator implements Comparator<KeyValue> {
final KVComparator comparator;
public RowComparator(final KVComparator c) {
@@ -1629,10 +1616,7 @@
* Compare key portion of a {@link KeyValue} for keys in <code>.META.</code>
* table.
*/
- public static class MetaKeyComparator extends KeyComparator
- implements Serializable {
- private static final long serialVersionUID = 1L;
-
+ public static class MetaKeyComparator extends KeyComparator {
public int compareRows(byte [] left, int loffset, int llength,
byte [] right, int roffset, int rlength) {
// LOG.info("META " + Bytes.toString(left, loffset, llength) +
@@ -1689,10 +1673,7 @@
/**
* Compare key portion of a {@link KeyValue}.
*/
- public static class KeyComparator implements RawComparator<byte []>,
- Serializable {
- private static final long serialVersionUID = 1L;
-
+ public static class KeyComparator implements RawComparator<byte []> {
volatile boolean ignoreTimestamp = false;
volatile boolean ignoreType = false;
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=826580&r1=826579&r2=826580&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 Mon Oct 19 02:46:08 2009
@@ -21,7 +21,6 @@
package org.apache.hadoop.hbase.regionserver;
import java.io.IOException;
-import java.io.Serializable;
import java.util.Comparator;
import java.util.List;
import java.util.PriorityQueue;
@@ -128,10 +127,7 @@
return next(result, -1);
}
- private static class KVScannerComparator
- implements Comparator<KeyValueScanner>, Serializable {
- private static final long serialVersionUID = 1L;
-
+ private class KVScannerComparator implements Comparator<KeyValueScanner> {
private KVComparator kvComparator;
/**
* Constructor
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java?rev=826580&r1=826579&r2=826580&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java Mon Oct 19 02:46:08 2009
@@ -22,7 +22,6 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.Comparator;
@@ -93,10 +92,7 @@
/**
* Byte array comparator class.
*/
- public static class ByteArrayComparator
- implements RawComparator<byte []>, Serializable {
- private static final long serialVersionUID = 1L;
-
+ public static class ByteArrayComparator implements RawComparator<byte []> {
/**
* Constructor
*/