You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/08/24 14:47:51 UTC
[37/51] [partial] hbase-site git commit: Published site at
a452487a9b82bfd33bc10683c3f8b8ae74d58883.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0cf79db0/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 9425699..f592ec3 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/DependentColumnFilter.html
@@ -30,296 +30,312 @@
<span class="sourceLineNo">022</span>import java.util.ArrayList;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.util.HashSet;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.Set;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Cell;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<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 org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations;<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>public class DependentColumnFilter extends CompareFilter {<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> protected byte[] columnFamily;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> protected byte[] columnQualifier;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> protected boolean dropDependentColumn;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> protected Set<Long> stampSet = new HashSet<>();<a name="line.55"></a>
-<span class="sourceLineNo">056</span> <a name="line.56"></a>
-<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * Build a dependent column filter with value checking<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * dependent column varies will be compared using the supplied<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * compareOp and comparator, for usage of which<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * refer to {@link CompareFilter}<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * <a name="line.62"></a>
-<span class="sourceLineNo">063</span> * @param family dependent column family<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param qualifier dependent column qualifier<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @param dropDependentColumn whether the column should be discarded after<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * @param valueCompareOp comparison op <a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param valueComparator comparator<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * {@link #DependentColumnFilter(byte[], byte[], boolean, CompareOperator, ByteArrayComparable)}<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * instead.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> */<a name="line.71"></a>
-<span class="sourceLineNo">072</span> @Deprecated<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.73"></a>
-<span class="sourceLineNo">074</span> final boolean dropDependentColumn, final CompareOp valueCompareOp,<a name="line.74"></a>
-<span class="sourceLineNo">075</span> final ByteArrayComparable valueComparator) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this(family, qualifier, dropDependentColumn, CompareOperator.valueOf(valueCompareOp.name()),<a name="line.76"></a>
-<span class="sourceLineNo">077</span> valueComparator);<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> * Build a dependent column filter with value checking<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * dependent column varies will be compared using the supplied<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * compareOp and comparator, for usage of which<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * refer to {@link CompareFilter}<a name="line.84"></a>
-<span class="sourceLineNo">085</span> *<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @param family dependent column family<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * @param qualifier dependent column qualifier<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * @param dropDependentColumn whether the column should be discarded after<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @param op Value comparison op<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @param valueComparator comparator<a name="line.90"></a>
-<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.92"></a>
-<span class="sourceLineNo">093</span> final boolean dropDependentColumn, final CompareOperator op,<a name="line.93"></a>
-<span class="sourceLineNo">094</span> final ByteArrayComparable valueComparator) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> // set up the comparator<a name="line.95"></a>
-<span class="sourceLineNo">096</span> super(op, valueComparator);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> this.columnFamily = family;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> this.columnQualifier = qualifier;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> this.dropDependentColumn = dropDependentColumn;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> <a name="line.101"></a>
-<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Constructor for DependentColumn filter.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * Cells where a Cell from target column<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * with the same timestamp do not exist will be dropped.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> *<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * @param family name of target column family<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * @param qualifier name of column qualifier<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public DependentColumnFilter(final byte [] family, final byte [] qualifier) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> this(family, qualifier, false);<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> * Constructor for DependentColumn filter.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * Cells where a Cell from target column<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * with the same timestamp do not exist will be dropped.<a name="line.117"></a>
-<span class="sourceLineNo">118</span> *<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param family name of dependent column family<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param qualifier name of dependent qualifier<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param dropDependentColumn whether the dependent columns Cells should be discarded<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public DependentColumnFilter(final byte [] family, final byte [] qualifier,<a name="line.123"></a>
-<span class="sourceLineNo">124</span> final boolean dropDependentColumn) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> this(family, qualifier, dropDependentColumn, CompareOp.NO_OP, null);<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> /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @return the column family<a name="line.129"></a>
-<span class="sourceLineNo">130</span> */<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public byte[] getFamily() {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return this.columnFamily;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @return the column qualifier<a name="line.136"></a>
-<span class="sourceLineNo">137</span> */<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public byte[] getQualifier() {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> return this.columnQualifier;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * @return true if we should drop the dependent column, false otherwise<a name="line.143"></a>
-<span class="sourceLineNo">144</span> */<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public boolean dropDependentColumn() {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return this.dropDependentColumn;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> public boolean getDropDependentColumn() {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return this.dropDependentColumn;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public boolean filterAllRemaining() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return false;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> @Deprecated<a name="line.158"></a>
-<span class="sourceLineNo">159</span> @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public ReturnCode filterKeyValue(final Cell c) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return filterCell(c);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public ReturnCode filterCell(final Cell c) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // Check if the column and qualifier match<a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> // include non-matches for the time being, they'll be discarded afterwards<a name="line.168"></a>
-<span class="sourceLineNo">169</span> return ReturnCode.INCLUDE;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // If it doesn't pass the op, skip it<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (comparator != null<a name="line.172"></a>
-<span class="sourceLineNo">173</span> && compareValue(getCompareOperator(), comparator, c))<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return ReturnCode.SKIP;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> <a name="line.175"></a>
-<span class="sourceLineNo">176</span> stampSet.add(c.getTimestamp());<a name="line.176"></a>
-<span class="sourceLineNo">177</span> if(dropDependentColumn) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> return ReturnCode.SKIP;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return ReturnCode.INCLUDE;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void filterRowCells(List<Cell> kvs) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> kvs.removeIf(kv -> !stampSet.contains(kv.getTimestamp()));<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> @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span> public boolean hasFilterRow() {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return true;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> <a name="line.192"></a>
-<span class="sourceLineNo">193</span> @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public boolean filterRow() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public boolean filterRowKey(byte[] buffer, int offset, int length) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return false;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> @Override<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public void reset() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> stampSet.clear(); <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> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> Preconditions.checkArgument(filterArguments.size() == 2 ||<a name="line.208"></a>
-<span class="sourceLineNo">209</span> filterArguments.size() == 3 ||<a name="line.209"></a>
-<span class="sourceLineNo">210</span> filterArguments.size() == 5,<a name="line.210"></a>
-<span class="sourceLineNo">211</span> "Expected 2, 3 or 5 but got: %s", filterArguments.size());<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (filterArguments.size() == 2) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.213"></a>
-<span class="sourceLineNo">214</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return new DependentColumnFilter(family, qualifier);<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> } else if (filterArguments.size() == 3) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.218"></a>
-<span class="sourceLineNo">219</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.219"></a>
-<span class="sourceLineNo">220</span> boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return new DependentColumnFilter(family, qualifier, dropDependentColumn);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> } else if (filterArguments.size() == 5) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.224"></a>
-<span class="sourceLineNo">225</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.225"></a>
-<span class="sourceLineNo">226</span> boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.226"></a>
-<span class="sourceLineNo">227</span> CompareOperator op = ParseFilter.createCompareOperator(filterArguments.get(3));<a name="line.227"></a>
-<span class="sourceLineNo">228</span> ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.228"></a>
-<span class="sourceLineNo">229</span> ParseFilter.removeQuotesFromByteArray(filterArguments.get(4)));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return new DependentColumnFilter(family, qualifier, dropDependentColumn,<a name="line.230"></a>
-<span class="sourceLineNo">231</span> op, comparator);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> } else {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> throw new IllegalArgumentException("Expected 2, 3 or 5 but got: " + filterArguments.size());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> /**<a name="line.237"></a>
-<span class="sourceLineNo">238</span> * @return The filter serialized using pb<a name="line.238"></a>
-<span class="sourceLineNo">239</span> */<a name="line.239"></a>
-<span class="sourceLineNo">240</span> @Override<a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte [] toByteArray() {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> FilterProtos.DependentColumnFilter.Builder builder =<a name="line.242"></a>
-<span class="sourceLineNo">243</span> FilterProtos.DependentColumnFilter.newBuilder();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> builder.setCompareFilter(super.convert());<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (this.columnFamily != null) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (this.columnQualifier != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> builder.setDropDependentColumn(this.dropDependentColumn);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> return builder.build().toByteArray();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> /**<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @param pbBytes A pb serialized {@link DependentColumnFilter} instance<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @return An instance of {@link DependentColumnFilter} made from <code>bytes</code><a name="line.257"></a>
-<span class="sourceLineNo">258</span> * @throws DeserializationException<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @see #toByteArray<a name="line.259"></a>
-<span class="sourceLineNo">260</span> */<a name="line.260"></a>
-<span class="sourceLineNo">261</span> public static DependentColumnFilter parseFrom(final byte [] pbBytes)<a name="line.261"></a>
-<span class="sourceLineNo">262</span> throws DeserializationException {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> FilterProtos.DependentColumnFilter proto;<a name="line.263"></a>
-<span class="sourceLineNo">264</span> try {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> proto = FilterProtos.DependentColumnFilter.parseFrom(pbBytes);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> } catch (InvalidProtocolBufferException e) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> throw new DeserializationException(e);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> final CompareOperator valueCompareOp =<a name="line.269"></a>
-<span class="sourceLineNo">270</span> CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.270"></a>
-<span class="sourceLineNo">271</span> ByteArrayComparable valueComparator = null;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (proto.getCompareFilter().hasComparator()) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } catch (IOException ioe) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> throw new DeserializationException(ioe);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return new DependentColumnFilter(<a name="line.279"></a>
-<span class="sourceLineNo">280</span> proto.hasColumnFamily()?proto.getColumnFamily().toByteArray():null,<a name="line.280"></a>
-<span class="sourceLineNo">281</span> proto.hasColumnQualifier()?proto.getColumnQualifier().toByteArray():null,<a name="line.281"></a>
-<span class="sourceLineNo">282</span> proto.getDropDependentColumn(), valueCompareOp, valueComparator);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * @param o<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * @return true if and only if the fields of the filter that are serialized<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.288"></a>
-<span class="sourceLineNo">289</span> */<a name="line.289"></a>
-<span class="sourceLineNo">290</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.290"></a>
-<span class="sourceLineNo">291</span> value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.291"></a>
-<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> if (o == this) return true;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (!(o instanceof DependentColumnFilter)) return false;<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> DependentColumnFilter other = (DependentColumnFilter)o;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> return other != null && super.areSerializedFieldsEqual(other)<a name="line.298"></a>
-<span class="sourceLineNo">299</span> && Bytes.equals(this.getFamily(), other.getFamily())<a name="line.299"></a>
-<span class="sourceLineNo">300</span> && Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.300"></a>
-<span class="sourceLineNo">301</span> && this.dropDependentColumn() == other.dropDependentColumn();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> @Override<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public String toString() {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return String.format("%s (%s, %s, %s, %s, %s)",<a name="line.306"></a>
-<span class="sourceLineNo">307</span> this.getClass().getSimpleName(),<a name="line.307"></a>
-<span class="sourceLineNo">308</span> Bytes.toStringBinary(this.columnFamily),<a name="line.308"></a>
-<span class="sourceLineNo">309</span> Bytes.toStringBinary(this.columnQualifier),<a name="line.309"></a>
-<span class="sourceLineNo">310</span> this.dropDependentColumn,<a name="line.310"></a>
-<span class="sourceLineNo">311</span> this.op.name(),<a name="line.311"></a>
-<span class="sourceLineNo">312</span> this.comparator != null ? Bytes.toStringBinary(this.comparator.getValue()) : "null");<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
+<span class="sourceLineNo">025</span>import java.util.Objects;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Set;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.Cell;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<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.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 org.apache.hbase.thirdparty.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.hbase.thirdparty.com.google.protobuf.InvalidProtocolBufferException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.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>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<Long> stampSet = new HashSet<>();<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> * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * {@link #DependentColumnFilter(byte[], byte[], boolean, CompareOperator, ByteArrayComparable)}<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * instead.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> */<a name="line.72"></a>
+<span class="sourceLineNo">073</span> @Deprecated<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.74"></a>
+<span class="sourceLineNo">075</span> final boolean dropDependentColumn, final CompareOp valueCompareOp,<a name="line.75"></a>
+<span class="sourceLineNo">076</span> final ByteArrayComparable valueComparator) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> this(family, qualifier, dropDependentColumn, CompareOperator.valueOf(valueCompareOp.name()),<a name="line.77"></a>
+<span class="sourceLineNo">078</span> valueComparator);<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> * Build a dependent column filter with value checking<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * dependent column varies will be compared using the supplied<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * compareOp and comparator, for usage of which<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * refer to {@link CompareFilter}<a name="line.85"></a>
+<span class="sourceLineNo">086</span> *<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * @param family dependent column family<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @param qualifier dependent column qualifier<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @param dropDependentColumn whether the column should be discarded after<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param op Value comparison op<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @param valueComparator comparator<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public DependentColumnFilter(final byte [] family, final byte[] qualifier,<a name="line.93"></a>
+<span class="sourceLineNo">094</span> final boolean dropDependentColumn, final CompareOperator op,<a name="line.94"></a>
+<span class="sourceLineNo">095</span> final ByteArrayComparable valueComparator) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> // set up the comparator<a name="line.96"></a>
+<span class="sourceLineNo">097</span> super(op, valueComparator);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.columnFamily = family;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> this.columnQualifier = qualifier;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this.dropDependentColumn = dropDependentColumn;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span> <a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Constructor for DependentColumn filter.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * Cells where a Cell from target column<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * with the same timestamp do not exist will be dropped.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> *<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @param family name of target column family<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * @param qualifier name of column qualifier<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public DependentColumnFilter(final byte [] family, final byte [] qualifier) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> this(family, qualifier, false);<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> /**<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * Constructor for DependentColumn filter.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Cells where a Cell from target column<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * with the same timestamp do not exist will be dropped.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> *<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @param family name of dependent column family<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param qualifier name of dependent qualifier<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @param dropDependentColumn whether the dependent columns Cells should be discarded<a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public DependentColumnFilter(final byte [] family, final byte [] qualifier,<a name="line.124"></a>
+<span class="sourceLineNo">125</span> final boolean dropDependentColumn) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> this(family, qualifier, dropDependentColumn, CompareOp.NO_OP, null);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<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>
+<span class="sourceLineNo">130</span> * @return the column family<a name="line.130"></a>
+<span class="sourceLineNo">131</span> */<a name="line.131"></a>
+<span class="sourceLineNo">132</span> public byte[] getFamily() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return this.columnFamily;<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> /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @return the column qualifier<a name="line.137"></a>
+<span class="sourceLineNo">138</span> */<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public byte[] getQualifier() {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return this.columnQualifier;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * @return true if we should drop the dependent column, false otherwise<a name="line.144"></a>
+<span class="sourceLineNo">145</span> */<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public boolean dropDependentColumn() {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> return this.dropDependentColumn;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> public boolean getDropDependentColumn() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return this.dropDependentColumn;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public boolean filterAllRemaining() {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return false;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> @Deprecated<a name="line.159"></a>
+<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public ReturnCode filterKeyValue(final Cell c) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return filterCell(c);<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> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public ReturnCode filterCell(final Cell c) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> // Check if the column and qualifier match<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // include non-matches for the time being, they'll be discarded afterwards<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return ReturnCode.INCLUDE;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // If it doesn't pass the op, skip it<a name="line.172"></a>
+<span class="sourceLineNo">173</span> if (comparator != null<a name="line.173"></a>
+<span class="sourceLineNo">174</span> && compareValue(getCompareOperator(), comparator, c))<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return ReturnCode.SKIP;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> <a name="line.176"></a>
+<span class="sourceLineNo">177</span> stampSet.add(c.getTimestamp());<a name="line.177"></a>
+<span class="sourceLineNo">178</span> if(dropDependentColumn) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> return ReturnCode.SKIP;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return ReturnCode.INCLUDE;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> @Override<a name="line.184"></a>
+<span class="sourceLineNo">185</span> public void filterRowCells(List<Cell> kvs) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> kvs.removeIf(kv -> !stampSet.contains(kv.getTimestamp()));<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span> public boolean hasFilterRow() {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return true;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> <a name="line.193"></a>
+<span class="sourceLineNo">194</span> @Override<a name="line.194"></a>
+<span class="sourceLineNo">195</span> public boolean filterRow() {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return false;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> public boolean filterRowKey(byte[] buffer, int offset, int length) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return false;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> @Override<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public void reset() {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> stampSet.clear(); <a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> Preconditions.checkArgument(filterArguments.size() == 2 ||<a name="line.209"></a>
+<span class="sourceLineNo">210</span> filterArguments.size() == 3 ||<a name="line.210"></a>
+<span class="sourceLineNo">211</span> filterArguments.size() == 5,<a name="line.211"></a>
+<span class="sourceLineNo">212</span> "Expected 2, 3 or 5 but got: %s", filterArguments.size());<a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (filterArguments.size() == 2) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.214"></a>
+<span class="sourceLineNo">215</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.215"></a>
+<span class="sourceLineNo">216</span> return new DependentColumnFilter(family, qualifier);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> } else if (filterArguments.size() == 3) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.221"></a>
+<span class="sourceLineNo">222</span> return new DependentColumnFilter(family, qualifier, dropDependentColumn);<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> } else if (filterArguments.size() == 5) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.225"></a>
+<span class="sourceLineNo">226</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.226"></a>
+<span class="sourceLineNo">227</span> boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2));<a name="line.227"></a>
+<span class="sourceLineNo">228</span> CompareOperator op = ParseFilter.createCompareOperator(filterArguments.get(3));<a name="line.228"></a>
+<span class="sourceLineNo">229</span> ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.229"></a>
+<span class="sourceLineNo">230</span> ParseFilter.removeQuotesFromByteArray(filterArguments.get(4)));<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return new DependentColumnFilter(family, qualifier, dropDependentColumn,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> op, comparator);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> } else {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> throw new IllegalArgumentException("Expected 2, 3 or 5 but got: " + filterArguments.size());<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @return The filter serialized using pb<a name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> @Override<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte [] toByteArray() {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> FilterProtos.DependentColumnFilter.Builder builder =<a name="line.243"></a>
+<span class="sourceLineNo">244</span> FilterProtos.DependentColumnFilter.newBuilder();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> builder.setCompareFilter(super.convert());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> if (this.columnFamily != null) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (this.columnQualifier != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> builder.setDropDependentColumn(this.dropDependentColumn);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return builder.build().toByteArray();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> /**<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * @param pbBytes A pb serialized {@link DependentColumnFilter} instance<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * @return An instance of {@link DependentColumnFilter} made from <code>bytes</code><a name="line.258"></a>
+<span class="sourceLineNo">259</span> * @throws DeserializationException<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @see #toByteArray<a name="line.260"></a>
+<span class="sourceLineNo">261</span> */<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public static DependentColumnFilter parseFrom(final byte [] pbBytes)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> throws DeserializationException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> FilterProtos.DependentColumnFilter proto;<a name="line.264"></a>
+<span class="sourceLineNo">265</span> try {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> proto = FilterProtos.DependentColumnFilter.parseFrom(pbBytes);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> } catch (InvalidProtocolBufferException e) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> throw new DeserializationException(e);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span> final CompareOperator valueCompareOp =<a name="line.270"></a>
+<span class="sourceLineNo">271</span> CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ByteArrayComparable valueComparator = null;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> try {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (proto.getCompareFilter().hasComparator()) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span> } catch (IOException ioe) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> throw new DeserializationException(ioe);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return new DependentColumnFilter(<a name="line.280"></a>
+<span class="sourceLineNo">281</span> proto.hasColumnFamily()?proto.getColumnFamily().toByteArray():null,<a name="line.281"></a>
+<span class="sourceLineNo">282</span> proto.hasColumnQualifier()?proto.getColumnQualifier().toByteArray():null,<a name="line.282"></a>
+<span class="sourceLineNo">283</span> proto.getDropDependentColumn(), valueCompareOp, valueComparator);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> /**<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @param o<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @return true if and only if the fields of the filter that are serialized<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> */<a name="line.290"></a>
+<span class="sourceLineNo">291</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.291"></a>
+<span class="sourceLineNo">292</span> value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.292"></a>
+<span class="sourceLineNo">293</span> @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> if (o == this) return true;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (!(o instanceof DependentColumnFilter)) return false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> DependentColumnFilter other = (DependentColumnFilter)o;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return other != null && super.areSerializedFieldsEqual(other)<a name="line.299"></a>
+<span class="sourceLineNo">300</span> && Bytes.equals(this.getFamily(), other.getFamily())<a name="line.300"></a>
+<span class="sourceLineNo">301</span> && Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.301"></a>
+<span class="sourceLineNo">302</span> && this.dropDependentColumn() == other.dropDependentColumn();<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> @Override<a name="line.305"></a>
+<span class="sourceLineNo">306</span> public String toString() {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return String.format("%s (%s, %s, %s, %s, %s)",<a name="line.307"></a>
+<span class="sourceLineNo">308</span> this.getClass().getSimpleName(),<a name="line.308"></a>
+<span class="sourceLineNo">309</span> Bytes.toStringBinary(this.columnFamily),<a name="line.309"></a>
+<span class="sourceLineNo">310</span> Bytes.toStringBinary(this.columnQualifier),<a name="line.310"></a>
+<span class="sourceLineNo">311</span> this.dropDependentColumn,<a name="line.311"></a>
+<span class="sourceLineNo">312</span> this.op.name(),<a name="line.312"></a>
+<span class="sourceLineNo">313</span> this.comparator != null ? Bytes.toStringBinary(this.comparator.getValue()) : "null");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public boolean equals(Object obj) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> if (obj == null || (!(obj instanceof DependentColumnFilter))) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return false;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> DependentColumnFilter f = (DependentColumnFilter) obj;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return this.areSerializedFieldsEqual(f);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> @Override<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public int hashCode() {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return Objects.hash(Bytes.hashCode(this.getFamily()), Bytes.hashCode(this.getQualifier()),<a name="line.327"></a>
+<span class="sourceLineNo">328</span> this.dropDependentColumn());<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>}<a name="line.330"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0cf79db0/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 d3595e6..58e8dfb 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FamilyFilter.html
@@ -29,132 +29,147 @@
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.util.ArrayList;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Cell;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<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.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.hbase.thirdparty.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>public class FamilyFilter extends CompareFilter {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Constructor.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * @param familyCompareOp the compare op for column family matching<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * @param familyComparator the comparator for column family matching<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Use {@link #FamilyFilter(CompareOperator, ByteArrayComparable)}<a name="line.56"></a>
-<span class="sourceLineNo">057</span> */<a name="line.57"></a>
-<span class="sourceLineNo">058</span> @Deprecated<a name="line.58"></a>
-<span class="sourceLineNo">059</span> public FamilyFilter(final CompareOp familyCompareOp,<a name="line.59"></a>
-<span class="sourceLineNo">060</span> final ByteArrayComparable familyComparator) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> super(familyCompareOp, familyComparator);<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * Constructor.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param op the compare op for column family matching<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * @param familyComparator the comparator for column family matching<a name="line.68"></a>
-<span class="sourceLineNo">069</span> */<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public FamilyFilter(final CompareOperator op,<a name="line.70"></a>
-<span class="sourceLineNo">071</span> final ByteArrayComparable familyComparator) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> super(op, familyComparator);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> @Deprecated<a name="line.75"></a>
-<span class="sourceLineNo">076</span> @Override<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public ReturnCode filterKeyValue(final Cell c) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return filterCell(c);<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> @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public ReturnCode filterCell(final Cell c) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> int familyLength = c.getFamilyLength();<a name="line.83"></a>
-<span class="sourceLineNo">084</span> if (familyLength > 0) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (compareFamily(getCompareOperator(), this.comparator, c)) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return ReturnCode.NEXT_ROW;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return ReturnCode.INCLUDE;<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> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> ArrayList<?> arguments = CompareFilter.extractArguments(filterArguments);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> return new FamilyFilter(compareOp, comparator);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> /**<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @return The filter serialized using pb<a name="line.100"></a>
-<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span> @Override<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public byte [] toByteArray() {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> FilterProtos.FamilyFilter.Builder builder =<a name="line.104"></a>
-<span class="sourceLineNo">105</span> FilterProtos.FamilyFilter.newBuilder();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> builder.setCompareFilter(super.convert());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return builder.build().toByteArray();<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @param pbBytes A pb serialized {@link FamilyFilter} instance<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * @return An instance of {@link FamilyFilter} made from <code>bytes</code><a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @throws DeserializationException<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @see #toByteArray<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public static FamilyFilter parseFrom(final byte [] pbBytes)<a name="line.116"></a>
-<span class="sourceLineNo">117</span> throws DeserializationException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> FilterProtos.FamilyFilter proto;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> try {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> proto = FilterProtos.FamilyFilter.parseFrom(pbBytes);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> } catch (InvalidProtocolBufferException e) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> throw new DeserializationException(e);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> final CompareOperator valueCompareOp =<a name="line.124"></a>
-<span class="sourceLineNo">125</span> CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.125"></a>
-<span class="sourceLineNo">126</span> ByteArrayComparable valueComparator = null;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> try {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> if (proto.getCompareFilter().hasComparator()) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span> } catch (IOException ioe) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> throw new DeserializationException(ioe);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> return new FamilyFilter(valueCompareOp,valueComparator);<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> /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @return true if and only if the fields of the filter that are serialized<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (o == this) return true;<a name="line.143"></a>
-<span class="sourceLineNo">144</span> if (!(o instanceof FamilyFilter)) return false;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> FamilyFilter other = (FamilyFilter)o;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return super.areSerializedFieldsEqual(other);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>}<a name="line.149"></a>
+<span class="sourceLineNo">024</span>import java.util.Objects;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.yetus.audience.InterfaceAudience;<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.shaded.protobuf.ProtobufUtil;<a name="line.30"></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.hbase.thirdparty.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>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> * @deprecated Since 2.0.0. Will be removed in 3.0.0.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * Use {@link #FamilyFilter(CompareOperator, ByteArrayComparable)}<a name="line.57"></a>
+<span class="sourceLineNo">058</span> */<a name="line.58"></a>
+<span class="sourceLineNo">059</span> @Deprecated<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public FamilyFilter(final CompareOp familyCompareOp,<a name="line.60"></a>
+<span class="sourceLineNo">061</span> final ByteArrayComparable familyComparator) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> super(familyCompareOp, familyComparator);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * Constructor.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> *<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * @param op the compare op for column family matching<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param familyComparator the comparator for column family matching<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public FamilyFilter(final CompareOperator op,<a name="line.71"></a>
+<span class="sourceLineNo">072</span> final ByteArrayComparable familyComparator) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> super(op, familyComparator);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> @Deprecated<a name="line.76"></a>
+<span class="sourceLineNo">077</span> @Override<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public ReturnCode filterKeyValue(final Cell c) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return filterCell(c);<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> @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public ReturnCode filterCell(final Cell c) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> int familyLength = c.getFamilyLength();<a name="line.84"></a>
+<span class="sourceLineNo">085</span> if (familyLength > 0) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (compareFamily(getCompareOperator(), this.comparator, c)) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> return ReturnCode.NEXT_ROW;<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> return ReturnCode.INCLUDE;<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> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> ArrayList<?> arguments = CompareFilter.extractArguments(filterArguments);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> CompareOperator compareOp = (CompareOperator)arguments.get(0);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> ByteArrayComparable comparator = (ByteArrayComparable)arguments.get(1);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return new FamilyFilter(compareOp, comparator);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @return The filter serialized using pb<a name="line.101"></a>
+<span class="sourceLineNo">102</span> */<a name="line.102"></a>
+<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public byte [] toByteArray() {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> FilterProtos.FamilyFilter.Builder builder =<a name="line.105"></a>
+<span class="sourceLineNo">106</span> FilterProtos.FamilyFilter.newBuilder();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> builder.setCompareFilter(super.convert());<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return builder.build().toByteArray();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param pbBytes A pb serialized {@link FamilyFilter} instance<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @return An instance of {@link FamilyFilter} made from <code>bytes</code><a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @throws DeserializationException<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @see #toByteArray<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public static FamilyFilter parseFrom(final byte [] pbBytes)<a name="line.117"></a>
+<span class="sourceLineNo">118</span> throws DeserializationException {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> FilterProtos.FamilyFilter proto;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> try {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> proto = FilterProtos.FamilyFilter.parseFrom(pbBytes);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> } catch (InvalidProtocolBufferException e) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> throw new DeserializationException(e);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span> final CompareOperator valueCompareOp =<a name="line.125"></a>
+<span class="sourceLineNo">126</span> CompareOperator.valueOf(proto.getCompareFilter().getCompareOp().name());<a name="line.126"></a>
+<span class="sourceLineNo">127</span> ByteArrayComparable valueComparator = null;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (proto.getCompareFilter().hasComparator()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> valueComparator = ProtobufUtil.toComparator(proto.getCompareFilter().getComparator());<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span> } catch (IOException ioe) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> throw new DeserializationException(ioe);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return new FamilyFilter(valueCompareOp,valueComparator);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return true if and only if the fields of the filter that are serialized<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> if (o == this) return true;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> if (!(o instanceof FamilyFilter)) return false;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> FamilyFilter other = (FamilyFilter)o;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return super.areSerializedFieldsEqual(other);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> @Override<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public boolean equals(Object obj) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (obj == null || (!(obj instanceof FamilyFilter))) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> FamilyFilter f = (FamilyFilter) obj;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return this.areSerializedFieldsEqual(f);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public int hashCode() {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return Objects.hash(this.getComparator(), this.getCompareOperator());<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>