From a022320ef9777badddd290653876f5d09bb377a6 Mon Sep 17 00:00:00 2001 From: Andrew Kyle Purtell Date: Mon, 19 Oct 2009 02:46:08 +0000 Subject: [PATCH] HBASE-1916 FindBugs and javac warnings cleanup; back out 'Serializable' additions git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@826580 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/KeyValue.java | 37 +++++-------------- .../hbase/regionserver/KeyValueHeap.java | 6 +-- .../org/apache/hadoop/hbase/util/Bytes.java | 6 +-- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/src/java/org/apache/hadoop/hbase/KeyValue.java b/src/java/org/apache/hadoop/hbase/KeyValue.java index 7ccbcb5e1f0..ed6997c7287 100644 --- a/src/java/org/apache/hadoop/hbase/KeyValue.java +++ b/src/java/org/apache/hadoop/hbase/KeyValue.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase; 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 @@ import org.apache.hadoop.io.Writable; *

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 @@ public class KeyValue implements Writable, HeapSize, Cloneable { * A {@link KVComparator} for -ROOT- 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 @@ public class KeyValue implements Writable, HeapSize, Cloneable { * A {@link KVComparator} for .META. 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 @@ public class KeyValue implements Writable, HeapSize, Cloneable { * considered the same as far as this Comparator is concerned. * Hosts a {@link KeyComparator}. */ - public static class KVComparator implements java.util.Comparator, - Serializable { - private static final long serialVersionUID = 1L; + public static class KVComparator implements java.util.Comparator { private final KeyComparator rawcomparator = new KeyComparator(); /** @@ -1564,10 +1557,7 @@ public class KeyValue implements Writable, HeapSize, Cloneable { * Compare key portion of a {@link KeyValue} for keys in -ROOT- * 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 @@ public class KeyValue implements Writable, HeapSize, Cloneable { /** * Comparator that compares row component only of a KeyValue. */ - public static class RowComparator implements Comparator, - Serializable { - private static final long serialVersionUID = 1L; - + public static class RowComparator implements Comparator { final KVComparator comparator; public RowComparator(final KVComparator c) { @@ -1629,10 +1616,7 @@ public class KeyValue implements Writable, HeapSize, Cloneable { * Compare key portion of a {@link KeyValue} for keys in .META. * 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 @@ public class KeyValue implements Writable, HeapSize, Cloneable { /** * Compare key portion of a {@link KeyValue}. */ - public static class KeyComparator implements RawComparator, - Serializable { - private static final long serialVersionUID = 1L; - + public static class KeyComparator implements RawComparator { volatile boolean ignoreTimestamp = false; volatile boolean ignoreType = false; diff --git a/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java b/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java index cc4662f4178..c7932307439 100644 --- a/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java @@ -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 @@ public class KeyValueHeap implements KeyValueScanner, InternalScanner { return next(result, -1); } - private static class KVScannerComparator - implements Comparator, Serializable { - private static final long serialVersionUID = 1L; - + private class KVScannerComparator implements Comparator { private KVComparator kvComparator; /** * Constructor diff --git a/src/java/org/apache/hadoop/hbase/util/Bytes.java b/src/java/org/apache/hadoop/hbase/util/Bytes.java index ec77e7ffa94..d63416d18ed 100644 --- a/src/java/org/apache/hadoop/hbase/util/Bytes.java +++ b/src/java/org/apache/hadoop/hbase/util/Bytes.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.util; 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 @@ public class Bytes { /** * Byte array comparator class. */ - public static class ByteArrayComparator - implements RawComparator, Serializable { - private static final long serialVersionUID = 1L; - + public static class ByteArrayComparator implements RawComparator { /** * Constructor */