http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/BigDecimalComparator.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BigDecimalComparator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BigDecimalComparator.html
index d327c65..a39fe8b 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/BigDecimalComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/BigDecimalComparator.html
@@ -44,84 +44,85 @@
 <span class="sourceLineNo">036</span> * A BigDecimal comparator which 
numerical compares against the specified byte array<a name="line.36"></a>
 <span class="sourceLineNo">037</span> */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>@InterfaceAudience.Public<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>public class BigDecimalComparator extends 
ByteArrayComparable {<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  private BigDecimal bigDecimal;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  public BigDecimalComparator(BigDecimal 
value) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    super(Bytes.toBytes(value));<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>    this.bigDecimal = 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>  @Override<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>    if (obj == null || !(obj instanceof 
BigDecimalComparator)) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      return false;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    }<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    if (this == obj) {<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>      return true;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    }<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    BigDecimalComparator bdc = 
(BigDecimalComparator) obj;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    return 
this.bigDecimal.equals(bdc.bigDecimal);<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>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public int hashCode() {<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    return 
Objects.hash(this.bigDecimal);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @Override<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    BigDecimal that = 
Bytes.toBigDecimal(value, offset, length);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    return 
this.bigDecimal.compareTo(that);<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>  @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    BigDecimal that = 
ByteBufferUtils.toBigDecimal(value, offset, length);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    return 
this.bigDecimal.compareTo(that);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  }<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>   * @return The comparator serialized 
using pb<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 byte[] toByteArray() {<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>    
ComparatorProtos.BigDecimalComparator.Builder builder =<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        
ComparatorProtos.BigDecimalComparator.newBuilder();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * @param pbBytes A pb serialized 
{@link BigDecimalComparator} instance<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @return An instance of {@link 
BigDecimalComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>   * @throws DeserializationException A 
deserialization exception<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * @see #toByteArray<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>   */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public static BigDecimalComparator 
parseFrom(final byte[] pbBytes)<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      throws DeserializationException {<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>    ComparatorProtos.BigDecimalComparator 
proto;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    try {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      proto = 
ComparatorProtos.BigDecimalComparator.parseFrom(pbBytes);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      throw new 
DeserializationException(e);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    return new 
BigDecimalComparator(Bytes.toBigDecimal(proto.getComparable().getValue()<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>        .toByteArray()));<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * @param other the other comparator<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @return true if and only if the 
fields of the comparator that are serialized are equal to the<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>   *         corresponding fields in 
other. Used for testing.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  boolean 
areSerializedFieldsEqual(BigDecimalComparator other) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    if (other == this) {<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>      return true;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
-<span class="sourceLineNo">116</span>}<a name="line.116"></a>
+<span class="sourceLineNo">039</span>@SuppressWarnings("ComparableType") // 
Should this move to Comparator usage?<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class BigDecimalComparator extends 
ByteArrayComparable {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  private BigDecimal bigDecimal;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public BigDecimalComparator(BigDecimal 
value) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    super(Bytes.toBytes(value));<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>    this.bigDecimal = 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>  @Override<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>    if (obj == null || !(obj instanceof 
BigDecimalComparator)) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      return false;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    if (this == obj) {<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>      return true;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    BigDecimalComparator bdc = 
(BigDecimalComparator) obj;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    return 
this.bigDecimal.equals(bdc.bigDecimal);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<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 int hashCode() {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    return 
Objects.hash(this.bigDecimal);<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    BigDecimal that = 
Bytes.toBigDecimal(value, offset, length);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return 
this.bigDecimal.compareTo(that);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<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 int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    BigDecimal that = 
ByteBufferUtils.toBigDecimal(value, offset, length);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    return 
this.bigDecimal.compareTo(that);<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>   * @return The comparator serialized 
using pb<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 byte[] toByteArray() {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    
ComparatorProtos.BigDecimalComparator.Builder builder =<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        
ComparatorProtos.BigDecimalComparator.newBuilder();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    return 
builder.build().toByteArray();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @param pbBytes A pb serialized 
{@link BigDecimalComparator} instance<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * @return An instance of {@link 
BigDecimalComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @throws DeserializationException A 
deserialization exception<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @see #toByteArray<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public static BigDecimalComparator 
parseFrom(final byte[] pbBytes)<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      throws DeserializationException {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    ComparatorProtos.BigDecimalComparator 
proto;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      proto = 
ComparatorProtos.BigDecimalComparator.parseFrom(pbBytes);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      throw new 
DeserializationException(e);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return new 
BigDecimalComparator(Bytes.toBigDecimal(proto.getComparable().getValue()<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>        .toByteArray()));<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<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">107</span>   * @param other the other comparator<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return true if and only if the 
fields of the comparator that are serialized are equal to the<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>   *         corresponding fields in 
other. Used for testing.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   */<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  boolean 
areSerializedFieldsEqual(BigDecimalComparator other) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (other == this) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      return true;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>}<a name="line.117"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryComparator.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryComparator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryComparator.html
index f427f35..e97b370 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryComparator.html
@@ -44,66 +44,67 @@
 <span class="sourceLineNo">036</span> * @since 2.0.0<a name="line.36"></a>
 <span class="sourceLineNo">037</span> */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>@InterfaceAudience.Public<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>public class BinaryComparator extends 
org.apache.hadoop.hbase.filter.ByteArrayComparable {<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 value<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>   */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>  public BinaryComparator(byte[] value) 
{<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    super(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>  @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public int compareTo(byte [] value, int 
offset, int length) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    return Bytes.compareTo(this.value, 0, 
this.value.length, value, offset, length);<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 compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    return 
ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, 
length);<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.BinaryComparator.Builder builder =<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      
ComparatorProtos.BinaryComparator.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 BinaryComparator} instance<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * @return An instance of {@link 
BinaryComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * @throws 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 BinaryComparator 
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.BinaryComparator 
proto;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    try {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      proto = 
ComparatorProtos.BinaryComparator.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 
BinaryComparator(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>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    if (other == this) return true;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    if (!(other instanceof 
BinaryComparator)) return false;<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>}<a name="line.98"></a>
+<span class="sourceLineNo">039</span>@SuppressWarnings("ComparableType") // 
Should this move to Comparator usage?<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class BinaryComparator extends 
org.apache.hadoop.hbase.filter.ByteArrayComparable {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   * Constructor<a name="line.42"></a>
+<span class="sourceLineNo">043</span>   * @param value value<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>   */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  public BinaryComparator(byte[] value) 
{<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    super(value);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  @Override<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public int compareTo(byte [] value, int 
offset, int length) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    return Bytes.compareTo(this.value, 0, 
this.value.length, value, offset, length);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Override<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    return 
ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, 
length);<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>  /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * @return The comparator serialized 
using pb<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 byte [] toByteArray() {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    
ComparatorProtos.BinaryComparator.Builder builder =<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      
ComparatorProtos.BinaryComparator.newBuilder();<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   * @param pbBytes A pb serialized 
{@link BinaryComparator} instance<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * @return An instance of {@link 
BinaryComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * @throws DeserializationException<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>   * @see #toByteArray<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public static BinaryComparator 
parseFrom(final byte [] pbBytes)<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  throws DeserializationException {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    ComparatorProtos.BinaryComparator 
proto;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    try {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      proto = 
ComparatorProtos.BinaryComparator.parseFrom(pbBytes);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      throw new 
DeserializationException(e);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    return new 
BinaryComparator(proto.getComparable().getValue().toByteArray());<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>  /**<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * @param other<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   */<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  @Override<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    if (other == this) return true;<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (!(other instanceof 
BinaryComparator)) return false;<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>}<a name="line.99"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.html
index 892daee..a335b08 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BinaryPrefixComparator.html
@@ -44,71 +44,72 @@
 <span class="sourceLineNo">036</span> * {@link BinaryComparator}.<a 
name="line.36"></a>
 <span class="sourceLineNo">037</span> */<a name="line.37"></a>
 <span class="sourceLineNo">038</span>@InterfaceAudience.Public<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>public class BinaryPrefixComparator 
extends ByteArrayComparable {<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>   * Constructor<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   * @param value value<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>   */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public BinaryPrefixComparator(byte[] 
value) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    super(value);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  @Override<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  public int compareTo(byte [] value, int 
offset, int length) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    return Bytes.compareTo(this.value, 0, 
this.value.length, value, offset,<a name="line.51"></a>
-<span class="sourceLineNo">052</span>        this.value.length &lt;= length ? 
this.value.length : length);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  @Override<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    if (this.value.length &lt;= length) 
{<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      length = this.value.length;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    }<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    return 
ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, 
length);<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>  /**<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @return The comparator serialized 
using pb<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public byte [] toByteArray() {<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>    
ComparatorProtos.BinaryPrefixComparator.Builder builder =<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      
ComparatorProtos.BinaryPrefixComparator.newBuilder();<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    return 
builder.build().toByteArray();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * @param pbBytes A pb serialized 
{@link BinaryPrefixComparator} instance<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * @return An instance of {@link 
BinaryPrefixComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>   * @throws DeserializationException<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>   * @see #toByteArray<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public static BinaryPrefixComparator 
parseFrom(final byte [] pbBytes)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  throws DeserializationException {<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>    
ComparatorProtos.BinaryPrefixComparator proto;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      proto = 
ComparatorProtos.BinaryPrefixComparator.parseFrom(pbBytes);<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      throw new 
DeserializationException(e);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    return new 
BinaryPrefixComparator(proto.getComparable().getValue().toByteArray());<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  /**<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @param other<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   */<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  @Override<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    if (other == this) return true;<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (!(other instanceof 
BinaryPrefixComparator)) return false;<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>}<a name="line.103"></a>
+<span class="sourceLineNo">039</span>@SuppressWarnings("ComparableType") // 
Should this move to Comparator usage?<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class BinaryPrefixComparator 
extends ByteArrayComparable {<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  /**<a name="line.42"></a>
+<span class="sourceLineNo">043</span>   * Constructor<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   * @param value value<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>   */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public BinaryPrefixComparator(byte[] 
value) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    super(value);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  @Override<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  public int compareTo(byte [] value, int 
offset, int length) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    return Bytes.compareTo(this.value, 0, 
this.value.length, value, offset,<a name="line.52"></a>
+<span class="sourceLineNo">053</span>        this.value.length &lt;= length ? 
this.value.length : length);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  @Override<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    if (this.value.length &lt;= length) 
{<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      length = this.value.length;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    }<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    return 
ByteBufferUtils.compareTo(this.value, 0, this.value.length, value, offset, 
length);<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @return The comparator serialized 
using pb<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public byte [] toByteArray() {<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>    
ComparatorProtos.BinaryPrefixComparator.Builder builder =<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      
ComparatorProtos.BinaryPrefixComparator.newBuilder();<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    return 
builder.build().toByteArray();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * @param pbBytes A pb serialized 
{@link BinaryPrefixComparator} instance<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   * @return An instance of {@link 
BinaryPrefixComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>   * @throws DeserializationException<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>   * @see #toByteArray<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>   */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public static BinaryPrefixComparator 
parseFrom(final byte [] pbBytes)<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  throws DeserializationException {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    
ComparatorProtos.BinaryPrefixComparator proto;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    try {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      proto = 
ComparatorProtos.BinaryPrefixComparator.parseFrom(pbBytes);<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      throw new 
DeserializationException(e);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    return new 
BinaryPrefixComparator(proto.getComparable().getValue().toByteArray());<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   * @param other<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  @Override<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    if (other == this) return true;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    if (!(other instanceof 
BinaryPrefixComparator)) return false;<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return 
super.areSerializedFieldsEqual(other);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>}<a name="line.104"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html
index 9c3c5ad..e8ccb35 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html
@@ -41,131 +41,132 @@
 <span class="sourceLineNo">033</span> * with the specified byte array. Then 
returns whether the result is non-zero.<a name="line.33"></a>
 <span class="sourceLineNo">034</span> */<a name="line.34"></a>
 <span class="sourceLineNo">035</span>@InterfaceAudience.Public<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>public class BitComparator extends 
ByteArrayComparable {<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>  /** Bit operators. */<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>  @InterfaceAudience.Public<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>  public enum BitwiseOp {<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>    /** and */<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    AND,<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    /** or */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    OR,<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    /** xor */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    XOR<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  protected BitwiseOp bitOperator;<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>   * Constructor<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * @param value value<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>   * @param bitOperator operator to use 
on the bit comparison<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public BitComparator(byte[] value, 
BitwiseOp bitOperator) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    super(value);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    this.bitOperator = bitOperator;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * @return the bitwise operator<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>   */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public BitwiseOp getOperator() {<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    return bitOperator;<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.BitComparator.Builder builder =<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      
ComparatorProtos.BitComparator.newBuilder();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    
ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      
ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    builder.setBitwiseOp(bitwiseOpPb);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    return 
builder.build().toByteArray();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * @param pbBytes A pb serialized 
{@link BitComparator} instance<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * @return An instance of {@link 
BitComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * @throws DeserializationException<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>   * @see #toByteArray<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public static BitComparator 
parseFrom(final byte [] pbBytes)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  throws DeserializationException {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>    ComparatorProtos.BitComparator 
proto;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    try {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      proto = 
ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      throw new 
DeserializationException(e);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    BitwiseOp bitwiseOp = 
BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return new 
BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @param other<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    if (other == this) return true;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    if (!(other instanceof 
BitComparator)) return false;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    BitComparator comparator = 
(BitComparator)other;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return 
super.areSerializedFieldsEqual(other)<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      &amp;&amp; 
this.getOperator().equals(comparator.getOperator());<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>  @Override<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    if (length != this.value.length) {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      return 1;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    int b = 0;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      switch (bitOperator) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        case AND:<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          b = (this.value[i] &amp; 
value[i+offset]) &amp; 0xff;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>          break;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        case OR:<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          b = (this.value[i] | 
value[i+offset]) &amp; 0xff;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>          break;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        case XOR:<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          b = (this.value[i] ^ 
value[i+offset]) &amp; 0xff;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>          break;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    return b == 0 ? 1 : 0;<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>  }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (length != this.value.length) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      return 1;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    int b = 0;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      switch (bitOperator) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>        case AND:<a name="line.146"></a>
-<span class="sourceLineNo">147</span>          b = (this.value[i] &amp; 
value.get(i + offset)) &amp; 0xff;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>          break;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        case OR:<a name="line.149"></a>
-<span class="sourceLineNo">150</span>          b = (this.value[i] | 
value.get(i + offset)) &amp; 0xff;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>          break;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        case XOR:<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          b = (this.value[i] ^ 
value.get(i + offset)) &amp; 0xff;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          break;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    return b == 0 ? 1 : 0;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>}<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">036</span>@SuppressWarnings("ComparableType") // 
Should this move to Comparator usage?<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public class BitComparator extends 
ByteArrayComparable {<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>  /** Bit operators. */<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>  @InterfaceAudience.Public<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>  public enum BitwiseOp {<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>    /** and */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    AND,<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    /** or */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    OR,<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    /** xor */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    XOR<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  protected BitwiseOp bitOperator;<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>   * Constructor<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @param value value<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>   * @param bitOperator operator to use 
on the bit comparison<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public BitComparator(byte[] value, 
BitwiseOp bitOperator) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    super(value);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    this.bitOperator = bitOperator;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<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>   * @return the bitwise operator<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public BitwiseOp getOperator() {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    return bitOperator;<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.BitComparator.Builder builder =<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      
ComparatorProtos.BitComparator.newBuilder();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    
ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      
ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    builder.setBitwiseOp(bitwiseOpPb);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    return 
builder.build().toByteArray();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param pbBytes A pb serialized 
{@link BitComparator} instance<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @return An instance of {@link 
BitComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @throws DeserializationException<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>   * @see #toByteArray<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public static BitComparator 
parseFrom(final byte [] pbBytes)<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  throws DeserializationException {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>    ComparatorProtos.BitComparator 
proto;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      proto = 
ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      throw new 
DeserializationException(e);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    BitwiseOp bitwiseOp = 
BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    return new 
BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * @param other<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    if (other == this) return true;<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    if (!(other instanceof 
BitComparator)) return false;<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    BitComparator comparator = 
(BitComparator)other;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return 
super.areSerializedFieldsEqual(other)<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      &amp;&amp; 
this.getOperator().equals(comparator.getOperator());<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (length != this.value.length) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      return 1;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    int b = 0;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      switch (bitOperator) {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>        case AND:<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          b = (this.value[i] &amp; 
value[i+offset]) &amp; 0xff;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>          break;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        case OR:<a name="line.127"></a>
+<span class="sourceLineNo">128</span>          b = (this.value[i] | 
value[i+offset]) &amp; 0xff;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>          break;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        case XOR:<a name="line.130"></a>
+<span class="sourceLineNo">131</span>          b = (this.value[i] ^ 
value[i+offset]) &amp; 0xff;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          break;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    return b == 0 ? 1 : 0;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (length != this.value.length) {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      return 1;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int b = 0;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      switch (bitOperator) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>        case AND:<a name="line.147"></a>
+<span class="sourceLineNo">148</span>          b = (this.value[i] &amp; 
value.get(i + offset)) &amp; 0xff;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>          break;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        case OR:<a name="line.150"></a>
+<span class="sourceLineNo">151</span>          b = (this.value[i] | 
value.get(i + offset)) &amp; 0xff;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>          break;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        case XOR:<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          b = (this.value[i] ^ 
value.get(i + offset)) &amp; 0xff;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          break;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    return b == 0 ? 1 : 0;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>}<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e9a81b89/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html
index 9c3c5ad..e8ccb35 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html
@@ -41,131 +41,132 @@
 <span class="sourceLineNo">033</span> * with the specified byte array. Then 
returns whether the result is non-zero.<a name="line.33"></a>
 <span class="sourceLineNo">034</span> */<a name="line.34"></a>
 <span class="sourceLineNo">035</span>@InterfaceAudience.Public<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>public class BitComparator extends 
ByteArrayComparable {<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>  /** Bit operators. */<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>  @InterfaceAudience.Public<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>  public enum BitwiseOp {<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>    /** and */<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    AND,<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    /** or */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    OR,<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    /** xor */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    XOR<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  protected BitwiseOp bitOperator;<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>   * Constructor<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * @param value value<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>   * @param bitOperator operator to use 
on the bit comparison<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public BitComparator(byte[] value, 
BitwiseOp bitOperator) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    super(value);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    this.bitOperator = bitOperator;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * @return the bitwise operator<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>   */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public BitwiseOp getOperator() {<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    return bitOperator;<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.BitComparator.Builder builder =<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      
ComparatorProtos.BitComparator.newBuilder();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    
ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      
ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    builder.setBitwiseOp(bitwiseOpPb);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    return 
builder.build().toByteArray();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * @param pbBytes A pb serialized 
{@link BitComparator} instance<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * @return An instance of {@link 
BitComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * @throws DeserializationException<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>   * @see #toByteArray<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public static BitComparator 
parseFrom(final byte [] pbBytes)<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  throws DeserializationException {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>    ComparatorProtos.BitComparator 
proto;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    try {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      proto = 
ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      throw new 
DeserializationException(e);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    BitwiseOp bitwiseOp = 
BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return new 
BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @param other<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    if (other == this) return true;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    if (!(other instanceof 
BitComparator)) return false;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    BitComparator comparator = 
(BitComparator)other;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return 
super.areSerializedFieldsEqual(other)<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      &amp;&amp; 
this.getOperator().equals(comparator.getOperator());<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>  @Override<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    if (length != this.value.length) {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      return 1;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    int b = 0;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      switch (bitOperator) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        case AND:<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          b = (this.value[i] &amp; 
value[i+offset]) &amp; 0xff;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>          break;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        case OR:<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          b = (this.value[i] | 
value[i+offset]) &amp; 0xff;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>          break;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        case XOR:<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          b = (this.value[i] ^ 
value[i+offset]) &amp; 0xff;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>          break;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    return b == 0 ? 1 : 0;<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>  }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (length != this.value.length) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      return 1;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    int b = 0;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      switch (bitOperator) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>        case AND:<a name="line.146"></a>
-<span class="sourceLineNo">147</span>          b = (this.value[i] &amp; 
value.get(i + offset)) &amp; 0xff;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>          break;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        case OR:<a name="line.149"></a>
-<span class="sourceLineNo">150</span>          b = (this.value[i] | 
value.get(i + offset)) &amp; 0xff;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>          break;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        case XOR:<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          b = (this.value[i] ^ 
value.get(i + offset)) &amp; 0xff;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          break;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    return b == 0 ? 1 : 0;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>}<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">036</span>@SuppressWarnings("ComparableType") // 
Should this move to Comparator usage?<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public class BitComparator extends 
ByteArrayComparable {<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>  /** Bit operators. */<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>  @InterfaceAudience.Public<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>  public enum BitwiseOp {<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>    /** and */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    AND,<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    /** or */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    OR,<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    /** xor */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    XOR<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  protected BitwiseOp bitOperator;<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>   * Constructor<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @param value value<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>   * @param bitOperator operator to use 
on the bit comparison<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public BitComparator(byte[] value, 
BitwiseOp bitOperator) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    super(value);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    this.bitOperator = bitOperator;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<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>   * @return the bitwise operator<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public BitwiseOp getOperator() {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    return bitOperator;<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.BitComparator.Builder builder =<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      
ComparatorProtos.BitComparator.newBuilder();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    
builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    
ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      
ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    builder.setBitwiseOp(bitwiseOpPb);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    return 
builder.build().toByteArray();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @param pbBytes A pb serialized 
{@link BitComparator} instance<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @return An instance of {@link 
BitComparator} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @throws DeserializationException<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>   * @see #toByteArray<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public static BitComparator 
parseFrom(final byte [] pbBytes)<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  throws DeserializationException {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>    ComparatorProtos.BitComparator 
proto;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      proto = 
ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      throw new 
DeserializationException(e);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    BitwiseOp bitwiseOp = 
BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    return new 
BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * @param other<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * @return true if and only if the 
fields of the comparator that are serialized<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  boolean 
areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    if (other == this) return true;<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    if (!(other instanceof 
BitComparator)) return false;<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    BitComparator comparator = 
(BitComparator)other;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return 
super.areSerializedFieldsEqual(other)<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      &amp;&amp; 
this.getOperator().equals(comparator.getOperator());<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public int compareTo(byte[] value, int 
offset, int length) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (length != this.value.length) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      return 1;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    int b = 0;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      switch (bitOperator) {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>        case AND:<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          b = (this.value[i] &amp; 
value[i+offset]) &amp; 0xff;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>          break;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        case OR:<a name="line.127"></a>
+<span class="sourceLineNo">128</span>          b = (this.value[i] | 
value[i+offset]) &amp; 0xff;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>          break;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        case XOR:<a name="line.130"></a>
+<span class="sourceLineNo">131</span>          b = (this.value[i] ^ 
value[i+offset]) &amp; 0xff;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          break;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    return b == 0 ? 1 : 0;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public int compareTo(ByteBuffer value, 
int offset, int length) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (length != this.value.length) {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      return 1;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int b = 0;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    //Iterating backwards is faster 
because we can quit after one non-zero byte.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    for (int i = length - 1; i &gt;= 0 
&amp;&amp; b == 0; i--) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      switch (bitOperator) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>        case AND:<a name="line.147"></a>
+<span class="sourceLineNo">148</span>          b = (this.value[i] &amp; 
value.get(i + offset)) &amp; 0xff;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>          break;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        case OR:<a name="line.150"></a>
+<span class="sourceLineNo">151</span>          b = (this.value[i] | 
value.get(i + offset)) &amp; 0xff;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>          break;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        case XOR:<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          b = (this.value[i] ^ 
value.get(i + offset)) &amp; 0xff;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          break;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    return b == 0 ? 1 : 0;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>}<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
 
 
 

Reply via email to