You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/03/08 14:54:17 UTC
[23/25] hbase-site git commit: Published site at
a03d09abd72789bbf9364d8a9b2c54d0e9351af9.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
index da5d73e..5afdb22 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html
@@ -40,83 +40,84 @@
<span class="sourceLineNo">032</span>// adding special compareTo methods. We have to clean it. Deprecate this class and replace it<a name="line.32"></a>
<span class="sourceLineNo">033</span>// with a more generic one which says it compares bytes (not necessary a byte array only)<a name="line.33"></a>
<span class="sourceLineNo">034</span>// BytesComparable implements Comparable<Byte> will work?<a name="line.34"></a>
-<span class="sourceLineNo">035</span>public abstract class ByteArrayComparable implements Comparable<byte[]> {<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span> byte[] value;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> /**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Constructor.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * @param value the value to compare against<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span> public ByteArrayComparable(byte [] value) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> this.value = value;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> }<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> public byte[] getValue() {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return value;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * @return The comparator serialized using pb<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span> public abstract byte [] toByteArray();<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * @param pbBytes A pb serialized {@link ByteArrayComparable} instance<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * @return An instance of {@link ByteArrayComparable} made from <code>bytes</code><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @throws DeserializationException<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @see #toByteArray<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public static ByteArrayComparable parseFrom(final byte [] pbBytes)<a name="line.62"></a>
-<span class="sourceLineNo">063</span> throws DeserializationException {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> throw new DeserializationException(<a name="line.64"></a>
-<span class="sourceLineNo">065</span> "parseFrom called on base ByteArrayComparable, but should be called on derived type");<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param other<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> if (other == this) return true;<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> return Bytes.equals(this.getValue(), other.getValue());<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public int compareTo(byte [] value) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return compareTo(value, 0, value.length);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Special compareTo method for subclasses, to avoid<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * copying byte[] unnecessarily.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @param value byte[] to compare<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * @param offset offset into value<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @param length number of bytes to compare<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @return a negative integer, zero, or a positive integer as this object<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * is less than, equal to, or greater than the specified object.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public abstract int compareTo(byte [] value, int offset, int length);<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * Special compareTo method for subclasses, to avoid copying bytes unnecessarily.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @param value bytes to compare within a ByteBuffer<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @param offset offset into value<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @param length number of bytes to compare<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @return a negative integer, zero, or a positive integer as this object<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * is less than, equal to, or greater than the specified object.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> // For BC, providing a default implementation here which is doing a bytes copy to a temp byte[]<a name="line.104"></a>
-<span class="sourceLineNo">105</span> // and calling compareTo(byte[]). Make sure to override this method in subclasses to avoid<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // copying bytes unnecessarily.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> byte[] temp = new byte[length];<a name="line.107"></a>
-<span class="sourceLineNo">108</span> ByteBufferUtils.copyFromBufferToArray(temp, value, offset, 0, length);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return compareTo(temp);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>}<a name="line.111"></a>
+<span class="sourceLineNo">035</span>@SuppressWarnings("ComparableType") // Should this move to Comparator usage?<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public abstract class ByteArrayComparable implements Comparable<byte[]> {<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> byte[] value;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> /**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Constructor.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @param value the value to compare against<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span> public ByteArrayComparable(byte [] value) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span> this.value = value;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> }<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> public byte[] getValue() {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return value;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @return The comparator serialized using pb<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public abstract byte [] toByteArray();<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * @param pbBytes A pb serialized {@link ByteArrayComparable} instance<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @return An instance of {@link ByteArrayComparable} made from <code>bytes</code><a name="line.59"></a>
+<span class="sourceLineNo">060</span> * @throws DeserializationException<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * @see #toByteArray<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public static ByteArrayComparable parseFrom(final byte [] pbBytes)<a name="line.63"></a>
+<span class="sourceLineNo">064</span> throws DeserializationException {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> throw new DeserializationException(<a name="line.65"></a>
+<span class="sourceLineNo">066</span> "parseFrom called on base ByteArrayComparable, but should be called on derived type");<a name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param other<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> */<a name="line.73"></a>
+<span class="sourceLineNo">074</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> if (other == this) return true;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> return Bytes.equals(this.getValue(), other.getValue());<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public int compareTo(byte [] value) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return compareTo(value, 0, value.length);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Special compareTo method for subclasses, to avoid<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * copying byte[] unnecessarily.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param value byte[] to compare<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param offset offset into value<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param length number of bytes to compare<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @return a negative integer, zero, or a positive integer as this object<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * is less than, equal to, or greater than the specified object.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public abstract int compareTo(byte [] value, int offset, int length);<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * Special compareTo method for subclasses, to avoid copying bytes unnecessarily.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param value bytes to compare within a ByteBuffer<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @param offset offset into value<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * @param length number of bytes to compare<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @return a negative integer, zero, or a positive integer as this object<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * is less than, equal to, or greater than the specified object.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> */<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> // For BC, providing a default implementation here which is doing a bytes copy to a temp byte[]<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // and calling compareTo(byte[]). Make sure to override this method in subclasses to avoid<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // copying bytes unnecessarily.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> byte[] temp = new byte[length];<a name="line.108"></a>
+<span class="sourceLineNo">109</span> ByteBufferUtils.copyFromBufferToArray(temp, value, offset, 0, length);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return compareTo(temp);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>}<a name="line.112"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/LongComparator.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/LongComparator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/LongComparator.html
index dc4e2f5..e5c72e8 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/LongComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/LongComparator.html
@@ -42,64 +42,65 @@
<span class="sourceLineNo">034</span> * A long comparator which numerical compares against the specified byte array<a name="line.34"></a>
<span class="sourceLineNo">035</span> */<a name="line.35"></a>
<span class="sourceLineNo">036</span>@InterfaceAudience.Public<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public class LongComparator extends ByteArrayComparable {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private long longValue;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> public LongComparator(long value) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> super(Bytes.toBytes(value));<a name="line.41"></a>
-<span class="sourceLineNo">042</span> this.longValue = value;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> }<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span> @Override<a name="line.45"></a>
-<span class="sourceLineNo">046</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> long that = Bytes.toLong(value, offset, length);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return Long.compare(longValue, that);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> @Override<a name="line.51"></a>
-<span class="sourceLineNo">052</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> long that = ByteBufferUtils.toLong(value, offset);<a name="line.53"></a>
-<span class="sourceLineNo">054</span> return Long.compare(longValue, that);<a name="line.54"></a>
-<span class="sourceLineNo">055</span> }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * @return The comparator serialized using pb<a name="line.58"></a>
-<span class="sourceLineNo">059</span> */<a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public byte [] toByteArray() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> ComparatorProtos.LongComparator.Builder builder =<a name="line.62"></a>
-<span class="sourceLineNo">063</span> ComparatorProtos.LongComparator.newBuilder();<a name="line.63"></a>
-<span class="sourceLineNo">064</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.64"></a>
-<span class="sourceLineNo">065</span> return builder.build().toByteArray();<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param pbBytes A pb serialized {@link LongComparator} instance<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * @return An instance of {@link LongComparator} made from <code>bytes</code><a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * @see #toByteArray<a name="line.72"></a>
-<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span> public static LongComparator parseFrom(final byte [] pbBytes)<a name="line.74"></a>
-<span class="sourceLineNo">075</span> throws DeserializationException {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> ComparatorProtos.LongComparator proto;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> try {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> proto = ComparatorProtos.LongComparator.parseFrom(pbBytes);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> } catch (InvalidProtocolBufferException e) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> throw new DeserializationException(e);<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span> return new LongComparator(Bytes.toLong(proto.getComparable().getValue().toByteArray()));<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @param other<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span> boolean areSerializedFieldsEqual(LongComparator other) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> if (other == this) return true;<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return super.areSerializedFieldsEqual(other);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>}<a name="line.94"></a>
+<span class="sourceLineNo">037</span>@SuppressWarnings("ComparableType") // Should this move to Comparator usage?<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class LongComparator extends ByteArrayComparable {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private long longValue;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> public LongComparator(long value) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> super(Bytes.toBytes(value));<a name="line.42"></a>
+<span class="sourceLineNo">043</span> this.longValue = value;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> }<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span> @Override<a name="line.46"></a>
+<span class="sourceLineNo">047</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> long that = Bytes.toLong(value, offset, length);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return Long.compare(longValue, that);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> long that = ByteBufferUtils.toLong(value, offset);<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return Long.compare(longValue, that);<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @return The comparator serialized using pb<a name="line.59"></a>
+<span class="sourceLineNo">060</span> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span> @Override<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public byte [] toByteArray() {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> ComparatorProtos.LongComparator.Builder builder =<a name="line.63"></a>
+<span class="sourceLineNo">064</span> ComparatorProtos.LongComparator.newBuilder();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.65"></a>
+<span class="sourceLineNo">066</span> return builder.build().toByteArray();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param pbBytes A pb serialized {@link LongComparator} instance<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @return An instance of {@link LongComparator} made from <code>bytes</code><a name="line.71"></a>
+<span class="sourceLineNo">072</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * @see #toByteArray<a name="line.73"></a>
+<span class="sourceLineNo">074</span> */<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static LongComparator parseFrom(final byte [] pbBytes)<a name="line.75"></a>
+<span class="sourceLineNo">076</span> throws DeserializationException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> ComparatorProtos.LongComparator proto;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> try {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> proto = ComparatorProtos.LongComparator.parseFrom(pbBytes);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> } catch (InvalidProtocolBufferException e) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> throw new DeserializationException(e);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return new LongComparator(Bytes.toLong(proto.getComparable().getValue().toByteArray()));<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * @param other<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> */<a name="line.90"></a>
+<span class="sourceLineNo">091</span> boolean areSerializedFieldsEqual(LongComparator other) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> if (other == this) return true;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> return super.areSerializedFieldsEqual(other);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>}<a name="line.95"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/NullComparator.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/NullComparator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/NullComparator.html
index 9f8ab35..03c79fd 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/NullComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/NullComparator.html
@@ -40,78 +40,79 @@
<span class="sourceLineNo">032</span> * byte array using {@link org.apache.hadoop.hbase.util.Bytes#compareTo(byte[], byte[])}.<a name="line.32"></a>
<span class="sourceLineNo">033</span> */<a name="line.33"></a>
<span class="sourceLineNo">034</span>@InterfaceAudience.Public<a name="line.34"></a>
-<span class="sourceLineNo">035</span>public class NullComparator extends ByteArrayComparable {<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span> public NullComparator() {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> super(new byte[0]);<a name="line.38"></a>
-<span class="sourceLineNo">039</span> }<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> @Override<a name="line.41"></a>
-<span class="sourceLineNo">042</span> public int compareTo(byte[] value) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> return value != null ? 1 : 0;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> @Override<a name="line.46"></a>
-<span class="sourceLineNo">047</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings (value="EQ_UNUSUAL", justification="")<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public boolean equals(Object obj) {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> return obj == null;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> @Override<a name="line.52"></a>
-<span class="sourceLineNo">053</span> public int hashCode() {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> return 0;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> @Override<a name="line.57"></a>
-<span class="sourceLineNo">058</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return compareTo(value);<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> @Override<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> return value != null ? 1 : 0;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> /**<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @return The comparator serialized using pb<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public byte [] toByteArray() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> ComparatorProtos.NullComparator.Builder builder =<a name="line.72"></a>
-<span class="sourceLineNo">073</span> ComparatorProtos.NullComparator.newBuilder();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return builder.build().toByteArray();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * @param pbBytes A pb serialized {@link NullComparator} instance<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * @return An instance of {@link NullComparator} made from <code>bytes</code><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @throws DeserializationException<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @see #toByteArray<a name="line.81"></a>
-<span class="sourceLineNo">082</span> */<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public static NullComparator parseFrom(final byte [] pbBytes)<a name="line.83"></a>
-<span class="sourceLineNo">084</span> throws DeserializationException {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> try {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> // Just parse. Don't use what we parse since on end we are returning new NullComparator.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> ComparatorProtos.NullComparator.parseFrom(pbBytes);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> } catch (InvalidProtocolBufferException e) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> throw new DeserializationException(e);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return new NullComparator();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @param other<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> */<a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if (other == this) return true;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (!(other instanceof NullComparator)) return false;<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> return super.areSerializedFieldsEqual(other);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>}<a name="line.106"></a>
+<span class="sourceLineNo">035</span>@SuppressWarnings("ComparableType") // Should this move to Comparator usage?<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class NullComparator extends ByteArrayComparable {<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span> public NullComparator() {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> super(new byte[0]);<a name="line.39"></a>
+<span class="sourceLineNo">040</span> }<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span> @Override<a name="line.42"></a>
+<span class="sourceLineNo">043</span> public int compareTo(byte[] value) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> return value != null ? 1 : 0;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> }<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> @Override<a name="line.47"></a>
+<span class="sourceLineNo">048</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings (value="EQ_UNUSUAL", justification="")<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public boolean equals(Object obj) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> return obj == null;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> @Override<a name="line.53"></a>
+<span class="sourceLineNo">054</span> public int hashCode() {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return 0;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> return compareTo(value);<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> @Override<a name="line.63"></a>
+<span class="sourceLineNo">064</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> return value != null ? 1 : 0;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @return The comparator serialized using pb<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> @Override<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public byte [] toByteArray() {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> ComparatorProtos.NullComparator.Builder builder =<a name="line.73"></a>
+<span class="sourceLineNo">074</span> ComparatorProtos.NullComparator.newBuilder();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return builder.build().toByteArray();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @param pbBytes A pb serialized {@link NullComparator} instance<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @return An instance of {@link NullComparator} made from <code>bytes</code><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @throws DeserializationException<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @see #toByteArray<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public static NullComparator parseFrom(final byte [] pbBytes)<a name="line.84"></a>
+<span class="sourceLineNo">085</span> throws DeserializationException {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> try {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // Just parse. Don't use what we parse since on end we are returning new NullComparator.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> ComparatorProtos.NullComparator.parseFrom(pbBytes);<a name="line.88"></a>
+<span class="sourceLineNo">089</span> } catch (InvalidProtocolBufferException e) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> throw new DeserializationException(e);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return new NullComparator();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param other<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> */<a name="line.99"></a>
+<span class="sourceLineNo">100</span> @Override<a name="line.100"></a>
+<span class="sourceLineNo">101</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (other == this) return true;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (!(other instanceof NullComparator)) return false;<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> return super.areSerializedFieldsEqual(other);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>}<a name="line.107"></a>