hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject [27/52] [partial] hbase-site git commit: Published site at e06c3676f1273f033e3e185ee9c1ec52c1c7cb31.
Date Sun, 09 Oct 2016 15:13:05 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html
index f8fb24d..bd0d99f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html
@@ -35,12 +35,12 @@
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<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>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import com.google.common.base.Preconditions;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.35"></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.util.Bytes;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import com.google.common.base.Preconditions;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
 <span class="sourceLineNo">037</span>/**<a name="line.37"></a>
 <span class="sourceLineNo">038</span> * A filter, based on the ColumnCountGetFilter, takes two arguments: limit and offset.<a name="line.38"></a>
@@ -180,7 +180,7 @@
 <span class="sourceLineNo">172</span>      builder.setOffset(this.offset);<a name="line.172"></a>
 <span class="sourceLineNo">173</span>    }<a name="line.173"></a>
 <span class="sourceLineNo">174</span>    if (this.columnOffset != null) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      builder.setColumnOffset(ByteStringer.wrap(this.columnOffset));<a name="line.175"></a>
+<span class="sourceLineNo">175</span>      builder.setColumnOffset(UnsafeByteOperations.unsafeWrap(this.columnOffset));<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    }<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    return builder.build().toByteArray();<a name="line.177"></a>
 <span class="sourceLineNo">178</span>  }<a name="line.178"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html
index 826e5c7..0c3cb13 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html
@@ -36,13 +36,13 @@
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.ByteBufferUtils;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>import com.google.common.base.Preconditions;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.37"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import com.google.common.base.Preconditions;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
 <span class="sourceLineNo">039</span>/**<a name="line.39"></a>
 <span class="sourceLineNo">040</span> * This filter is used for selecting only those keys with columns that matches<a name="line.40"></a>
@@ -120,7 +120,7 @@
 <span class="sourceLineNo">112</span>  public byte [] toByteArray() {<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    FilterProtos.ColumnPrefixFilter.Builder builder =<a name="line.113"></a>
 <span class="sourceLineNo">114</span>      FilterProtos.ColumnPrefixFilter.newBuilder();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (this.prefix != null) builder.setPrefix(ByteStringer.wrap(this.prefix));<a name="line.115"></a>
+<span class="sourceLineNo">115</span>    if (this.prefix != null) builder.setPrefix(UnsafeByteOperations.unsafeWrap(this.prefix));<a name="line.115"></a>
 <span class="sourceLineNo">116</span>    return builder.build().toByteArray();<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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
index 0d25b14..e3cae69 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html
@@ -38,12 +38,12 @@
 <span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>import com.google.common.base.Preconditions;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.38"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>import com.google.common.base.Preconditions;<a name="line.38"></a>
 <span class="sourceLineNo">039</span><a name="line.39"></a>
 <span class="sourceLineNo">040</span>/**<a name="line.40"></a>
 <span class="sourceLineNo">041</span> * This filter is used for selecting only those keys with columns that are<a name="line.41"></a>
@@ -183,61 +183,63 @@
 <span class="sourceLineNo">175</span>  public byte [] toByteArray() {<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    FilterProtos.ColumnRangeFilter.Builder builder =<a name="line.176"></a>
 <span class="sourceLineNo">177</span>      FilterProtos.ColumnRangeFilter.newBuilder();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    if (this.minColumn != null) builder.setMinColumn(ByteStringer.wrap(this.minColumn));<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    builder.setMinColumnInclusive(this.minColumnInclusive);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    if (this.maxColumn != null) builder.setMaxColumn(ByteStringer.wrap(this.maxColumn));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    builder.setMaxColumnInclusive(this.maxColumnInclusive);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    return builder.build().toByteArray();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @param pbBytes A pb serialized {@link ColumnRangeFilter} instance<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   * @return An instance of {@link ColumnRangeFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   * @throws DeserializationException<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   * @see #toByteArray<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  public static ColumnRangeFilter parseFrom(final byte [] pbBytes)<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  throws DeserializationException {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    FilterProtos.ColumnRangeFilter proto;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      proto = FilterProtos.ColumnRangeFilter.parseFrom(pbBytes);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    } catch (InvalidProtocolBufferException e) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      throw new DeserializationException(e);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return new ColumnRangeFilter(proto.hasMinColumn()?proto.getMinColumn().toByteArray():null,<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      proto.getMinColumnInclusive(),proto.hasMaxColumn()?proto.getMaxColumn().toByteArray():null,<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      proto.getMaxColumnInclusive());<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>  /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @param other<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   if (o == this) return true;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span>   ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.214"></a>
-<span class="sourceLineNo">215</span>     &amp;&amp; this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.215"></a>
-<span class="sourceLineNo">216</span>     &amp;&amp; Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.216"></a>
-<span class="sourceLineNo">217</span>     &amp;&amp; this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  public Cell getNextCellHint(Cell cell) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    return CellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.222"></a>
-<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>  @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  public String toString() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    return this.getClass().getSimpleName() + " "<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        + (this.maxColumnInclusive ? "]" : ")");<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>}<a name="line.232"></a>
+<span class="sourceLineNo">178</span>    if (this.minColumn != null) builder.setMinColumn(<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        UnsafeByteOperations.unsafeWrap(this.minColumn));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    builder.setMinColumnInclusive(this.minColumnInclusive);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    if (this.maxColumn != null) builder.setMaxColumn(<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        UnsafeByteOperations.unsafeWrap(this.maxColumn));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    builder.setMaxColumnInclusive(this.maxColumnInclusive);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    return builder.build().toByteArray();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>  /**<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @param pbBytes A pb serialized {@link ColumnRangeFilter} instance<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @return An instance of {@link ColumnRangeFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   * @throws DeserializationException<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   * @see #toByteArray<a name="line.191"></a>
+<span class="sourceLineNo">192</span>   */<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  public static ColumnRangeFilter parseFrom(final byte [] pbBytes)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  throws DeserializationException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    FilterProtos.ColumnRangeFilter proto;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    try {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      proto = FilterProtos.ColumnRangeFilter.parseFrom(pbBytes);<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    } catch (InvalidProtocolBufferException e) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      throw new DeserializationException(e);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    return new ColumnRangeFilter(proto.hasMinColumn()?proto.getMinColumn().toByteArray():null,<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      proto.getMinColumnInclusive(),proto.hasMaxColumn()?proto.getMaxColumn().toByteArray():null,<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      proto.getMaxColumnInclusive());<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>  /**<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @param other<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   if (o == this) return true;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>   ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.216"></a>
+<span class="sourceLineNo">217</span>     &amp;&amp; this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.217"></a>
+<span class="sourceLineNo">218</span>     &amp;&amp; Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.218"></a>
+<span class="sourceLineNo">219</span>     &amp;&amp; this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>  @Override<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  public Cell getNextCellHint(Cell cell) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    return CellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>  @Override<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  public String toString() {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    return this.getClass().getSimpleName() + " "<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        + (this.maxColumnInclusive ? "]" : ")");<a name="line.232"></a>
+<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>}<a name="line.234"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
index 5dc0115..bb0976f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
@@ -34,10 +34,10 @@
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<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>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType;<a name="line.32"></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.protobuf.generated.HBaseProtos;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>
 <span class="sourceLineNo">035</span>import com.google.common.base.Preconditions;<a name="line.35"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
index 5dc0115..bb0976f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.html
@@ -34,10 +34,10 @@
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<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>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType;<a name="line.32"></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.protobuf.generated.HBaseProtos;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>
 <span class="sourceLineNo">035</span>import com.google.common.base.Preconditions;<a name="line.35"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
index 61555ca..ef89262 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
@@ -38,265 +38,266 @@
 <span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import com.google.common.base.Preconditions;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import com.google.protobuf.InvalidProtocolBufferException;<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> * A filter for adding inter-column timestamp matching<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Only cells with a correspondingly timestamped entry in<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * the target column will be retained<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Not compatible with Scan.setBatch as operations need <a name="line.45"></a>
-<span class="sourceLineNo">046</span> * full rows for correct filtering <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 DependentColumnFilter extends CompareFilter {<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  protected byte[] columnFamily;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  protected byte[] columnQualifier;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  protected boolean dropDependentColumn;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  protected Set&lt;Long&gt; stampSet = new HashSet&lt;Long&gt;();<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>   * Build a dependent column filter with value checking<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * dependent column varies will be compared using the supplied<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * compareOp and comparator, for usage of which<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * refer to {@link CompareFilter}<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * <a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param family dependent column family<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * @param qualifier dependent column qualifier<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * @param dropDependentColumn whether the column should be discarded after<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * @param valueCompareOp comparison op <a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * @param valueComparator comparator<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      final boolean dropDependentColumn, final CompareOp valueCompareOp,<a name="line.71"></a>
-<span class="sourceLineNo">072</span>        final ByteArrayComparable valueComparator) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    // set up the comparator   <a name="line.73"></a>
-<span class="sourceLineNo">074</span>    super(valueCompareOp, valueComparator);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    this.columnFamily = family;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    this.columnQualifier = qualifier;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    this.dropDependentColumn = dropDependentColumn;<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>   * Constructor for DependentColumn filter.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * Cells where a Cell from target column<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * with the same timestamp do not exist will be dropped.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   *<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * @param family name of target column family<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @param qualifier name of column qualifier<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public DependentColumnFilter(final byte [] family, final byte [] qualifier) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    this(family, qualifier, false);<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>   * Constructor for DependentColumn filter.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * Cells where a Cell from target column<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * with the same timestamp do not exist will be dropped.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   *<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * @param family name of dependent column family<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * @param qualifier name of dependent qualifier<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @param dropDependentColumn whether the dependent columns Cells should be discarded<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public DependentColumnFilter(final byte [] family, final byte [] qualifier,<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      final boolean dropDependentColumn) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    this(family, qualifier, dropDependentColumn, CompareOp.NO_OP, null);<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>   * @return the column family<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public byte[] getFamily() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return this.columnFamily;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @return the column qualifier<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public byte[] getQualifier() {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return this.columnQualifier;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * @return true if we should drop the dependent column, false otherwise<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public boolean dropDependentColumn() {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    return this.dropDependentColumn;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public boolean getDropDependentColumn() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    return this.dropDependentColumn;<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">131</span>  @Override<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public boolean filterAllRemaining() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return false;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  @Override<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  public ReturnCode filterKeyValue(Cell c) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    // Check if the column and qualifier match<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        // include non-matches for the time being, they'll be discarded afterwards<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        return ReturnCode.INCLUDE;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    // If it doesn't pass the op, skip it<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    if (comparator != null<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        &amp;&amp; compareValue(compareOp, comparator, c))<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      return ReturnCode.SKIP;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  <a name="line.147"></a>
-<span class="sourceLineNo">148</span>    stampSet.add(c.getTimestamp());<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    if(dropDependentColumn) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      return ReturnCode.SKIP;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    return ReturnCode.INCLUDE;<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public void filterRowCells(List&lt;Cell&gt; kvs) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    Iterator&lt;? extends Cell&gt; it = kvs.iterator();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    Cell kv;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    while(it.hasNext()) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      kv = it.next();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      if(!stampSet.contains(kv.getTimestamp())) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        it.remove();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public boolean hasFilterRow() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    return true;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  <a name="line.171"></a>
-<span class="sourceLineNo">172</span>  @Override<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  public boolean filterRow() {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    return false;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public boolean filterRowKey(byte[] buffer, int offset, int length) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    return false;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  @Override<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public void reset() {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    stampSet.clear();    <a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    Preconditions.checkArgument(filterArguments.size() == 2 ||<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                                filterArguments.size() == 3 ||<a name="line.188"></a>
-<span class="sourceLineNo">189</span>                                filterArguments.size() == 5,<a name="line.189"></a>
-<span class="sourceLineNo">190</span>                                "Expected 2, 3 or 5 but got: %s", filterArguments.size());<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    if (filterArguments.size() == 2) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      return new DependentColumnFilter(family, qualifier);<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    } else if (filterArguments.size() == 3) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      return new DependentColumnFilter(family, qualifier, dropDependentColumn);<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>    } else if (filterArguments.size() == 5) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(3));<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        ParseFilter.removeQuotesFromByteArray(filterArguments.get(4)));<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return new DependentColumnFilter(family, qualifier, dropDependentColumn,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>                                       compareOp, comparator);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      throw new IllegalArgumentException("Expected 2, 3 or 5 but got: " + filterArguments.size());<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  /**<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * @return The filter serialized using pb<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  public byte [] toByteArray() {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    FilterProtos.DependentColumnFilter.Builder builder =<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      FilterProtos.DependentColumnFilter.newBuilder();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    builder.setCompareFilter(super.convert());<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    if (this.columnFamily != null) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      builder.setColumnFamily(ByteStringer.wrap(this.columnFamily));<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    if (this.columnQualifier != null) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      builder.setColumnQualifier(ByteStringer.wrap(this.columnQualifier));<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    builder.setDropDependentColumn(this.dropDependentColumn);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    return builder.build().toByteArray();<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * @param pbBytes A pb serialized {@link DependentColumnFilter} instance<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @return An instance of {@link DependentColumnFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @throws DeserializationException<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @see #toByteArray<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   */<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  public static DependentColumnFilter parseFrom(final byte [] pbBytes)<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  throws DeserializationException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    FilterProtos.DependentColumnFilter proto;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    try {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      proto = FilterProtos.DependentColumnFilter.parseFrom(pbBytes);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    } catch (InvalidProtocolBufferException e) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      throw new DeserializationException(e);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    final CompareOp valueCompareOp =<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      CompareOp.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    ByteArrayComparable valueComparator = null;<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    try {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    } catch (IOException ioe) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      throw new DeserializationException(ioe);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    return new DependentColumnFilter(<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      proto.hasColumnFamily()?proto.getColumnFamily().toByteArray():null,<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      proto.hasColumnQualifier()?proto.getColumnQualifier().toByteArray():null,<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      proto.getDropDependentColumn(), valueCompareOp, valueComparator);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @param o<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   */<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    if (o == this) return true;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    if (!(o instanceof DependentColumnFilter)) return false;<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>    DependentColumnFilter other = (DependentColumnFilter)o;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    return other != null &amp;&amp; super.areSerializedFieldsEqual(other)<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      &amp;&amp; Bytes.equals(this.getFamily(), other.getFamily())<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      &amp;&amp; Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      &amp;&amp; this.dropDependentColumn() == other.dropDependentColumn();<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>  @Override<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  public String toString() {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    return String.format("%s (%s, %s, %s, %s, %s)",<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        this.getClass().getSimpleName(),<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        Bytes.toStringBinary(this.columnFamily),<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        Bytes.toStringBinary(this.columnQualifier),<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        this.dropDependentColumn,<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        this.compareOp.name(),<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        this.comparator != null ? Bytes.toStringBinary(this.comparator.getValue()) : "null");<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>}<a name="line.291"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>import com.google.common.base.Preconditions;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<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> * A filter for adding inter-column timestamp matching<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * Only cells with a correspondingly timestamped entry in<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * the target column will be retained<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Not compatible with Scan.setBatch as operations need <a name="line.46"></a>
+<span class="sourceLineNo">047</span> * full rows for correct filtering <a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@InterfaceAudience.Public<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@InterfaceStability.Stable<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class DependentColumnFilter extends CompareFilter {<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  protected byte[] columnFamily;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  protected byte[] columnQualifier;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  protected boolean dropDependentColumn;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  protected Set&lt;Long&gt; stampSet = new HashSet&lt;Long&gt;();<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>   * Build a dependent column filter with value checking<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   * dependent column varies will be compared using the supplied<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   * compareOp and comparator, for usage of which<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   * refer to {@link CompareFilter}<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   * <a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * @param family dependent column family<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param qualifier dependent column qualifier<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param dropDependentColumn whether the column should be discarded after<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @param valueCompareOp comparison op <a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * @param valueComparator comparator<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      final boolean dropDependentColumn, final CompareOp valueCompareOp,<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        final ByteArrayComparable valueComparator) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    // set up the comparator   <a name="line.74"></a>
+<span class="sourceLineNo">075</span>    super(valueCompareOp, valueComparator);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    this.columnFamily = family;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    this.columnQualifier = qualifier;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    this.dropDependentColumn = dropDependentColumn;<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>   * Constructor for DependentColumn filter.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * Cells where a Cell from target column<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * with the same timestamp do not exist will be dropped.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   *<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * @param family name of target column family<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * @param qualifier name of column qualifier<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  public DependentColumnFilter(final byte [] family, final byte [] qualifier) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    this(family, qualifier, false);<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>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Constructor for DependentColumn filter.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * Cells where a Cell from target column<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * with the same timestamp do not exist will be dropped.<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   *<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * @param family name of dependent column family<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   * @param qualifier name of dependent qualifier<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @param dropDependentColumn whether the dependent columns Cells should be discarded<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public DependentColumnFilter(final byte [] family, final byte [] qualifier,<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      final boolean dropDependentColumn) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    this(family, qualifier, dropDependentColumn, CompareOp.NO_OP, null);<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>  /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return the column family<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public byte[] getFamily() {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return this.columnFamily;<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>  /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @return the column qualifier<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public byte[] getQualifier() {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    return this.columnQualifier;<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * @return true if we should drop the dependent column, false otherwise<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public boolean dropDependentColumn() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return this.dropDependentColumn;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  public boolean getDropDependentColumn() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    return this.dropDependentColumn;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>  @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  public boolean filterAllRemaining() {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    return false;<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 ReturnCode filterKeyValue(Cell c) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    // Check if the column and qualifier match<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        // include non-matches for the time being, they'll be discarded afterwards<a name="line.141"></a>
+<span class="sourceLineNo">142</span>        return ReturnCode.INCLUDE;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    // If it doesn't pass the op, skip it<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    if (comparator != null<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        &amp;&amp; compareValue(compareOp, comparator, c))<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      return ReturnCode.SKIP;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  <a name="line.148"></a>
+<span class="sourceLineNo">149</span>    stampSet.add(c.getTimestamp());<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    if(dropDependentColumn) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return ReturnCode.SKIP;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    return ReturnCode.INCLUDE;<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public void filterRowCells(List&lt;Cell&gt; kvs) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    Iterator&lt;? extends Cell&gt; it = kvs.iterator();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    Cell kv;<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    while(it.hasNext()) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      kv = it.next();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      if(!stampSet.contains(kv.getTimestamp())) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        it.remove();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  public boolean hasFilterRow() {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    return true;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  <a name="line.172"></a>
+<span class="sourceLineNo">173</span>  @Override<a name="line.173"></a>
+<span class="sourceLineNo">174</span>  public boolean filterRow() {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    return false;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>  @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  public boolean filterRowKey(byte[] buffer, int offset, int length) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    return false;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  @Override<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  public void reset() {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    stampSet.clear();    <a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    Preconditions.checkArgument(filterArguments.size() == 2 ||<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                                filterArguments.size() == 3 ||<a name="line.189"></a>
+<span class="sourceLineNo">190</span>                                filterArguments.size() == 5,<a name="line.190"></a>
+<span class="sourceLineNo">191</span>                                "Expected 2, 3 or 5 but got: %s", filterArguments.size());<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    if (filterArguments.size() == 2) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return new DependentColumnFilter(family, qualifier);<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>    } else if (filterArguments.size() == 3) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      return new DependentColumnFilter(family, qualifier, dropDependentColumn);<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    } else if (filterArguments.size() == 5) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(3));<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        ParseFilter.removeQuotesFromByteArray(filterArguments.get(4)));<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      return new DependentColumnFilter(family, qualifier, dropDependentColumn,<a name="line.210"></a>
+<span class="sourceLineNo">211</span>                                       compareOp, comparator);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    } else {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      throw new IllegalArgumentException("Expected 2, 3 or 5 but got: " + filterArguments.size());<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>  }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>  /**<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   * @return The filter serialized using pb<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   */<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  public byte [] toByteArray() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    FilterProtos.DependentColumnFilter.Builder builder =<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      FilterProtos.DependentColumnFilter.newBuilder();<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    builder.setCompareFilter(super.convert());<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    if (this.columnFamily != null) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    if (this.columnQualifier != null) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    builder.setDropDependentColumn(this.dropDependentColumn);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    return builder.build().toByteArray();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>  /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param pbBytes A pb serialized {@link DependentColumnFilter} instance<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @return An instance of {@link DependentColumnFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * @throws DeserializationException<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * @see #toByteArray<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  public static DependentColumnFilter parseFrom(final byte [] pbBytes)<a name="line.240"></a>
+<span class="sourceLineNo">241</span>  throws DeserializationException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    FilterProtos.DependentColumnFilter proto;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      proto = FilterProtos.DependentColumnFilter.parseFrom(pbBytes);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    } catch (InvalidProtocolBufferException e) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      throw new DeserializationException(e);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    final CompareOp valueCompareOp =<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      CompareOp.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    ByteArrayComparable valueComparator = null;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    try {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      if (proto.getCompareFilter().hasComparator()) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    } catch (IOException ioe) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      throw new DeserializationException(ioe);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    return new DependentColumnFilter(<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      proto.hasColumnFamily()?proto.getColumnFamily().toByteArray():null,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      proto.hasColumnQualifier()?proto.getColumnQualifier().toByteArray():null,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      proto.getDropDependentColumn(), valueCompareOp, valueComparator);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param o<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @return true if and only if the fields of the filter that are serialized<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * are equal to the corresponding fields in other.  Used for testing.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  boolean areSerializedFieldsEqual(Filter o) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    if (o == this) return true;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    if (!(o instanceof DependentColumnFilter)) return false;<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    DependentColumnFilter other = (DependentColumnFilter)o;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    return other != null &amp;&amp; super.areSerializedFieldsEqual(other)<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      &amp;&amp; Bytes.equals(this.getFamily(), other.getFamily())<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      &amp;&amp; Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      &amp;&amp; this.dropDependentColumn() == other.dropDependentColumn();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>  @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public String toString() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    return String.format("%s (%s, %s, %s, %s, %s)",<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        this.getClass().getSimpleName(),<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        Bytes.toStringBinary(this.columnFamily),<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        Bytes.toStringBinary(this.columnQualifier),<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        this.dropDependentColumn,<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        this.compareOp.name(),<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        this.comparator != null ? Bytes.toStringBinary(this.comparator.getValue()) : "null");<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  }<a name="line.291"></a>
+<span class="sourceLineNo">292</span>}<a name="line.292"></a>
 
 
 


Mime
View raw message