You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/10/09 15:12:56 UTC
[18/52] [partial] hbase-site git commit: Published site at
e06c3676f1273f033e3e185ee9c1ec52c1c7cb31.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
index c7a9ba3..3cd803c 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.html
@@ -37,15 +37,15 @@
<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.filter.CompareFilter.CompareOp;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<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.protobuf.generated.HBaseProtos;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import com.google.common.base.Preconditions;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.40"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<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.shaded.protobuf.generated.HBaseProtos;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import com.google.common.base.Preconditions;<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> * This filter is used to filter cells based on value. It takes a {@link CompareFilter.CompareOp}<a name="line.43"></a>
@@ -82,7 +82,7 @@
<span class="sourceLineNo">074</span> protected byte [] columnFamily;<a name="line.74"></a>
<span class="sourceLineNo">075</span> protected byte [] columnQualifier;<a name="line.75"></a>
<span class="sourceLineNo">076</span> protected CompareOp compareOp;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> protected ByteArrayComparable comparator;<a name="line.77"></a>
+<span class="sourceLineNo">077</span> protected org.apache.hadoop.hbase.filter.ByteArrayComparable comparator;<a name="line.77"></a>
<span class="sourceLineNo">078</span> protected boolean foundColumn = false;<a name="line.78"></a>
<span class="sourceLineNo">079</span> protected boolean matchedColumn = false;<a name="line.79"></a>
<span class="sourceLineNo">080</span> protected boolean filterIfMissing = false;<a name="line.80"></a>
@@ -104,7 +104,7 @@
<span class="sourceLineNo">096</span> */<a name="line.96"></a>
<span class="sourceLineNo">097</span> public SingleColumnValueFilter(final byte [] family, final byte [] qualifier,<a name="line.97"></a>
<span class="sourceLineNo">098</span> final CompareOp compareOp, final byte[] value) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> this(family, qualifier, compareOp, new BinaryComparator(value));<a name="line.99"></a>
+<span class="sourceLineNo">099</span> this(family, qualifier, compareOp, new org.apache.hadoop.hbase.filter.BinaryComparator(value));<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>
@@ -122,283 +122,285 @@
<span class="sourceLineNo">114</span> * @param comparator Comparator to use.<a name="line.114"></a>
<span class="sourceLineNo">115</span> */<a name="line.115"></a>
<span class="sourceLineNo">116</span> public SingleColumnValueFilter(final byte [] family, final byte [] qualifier,<a name="line.116"></a>
-<span class="sourceLineNo">117</span> final CompareOp compareOp, final ByteArrayComparable comparator) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> this.columnFamily = family;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> this.columnQualifier = qualifier;<a name="line.119"></a>
-<span class="sourceLineNo">120</span> this.compareOp = compareOp;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> this.comparator = comparator;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * Constructor for protobuf deserialization only.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * @param family<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @param qualifier<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @param compareOp<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @param comparator<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * @param filterIfMissing<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * @param latestVersionOnly<a name="line.131"></a>
-<span class="sourceLineNo">132</span> */<a name="line.132"></a>
-<span class="sourceLineNo">133</span> protected SingleColumnValueFilter(final byte[] family, final byte[] qualifier,<a name="line.133"></a>
-<span class="sourceLineNo">134</span> final CompareOp compareOp, ByteArrayComparable comparator, final boolean filterIfMissing,<a name="line.134"></a>
-<span class="sourceLineNo">135</span> final boolean latestVersionOnly) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> this(family, qualifier, compareOp, comparator);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> this.filterIfMissing = filterIfMissing;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> this.latestVersionOnly = latestVersionOnly;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<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> * @return operator<a name="line.142"></a>
-<span class="sourceLineNo">143</span> */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public CompareOp getOperator() {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> return compareOp;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<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> * @return the comparator<a name="line.149"></a>
-<span class="sourceLineNo">150</span> */<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public ByteArrayComparable getComparator() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return comparator;<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> /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @return the family<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public byte[] getFamily() {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> return columnFamily;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> /**<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @return the qualifier<a name="line.163"></a>
-<span class="sourceLineNo">164</span> */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public byte[] getQualifier() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return columnQualifier;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public boolean filterRowKey(Cell cell) throws IOException {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return false;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public ReturnCode filterKeyValue(Cell c) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // System.out.println("REMOVE KEY=" + keyValue.toString() + ", value=" + Bytes.toString(keyValue.getValue()));<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (this.matchedColumn) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // We already found and matched the single column, all keys now pass<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return ReturnCode.INCLUDE;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> } else if (this.latestVersionOnly && this.foundColumn) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // We found but did not match the single column, skip to next row<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return ReturnCode.NEXT_ROW;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return ReturnCode.INCLUDE;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> foundColumn = true;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (filterColumnValue(c)) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return this.latestVersionOnly? ReturnCode.NEXT_ROW: ReturnCode.INCLUDE;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> this.matchedColumn = true;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return ReturnCode.INCLUDE;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> private boolean filterColumnValue(final Cell cell) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> int compareResult = CellComparator.compareValue(cell, this.comparator);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> switch (this.compareOp) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> case LESS:<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return compareResult <= 0;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> case LESS_OR_EQUAL:<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return compareResult < 0;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> case EQUAL:<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return compareResult != 0;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> case NOT_EQUAL:<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return compareResult == 0;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> case GREATER_OR_EQUAL:<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return compareResult > 0;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> case GREATER:<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return compareResult >= 0;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> default:<a name="line.211"></a>
-<span class="sourceLineNo">212</span> throw new RuntimeException("Unknown Compare op " + compareOp.name());<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> public boolean filterRow() {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> // If column was found, return false if it was matched, true if it was not<a name="line.217"></a>
-<span class="sourceLineNo">218</span> // If column not found, return true if we filter if missing, false if not<a name="line.218"></a>
-<span class="sourceLineNo">219</span> return this.foundColumn? !this.matchedColumn: this.filterIfMissing;<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> public boolean hasFilterRow() {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> return true;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> public void reset() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> foundColumn = false;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> matchedColumn = false;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * Get whether entire row should be filtered if column is not found.<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * @return true if row should be skipped if column not found, false if row<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * should be let through anyways<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> public boolean getFilterIfMissing() {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> return filterIfMissing;<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * Set whether entire row should be filtered if column is not found.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <p><a name="line.242"></a>
-<span class="sourceLineNo">243</span> * If true, the entire row will be skipped if the column is not found.<a name="line.243"></a>
+<span class="sourceLineNo">117</span> final CompareOp compareOp,<a name="line.117"></a>
+<span class="sourceLineNo">118</span> final org.apache.hadoop.hbase.filter.ByteArrayComparable comparator) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> this.columnFamily = family;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> this.columnQualifier = qualifier;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> this.compareOp = compareOp;<a name="line.121"></a>
+<span class="sourceLineNo">122</span> this.comparator = comparator;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> /**<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * Constructor for protobuf deserialization only.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @param family<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @param qualifier<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * @param compareOp<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @param comparator<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @param filterIfMissing<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @param latestVersionOnly<a name="line.132"></a>
+<span class="sourceLineNo">133</span> */<a name="line.133"></a>
+<span class="sourceLineNo">134</span> protected SingleColumnValueFilter(final byte[] family, final byte[] qualifier,<a name="line.134"></a>
+<span class="sourceLineNo">135</span> final CompareOp compareOp, org.apache.hadoop.hbase.filter.ByteArrayComparable comparator,<a name="line.135"></a>
+<span class="sourceLineNo">136</span> final boolean filterIfMissing,<a name="line.136"></a>
+<span class="sourceLineNo">137</span> final boolean latestVersionOnly) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> this(family, qualifier, compareOp, comparator);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> this.filterIfMissing = filterIfMissing;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> this.latestVersionOnly = latestVersionOnly;<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 operator<a name="line.144"></a>
+<span class="sourceLineNo">145</span> */<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public CompareOp getOperator() {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> return compareOp;<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> /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @return the comparator<a name="line.151"></a>
+<span class="sourceLineNo">152</span> */<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public org.apache.hadoop.hbase.filter.ByteArrayComparable getComparator() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return comparator;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * @return the family<a name="line.158"></a>
+<span class="sourceLineNo">159</span> */<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public byte[] getFamily() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> return columnFamily;<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> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * @return the qualifier<a name="line.165"></a>
+<span class="sourceLineNo">166</span> */<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public byte[] getQualifier() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return columnQualifier;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
+<span class="sourceLineNo">172</span> public boolean filterRowKey(Cell cell) throws IOException {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<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 ReturnCode filterKeyValue(Cell c) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // System.out.println("REMOVE KEY=" + keyValue.toString() + ", value=" + Bytes.toString(keyValue.getValue()));<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if (this.matchedColumn) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // We already found and matched the single column, all keys now pass<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return ReturnCode.INCLUDE;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> } else if (this.latestVersionOnly && this.foundColumn) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // We found but did not match the single column, skip to next row<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return ReturnCode.NEXT_ROW;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (!CellUtil.matchingColumn(c, this.columnFamily, this.columnQualifier)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return ReturnCode.INCLUDE;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> foundColumn = true;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (filterColumnValue(c)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return this.latestVersionOnly? ReturnCode.NEXT_ROW: ReturnCode.INCLUDE;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.matchedColumn = true;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return ReturnCode.INCLUDE;<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> private boolean filterColumnValue(final Cell cell) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> int compareResult = CellComparator.compareValue(cell, this.comparator);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> switch (this.compareOp) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> case LESS:<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return compareResult <= 0;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> case LESS_OR_EQUAL:<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return compareResult < 0;<a name="line.204"></a>
+<span class="sourceLineNo">205</span> case EQUAL:<a name="line.205"></a>
+<span class="sourceLineNo">206</span> return compareResult != 0;<a name="line.206"></a>
+<span class="sourceLineNo">207</span> case NOT_EQUAL:<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return compareResult == 0;<a name="line.208"></a>
+<span class="sourceLineNo">209</span> case GREATER_OR_EQUAL:<a name="line.209"></a>
+<span class="sourceLineNo">210</span> return compareResult > 0;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> case GREATER:<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return compareResult >= 0;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> default:<a name="line.213"></a>
+<span class="sourceLineNo">214</span> throw new RuntimeException("Unknown Compare op " + compareOp.name());<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> public boolean filterRow() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> // If column was found, return false if it was matched, true if it was not<a name="line.219"></a>
+<span class="sourceLineNo">220</span> // If column not found, return true if we filter if missing, false if not<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return this.foundColumn? !this.matchedColumn: this.filterIfMissing;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> <a name="line.223"></a>
+<span class="sourceLineNo">224</span> public boolean hasFilterRow() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return true;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> public void reset() {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> foundColumn = false;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> matchedColumn = false;<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> * Get whether entire row should be filtered if column is not found.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @return true if row should be skipped if column not found, false if row<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * should be let through anyways<a name="line.236"></a>
+<span class="sourceLineNo">237</span> */<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public boolean getFilterIfMissing() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return filterIfMissing;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> /**<a name="line.242"></a>
+<span class="sourceLineNo">243</span> * Set whether entire row should be filtered if column is not found.<a name="line.243"></a>
<span class="sourceLineNo">244</span> * <p><a name="line.244"></a>
-<span class="sourceLineNo">245</span> * If false, the row will pass if the column is not found. This is default.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * @param filterIfMissing flag<a name="line.246"></a>
-<span class="sourceLineNo">247</span> */<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setFilterIfMissing(boolean filterIfMissing) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> this.filterIfMissing = filterIfMissing;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * Get whether only the latest version of the column value should be compared.<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * If true, the row will be returned if only the latest version of the column<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * value matches. If false, the row will be returned if any version of the<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * column value matches. The default is true.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @return return value<a name="line.257"></a>
-<span class="sourceLineNo">258</span> */<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getLatestVersionOnly() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return latestVersionOnly;<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> * Set whether only the latest version of the column value should be compared.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * If true, the row will be returned if only the latest version of the column<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * value matches. If false, the row will be returned if any version of the<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * column value matches. The default is true.<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * @param latestVersionOnly flag<a name="line.268"></a>
-<span class="sourceLineNo">269</span> */<a name="line.269"></a>
-<span class="sourceLineNo">270</span> public void setLatestVersionOnly(boolean latestVersionOnly) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> this.latestVersionOnly = latestVersionOnly;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> Preconditions.checkArgument(filterArguments.size() == 4 || filterArguments.size() == 6,<a name="line.275"></a>
-<span class="sourceLineNo">276</span> "Expected 4 or 6 but got: %s", filterArguments.size());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.277"></a>
-<span class="sourceLineNo">278</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.278"></a>
-<span class="sourceLineNo">279</span> CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(2));<a name="line.279"></a>
-<span class="sourceLineNo">280</span> ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.280"></a>
-<span class="sourceLineNo">281</span> ParseFilter.removeQuotesFromByteArray(filterArguments.get(3)));<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (comparator instanceof RegexStringComparator ||<a name="line.283"></a>
-<span class="sourceLineNo">284</span> comparator instanceof SubstringComparator) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> if (compareOp != CompareOp.EQUAL &&<a name="line.285"></a>
-<span class="sourceLineNo">286</span> compareOp != CompareOp.NOT_EQUAL) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> throw new IllegalArgumentException ("A regexstring comparator and substring comparator " +<a name="line.287"></a>
-<span class="sourceLineNo">288</span> "can only be used with EQUAL and NOT_EQUAL");<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<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">292</span> SingleColumnValueFilter filter = new SingleColumnValueFilter(family, qualifier,<a name="line.292"></a>
-<span class="sourceLineNo">293</span> compareOp, comparator);<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (filterArguments.size() == 6) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> boolean filterIfMissing = ParseFilter.convertByteArrayToBoolean(filterArguments.get(4));<a name="line.296"></a>
-<span class="sourceLineNo">297</span> boolean latestVersionOnly = ParseFilter.convertByteArrayToBoolean(filterArguments.get(5));<a name="line.297"></a>
-<span class="sourceLineNo">298</span> filter.setFilterIfMissing(filterIfMissing);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> filter.setLatestVersionOnly(latestVersionOnly);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> return filter;<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> FilterProtos.SingleColumnValueFilter convert() {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> FilterProtos.SingleColumnValueFilter.Builder builder =<a name="line.305"></a>
-<span class="sourceLineNo">306</span> FilterProtos.SingleColumnValueFilter.newBuilder();<a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (this.columnFamily != null) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> builder.setColumnFamily(ByteStringer.wrap(this.columnFamily));<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (this.columnQualifier != null) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> builder.setColumnQualifier(ByteStringer.wrap(this.columnQualifier));<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> HBaseProtos.CompareType compareOp = CompareType.valueOf(this.compareOp.name());<a name="line.313"></a>
-<span class="sourceLineNo">314</span> builder.setCompareOp(compareOp);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a name="line.315"></a>
-<span class="sourceLineNo">316</span> builder.setFilterIfMissing(this.filterIfMissing);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> builder.setLatestVersionOnly(this.latestVersionOnly);<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> return builder.build();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * @return The filter serialized using pb<a name="line.323"></a>
-<span class="sourceLineNo">324</span> */<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public byte [] toByteArray() {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> return convert().toByteArray();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * @param pbBytes A pb serialized {@link SingleColumnValueFilter} instance<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * @return An instance of {@link SingleColumnValueFilter} made from <code>bytes</code><a name="line.331"></a>
-<span class="sourceLineNo">332</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * @see #toByteArray<a name="line.333"></a>
-<span class="sourceLineNo">334</span> */<a name="line.334"></a>
-<span class="sourceLineNo">335</span> public static SingleColumnValueFilter parseFrom(final byte [] pbBytes)<a name="line.335"></a>
-<span class="sourceLineNo">336</span> throws DeserializationException {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> FilterProtos.SingleColumnValueFilter proto;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> try {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> proto = FilterProtos.SingleColumnValueFilter.parseFrom(pbBytes);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> } catch (InvalidProtocolBufferException e) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> throw new DeserializationException(e);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> final CompareOp compareOp =<a name="line.344"></a>
-<span class="sourceLineNo">345</span> CompareOp.valueOf(proto.getCompareOp().name());<a name="line.345"></a>
-<span class="sourceLineNo">346</span> final ByteArrayComparable comparator;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> try {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> comparator = ProtobufUtil.toComparator(proto.getComparator());<a name="line.348"></a>
-<span class="sourceLineNo">349</span> } catch (IOException ioe) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> throw new DeserializationException(ioe);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> return new SingleColumnValueFilter(proto.hasColumnFamily() ? proto.getColumnFamily()<a name="line.353"></a>
-<span class="sourceLineNo">354</span> .toByteArray() : null, proto.hasColumnQualifier() ? proto.getColumnQualifier()<a name="line.354"></a>
-<span class="sourceLineNo">355</span> .toByteArray() : null, compareOp, comparator, proto.getFilterIfMissing(), proto<a name="line.355"></a>
-<span class="sourceLineNo">356</span> .getLatestVersionOnly());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * @param other<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * @return true if and only if the fields of the filter that are serialized<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> */<a name="line.363"></a>
-<span class="sourceLineNo">364</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> if (o == this) return true;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (!(o instanceof SingleColumnValueFilter)) return false;<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> SingleColumnValueFilter other = (SingleColumnValueFilter)o;<a name="line.368"></a>
-<span class="sourceLineNo">369</span> return Bytes.equals(this.getFamily(), other.getFamily())<a name="line.369"></a>
-<span class="sourceLineNo">370</span> && Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.370"></a>
-<span class="sourceLineNo">371</span> && this.compareOp.equals(other.compareOp)<a name="line.371"></a>
-<span class="sourceLineNo">372</span> && this.getComparator().areSerializedFieldsEqual(other.getComparator())<a name="line.372"></a>
-<span class="sourceLineNo">373</span> && this.getFilterIfMissing() == other.getFilterIfMissing()<a name="line.373"></a>
-<span class="sourceLineNo">374</span> && this.getLatestVersionOnly() == other.getLatestVersionOnly();<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * The only CF this filter needs is given column family. So, it's the only essential<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * column in whole scan. If filterIfMissing == false, all families are essential,<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * because of possibility of skipping the rows without any data in filtered CF.<a name="line.380"></a>
-<span class="sourceLineNo">381</span> */<a name="line.381"></a>
-<span class="sourceLineNo">382</span> public boolean isFamilyEssential(byte[] name) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> return !this.filterIfMissing || Bytes.equals(name, this.columnFamily);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> @Override<a name="line.386"></a>
-<span class="sourceLineNo">387</span> public String toString() {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> return String.format("%s (%s, %s, %s, %s)",<a name="line.388"></a>
-<span class="sourceLineNo">389</span> this.getClass().getSimpleName(), Bytes.toStringBinary(this.columnFamily),<a name="line.389"></a>
-<span class="sourceLineNo">390</span> Bytes.toStringBinary(this.columnQualifier), this.compareOp.name(),<a name="line.390"></a>
-<span class="sourceLineNo">391</span> Bytes.toStringBinary(this.comparator.getValue()));<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>}<a name="line.393"></a>
+<span class="sourceLineNo">245</span> * If true, the entire row will be skipped if the column is not found.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <p><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * If false, the row will pass if the column is not found. This is default.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * @param filterIfMissing flag<a name="line.248"></a>
+<span class="sourceLineNo">249</span> */<a name="line.249"></a>
+<span class="sourceLineNo">250</span> public void setFilterIfMissing(boolean filterIfMissing) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> this.filterIfMissing = filterIfMissing;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<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> * Get whether only the latest version of the column value should be compared.<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * If true, the row will be returned if only the latest version of the column<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * value matches. If false, the row will be returned if any version of the<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * column value matches. The default is true.<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * @return return value<a name="line.259"></a>
+<span class="sourceLineNo">260</span> */<a name="line.260"></a>
+<span class="sourceLineNo">261</span> public boolean getLatestVersionOnly() {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> return latestVersionOnly;<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> /**<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * Set whether only the latest version of the column value should be compared.<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * If true, the row will be returned if only the latest version of the column<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * value matches. If false, the row will be returned if any version of the<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * column value matches. The default is true.<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * @param latestVersionOnly flag<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> public void setLatestVersionOnly(boolean latestVersionOnly) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> this.latestVersionOnly = latestVersionOnly;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> Preconditions.checkArgument(filterArguments.size() == 4 || filterArguments.size() == 6,<a name="line.277"></a>
+<span class="sourceLineNo">278</span> "Expected 4 or 6 but got: %s", filterArguments.size());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> byte [] family = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> byte [] qualifier = ParseFilter.removeQuotesFromByteArray(filterArguments.get(1));<a name="line.280"></a>
+<span class="sourceLineNo">281</span> CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(2));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> org.apache.hadoop.hbase.filter.ByteArrayComparable comparator = ParseFilter.createComparator(<a name="line.282"></a>
+<span class="sourceLineNo">283</span> ParseFilter.removeQuotesFromByteArray(filterArguments.get(3)));<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (comparator instanceof RegexStringComparator ||<a name="line.285"></a>
+<span class="sourceLineNo">286</span> comparator instanceof SubstringComparator) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> if (compareOp != CompareOp.EQUAL &&<a name="line.287"></a>
+<span class="sourceLineNo">288</span> compareOp != CompareOp.NOT_EQUAL) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> throw new IllegalArgumentException ("A regexstring comparator and substring comparator " +<a name="line.289"></a>
+<span class="sourceLineNo">290</span> "can only be used with EQUAL and NOT_EQUAL");<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>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> SingleColumnValueFilter filter = new SingleColumnValueFilter(family, qualifier,<a name="line.294"></a>
+<span class="sourceLineNo">295</span> compareOp, comparator);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (filterArguments.size() == 6) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> boolean filterIfMissing = ParseFilter.convertByteArrayToBoolean(filterArguments.get(4));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> boolean latestVersionOnly = ParseFilter.convertByteArrayToBoolean(filterArguments.get(5));<a name="line.299"></a>
+<span class="sourceLineNo">300</span> filter.setFilterIfMissing(filterIfMissing);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> filter.setLatestVersionOnly(latestVersionOnly);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return filter;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> FilterProtos.SingleColumnValueFilter convert() {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> FilterProtos.SingleColumnValueFilter.Builder builder =<a name="line.307"></a>
+<span class="sourceLineNo">308</span> FilterProtos.SingleColumnValueFilter.newBuilder();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> if (this.columnFamily != null) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> builder.setColumnFamily(UnsafeByteOperations.unsafeWrap(this.columnFamily));<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (this.columnQualifier != null) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> builder.setColumnQualifier(UnsafeByteOperations.unsafeWrap(this.columnQualifier));<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> HBaseProtos.CompareType compareOp = CompareType.valueOf(this.compareOp.name());<a name="line.315"></a>
+<span class="sourceLineNo">316</span> builder.setCompareOp(compareOp);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> builder.setComparator(ProtobufUtil.toComparator(this.comparator));<a name="line.317"></a>
+<span class="sourceLineNo">318</span> builder.setFilterIfMissing(this.filterIfMissing);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> builder.setLatestVersionOnly(this.latestVersionOnly);<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> return builder.build();<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<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> * @return The filter serialized using pb<a name="line.325"></a>
+<span class="sourceLineNo">326</span> */<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public byte [] toByteArray() {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> return convert().toByteArray();<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>
+<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @param pbBytes A pb serialized {@link SingleColumnValueFilter} instance<a name="line.332"></a>
+<span class="sourceLineNo">333</span> * @return An instance of {@link SingleColumnValueFilter} made from <code>bytes</code><a name="line.333"></a>
+<span class="sourceLineNo">334</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * @see #toByteArray<a name="line.335"></a>
+<span class="sourceLineNo">336</span> */<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public static SingleColumnValueFilter parseFrom(final byte [] pbBytes)<a name="line.337"></a>
+<span class="sourceLineNo">338</span> throws DeserializationException {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> FilterProtos.SingleColumnValueFilter proto;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> try {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> proto = FilterProtos.SingleColumnValueFilter.parseFrom(pbBytes);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } catch (InvalidProtocolBufferException e) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> throw new DeserializationException(e);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> final CompareOp compareOp =<a name="line.346"></a>
+<span class="sourceLineNo">347</span> CompareOp.valueOf(proto.getCompareOp().name());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> final org.apache.hadoop.hbase.filter.ByteArrayComparable comparator;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> try {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> comparator = ProtobufUtil.toComparator(proto.getComparator());<a name="line.350"></a>
+<span class="sourceLineNo">351</span> } catch (IOException ioe) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> throw new DeserializationException(ioe);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> return new SingleColumnValueFilter(proto.hasColumnFamily() ? proto.getColumnFamily()<a name="line.355"></a>
+<span class="sourceLineNo">356</span> .toByteArray() : null, proto.hasColumnQualifier() ? proto.getColumnQualifier()<a name="line.356"></a>
+<span class="sourceLineNo">357</span> .toByteArray() : null, compareOp, comparator, proto.getFilterIfMissing(), proto<a name="line.357"></a>
+<span class="sourceLineNo">358</span> .getLatestVersionOnly());<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @param other<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return true if and only if the fields of the filter that are serialized<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> */<a name="line.365"></a>
+<span class="sourceLineNo">366</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (o == this) return true;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if (!(o instanceof SingleColumnValueFilter)) return false;<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> SingleColumnValueFilter other = (SingleColumnValueFilter)o;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> return Bytes.equals(this.getFamily(), other.getFamily())<a name="line.371"></a>
+<span class="sourceLineNo">372</span> && Bytes.equals(this.getQualifier(), other.getQualifier())<a name="line.372"></a>
+<span class="sourceLineNo">373</span> && this.compareOp.equals(other.compareOp)<a name="line.373"></a>
+<span class="sourceLineNo">374</span> && this.getComparator().areSerializedFieldsEqual(other.getComparator())<a name="line.374"></a>
+<span class="sourceLineNo">375</span> && this.getFilterIfMissing() == other.getFilterIfMissing()<a name="line.375"></a>
+<span class="sourceLineNo">376</span> && this.getLatestVersionOnly() == other.getLatestVersionOnly();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> /**<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * The only CF this filter needs is given column family. So, it's the only essential<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * column in whole scan. If filterIfMissing == false, all families are essential,<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * because of possibility of skipping the rows without any data in filtered CF.<a name="line.382"></a>
+<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">384</span> public boolean isFamilyEssential(byte[] name) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> return !this.filterIfMissing || Bytes.equals(name, this.columnFamily);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> }<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span> @Override<a name="line.388"></a>
+<span class="sourceLineNo">389</span> public String toString() {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> return String.format("%s (%s, %s, %s, %s)",<a name="line.390"></a>
+<span class="sourceLineNo">391</span> this.getClass().getSimpleName(), Bytes.toStringBinary(this.columnFamily),<a name="line.391"></a>
+<span class="sourceLineNo">392</span> Bytes.toStringBinary(this.columnQualifier), this.compareOp.name(),<a name="line.392"></a>
+<span class="sourceLineNo">393</span> Bytes.toStringBinary(this.comparator.getValue()));<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>}<a name="line.395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
index 882dd32..0c46f1b 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SkipFilter.html
@@ -33,135 +33,134 @@
<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 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> * A wrapper filter that filters an entire row if any of the Cell checks do<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * not pass.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p><a name="line.36"></a>
-<span class="sourceLineNo">037</span> * For example, if all columns in a row represent weights of different things,<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * with the values being the actual weights, and we want to filter out the<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * entire row if any of its weights are zero. In this case, we want to prevent<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * rows from being emitted if a single key is filtered. Combine this filter<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * with a {@link ValueFilter}:<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * </p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <p><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * <code><a name="line.44"></a>
-<span class="sourceLineNo">045</span> * scan.setFilter(new SkipFilter(new ValueFilter(CompareOp.NOT_EQUAL,<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * new BinaryComparator(Bytes.toBytes(0))));<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * </code><a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Any row which contained a column whose value was 0 will be filtered out<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * (since ValueFilter will not pass that Cell).<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Without this filter, the other non-zero valued columns in the row would still<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * be emitted.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * </p><a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@InterfaceAudience.Public<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceStability.Stable<a name="line.55"></a>
-<span class="sourceLineNo">056</span>public class SkipFilter extends FilterBase {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private boolean filterRow = false;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private Filter filter;<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> public SkipFilter(Filter filter) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.filter = filter;<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> public Filter getFilter() {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> return filter;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public void reset() throws IOException {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> filter.reset();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> filterRow = false;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> private void changeFR(boolean value) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> filterRow = filterRow || value;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public boolean filterRowKey(Cell cell) throws IOException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return false;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> @Override<a name="line.84"></a>
-<span class="sourceLineNo">085</span> public ReturnCode filterKeyValue(Cell v) throws IOException {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> ReturnCode c = filter.filterKeyValue(v);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> changeFR(c != ReturnCode.INCLUDE);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return c;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public Cell transformCell(Cell v) throws IOException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> return filter.transformCell(v);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> public boolean filterRow() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return filterRow;<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> public boolean hasFilterRow() {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return true;<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> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @return The filter serialized using pb<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public byte[] toByteArray() throws IOException {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> FilterProtos.SkipFilter.Builder builder =<a name="line.108"></a>
-<span class="sourceLineNo">109</span> FilterProtos.SkipFilter.newBuilder();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> builder.setFilter(ProtobufUtil.toFilter(this.filter));<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return builder.build().toByteArray();<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> * @param pbBytes A pb serialized {@link SkipFilter} instance<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @return An instance of {@link SkipFilter} made from <code>bytes</code><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @throws DeserializationException<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * @see #toByteArray<a name="line.118"></a>
-<span class="sourceLineNo">119</span> */<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public static SkipFilter parseFrom(final byte [] pbBytes)<a name="line.120"></a>
-<span class="sourceLineNo">121</span> throws DeserializationException {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> FilterProtos.SkipFilter proto;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> try {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> proto = FilterProtos.SkipFilter.parseFrom(pbBytes);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> } catch (InvalidProtocolBufferException e) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> throw new DeserializationException(e);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span> try {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> return new SkipFilter(ProtobufUtil.toFilter(proto.getFilter()));<a name="line.129"></a>
-<span class="sourceLineNo">130</span> } catch (IOException ioe) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throw new DeserializationException(ioe);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @param other<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @return true if and only if the fields of the filter that are serialized<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> */<a name="line.139"></a>
-<span class="sourceLineNo">140</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> if (o == this) return true;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> if (!(o instanceof SkipFilter)) return false;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> SkipFilter other = (SkipFilter)o;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> return getFilter().areSerializedFieldsEqual(other.getFilter());<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return filter.isFamilyEssential(name);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public String toString() {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return this.getClass().getSimpleName() + " " + this.filter.toString();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>}<a name="line.156"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * A wrapper filter that filters an entire row if any of the Cell checks do<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * not pass.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * <p><a name="line.35"></a>
+<span class="sourceLineNo">036</span> * For example, if all columns in a row represent weights of different things,<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * with the values being the actual weights, and we want to filter out the<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * entire row if any of its weights are zero. In this case, we want to prevent<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * rows from being emitted if a single key is filtered. Combine this filter<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * with a {@link ValueFilter}:<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * </p><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <code><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * scan.setFilter(new SkipFilter(new ValueFilter(CompareOp.NOT_EQUAL,<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * new BinaryComparator(Bytes.toBytes(0))));<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * </code><a name="line.46"></a>
+<span class="sourceLineNo">047</span> * Any row which contained a column whose value was 0 will be filtered out<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * (since ValueFilter will not pass that Cell).<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Without this filter, the other non-zero valued columns in the row would still<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * be emitted.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * </p><a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.Public<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@InterfaceStability.Stable<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class SkipFilter extends FilterBase {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private boolean filterRow = false;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> private Filter filter;<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> public SkipFilter(Filter filter) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> this.filter = filter;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> public Filter getFilter() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> return filter;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public void reset() throws IOException {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> filter.reset();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> filterRow = false;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> private void changeFR(boolean value) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> filterRow = filterRow || value;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> @Override<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public boolean filterRowKey(Cell cell) throws IOException {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> // Impl in FilterBase might do unnecessary copy for Off heap backed Cells.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> return false;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> @Override<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public ReturnCode filterKeyValue(Cell v) throws IOException {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> ReturnCode c = filter.filterKeyValue(v);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> changeFR(c != ReturnCode.INCLUDE);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> return c;<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> @Override<a name="line.90"></a>
+<span class="sourceLineNo">091</span> public Cell transformCell(Cell v) throws IOException {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return filter.transformCell(v);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> public boolean filterRow() {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> return filterRow;<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> public boolean hasFilterRow() {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> return true;<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> * @return The filter serialized using pb<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public byte[] toByteArray() throws IOException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> FilterProtos.SkipFilter.Builder builder =<a name="line.107"></a>
+<span class="sourceLineNo">108</span> FilterProtos.SkipFilter.newBuilder();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> builder.setFilter(ProtobufUtil.toFilter(this.filter));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return builder.build().toByteArray();<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> * @param pbBytes A pb serialized {@link SkipFilter} instance<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return An instance of {@link SkipFilter} made from <code>bytes</code><a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @throws DeserializationException<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @see #toByteArray<a name="line.117"></a>
+<span class="sourceLineNo">118</span> */<a name="line.118"></a>
+<span class="sourceLineNo">119</span> public static SkipFilter parseFrom(final byte [] pbBytes)<a name="line.119"></a>
+<span class="sourceLineNo">120</span> throws DeserializationException {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> FilterProtos.SkipFilter proto;<a name="line.121"></a>
+<span class="sourceLineNo">122</span> try {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> proto = FilterProtos.SkipFilter.parseFrom(pbBytes);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> } catch (InvalidProtocolBufferException e) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> throw new DeserializationException(e);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span> try {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> return new SkipFilter(ProtobufUtil.toFilter(proto.getFilter()));<a name="line.128"></a>
+<span class="sourceLineNo">129</span> } catch (IOException ioe) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> throw new DeserializationException(ioe);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @param other<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * @return true if and only if the fields of the filter that are serialized<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> */<a name="line.138"></a>
+<span class="sourceLineNo">139</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> if (o == this) return true;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (!(o instanceof SkipFilter)) return false;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> SkipFilter other = (SkipFilter)o;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return getFilter().areSerializedFieldsEqual(other.getFilter());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return filter.isFamilyEssential(name);<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 String toString() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return this.getClass().getSimpleName() + " " + this.filter.toString();<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
index e211154..0bbed44 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/SubstringComparator.html
@@ -30,10 +30,10 @@
<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos;<a name="line.25"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ComparatorProtos;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.26"></a>
<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.28"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a name="line.28"></a>
<span class="sourceLineNo">029</span><a name="line.29"></a>
<span class="sourceLineNo">030</span><a name="line.30"></a>
<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
index a5616d0..d00a4b0 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
@@ -35,10 +35,10 @@
<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">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span>import com.google.common.base.Preconditions;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import com.google.protobuf.InvalidProtocolBufferException;<a name="line.33"></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><a name="line.34"></a>
<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
<span class="sourceLineNo">036</span> * Filter that returns only cells whose timestamp (version) is<a name="line.36"></a>