http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
b/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
index 507603e..59c5078 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
@@ -34,108 +34,107 @@
<span class="sourceLineNo">026</span>import
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.exceptions.DeserializationException;<a
name="line.28"></a>
-<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.protobuf.generated.FilterProtos;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import
com.google.protobuf.InvalidProtocolBufferException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * <p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> * This filter is used to filter based on
the column family. It takes an<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * operator (equal, greater, not equal,
etc) and a byte [] comparator for the<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * column family portion of a key.<a
name="line.38"></a>
-<span class="sourceLineNo">039</span> * </p><p><a
name="line.39"></a>
-<span class="sourceLineNo">040</span> * This filter can be wrapped with {@link
org.apache.hadoop.hbase.filter.WhileMatchFilter} and {@link
org.apache.hadoop.hbase.filter.SkipFilter}<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * to add more control.<a
name="line.41"></a>
-<span class="sourceLineNo">042</span> * </p><p><a
name="line.42"></a>
-<span class="sourceLineNo">043</span> * Multiple filters can be combined using
{@link org.apache.hadoop.hbase.filter.FilterList}.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * </p><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * If an already known column family is
looked for, use {@link org.apache.hadoop.hbase.client.Get#addFamily(byte[])}<a
name="line.45"></a>
-<span class="sourceLineNo">046</span> * directly rather than a filter.<a
name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@InterfaceAudience.Public<a
name="line.48"></a>
-<span class="sourceLineNo">049</span>@InterfaceStability.Stable<a
name="line.49"></a>
-<span class="sourceLineNo">050</span>public class FamilyFilter extends
CompareFilter {<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> * Constructor.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * @param familyCompareOp the compare
op for column family matching<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * @param familyComparator the
comparator for column family matching<a name="line.56"></a>
-<span class="sourceLineNo">057</span> */<a name="line.57"></a>
-<span class="sourceLineNo">058</span> public FamilyFilter(final CompareOp
familyCompareOp,<a name="line.58"></a>
-<span class="sourceLineNo">059</span> final
ByteArrayComparable familyComparator) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> super(familyCompareOp,
familyComparator);<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 ReturnCode filterKeyValue(Cell
v) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> int familyLength =
v.getFamilyLength();<a name="line.65"></a>
-<span class="sourceLineNo">066</span> if (familyLength > 0) {<a
name="line.66"></a>
-<span class="sourceLineNo">067</span> if (compareFamily(this.compareOp,
this.comparator, v)) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return ReturnCode.NEXT_ROW;<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> return ReturnCode.INCLUDE;<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> public static Filter
createFilterFromArguments(ArrayList<byte []> filterArguments) {<a
name="line.74"></a>
-<span class="sourceLineNo">075</span> ArrayList<?> arguments =
CompareFilter.extractArguments(filterArguments);<a name="line.75"></a>
-<span class="sourceLineNo">076</span> CompareOp compareOp =
(CompareOp)arguments.get(0);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> ByteArrayComparable comparator =
(ByteArrayComparable)arguments.get(1);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return new FamilyFilter(compareOp,
comparator);<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> * @return The filter serialized using
pb<a name="line.82"></a>
-<span class="sourceLineNo">083</span> */<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public byte [] toByteArray() {<a
name="line.84"></a>
-<span class="sourceLineNo">085</span> FilterProtos.FamilyFilter.Builder
builder =<a name="line.85"></a>
-<span class="sourceLineNo">086</span>
FilterProtos.FamilyFilter.newBuilder();<a name="line.86"></a>
-<span class="sourceLineNo">087</span>
builder.setCompareFilter(super.convert());<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return
builder.build().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 pbBytes A pb serialized
{@link FamilyFilter} instance<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @return An instance of {@link
FamilyFilter} made from <code>bytes</code><a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @throws DeserializationException<a
name="line.94"></a>
-<span class="sourceLineNo">095</span> * @see #toByteArray<a
name="line.95"></a>
-<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public static FamilyFilter
parseFrom(final byte [] pbBytes)<a name="line.97"></a>
-<span class="sourceLineNo">098</span> throws DeserializationException {<a
name="line.98"></a>
-<span class="sourceLineNo">099</span> FilterProtos.FamilyFilter proto;<a
name="line.99"></a>
-<span class="sourceLineNo">100</span> try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> proto =
FilterProtos.FamilyFilter.parseFrom(pbBytes);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> } catch
(InvalidProtocolBufferException e) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> throw new
DeserializationException(e);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> final CompareOp valueCompareOp =<a
name="line.105"></a>
-<span class="sourceLineNo">106</span>
CompareOp.valueOf(proto.getCompareFilter().getCompareOp().name());<a
name="line.106"></a>
-<span class="sourceLineNo">107</span> ByteArrayComparable valueComparator =
null;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> try {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if
(proto.getCompareFilter().hasComparator()) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> valueComparator =
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a
name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> } catch (IOException ioe) {<a
name="line.112"></a>
-<span class="sourceLineNo">113</span> throw new
DeserializationException(ioe);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return new
FamilyFilter(valueCompareOp,valueComparator);<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>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param other<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @return true if and only if the
fields of the filter that are serialized<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * are equal to the corresponding
fields in other. Used for testing.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> boolean areSerializedFieldsEqual(Filter
o) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> if (o == this) return true;<a
name="line.124"></a>
-<span class="sourceLineNo">125</span> if (!(o instanceof FamilyFilter))
return false;<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> FamilyFilter other =
(FamilyFilter)o;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return
super.areSerializedFieldsEqual(other);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>}<a name="line.130"></a>
+<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a
name="line.30"></a>
+<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * <p><a name="line.34"></a>
+<span class="sourceLineNo">035</span> * This filter is used to filter based on
the column family. It takes an<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * operator (equal, greater, not equal,
etc) and a byte [] comparator for the<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * column family portion of a key.<a
name="line.37"></a>
+<span class="sourceLineNo">038</span> * </p><p><a
name="line.38"></a>
+<span class="sourceLineNo">039</span> * This filter can be wrapped with {@link
org.apache.hadoop.hbase.filter.WhileMatchFilter} and {@link
org.apache.hadoop.hbase.filter.SkipFilter}<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * to add more control.<a
name="line.40"></a>
+<span class="sourceLineNo">041</span> * </p><p><a
name="line.41"></a>
+<span class="sourceLineNo">042</span> * Multiple filters can be combined using
{@link org.apache.hadoop.hbase.filter.FilterList}.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * </p><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * If an already known column family is
looked for, use {@link org.apache.hadoop.hbase.client.Get#addFamily(byte[])}<a
name="line.44"></a>
+<span class="sourceLineNo">045</span> * directly rather than a filter.<a
name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@InterfaceAudience.Public<a
name="line.47"></a>
+<span class="sourceLineNo">048</span>@InterfaceStability.Stable<a
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class FamilyFilter extends
CompareFilter {<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> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * @param familyCompareOp the compare
op for column family matching<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * @param familyComparator the
comparator for column family matching<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span> public FamilyFilter(final CompareOp
familyCompareOp,<a name="line.57"></a>
+<span class="sourceLineNo">058</span> final
ByteArrayComparable familyComparator) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> super(familyCompareOp,
familyComparator);<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 ReturnCode filterKeyValue(Cell
v) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> int familyLength =
v.getFamilyLength();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> if (familyLength > 0) {<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> if (compareFamily(this.compareOp,
this.comparator, v)) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return ReturnCode.NEXT_ROW;<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> return ReturnCode.INCLUDE;<a
name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> public static Filter
createFilterFromArguments(ArrayList<byte []> filterArguments) {<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> ArrayList<?> arguments =
CompareFilter.extractArguments(filterArguments);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> CompareOp compareOp =
(CompareOp)arguments.get(0);<a name="line.75"></a>
+<span class="sourceLineNo">076</span> ByteArrayComparable comparator =
(ByteArrayComparable)arguments.get(1);<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return new FamilyFilter(compareOp,
comparator);<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> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @return The filter serialized using
pb<a name="line.81"></a>
+<span class="sourceLineNo">082</span> */<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public byte [] toByteArray() {<a
name="line.83"></a>
+<span class="sourceLineNo">084</span> FilterProtos.FamilyFilter.Builder
builder =<a name="line.84"></a>
+<span class="sourceLineNo">085</span>
FilterProtos.FamilyFilter.newBuilder();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>
builder.setCompareFilter(super.convert());<a name="line.86"></a>
+<span class="sourceLineNo">087</span> return
builder.build().toByteArray();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<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> * @param pbBytes A pb serialized
{@link FamilyFilter} instance<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @return An instance of {@link
FamilyFilter} made from <code>bytes</code><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @throws DeserializationException<a
name="line.93"></a>
+<span class="sourceLineNo">094</span> * @see #toByteArray<a
name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public static FamilyFilter
parseFrom(final byte [] pbBytes)<a name="line.96"></a>
+<span class="sourceLineNo">097</span> throws DeserializationException {<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> FilterProtos.FamilyFilter proto;<a
name="line.98"></a>
+<span class="sourceLineNo">099</span> try {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> proto =
FilterProtos.FamilyFilter.parseFrom(pbBytes);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> } catch
(InvalidProtocolBufferException e) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw new
DeserializationException(e);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final CompareOp valueCompareOp =<a
name="line.104"></a>
+<span class="sourceLineNo">105</span>
CompareOp.valueOf(proto.getCompareFilter().getCompareOp().name());<a
name="line.105"></a>
+<span class="sourceLineNo">106</span> ByteArrayComparable valueComparator =
null;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> try {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> if
(proto.getCompareFilter().hasComparator()) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> valueComparator =
ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a
name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span> } catch (IOException ioe) {<a
name="line.111"></a>
+<span class="sourceLineNo">112</span> throw new
DeserializationException(ioe);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return new
FamilyFilter(valueCompareOp,valueComparator);<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">117</span> /**<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * @param other<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @return true if and only if the
fields of the filter that are serialized<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * are equal to the corresponding
fields in other. Used for testing.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> boolean areSerializedFieldsEqual(Filter
o) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (o == this) return true;<a
name="line.123"></a>
+<span class="sourceLineNo">124</span> if (!(o instanceof FamilyFilter))
return false;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> FamilyFilter other =
(FamilyFilter)o;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> return
super.areSerializedFieldsEqual(other);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>}<a name="line.129"></a>
