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/07/14 15:34:49 UTC
[11/29] hbase-site git commit: Published site at
2997b6d0714d5542784baf830e7c16a9ef6b62d6.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/19303896/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.html
index 73545d5..cc42ba2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.html
@@ -30,57 +30,57 @@
<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.io.Serializable;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import javax.ws.rs.core.MediaType;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.xml.bind.annotation.XmlAttribute;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import javax.xml.bind.annotation.XmlElement;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import javax.xml.bind.annotation.XmlRootElement;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.filter.BinaryComparator;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.filter.BinaryPrefixComparator;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.filter.BitComparator;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.filter.ByteArrayComparable;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.filter.ColumnCountGetFilter;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.filter.ColumnPaginationFilter;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.filter.ColumnRangeFilter;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.filter.DependentColumnFilter;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.filter.FamilyFilter;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.InclusiveStopFilter;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.KeyOnlyFilter;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.MultiRowRangeFilter;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.MultiRowRangeFilter.RowRange;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.MultipleColumnPrefixFilter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.filter.NullComparator;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.filter.PageFilter;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.filter.PrefixFilter;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.filter.RandomRowFilter;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.filter.SkipFilter;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.filter.SubstringComparator;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.filter.TimestampsFilter;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.filter.ValueFilter;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.filter.WhileMatchFilter;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.rest.ProtobufMessageHandler;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.rest.protobuf.generated.ScannerMessage.Scanner;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.hadoop.hbase.security.visibility.Authorizations;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.apache.hadoop.hbase.util.Base64;<a name="line.75"></a>
+<span class="sourceLineNo">025</span>import java.util.Base64;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Map;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.NavigableSet;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>import javax.ws.rs.core.MediaType;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import javax.xml.bind.annotation.XmlAttribute;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import javax.xml.bind.annotation.XmlElement;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import javax.xml.bind.annotation.XmlRootElement;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.CompareOperator;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.filter.BinaryComparator;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.filter.BinaryPrefixComparator;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.filter.BitComparator;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.filter.ByteArrayComparable;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.filter.ColumnCountGetFilter;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.filter.ColumnPaginationFilter;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.filter.ColumnPrefixFilter;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.filter.ColumnRangeFilter;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.filter.CompareFilter;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.filter.DependentColumnFilter;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.filter.FamilyFilter;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.filter.FilterList;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.filter.InclusiveStopFilter;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.filter.KeyOnlyFilter;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.filter.MultiRowRangeFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.filter.MultiRowRangeFilter.RowRange;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.filter.MultipleColumnPrefixFilter;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.filter.NullComparator;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.filter.PageFilter;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.filter.PrefixFilter;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.filter.QualifierFilter;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.filter.RandomRowFilter;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.filter.RegexStringComparator;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.filter.RowFilter;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.filter.SkipFilter;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.filter.SubstringComparator;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.filter.TimestampsFilter;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.filter.ValueFilter;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.filter.WhileMatchFilter;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.rest.ProtobufMessageHandler;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.hbase.rest.protobuf.generated.ScannerMessage.Scanner;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.hadoop.hbase.security.visibility.Authorizations;<a name="line.75"></a>
<span class="sourceLineNo">076</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.76"></a>
<span class="sourceLineNo">077</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
@@ -162,10 +162,10 @@
<span class="sourceLineNo">154</span> switch (type) {<a name="line.154"></a>
<span class="sourceLineNo">155</span> case BinaryComparator:<a name="line.155"></a>
<span class="sourceLineNo">156</span> case BinaryPrefixComparator:<a name="line.156"></a>
-<span class="sourceLineNo">157</span> this.value = Base64.encodeBytes(comparator.getValue());<a name="line.157"></a>
+<span class="sourceLineNo">157</span> this.value = Bytes.toString(Base64.getEncoder().encode(comparator.getValue()));<a name="line.157"></a>
<span class="sourceLineNo">158</span> break;<a name="line.158"></a>
<span class="sourceLineNo">159</span> case BitComparator:<a name="line.159"></a>
-<span class="sourceLineNo">160</span> this.value = Base64.encodeBytes(comparator.getValue());<a name="line.160"></a>
+<span class="sourceLineNo">160</span> this.value = Bytes.toString(Base64.getEncoder().encode(comparator.getValue()));<a name="line.160"></a>
<span class="sourceLineNo">161</span> this.op = ((BitComparator)comparator).getOperator().toString();<a name="line.161"></a>
<span class="sourceLineNo">162</span> break;<a name="line.162"></a>
<span class="sourceLineNo">163</span> case NullComparator:<a name="line.163"></a>
@@ -183,13 +183,13 @@
<span class="sourceLineNo">175</span> ByteArrayComparable comparator;<a name="line.175"></a>
<span class="sourceLineNo">176</span> switch (ComparatorType.valueOf(type)) {<a name="line.176"></a>
<span class="sourceLineNo">177</span> case BinaryComparator:<a name="line.177"></a>
-<span class="sourceLineNo">178</span> comparator = new BinaryComparator(Base64.decode(value));<a name="line.178"></a>
+<span class="sourceLineNo">178</span> comparator = new BinaryComparator(Base64.getDecoder().decode(value));<a name="line.178"></a>
<span class="sourceLineNo">179</span> break;<a name="line.179"></a>
<span class="sourceLineNo">180</span> case BinaryPrefixComparator:<a name="line.180"></a>
-<span class="sourceLineNo">181</span> comparator = new BinaryPrefixComparator(Base64.decode(value));<a name="line.181"></a>
+<span class="sourceLineNo">181</span> comparator = new BinaryPrefixComparator(Base64.getDecoder().decode(value));<a name="line.181"></a>
<span class="sourceLineNo">182</span> break;<a name="line.182"></a>
<span class="sourceLineNo">183</span> case BitComparator:<a name="line.183"></a>
-<span class="sourceLineNo">184</span> comparator = new BitComparator(Base64.decode(value),<a name="line.184"></a>
+<span class="sourceLineNo">184</span> comparator = new BitComparator(Base64.getDecoder().decode(value),<a name="line.184"></a>
<span class="sourceLineNo">185</span> BitComparator.BitwiseOp.valueOf(op));<a name="line.185"></a>
<span class="sourceLineNo">186</span> break;<a name="line.186"></a>
<span class="sourceLineNo">187</span> case NullComparator:<a name="line.187"></a>
@@ -273,612 +273,615 @@
<span class="sourceLineNo">265</span> this.offset = ((ColumnPaginationFilter)filter).getOffset();<a name="line.265"></a>
<span class="sourceLineNo">266</span> break;<a name="line.266"></a>
<span class="sourceLineNo">267</span> case ColumnPrefixFilter:<a name="line.267"></a>
-<span class="sourceLineNo">268</span> this.value = Base64.encodeBytes(((ColumnPrefixFilter)filter).getPrefix());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> break;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> case ColumnRangeFilter:<a name="line.270"></a>
-<span class="sourceLineNo">271</span> this.minColumn = Base64.encodeBytes(((ColumnRangeFilter)filter).getMinColumn());<a name="line.271"></a>
-<span class="sourceLineNo">272</span> this.minColumnInclusive = ((ColumnRangeFilter)filter).getMinColumnInclusive();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> this.maxColumn = Base64.encodeBytes(((ColumnRangeFilter)filter).getMaxColumn());<a name="line.273"></a>
-<span class="sourceLineNo">274</span> this.maxColumnInclusive = ((ColumnRangeFilter)filter).getMaxColumnInclusive();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> break;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> case DependentColumnFilter: {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> DependentColumnFilter dcf = (DependentColumnFilter)filter;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> this.family = Base64.encodeBytes(dcf.getFamily());<a name="line.278"></a>
-<span class="sourceLineNo">279</span> byte[] qualifier = dcf.getQualifier();<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (qualifier != null) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> this.qualifier = Base64.encodeBytes(qualifier);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> this.op = dcf.getOperator().toString();<a name="line.283"></a>
-<span class="sourceLineNo">284</span> this.comparator = new ByteArrayComparableModel(dcf.getComparator());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.dropDependentColumn = dcf.dropDependentColumn();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } break;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> case FilterList:<a name="line.287"></a>
-<span class="sourceLineNo">288</span> this.op = ((FilterList)filter).getOperator().toString();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> this.filters = new ArrayList<>();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> for (Filter child: ((FilterList)filter).getFilters()) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> this.filters.add(new FilterModel(child));<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span> break;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> case FirstKeyOnlyFilter:<a name="line.294"></a>
-<span class="sourceLineNo">295</span> case KeyOnlyFilter:<a name="line.295"></a>
-<span class="sourceLineNo">296</span> break;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> case InclusiveStopFilter:<a name="line.297"></a>
-<span class="sourceLineNo">298</span> this.value =<a name="line.298"></a>
-<span class="sourceLineNo">299</span> Base64.encodeBytes(((InclusiveStopFilter)filter).getStopRowKey());<a name="line.299"></a>
-<span class="sourceLineNo">300</span> break;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> case MultipleColumnPrefixFilter:<a name="line.301"></a>
-<span class="sourceLineNo">302</span> this.prefixes = new ArrayList<>();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> for (byte[] prefix: ((MultipleColumnPrefixFilter)filter).getPrefix()) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> this.prefixes.add(Base64.encodeBytes(prefix));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> break;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> case MultiRowRangeFilter:<a name="line.307"></a>
-<span class="sourceLineNo">308</span> this.ranges = new ArrayList<>();<a name="line.308"></a>
-<span class="sourceLineNo">309</span> for(RowRange range : ((MultiRowRangeFilter)filter).getRowRanges()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> this.ranges.add(new RowRange(range.getStartRow(), range.isStartRowInclusive(),<a name="line.310"></a>
-<span class="sourceLineNo">311</span> range.getStopRow(), range.isStopRowInclusive()));<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> break;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> case PageFilter:<a name="line.314"></a>
-<span class="sourceLineNo">315</span> this.value = Long.toString(((PageFilter)filter).getPageSize());<a name="line.315"></a>
-<span class="sourceLineNo">316</span> break;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> case PrefixFilter:<a name="line.317"></a>
-<span class="sourceLineNo">318</span> this.value = Base64.encodeBytes(((PrefixFilter)filter).getPrefix());<a name="line.318"></a>
-<span class="sourceLineNo">319</span> break;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> case FamilyFilter:<a name="line.320"></a>
-<span class="sourceLineNo">321</span> case QualifierFilter:<a name="line.321"></a>
-<span class="sourceLineNo">322</span> case RowFilter:<a name="line.322"></a>
-<span class="sourceLineNo">323</span> case ValueFilter:<a name="line.323"></a>
-<span class="sourceLineNo">324</span> this.op = ((CompareFilter)filter).getOperator().toString();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> this.comparator =<a name="line.325"></a>
-<span class="sourceLineNo">326</span> new ByteArrayComparableModel(<a name="line.326"></a>
-<span class="sourceLineNo">327</span> ((CompareFilter)filter).getComparator());<a name="line.327"></a>
-<span class="sourceLineNo">328</span> break;<a name="line.328"></a>
-<span class="sourceLineNo">329</span> case RandomRowFilter:<a name="line.329"></a>
-<span class="sourceLineNo">330</span> this.chance = ((RandomRowFilter)filter).getChance();<a name="line.330"></a>
+<span class="sourceLineNo">268</span> byte[] src = ((ColumnPrefixFilter)filter).getPrefix();<a name="line.268"></a>
+<span class="sourceLineNo">269</span> this.value = Bytes.toString(Base64.getEncoder().encode(src));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> break;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> case ColumnRangeFilter:<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ColumnRangeFilter crf = (ColumnRangeFilter)filter;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> this.minColumn = Bytes.toString(Base64.getEncoder().encode(crf.getMinColumn()));<a name="line.273"></a>
+<span class="sourceLineNo">274</span> this.minColumnInclusive = crf.getMinColumnInclusive();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.maxColumn = Bytes.toString(Base64.getEncoder().encode(crf.getMaxColumn()));<a name="line.275"></a>
+<span class="sourceLineNo">276</span> this.maxColumnInclusive = crf.getMaxColumnInclusive();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> break;<a name="line.277"></a>
+<span class="sourceLineNo">278</span> case DependentColumnFilter: {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> DependentColumnFilter dcf = (DependentColumnFilter)filter;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> this.family = Bytes.toString(Base64.getEncoder().encode(dcf.getFamily()));<a name="line.280"></a>
+<span class="sourceLineNo">281</span> byte[] qualifier = dcf.getQualifier();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (qualifier != null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> this.qualifier = Bytes.toString(Base64.getEncoder().encode(qualifier));<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> this.op = dcf.getOperator().toString();<a name="line.285"></a>
+<span class="sourceLineNo">286</span> this.comparator = new ByteArrayComparableModel(dcf.getComparator());<a name="line.286"></a>
+<span class="sourceLineNo">287</span> this.dropDependentColumn = dcf.dropDependentColumn();<a name="line.287"></a>
+<span class="sourceLineNo">288</span> } break;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> case FilterList:<a name="line.289"></a>
+<span class="sourceLineNo">290</span> this.op = ((FilterList)filter).getOperator().toString();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> this.filters = new ArrayList<>();<a name="line.291"></a>
+<span class="sourceLineNo">292</span> for (Filter child: ((FilterList)filter).getFilters()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> this.filters.add(new FilterModel(child));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> break;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> case FirstKeyOnlyFilter:<a name="line.296"></a>
+<span class="sourceLineNo">297</span> case KeyOnlyFilter:<a name="line.297"></a>
+<span class="sourceLineNo">298</span> break;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> case InclusiveStopFilter:<a name="line.299"></a>
+<span class="sourceLineNo">300</span> this.value = Bytes.toString(Base64.getEncoder().encode(<a name="line.300"></a>
+<span class="sourceLineNo">301</span> ((InclusiveStopFilter)filter).getStopRowKey()));<a name="line.301"></a>
+<span class="sourceLineNo">302</span> break;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> case MultipleColumnPrefixFilter:<a name="line.303"></a>
+<span class="sourceLineNo">304</span> this.prefixes = new ArrayList<>();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> for (byte[] prefix: ((MultipleColumnPrefixFilter)filter).getPrefix()) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> this.prefixes.add(Bytes.toString(Base64.getEncoder().encode(prefix)));<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> break;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> case MultiRowRangeFilter:<a name="line.309"></a>
+<span class="sourceLineNo">310</span> this.ranges = new ArrayList<>();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> for(RowRange range : ((MultiRowRangeFilter)filter).getRowRanges()) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> this.ranges.add(new RowRange(range.getStartRow(), range.isStartRowInclusive(),<a name="line.312"></a>
+<span class="sourceLineNo">313</span> range.getStopRow(), range.isStopRowInclusive()));<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> break;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> case PageFilter:<a name="line.316"></a>
+<span class="sourceLineNo">317</span> this.value = Long.toString(((PageFilter)filter).getPageSize());<a name="line.317"></a>
+<span class="sourceLineNo">318</span> break;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> case PrefixFilter:<a name="line.319"></a>
+<span class="sourceLineNo">320</span> this.value = Bytes.toString(Base64.getEncoder().encode(<a name="line.320"></a>
+<span class="sourceLineNo">321</span> ((PrefixFilter)filter).getPrefix()));<a name="line.321"></a>
+<span class="sourceLineNo">322</span> break;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> case FamilyFilter:<a name="line.323"></a>
+<span class="sourceLineNo">324</span> case QualifierFilter:<a name="line.324"></a>
+<span class="sourceLineNo">325</span> case RowFilter:<a name="line.325"></a>
+<span class="sourceLineNo">326</span> case ValueFilter:<a name="line.326"></a>
+<span class="sourceLineNo">327</span> this.op = ((CompareFilter)filter).getOperator().toString();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> this.comparator =<a name="line.328"></a>
+<span class="sourceLineNo">329</span> new ByteArrayComparableModel(<a name="line.329"></a>
+<span class="sourceLineNo">330</span> ((CompareFilter)filter).getComparator());<a name="line.330"></a>
<span class="sourceLineNo">331</span> break;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> case SingleColumnValueExcludeFilter:<a name="line.332"></a>
-<span class="sourceLineNo">333</span> case SingleColumnValueFilter: {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> SingleColumnValueFilter scvf = (SingleColumnValueFilter) filter;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> this.family = Base64.encodeBytes(scvf.getFamily());<a name="line.335"></a>
-<span class="sourceLineNo">336</span> byte[] qualifier = scvf.getQualifier();<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (qualifier != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> this.qualifier = Base64.encodeBytes(qualifier);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> }<a name="line.339"></a>
-<span class="sourceLineNo">340</span> this.op = scvf.getOperator().toString();<a name="line.340"></a>
-<span class="sourceLineNo">341</span> this.comparator =<a name="line.341"></a>
-<span class="sourceLineNo">342</span> new ByteArrayComparableModel(scvf.getComparator());<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (scvf.getFilterIfMissing()) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> this.ifMissing = true;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (scvf.getLatestVersionOnly()) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> this.latestVersion = true;<a name="line.347"></a>
+<span class="sourceLineNo">332</span> case RandomRowFilter:<a name="line.332"></a>
+<span class="sourceLineNo">333</span> this.chance = ((RandomRowFilter)filter).getChance();<a name="line.333"></a>
+<span class="sourceLineNo">334</span> break;<a name="line.334"></a>
+<span class="sourceLineNo">335</span> case SingleColumnValueExcludeFilter:<a name="line.335"></a>
+<span class="sourceLineNo">336</span> case SingleColumnValueFilter: {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> SingleColumnValueFilter scvf = (SingleColumnValueFilter) filter;<a name="line.337"></a>
+<span class="sourceLineNo">338</span> this.family = Bytes.toString(Base64.getEncoder().encode(scvf.getFamily()));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> byte[] qualifier = scvf.getQualifier();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> if (qualifier != null) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> this.qualifier = Bytes.toString(Base64.getEncoder().encode(qualifier));<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.op = scvf.getOperator().toString();<a name="line.343"></a>
+<span class="sourceLineNo">344</span> this.comparator =<a name="line.344"></a>
+<span class="sourceLineNo">345</span> new ByteArrayComparableModel(scvf.getComparator());<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (scvf.getFilterIfMissing()) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> this.ifMissing = true;<a name="line.347"></a>
<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span> } break;<a name="line.349"></a>
-<span class="sourceLineNo">350</span> case SkipFilter:<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.filters = new ArrayList<>();<a name="line.351"></a>
-<span class="sourceLineNo">352</span> this.filters.add(new FilterModel(((SkipFilter)filter).getFilter()));<a name="line.352"></a>
-<span class="sourceLineNo">353</span> break;<a name="line.353"></a>
-<span class="sourceLineNo">354</span> case TimestampsFilter:<a name="line.354"></a>
-<span class="sourceLineNo">355</span> this.timestamps = ((TimestampsFilter)filter).getTimestamps();<a name="line.355"></a>
+<span class="sourceLineNo">349</span> if (scvf.getLatestVersionOnly()) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> this.latestVersion = true;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } break;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> case SkipFilter:<a name="line.353"></a>
+<span class="sourceLineNo">354</span> this.filters = new ArrayList<>();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> this.filters.add(new FilterModel(((SkipFilter)filter).getFilter()));<a name="line.355"></a>
<span class="sourceLineNo">356</span> break;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> case WhileMatchFilter:<a name="line.357"></a>
-<span class="sourceLineNo">358</span> this.filters = new ArrayList<>();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.filters.add(<a name="line.359"></a>
-<span class="sourceLineNo">360</span> new FilterModel(((WhileMatchFilter)filter).getFilter()));<a name="line.360"></a>
-<span class="sourceLineNo">361</span> break;<a name="line.361"></a>
-<span class="sourceLineNo">362</span> default:<a name="line.362"></a>
-<span class="sourceLineNo">363</span> throw new RuntimeException("unhandled filter type " + type);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> public Filter build() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> Filter filter;<a name="line.368"></a>
-<span class="sourceLineNo">369</span> switch (FilterType.valueOf(type)) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> case ColumnCountGetFilter:<a name="line.370"></a>
-<span class="sourceLineNo">371</span> filter = new ColumnCountGetFilter(limit);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> break;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> case ColumnPaginationFilter:<a name="line.373"></a>
-<span class="sourceLineNo">374</span> filter = new ColumnPaginationFilter(limit, offset);<a name="line.374"></a>
+<span class="sourceLineNo">357</span> case TimestampsFilter:<a name="line.357"></a>
+<span class="sourceLineNo">358</span> this.timestamps = ((TimestampsFilter)filter).getTimestamps();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> break;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> case WhileMatchFilter:<a name="line.360"></a>
+<span class="sourceLineNo">361</span> this.filters = new ArrayList<>();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> this.filters.add(<a name="line.362"></a>
+<span class="sourceLineNo">363</span> new FilterModel(((WhileMatchFilter)filter).getFilter()));<a name="line.363"></a>
+<span class="sourceLineNo">364</span> break;<a name="line.364"></a>
+<span class="sourceLineNo">365</span> default:<a name="line.365"></a>
+<span class="sourceLineNo">366</span> throw new RuntimeException("unhandled filter type " + type);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> public Filter build() {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> Filter filter;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> switch (FilterType.valueOf(type)) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> case ColumnCountGetFilter:<a name="line.373"></a>
+<span class="sourceLineNo">374</span> filter = new ColumnCountGetFilter(limit);<a name="line.374"></a>
<span class="sourceLineNo">375</span> break;<a name="line.375"></a>
-<span class="sourceLineNo">376</span> case ColumnPrefixFilter:<a name="line.376"></a>
-<span class="sourceLineNo">377</span> filter = new ColumnPrefixFilter(Base64.decode(value));<a name="line.377"></a>
+<span class="sourceLineNo">376</span> case ColumnPaginationFilter:<a name="line.376"></a>
+<span class="sourceLineNo">377</span> filter = new ColumnPaginationFilter(limit, offset);<a name="line.377"></a>
<span class="sourceLineNo">378</span> break;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> case ColumnRangeFilter:<a name="line.379"></a>
-<span class="sourceLineNo">380</span> filter = new ColumnRangeFilter(Base64.decode(minColumn),<a name="line.380"></a>
-<span class="sourceLineNo">381</span> minColumnInclusive, Base64.decode(maxColumn),<a name="line.381"></a>
-<span class="sourceLineNo">382</span> maxColumnInclusive);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> break;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> case DependentColumnFilter:<a name="line.384"></a>
-<span class="sourceLineNo">385</span> filter = new DependentColumnFilter(Base64.decode(family),<a name="line.385"></a>
-<span class="sourceLineNo">386</span> qualifier != null ? Base64.decode(qualifier) : null,<a name="line.386"></a>
-<span class="sourceLineNo">387</span> dropDependentColumn, CompareOperator.valueOf(op), comparator.build());<a name="line.387"></a>
-<span class="sourceLineNo">388</span> break;<a name="line.388"></a>
-<span class="sourceLineNo">389</span> case FamilyFilter:<a name="line.389"></a>
-<span class="sourceLineNo">390</span> filter = new FamilyFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.390"></a>
+<span class="sourceLineNo">379</span> case ColumnPrefixFilter:<a name="line.379"></a>
+<span class="sourceLineNo">380</span> filter = new ColumnPrefixFilter(Base64.getDecoder().decode(value));<a name="line.380"></a>
+<span class="sourceLineNo">381</span> break;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> case ColumnRangeFilter:<a name="line.382"></a>
+<span class="sourceLineNo">383</span> filter = new ColumnRangeFilter(Base64.getDecoder().decode(minColumn),<a name="line.383"></a>
+<span class="sourceLineNo">384</span> minColumnInclusive, Base64.getDecoder().decode(maxColumn),<a name="line.384"></a>
+<span class="sourceLineNo">385</span> maxColumnInclusive);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> break;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> case DependentColumnFilter:<a name="line.387"></a>
+<span class="sourceLineNo">388</span> filter = new DependentColumnFilter(Base64.getDecoder().decode(family),<a name="line.388"></a>
+<span class="sourceLineNo">389</span> qualifier != null ? Base64.getDecoder().decode(qualifier) : null,<a name="line.389"></a>
+<span class="sourceLineNo">390</span> dropDependentColumn, CompareOperator.valueOf(op), comparator.build());<a name="line.390"></a>
<span class="sourceLineNo">391</span> break;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> case FilterList: {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> List<Filter> list = new ArrayList<>(filters.size());<a name="line.393"></a>
-<span class="sourceLineNo">394</span> for (FilterModel model: filters) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> list.add(model.build());<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> filter = new FilterList(FilterList.Operator.valueOf(op), list);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> } break;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> case FirstKeyOnlyFilter:<a name="line.399"></a>
-<span class="sourceLineNo">400</span> filter = new FirstKeyOnlyFilter();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> break;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> case InclusiveStopFilter:<a name="line.402"></a>
-<span class="sourceLineNo">403</span> filter = new InclusiveStopFilter(Base64.decode(value));<a name="line.403"></a>
+<span class="sourceLineNo">392</span> case FamilyFilter:<a name="line.392"></a>
+<span class="sourceLineNo">393</span> filter = new FamilyFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.393"></a>
+<span class="sourceLineNo">394</span> break;<a name="line.394"></a>
+<span class="sourceLineNo">395</span> case FilterList: {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> List<Filter> list = new ArrayList<>(filters.size());<a name="line.396"></a>
+<span class="sourceLineNo">397</span> for (FilterModel model: filters) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> list.add(model.build());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span> filter = new FilterList(FilterList.Operator.valueOf(op), list);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> } break;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> case FirstKeyOnlyFilter:<a name="line.402"></a>
+<span class="sourceLineNo">403</span> filter = new FirstKeyOnlyFilter();<a name="line.403"></a>
<span class="sourceLineNo">404</span> break;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> case KeyOnlyFilter:<a name="line.405"></a>
-<span class="sourceLineNo">406</span> filter = new KeyOnlyFilter();<a name="line.406"></a>
+<span class="sourceLineNo">405</span> case InclusiveStopFilter:<a name="line.405"></a>
+<span class="sourceLineNo">406</span> filter = new InclusiveStopFilter(Base64.getDecoder().decode(value));<a name="line.406"></a>
<span class="sourceLineNo">407</span> break;<a name="line.407"></a>
-<span class="sourceLineNo">408</span> case MultipleColumnPrefixFilter: {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> byte[][] values = new byte[prefixes.size()][];<a name="line.409"></a>
-<span class="sourceLineNo">410</span> for (int i = 0; i < prefixes.size(); i++) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> values[i] = Base64.decode(prefixes.get(i));<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span> filter = new MultipleColumnPrefixFilter(values);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> } break;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> case MultiRowRangeFilter: {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> filter = new MultiRowRangeFilter(ranges);<a name="line.416"></a>
+<span class="sourceLineNo">408</span> case KeyOnlyFilter:<a name="line.408"></a>
+<span class="sourceLineNo">409</span> filter = new KeyOnlyFilter();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> break;<a name="line.410"></a>
+<span class="sourceLineNo">411</span> case MultipleColumnPrefixFilter: {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> byte[][] values = new byte[prefixes.size()][];<a name="line.412"></a>
+<span class="sourceLineNo">413</span> for (int i = 0; i < prefixes.size(); i++) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> values[i] = Base64.getDecoder().decode(prefixes.get(i));<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> filter = new MultipleColumnPrefixFilter(values);<a name="line.416"></a>
<span class="sourceLineNo">417</span> } break;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> case PageFilter:<a name="line.418"></a>
-<span class="sourceLineNo">419</span> filter = new PageFilter(Long.parseLong(value));<a name="line.419"></a>
-<span class="sourceLineNo">420</span> break;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> case PrefixFilter:<a name="line.421"></a>
-<span class="sourceLineNo">422</span> filter = new PrefixFilter(Base64.decode(value));<a name="line.422"></a>
+<span class="sourceLineNo">418</span> case MultiRowRangeFilter: {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> filter = new MultiRowRangeFilter(ranges);<a name="line.419"></a>
+<span class="sourceLineNo">420</span> } break;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> case PageFilter:<a name="line.421"></a>
+<span class="sourceLineNo">422</span> filter = new PageFilter(Long.parseLong(value));<a name="line.422"></a>
<span class="sourceLineNo">423</span> break;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> case QualifierFilter:<a name="line.424"></a>
-<span class="sourceLineNo">425</span> filter = new QualifierFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.425"></a>
+<span class="sourceLineNo">424</span> case PrefixFilter:<a name="line.424"></a>
+<span class="sourceLineNo">425</span> filter = new PrefixFilter(Base64.getDecoder().decode(value));<a name="line.425"></a>
<span class="sourceLineNo">426</span> break;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> case RandomRowFilter:<a name="line.427"></a>
-<span class="sourceLineNo">428</span> filter = new RandomRowFilter(chance);<a name="line.428"></a>
+<span class="sourceLineNo">427</span> case QualifierFilter:<a name="line.427"></a>
+<span class="sourceLineNo">428</span> filter = new QualifierFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.428"></a>
<span class="sourceLineNo">429</span> break;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> case RowFilter:<a name="line.430"></a>
-<span class="sourceLineNo">431</span> filter = new RowFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.431"></a>
+<span class="sourceLineNo">430</span> case RandomRowFilter:<a name="line.430"></a>
+<span class="sourceLineNo">431</span> filter = new RandomRowFilter(chance);<a name="line.431"></a>
<span class="sourceLineNo">432</span> break;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> case SingleColumnValueFilter:<a name="line.433"></a>
-<span class="sourceLineNo">434</span> filter = new SingleColumnValueFilter(Base64.decode(family),<a name="line.434"></a>
-<span class="sourceLineNo">435</span> qualifier != null ? Base64.decode(qualifier) : null,<a name="line.435"></a>
-<span class="sourceLineNo">436</span> CompareOperator.valueOf(op), comparator.build());<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (ifMissing != null) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> ((SingleColumnValueFilter)filter).setFilterIfMissing(ifMissing);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (latestVersion != null) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> ((SingleColumnValueFilter)filter).setLatestVersionOnly(latestVersion);<a name="line.441"></a>
+<span class="sourceLineNo">433</span> case RowFilter:<a name="line.433"></a>
+<span class="sourceLineNo">434</span> filter = new RowFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.434"></a>
+<span class="sourceLineNo">435</span> break;<a name="line.435"></a>
+<span class="sourceLineNo">436</span> case SingleColumnValueFilter:<a name="line.436"></a>
+<span class="sourceLineNo">437</span> filter = new SingleColumnValueFilter(Base64.getDecoder().decode(family),<a name="line.437"></a>
+<span class="sourceLineNo">438</span> qualifier != null ? Base64.getDecoder().decode(qualifier) : null,<a name="line.438"></a>
+<span class="sourceLineNo">439</span> CompareOperator.valueOf(op), comparator.build());<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (ifMissing != null) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> ((SingleColumnValueFilter)filter).setFilterIfMissing(ifMissing);<a name="line.441"></a>
<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> break;<a name="line.443"></a>
-<span class="sourceLineNo">444</span> case SingleColumnValueExcludeFilter:<a name="line.444"></a>
-<span class="sourceLineNo">445</span> filter = new SingleColumnValueExcludeFilter(Base64.decode(family),<a name="line.445"></a>
-<span class="sourceLineNo">446</span> qualifier != null ? Base64.decode(qualifier) : null,<a name="line.446"></a>
-<span class="sourceLineNo">447</span> CompareOperator.valueOf(op), comparator.build());<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (ifMissing != null) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> ((SingleColumnValueExcludeFilter)filter).setFilterIfMissing(ifMissing);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> if (latestVersion != null) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> ((SingleColumnValueExcludeFilter)filter).setLatestVersionOnly(latestVersion);<a name="line.452"></a>
+<span class="sourceLineNo">443</span> if (latestVersion != null) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> ((SingleColumnValueFilter)filter).setLatestVersionOnly(latestVersion);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span> break;<a name="line.446"></a>
+<span class="sourceLineNo">447</span> case SingleColumnValueExcludeFilter:<a name="line.447"></a>
+<span class="sourceLineNo">448</span> filter = new SingleColumnValueExcludeFilter(Base64.getDecoder().decode(family),<a name="line.448"></a>
+<span class="sourceLineNo">449</span> qualifier != null ? Base64.getDecoder().decode(qualifier) : null,<a name="line.449"></a>
+<span class="sourceLineNo">450</span> CompareOperator.valueOf(op), comparator.build());<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (ifMissing != null) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> ((SingleColumnValueExcludeFilter)filter).setFilterIfMissing(ifMissing);<a name="line.452"></a>
<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> break;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> case SkipFilter:<a name="line.455"></a>
-<span class="sourceLineNo">456</span> filter = new SkipFilter(filters.get(0).build());<a name="line.456"></a>
+<span class="sourceLineNo">454</span> if (latestVersion != null) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> ((SingleColumnValueExcludeFilter)filter).setLatestVersionOnly(latestVersion);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
<span class="sourceLineNo">457</span> break;<a name="line.457"></a>
-<span class="sourceLineNo">458</span> case TimestampsFilter:<a name="line.458"></a>
-<span class="sourceLineNo">459</span> filter = new TimestampsFilter(timestamps);<a name="line.459"></a>
+<span class="sourceLineNo">458</span> case SkipFilter:<a name="line.458"></a>
+<span class="sourceLineNo">459</span> filter = new SkipFilter(filters.get(0).build());<a name="line.459"></a>
<span class="sourceLineNo">460</span> break;<a name="line.460"></a>
-<span class="sourceLineNo">461</span> case ValueFilter:<a name="line.461"></a>
-<span class="sourceLineNo">462</span> filter = new ValueFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.462"></a>
+<span class="sourceLineNo">461</span> case TimestampsFilter:<a name="line.461"></a>
+<span class="sourceLineNo">462</span> filter = new TimestampsFilter(timestamps);<a name="line.462"></a>
<span class="sourceLineNo">463</span> break;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> case WhileMatchFilter:<a name="line.464"></a>
-<span class="sourceLineNo">465</span> filter = new WhileMatchFilter(filters.get(0).build());<a name="line.465"></a>
+<span class="sourceLineNo">464</span> case ValueFilter:<a name="line.464"></a>
+<span class="sourceLineNo">465</span> filter = new ValueFilter(CompareOperator.valueOf(op), comparator.build());<a name="line.465"></a>
<span class="sourceLineNo">466</span> break;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> default:<a name="line.467"></a>
-<span class="sourceLineNo">468</span> throw new RuntimeException("unhandled filter type: " + type);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> return filter;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> /**<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * Get the <code>JacksonJaxbJsonProvider</code> instance;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> *<a name="line.477"></a>
-<span class="sourceLineNo">478</span> * @return A <code>JacksonJaxbJsonProvider</code>.<a name="line.478"></a>
-<span class="sourceLineNo">479</span> */<a name="line.479"></a>
-<span class="sourceLineNo">480</span> private static JacksonJaxbJsonProvider getJasonProvider() {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> return JaxbJsonProviderHolder.INSTANCE;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @param s the JSON representation of the filter<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @return the filter<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @throws Exception<a name="line.487"></a>
-<span class="sourceLineNo">488</span> */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> public static Filter buildFilter(String s) throws Exception {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> FilterModel model = getJasonProvider().locateMapper(FilterModel.class,<a name="line.490"></a>
-<span class="sourceLineNo">491</span> MediaType.APPLICATION_JSON_TYPE).readValue(s, FilterModel.class);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return model.build();<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
-<span class="sourceLineNo">496</span> * @param filter the filter<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @return the JSON representation of the filter<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * @throws Exception<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> public static String stringifyFilter(final Filter filter) throws Exception {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> return getJasonProvider().locateMapper(FilterModel.class,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> MediaType.APPLICATION_JSON_TYPE).writeValueAsString(new FilterModel(filter));<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> private static final byte[] COLUMN_DIVIDER = Bytes.toBytes(":");<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span> /**<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * @param scan the scan specification<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * @throws Exception<a name="line.509"></a>
-<span class="sourceLineNo">510</span> */<a name="line.510"></a>
-<span class="sourceLineNo">511</span> public static ScannerModel fromScan(Scan scan) throws Exception {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ScannerModel model = new ScannerModel();<a name="line.512"></a>
-<span class="sourceLineNo">513</span> model.setStartRow(scan.getStartRow());<a name="line.513"></a>
-<span class="sourceLineNo">514</span> model.setEndRow(scan.getStopRow());<a name="line.514"></a>
-<span class="sourceLineNo">515</span> Map<byte [], NavigableSet<byte []>> families = scan.getFamilyMap();<a name="line.515"></a>
-<span class="sourceLineNo">516</span> if (families != null) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> for (Map.Entry<byte [], NavigableSet<byte []>> entry : families.entrySet()) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> if (entry.getValue() != null) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> for (byte[] qualifier: entry.getValue()) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> model.addColumn(Bytes.add(entry.getKey(), COLUMN_DIVIDER, qualifier));<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span> } else {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> model.addColumn(entry.getKey());<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> model.setStartTime(scan.getTimeRange().getMin());<a name="line.527"></a>
-<span class="sourceLineNo">528</span> model.setEndTime(scan.getTimeRange().getMax());<a name="line.528"></a>
-<span class="sourceLineNo">529</span> int caching = scan.getCaching();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> if (caching > 0) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> model.setCaching(caching);<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span> int batch = scan.getBatch();<a name="line.533"></a>
-<span class="sourceLineNo">534</span> if (batch > 0) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> model.setBatch(batch);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span> int maxVersions = scan.getMaxVersions();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> if (maxVersions > 0) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> model.setMaxVersions(maxVersions);<a name="line.539"></a>
-<span class="sourceLineNo">540</span> }<a name="line.540"></a>
-<span class="sourceLineNo">541</span> Filter filter = scan.getFilter();<a name="line.541"></a>
-<span class="sourceLineNo">542</span> if (filter != null) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> model.setFilter(stringifyFilter(filter));<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> // Add the visbility labels if found in the attributes<a name="line.545"></a>
-<span class="sourceLineNo">546</span> Authorizations authorizations = scan.getAuthorizations();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> if (authorizations != null) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> List<String> labels = authorizations.getLabels();<a name="line.548"></a>
-<span class="sourceLineNo">549</span> for (String label : labels) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> model.addLabel(label);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span> return model;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> }<a name="line.554"></a>
-<span class="sourceLineNo">555</span><a name="line.555"></a>
-<span class="sourceLineNo">556</span> /**<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * Default constructor<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> public ScannerModel() {}<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> /**<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * Constructor<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param startRow the start key of the row-range<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * @param endRow the end key of the row-range<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * @param columns the columns to scan<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * @param batch the number of values to return in batch<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @param caching the number of rows that the scanner will fetch at once<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * @param endTime the upper bound on timestamps of values of interest<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * @param maxVersions the maximum number of versions to return<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * @param filter a filter specification<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * (values with timestamps later than this are excluded)<a name="line.571"></a>
-<span class="sourceLineNo">572</span> */<a name="line.572"></a>
-<span class="sourceLineNo">573</span> public ScannerModel(byte[] startRow, byte[] endRow, List<byte[]> columns,<a name="line.573"></a>
-<span class="sourceLineNo">574</span> int batch, int caching, long endTime, int maxVersions, String filter) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> super();<a name="line.575"></a>
-<span class="sourceLineNo">576</span> this.startRow = startRow;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> this.endRow = endRow;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.columns = columns;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> this.batch = batch;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> this.caching = caching;<a name="line.580"></a>
-<span class="sourceLineNo">581</span> this.endTime = endTime;<a name="line.581"></a>
-<span class="sourceLineNo">582</span> this.maxVersions = maxVersions;<a name="line.582"></a>
-<span class="sourceLineNo">583</span> this.filter = filter;<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span> /**<a name="line.586"></a>
-<span class="sourceLineNo">587</span> * Constructor<a name="line.587"></a>
-<span class="sourceLineNo">588</span> * @param startRow the start key of the row-range<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * @param endRow the end key of the row-range<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * @param columns the columns to scan<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @param batch the number of values to return in batch<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @param caching the number of rows that the scanner will fetch at once<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * @param startTime the lower bound on timestamps of values of interest<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * (values with timestamps earlier than this are excluded)<a name="line.594"></a>
-<span class="sourceLineNo">595</span> * @param endTime the upper bound on timestamps of values of interest<a name="line.595"></a>
-<span class="sourceLineNo">596</span> * (values with timestamps later than this are excluded)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> * @param filter a filter specification<a name="line.597"></a>
-<span class="sourceLineNo">598</span> */<a name="line.598"></a>
-<span class="sourceLineNo">599</span> public ScannerModel(byte[] startRow, byte[] endRow, List<byte[]> columns,<a name="line.599"></a>
-<span class="sourceLineNo">600</span> int batch, int caching, long startTime, long endTime, String filter) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> super();<a name="line.601"></a>
-<span class="sourceLineNo">602</span> this.startRow = startRow;<a name="line.602"></a>
-<span class="sourceLineNo">603</span> this.endRow = endRow;<a name="line.603"></a>
-<span class="sourceLineNo">604</span> this.columns = columns;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> this.batch = batch;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> this.caching = caching;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> this.startTime = startTime;<a name="line.607"></a>
-<span class="sourceLineNo">608</span> this.endTime = endTime;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> this.filter = filter;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> }<a name="line.610"></a>
-<span class="sourceLineNo">611</span><a name="line.611"></a>
-<span class="sourceLineNo">612</span> /**<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * Add a column to the column set<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * @param column the column name, as &lt;column&gt;(:&lt;qualifier&gt;)?<a name="line.614"></a>
-<span class="sourceLineNo">615</span> */<a name="line.615"></a>
-<span class="sourceLineNo">616</span> public void addColumn(byte[] column) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> columns.add(column);<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * Add a visibility label to the scan<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public void addLabel(String label) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> labels.add(label);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span> /**<a name="line.626"></a>
-<span class="sourceLineNo">627</span> * @return true if a start row was specified<a name="line.627"></a>
-<span class="sourceLineNo">628</span> */<a name="line.628"></a>
-<span class="sourceLineNo">629</span> public boolean hasStartRow() {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> return !Bytes.equals(startRow, HConstants.EMPTY_START_ROW);<a name="line.630"></a>
-<span class="sourceLineNo">631</span> }<a name="line.631"></a>
-<span class="sourceLineNo">632</span><a name="line.632"></a>
-<span class="sourceLineNo">633</span> /**<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @return start row<a name="line.634"></a>
-<span class="sourceLineNo">635</span> */<a name="line.635"></a>
-<span class="sourceLineNo">636</span> @XmlAttribute<a name="line.636"></a>
-<span class="sourceLineNo">637</span> public byte[] getStartRow() {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> return startRow;<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span> /**<a name="line.641"></a>
-<span class="sourceLineNo">642</span> * @return true if an end row was specified<a name="line.642"></a>
-<span class="sourceLineNo">643</span> */<a name="line.643"></a>
-<span class="sourceLineNo">644</span> public boolean hasEndRow() {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> return !Bytes.equals(endRow, HConstants.EMPTY_END_ROW);<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> /**<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @return end row<a name="line.649"></a>
-<span class="sourceLineNo">650</span> */<a name="line.650"></a>
-<span class="sourceLineNo">651</span> @XmlAttribute<a name="line.651"></a>
-<span class="sourceLineNo">652</span> public byte[] getEndRow() {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> return endRow;<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> /**<a name="line.656"></a>
-<span class="sourceLineNo">657</span> * @return list of columns of interest in column:qualifier format, or empty for all<a name="line.657"></a>
-<span class="sourceLineNo">658</span> */<a name="line.658"></a>
-<span class="sourceLineNo">659</span> @XmlElement(name="column")<a name="line.659"></a>
-<span class="sourceLineNo">660</span> public List<byte[]> getColumns() {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> return columns;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> }<a name="line.662"></a>
-<span class="sourceLineNo">663</span><a name="line.663"></a>
-<span class="sourceLineNo">664</span> @XmlElement(name="labels")<a name="line.664"></a>
-<span class="sourceLineNo">665</span> public List<String> getLabels() {<a name="line.665"></a>
-<span class="sourceLineNo">666</span> return labels;<a name="line.666"></a>
-<span class="sourceLineNo">667</span> }<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> /**<a name="line.669"></a>
-<span class="sourceLineNo">670</span> * @return the number of cells to return in batch<a name="line.670"></a>
-<span class="sourceLineNo">671</span> */<a name="line.671"></a>
-<span class="sourceLineNo">672</span> @XmlAttribute<a name="line.672"></a>
-<span class="sourceLineNo">673</span> public int getBatch() {<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return batch;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span> /**<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * @return the number of rows that the scanner to fetch at once<a name="line.678"></a>
-<span class="sourceLineNo">679</span> */<a name="line.679"></a>
-<span class="sourceLineNo">680</span> @XmlAttribute<a name="line.680"></a>
-<span class="sourceLineNo">681</span> public int getCaching() {<a name="line.681"></a>
-<span class="sourceLineNo">682</span> return caching;<a name="line.682"></a>
-<span class="sourceLineNo">683</span> }<a name="line.683"></a>
-<span class="sourceLineNo">684</span><a name="line.684"></a>
-<span class="sourceLineNo">685</span> /**<a name="line.685"></a>
-<span class="sourceLineNo">686</span> * @return true if HFile blocks should be cached on the servers for this scan, false otherwise<a name="line.686"></a>
-<span class="sourceLineNo">687</span> */<a name="line.687"></a>
-<span class="sourceLineNo">688</span> @XmlAttribute<a name="line.688"></a>
-<span class="sourceLineNo">689</span> public boolean getCacheBlocks() {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> return cacheBlocks;<a name="line.690"></a>
-<span class="sourceLineNo">691</span> }<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span> /**<a name="line.693"></a>
-<span class="sourceLineNo">694</span> * @return the lower bound on timestamps of items of interest<a name="line.694"></a>
-<span class="sourceLineNo">695</span> */<a name="line.695"></a>
-<span class="sourceLineNo">696</span> @XmlAttribute<a name="line.696"></a>
-<span class="sourceLineNo">697</span> public long getStartTime() {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> return startTime;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> }<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> /**<a name="line.701"></a>
-<span class="sourceLineNo">702</span> * @return the upper bound on timestamps of items of interest<a name="line.702"></a>
-<span class="sourceLineNo">703</span> */<a name="line.703"></a>
-<span class="sourceLineNo">704</span> @XmlAttribute<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public long getEndTime() {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> return endTime;<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span><a name="line.708"></a>
-<span class="sourceLineNo">709</span> /**<a name="line.709"></a>
-<span class="sourceLineNo">710</span> * @return maximum number of versions to return<a name="line.710"></a>
-<span class="sourceLineNo">711</span> */<a name="line.711"></a>
-<span class="sourceLineNo">712</span> @XmlAttribute<a name="line.712"></a>
-<span class="sourceLineNo">713</span> public int getMaxVersions() {<a name="line.713"></a>
-<span class="sourceLineNo">714</span> return maxVersions;<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span> /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * @return the filter specification<a name="line.718"></a>
-<span class="sourceLineNo">719</span> */<a name="line.719"></a>
-<span class="sourceLineNo">720</span> @XmlElement<a name="line.720"></a>
-<span class="sourceLineNo">721</span> public String getFilter() {<a name="line.721"></a>
-<span class="sourceLineNo">722</span> return filter;<a name="line.722"></a>
-<span class="sourceLineNo">723</span> }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span> /**<a name="line.725"></a>
-<span class="sourceLineNo">726</span> * @param startRow start row<a name="line.726"></a>
-<span class="sourceLineNo">727</span> */<a name="line.727"></a>
-<span class="sourceLineNo">728</span> public void setStartRow(byte[] startRow) {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> this.startRow = startRow;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span> /**<a name="line.732"></a>
-<span class="sourceLineNo">733</span> * @param endRow end row<a name="line.733"></a>
-<span class="sourceLineNo">734</span> */<a name="line.734"></a>
-<span class="sourceLineNo">735</span> public void setEndRow(byte[] endRow) {<a name="line.735"></a>
-<span class="sourceLineNo">736</span> this.endRow = endRow;<a name="line.736"></a>
-<span class="sourceLineNo">737</span> }<a name="line.737"></a>
-<span class="sourceLineNo">738</span><a name="line.738"></a>
-<span class="sourceLineNo">739</span> /**<a name="line.739"></a>
-<span class="sourceLineNo">740</span> * @param columns list of columns of interest in column:qualifier format, or empty for all<a name="line.740"></a>
-<span class="sourceLineNo">741</span> */<a name="line.741"></a>
-<span class="sourceLineNo">742</span> public void setColumns(List<byte[]> columns) {<a name="line.742"></a>
-<span class="sourceLineNo">743</span> this.columns = columns;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> /**<a name="line.746"></a>
-<span class="sourceLineNo">747</span> * @param batch the number of cells to return in batch<a name="line.747"></a>
-<span class="sourceLineNo">748</span> */<a name="line.748"></a>
-<span class="sourceLineNo">749</span> public void setBatch(int batch) {<a name="line.749"></a>
-<span class="sourceLineNo">750</span> this.batch = batch;<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> /**<a name="line.753"></a>
-<span class="sourceLineNo">754</span> * @param caching the number of rows to fetch at once<a name="line.754"></a>
-<span class="sourceLineNo">755</span> */<a name="line.755"></a>
-<span class="sourceLineNo">756</span> public void setCaching(int caching) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> this.caching = caching;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * @param value true if HFile blocks should be cached on the servers for this scan, false otherwise<a name="line.761"></a>
-<span class="sourceLineNo">762</span> */<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void setCacheBlocks(boolean value) {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> this.cacheBlocks = value;<a name="line.764"></a>
-<span class="sourceLineNo">765</span> }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span> /**<a name="line.767"></a>
-<span class="sourceLineNo">768</span> * @param maxVersions maximum number of versions to return<a name="line.768"></a>
-<span class="sourceLineNo">769</span> */<a name="line.769"></a>
-<span class="sourceLineNo">770</span> public void setMaxVersions(int maxVersions) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span> this.maxVersions = maxVersions;<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span><a name="line.773"></a>
-<span class="sourceLineNo">774</span> /**<a name="line.774"></a>
-<span class="sourceLineNo">775</span> * @param startTime the lower bound on timestamps of values of interest<a name="line.775"></a>
-<span class="sourceLineNo">776</span> */<a name="line.776"></a>
-<span class="sourceLineNo">777</span> public void setStartTime(long startTime) {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> this.startTime = startTime;<a name="line.778"></a>
-<span class="sourceLineNo">779</span> }<a name="line.779"></a>
-<span class="sourceLineNo">780</span><a name="line.780"></a>
-<span class="sourceLineNo">781</span> /**<a name="line.781"></a>
-<span class="sourceLineNo">782</span> * @param endTime the upper bound on timestamps of values of interest<a name="line.782"></a>
-<span class="sourceLineNo">783</span> */<a name="line.783"></a>
-<span class="sourceLineNo">784</span> public void setEndTime(long endTime) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> this.endTime = endTime;<a name="line.785"></a>
-<span class="sourceLineNo">786</span> }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span> /**<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @param filter the filter specification<a name="line.789"></a>
-<span class="sourceLineNo">790</span> */<a name="line.790"></a>
-<span class="sourceLineNo">791</span> public void setFilter(String filter) {<a name="line.791"></a>
-<span class="sourceLineNo">792</span> this.filter = filter;<a name="line.792"></a>
-<span class="sourceLineNo">793</span> }<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span> @Override<a name="line.795"></a>
-<span class="sourceLineNo">796</span> public byte[] createProtobufOutput() {<a name="line.796"></a>
-<span class="sourceLineNo">797</span> Scanner.Builder builder = Scanner.newBuilder();<a name="line.797"></a>
-<span class="sourceLineNo">798</span> if (!Bytes.equals(startRow, HConstants.EMPTY_START_ROW)) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> builder.setStartRow(ByteStringer.wrap(startRow));<a name="line.799"></a>
-<span class="sourceLineNo">800</span> }<a name="line.800"></a>
-<span class="sourceLineNo">801</span> if (!Bytes.equals(endRow, HConstants.EMPTY_START_ROW)) {<a name="line.801"></a>
-<span class="sourceLineNo">802</span> builder.setEndRow(ByteStringer.wrap(endRow));<a name="line.802"></a>
+<span class="sourceLineNo">467</span> case WhileMatchFilter:<a name="line.467"></a>
+<span class="sourceLineNo">468</span> filter = new WhileMatchFilter(filters.get(0).build());<a name="line.468"></a>
+<span class="sourceLineNo">469</span> break;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> default:<a name="line.470"></a>
+<span class="sourceLineNo">471</span> throw new RuntimeException("unhandled filter type: " + type);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span> return filter;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span> /**<a name="line.478"></a>
+<span class="sourceLineNo">479</span> * Get the <code>JacksonJaxbJsonProvider</code> instance;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> *<a name="line.480"></a>
+<span class="sourceLineNo">481</span> * @return A <code>JacksonJaxbJsonProvider</code>.<a name="line.481"></a>
+<span class="sourceLineNo">482</span> */<a name="line.482"></a>
+<span class="sourceLineNo">483</span> private static JacksonJaxbJsonProvider getJasonProvider() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return JaxbJsonProviderHolder.INSTANCE;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * @param s the JSON representation of the filter<a name="line.488"></a>
+<span class="sourceLineNo">489</span> * @return the filter<a name="line.489"></a>
+<span class="sourceLineNo">490</span> * @throws Exception<a name="line.490"></a>
+<span class="sourceLineNo">491</span> */<a name="line.491"></a>
+<span class="sourceLineNo">492</span> public static Filter buildFilter(String s) throws Exception {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> FilterModel model = getJasonProvider().locateMapper(FilterModel.class,<a name="line.493"></a>
+<span class="sourceLineNo">494</span> MediaType.APPLICATION_JSON_TYPE).readValue(s, FilterModel.class);<a name="line.494"></a>
+<span class="sourceLineNo">495</span> return model.build();<a name="line.495"></a>
+<span class="sourceLineNo">496</span> }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> /**<a name="line.498"></a>
+<span class="sourceLineNo">499</span> * @param filter the filter<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * @return the JSON representation of the filter<a name="line.500"></a>
+<span class="sourceLineNo">501</span> * @throws Exception<a name="line.501"></a>
+<span class="sourceLineNo">502</span> */<a name="line.502"></a>
+<span class="sourceLineNo">503</span> public static String stringifyFilter(final Filter filter) throws Exception {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> return getJasonProvider().locateMapper(FilterModel.class,<a name="line.504"></a>
+<span class="sourceLineNo">505</span> MediaType.APPLICATION_JSON_TYPE).writeValueAsString(new FilterModel(filter));<a name="line.505"></a>
+<span class="sourceLineNo">506</span> }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span> private static final byte[] COLUMN_DIVIDER = Bytes.toBytes(":");<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span> /**<a name="line.510"></a>
+<span class="sourceLineNo">511</span> * @param scan the scan specification<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * @throws Exception<a name="line.512"></a>
+<span class="sourceLineNo">513</span> */<a name="line.513"></a>
+<span class="sourceLineNo">514</span> public static ScannerModel fromScan(Scan scan) throws Exception {<a name="line.514"></a>
+<span class="sourceLineNo">515</span> ScannerModel model = new ScannerModel();<a name="line.515"></a>
+<span class="sourceLineNo">516</span> model.setStartRow(scan.getStartRow());<a name="line.516"></a>
+<span class="sourceLineNo">517</span> model.setEndRow(scan.getStopRow());<a name="line.517"></a>
+<span class="sourceLineNo">518</span> Map<byte [], NavigableSet<byte []>> families = scan.getFamilyMap();<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (families != nu
<TRUNCATED>