http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0b638133/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html
index 232ef56..bc3a6d0 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html
@@ -29,610 +29,626 @@
 <span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertEquals;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertFalse;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import static 
org.junit.Assert.assertTrue;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.ByteArrayOutputStream;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.io.IOException;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.math.BigDecimal;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.nio.ByteBuffer;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.ArrayList;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.List;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.NavigableMap;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.TreeMap;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.Assert;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.Test;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.junit.experimental.categories.Category;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>@Category({MiscTests.class, 
SmallTests.class})<a name="line.40"></a>
-<span class="sourceLineNo">041</span>public class TestCellUtil {<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>  /**<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   * CellScannable used in test. Returns 
a {@link TestCellScanner}<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private static class TestCellScannable 
implements CellScannable {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    private final int cellsCount;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>    TestCellScannable(final int 
cellsCount) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      this.cellsCount = cellsCount;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>    }<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    @Override<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    public CellScanner cellScanner() {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>      return new 
TestCellScanner(this.cellsCount);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    }<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * CellScanner used in test.<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static class TestCellScanner 
implements CellScanner {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    private int count = 0;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>    private Cell current = null;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    private final int cellsCount;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>    TestCellScanner(final int cellsCount) 
{<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      this.cellsCount = cellsCount;<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 Cell current() {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      return this.current;<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>    @Override<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    public boolean advance() throws 
IOException {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      if (this.count &lt; cellsCount) {<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>        this.current = new 
TestCell(this.count);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        this.count++;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>        return true;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      }<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><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * Cell used in test. Has row only.<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  private static class TestCell 
implements Cell {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    private final byte [] row;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    TestCell(final int i) {<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>      this.row = Bytes.toBytes(i);<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>    @Override<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    public byte[] getRowArray() {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      return this.row;<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>    @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    public int getRowOffset() {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      return 0;<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>    @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    public short getRowLength() {<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      return (short)this.row.length;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>    @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    public byte[] getFamilyArray() {<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>      // TODO Auto-generated method 
stub<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      return null;<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>    @Override<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    public int getFamilyOffset() {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      // TODO Auto-generated method 
stub<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      return 0;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>    @Override<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    public byte getFamilyLength() {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>      // TODO Auto-generated method 
stub<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      return 0;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    @Override<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    public byte[] getQualifierArray() {<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      // TODO Auto-generated method 
stub<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      return null;<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>    @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    public int getQualifierOffset() {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>      // TODO Auto-generated method 
stub<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      return 0;<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    @Override<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public int getQualifierLength() {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>      // TODO Auto-generated method 
stub<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return 0;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    @Override<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public long getTimestamp() {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      // TODO Auto-generated method 
stub<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      return 0;<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 byte getTypeByte() {<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>      // TODO Auto-generated method 
stub<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return 0;<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>    @Override<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    public byte[] getValueArray() {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      // TODO Auto-generated method 
stub<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      return null;<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>    @Override<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    public int getValueOffset() {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>      // TODO Auto-generated method 
stub<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return 0;<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 int getValueLength() {<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      // TODO Auto-generated method 
stub<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      return 0;<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 byte[] getTagsArray() {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      // TODO Auto-generated method 
stub<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return null;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    @Override<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    public int getTagsOffset() {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>      // TODO Auto-generated method 
stub<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      return 0;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    @Override<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public long getSequenceId() {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>      // TODO Auto-generated method 
stub<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return 0;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>    @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    public int getTagsLength() {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      // TODO Auto-generated method 
stub<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      return 0;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    @Override<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    public Type getType() {<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>      return 
PrivateCellUtil.toType(getTypeByte());<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>  /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * Was overflowing if 100k or so lists 
of cellscanners to return.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  @Test<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  public void 
testCreateCellScannerOverflow() throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    consume(doCreateCellScanner(1, 1), 1 
* 1);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    consume(doCreateCellScanner(3, 0), 3 
* 0);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    consume(doCreateCellScanner(3, 3), 3 
* 3);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    consume(doCreateCellScanner(0, 1), 0 
* 1);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    // Do big number. See HBASE-11813 for 
why.<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    final int hundredK = 100000;<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    consume(doCreateCellScanner(hundredK, 
0), hundredK * 0);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    consume(doCreateCellArray(1), 1);<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>    consume(doCreateCellArray(0), 0);<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    consume(doCreateCellArray(3), 3);<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    List&lt;CellScannable&gt; cells = new 
ArrayList&lt;&gt;(hundredK);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    for (int i = 0; i &lt; hundredK; i++) 
{<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      cells.add(new 
TestCellScannable(1));<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    
consume(CellUtil.createCellScanner(cells), hundredK * 1);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    NavigableMap&lt;byte [], 
List&lt;Cell&gt;&gt; m = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>    List&lt;Cell&gt; cellArray = new 
ArrayList&lt;&gt;(hundredK);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    for (int i = 0; i &lt; hundredK; i++) 
{<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      cellArray.add(new TestCell(i));<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    m.put(new byte [] {'f'}, 
cellArray);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    
consume(CellUtil.createCellScanner(m), hundredK * 1);<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>  private CellScanner 
doCreateCellArray(final int itemsPerList) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    Cell [] cells = new Cell 
[itemsPerList];<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    for (int i = 0; i &lt; itemsPerList; 
i++) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      cells[i] = new TestCell(i);<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    return 
CellUtil.createCellScanner(cells);<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>  private CellScanner 
doCreateCellScanner(final int listsCount, final int itemsPerList)<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>  throws IOException {<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    List&lt;CellScannable&gt; cells = new 
ArrayList&lt;&gt;(listsCount);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    for (int i = 0; i &lt; listsCount; 
i++) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      CellScannable cs = new 
CellScannable() {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        @Override<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        public CellScanner cellScanner() 
{<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          return new 
TestCellScanner(itemsPerList);<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>      cells.add(cs);<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    return 
CellUtil.createCellScanner(cells);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>  private void consume(final CellScanner 
scanner, final int expected) throws IOException {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    int count = 0;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    while (scanner.advance()) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      count++;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    Assert.assertEquals(expected, 
count);<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>  @Test<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  public void testOverlappingKeys() {<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    byte[] empty = 
HConstants.EMPTY_BYTE_ARRAY;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    byte[] a = Bytes.toBytes("a");<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    byte[] b = Bytes.toBytes("b");<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>    byte[] c = Bytes.toBytes("c");<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>    byte[] d = Bytes.toBytes("d");<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    // overlaps<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, a, b));<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, c, a, b));<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, a, c));<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(b, c, a, c));<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, c, b, c));<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, d, b, c));<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(b, c, a, d));<a 
name="line.280"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.fail;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.ByteArrayOutputStream;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.io.IOException;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.math.BigDecimal;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.nio.ByteBuffer;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.ArrayList;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.List;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.NavigableMap;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.TreeMap;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.Assert;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.Test;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.junit.experimental.categories.Category;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.mockito.Mockito;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>@Category({MiscTests.class, 
SmallTests.class})<a name="line.42"></a>
+<span class="sourceLineNo">043</span>public class TestCellUtil {<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>  /**<a name="line.44"></a>
+<span class="sourceLineNo">045</span>   * CellScannable used in test. Returns 
a {@link TestCellScanner}<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private static class TestCellScannable 
implements CellScannable {<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    private final int cellsCount;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>    TestCellScannable(final int 
cellsCount) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      this.cellsCount = cellsCount;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    }<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    public CellScanner cellScanner() {<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>      return new 
TestCellScanner(this.cellsCount);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * CellScanner used in test.<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>   */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static class TestCellScanner 
implements CellScanner {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    private int count = 0;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    private Cell current = null;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    private final int cellsCount;<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>    TestCellScanner(final int cellsCount) 
{<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      this.cellsCount = cellsCount;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    public Cell current() {<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>      return this.current;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    @Override<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    public boolean advance() throws 
IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      if (this.count &lt; cellsCount) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>        this.current = new 
TestCell(this.count);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        this.count++;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>        return true;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      return false;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * Cell used in test. Has row only.<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>   */<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  private static class TestCell 
implements Cell {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    private final byte [] row;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>    TestCell(final int i) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      this.row = Bytes.toBytes(i);<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>    @Override<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    public byte[] getRowArray() {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      return this.row;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>    @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    public int getRowOffset() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>      return 0;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>    @Override<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    public short getRowLength() {<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      return (short)this.row.length;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>    @Override<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public byte[] getFamilyArray() {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      // TODO Auto-generated method 
stub<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      return null;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>    @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    public int getFamilyOffset() {<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>      // TODO Auto-generated method 
stub<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      return 0;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>    @Override<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    public byte getFamilyLength() {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>      // TODO Auto-generated method 
stub<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      return 0;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>    @Override<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    public byte[] getQualifierArray() {<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>      // TODO Auto-generated method 
stub<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      return null;<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>    @Override<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    public int getQualifierOffset() {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      // TODO Auto-generated method 
stub<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return 0;<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>    @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    public int getQualifierLength() {<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>      // TODO Auto-generated method 
stub<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      return 0;<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>    @Override<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    public long getTimestamp() {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>      // TODO Auto-generated method 
stub<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return 0;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    @Override<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    public byte getTypeByte() {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      // TODO Auto-generated method 
stub<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      return 0;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>    @Override<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    public byte[] getValueArray() {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      // TODO Auto-generated method 
stub<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      return null;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>    @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public int getValueOffset() {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      // TODO Auto-generated method 
stub<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      return 0;<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 int getValueLength() {<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>      // TODO Auto-generated method 
stub<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return 0;<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 byte[] getTagsArray() {<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      // TODO Auto-generated method 
stub<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      return null;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>    @Override<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    public int getTagsOffset() {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      // TODO Auto-generated method 
stub<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      return 0;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>    @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    public long getSequenceId() {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      // TODO Auto-generated method 
stub<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>    @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    public int getTagsLength() {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      // TODO Auto-generated method 
stub<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      return 0;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>  /**<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * Was overflowing if 100k or so lists 
of cellscanners to return.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Test<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public void 
testCreateCellScannerOverflow() throws IOException {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    consume(doCreateCellScanner(1, 1), 1 
* 1);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    consume(doCreateCellScanner(3, 0), 3 
* 0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    consume(doCreateCellScanner(3, 3), 3 
* 3);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    consume(doCreateCellScanner(0, 1), 0 
* 1);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    // Do big number. See HBASE-11813 for 
why.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    final int hundredK = 100000;<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>    consume(doCreateCellScanner(hundredK, 
0), hundredK * 0);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    consume(doCreateCellArray(1), 1);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>    consume(doCreateCellArray(0), 0);<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>    consume(doCreateCellArray(3), 3);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>    List&lt;CellScannable&gt; cells = new 
ArrayList&lt;&gt;(hundredK);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    for (int i = 0; i &lt; hundredK; i++) 
{<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      cells.add(new 
TestCellScannable(1));<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    
consume(CellUtil.createCellScanner(cells), hundredK * 1);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    NavigableMap&lt;byte [], 
List&lt;Cell&gt;&gt; m = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    List&lt;Cell&gt; cellArray = new 
ArrayList&lt;&gt;(hundredK);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    for (int i = 0; i &lt; hundredK; i++) 
{<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      cellArray.add(new TestCell(i));<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    m.put(new byte [] {'f'}, 
cellArray);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    
consume(CellUtil.createCellScanner(m), hundredK * 1);<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>  private CellScanner 
doCreateCellArray(final int itemsPerList) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    Cell [] cells = new Cell 
[itemsPerList];<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    for (int i = 0; i &lt; itemsPerList; 
i++) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      cells[i] = new TestCell(i);<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    return 
CellUtil.createCellScanner(cells);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>  private CellScanner 
doCreateCellScanner(final int listsCount, final int itemsPerList)<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>  throws IOException {<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    List&lt;CellScannable&gt; cells = new 
ArrayList&lt;&gt;(listsCount);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    for (int i = 0; i &lt; listsCount; 
i++) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      CellScannable cs = new 
CellScannable() {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        @Override<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        public CellScanner cellScanner() 
{<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          return new 
TestCellScanner(itemsPerList);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      };<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      cells.add(cs);<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    return 
CellUtil.createCellScanner(cells);<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>  private void consume(final CellScanner 
scanner, final int expected) throws IOException {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    int count = 0;<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    while (scanner.advance()) {<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>      count++;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    Assert.assertEquals(expected, 
count);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>  @Test<a name="line.262"></a>
+<span class="sourceLineNo">263</span>  public void testOverlappingKeys() {<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    byte[] empty = 
HConstants.EMPTY_BYTE_ARRAY;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    byte[] a = Bytes.toBytes("a");<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>    byte[] b = Bytes.toBytes("b");<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>    byte[] c = Bytes.toBytes("c");<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    byte[] d = Bytes.toBytes("d");<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    // overlaps<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, a, b));<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, c, a, b));<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, a, c));<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(b, c, a, c));<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, c, b, c));<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, d, b, c));<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(b, c, a, d));<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, b, a, b));<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, b, a, c));<a 
name="line.280"></a>
 <span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, b, a, b));<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, b, a, c));<a 
name="line.283"></a>
+<span class="sourceLineNo">282</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, b));<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, c));<a 
name="line.283"></a>
 <span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, b));<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, c));<a 
name="line.286"></a>
+<span class="sourceLineNo">285</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, empty, a, b));<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, empty, a, c));<a 
name="line.286"></a>
 <span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, empty, a, b));<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, empty, a, c));<a 
name="line.289"></a>
+<span class="sourceLineNo">288</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, empty));<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, empty, a, b));<a 
name="line.289"></a>
 <span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(a, b, empty, empty));<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    
Assert.assertTrue(PrivateCellUtil.overlappingKeys(empty, empty, a, b));<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span>    // non overlaps<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(a, b, c, d));<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, d, a, b));<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, c, d));<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, c, empty));<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, d, empty));<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, d, b, c));<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, empty, b, c));<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(d, empty, b, c));<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, a, b));<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, empty, b));<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, empty, a));<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(a,b, b, c));<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(empty, b, b, c));<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(empty, a, b, c));<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>  }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>  @Test<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  public void 
testFindCommonPrefixInFlatKey() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    // The whole key matching case<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>    KeyValue kv1 = new 
KeyValue(Bytes.toBytes("r1"), Bytes.toBytes("f1"),<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        Bytes.toBytes("q1"), null);<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>    
Assert.assertEquals(kv1.getKeyLength(),<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, true, true));<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>    
Assert.assertEquals(kv1.getKeyLength(),<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, false, true));<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>    
Assert.assertEquals(kv1.getKeyLength() - KeyValue.TIMESTAMP_TYPE_SIZE,<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, true, false));<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>    // The rk length itself mismatch<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>    KeyValue kv2 = new 
KeyValue(Bytes.toBytes("r12"), Bytes.toBytes("f1"),<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        Bytes.toBytes("q1"), null);<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>    Assert.assertEquals(1, 
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv2, true, true));<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    // part of rk is same<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>    KeyValue kv3 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f1"),<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        Bytes.toBytes("q1"), null);<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + Bytes.toBytes("r1").length,<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv2, kv3, true, true));<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>    // entire rk is same but different cf 
name<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    KeyValue kv4 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f2"),<a name="line.334"></a>
-<span class="sourceLineNo">335</span>        Bytes.toBytes("q1"), null);<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv3.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        + Bytes.toBytes("f").length,<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv3, kv4, false, true));<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    // rk and family are same and part of 
qualifier<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    KeyValue kv5 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f2"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        Bytes.toBytes("q123"), null);<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv3.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        + kv4.getFamilyLength() + 
kv4.getQualifierLength(),<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv4, kv5, true, true));<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>    // rk, cf and q are same. ts 
differs<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    KeyValue kv6 = new 
KeyValue(Bytes.toBytes("rk"), 1234L);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    KeyValue kv7 = new 
KeyValue(Bytes.toBytes("rk"), 1235L);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    // only last byte out of 8 ts bytes 
in ts part differs<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength() + 7,<a name="line.350"></a>
-<span class="sourceLineNo">351</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv7, true, true));<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>    // rk, cf, q and ts are same. Only 
type differs<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    KeyValue kv8 = new 
KeyValue(Bytes.toBytes("rk"), 1234L, KeyValue.Type.Delete);<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength() + KeyValue.TIMESTAMP_SIZE,<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv8, true, true));<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    // With out TS_TYPE check<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.358"></a>
-<span class="sourceLineNo">359</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength(),<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv8, true, false));<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>  }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>  /**<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * Assert CellUtil makes Cell toStrings 
same way we do KeyValue toStrings.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   */<a name="line.365"></a>
-<span class="sourceLineNo">366</span>  @Test<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public void testToString() {<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>    byte [] row = Bytes.toBytes("row");<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>    long ts = 123L;<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    // Make a KeyValue and a Cell and see 
if same toString result.<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    KeyValue kv = new KeyValue(row, 
HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY,<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        ts, KeyValue.Type.Minimum, 
HConstants.EMPTY_BYTE_ARRAY);<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    Cell cell = CellUtil.createCell(row, 
HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY,<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        ts, 
KeyValue.Type.Minimum.getCode(), HConstants.EMPTY_BYTE_ARRAY);<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>    String cellToString = 
CellUtil.getCellKeyAsString(cell);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    assertEquals(kv.toString(), 
cellToString);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    // Do another w/ non-null family.<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>    byte [] f = new byte [] {'f'};<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>    byte [] q = new byte [] {'q'};<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    kv = new KeyValue(row, f, q, ts, 
KeyValue.Type.Minimum, HConstants.EMPTY_BYTE_ARRAY);<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    cell = CellUtil.createCell(row, f, q, 
ts, KeyValue.Type.Minimum.getCode(),<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        HConstants.EMPTY_BYTE_ARRAY);<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>    cellToString = 
CellUtil.getCellKeyAsString(cell);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    assertEquals(kv.toString(), 
cellToString);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    <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>  @Test<a name="line.388"></a>
-<span class="sourceLineNo">389</span>  public void testToString1() {<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>    String row = "test.row";<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>    String family = "test.family";<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>    String qualifier = 
"test.qualifier";<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    long timestamp = 42;<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>    KeyValue.Type type = 
KeyValue.Type.Put;<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    String value = "test.value";<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>    long seqId = 1042;<a 
name="line.396"></a>
+<span class="sourceLineNo">291</span>    // non overlaps<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(a, b, c, d));<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, d, a, b));<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, c, d));<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, c, empty));<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, d, empty));<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, d, b, c));<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(c, empty, b, c));<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(d, empty, b, c));<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, a, b));<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, empty, b));<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(b, c, empty, a));<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(a,b, b, c));<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(empty, b, b, c));<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>    
Assert.assertFalse(PrivateCellUtil.overlappingKeys(empty, a, b, c));<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>  @Test<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public void 
testFindCommonPrefixInFlatKey() {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    // The whole key matching case<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>    KeyValue kv1 = new 
KeyValue(Bytes.toBytes("r1"), Bytes.toBytes("f1"),<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        Bytes.toBytes("q1"), null);<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    
Assert.assertEquals(kv1.getKeyLength(),<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, true, true));<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>    
Assert.assertEquals(kv1.getKeyLength(),<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, false, true));<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>    
Assert.assertEquals(kv1.getKeyLength() - KeyValue.TIMESTAMP_TYPE_SIZE,<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv1, true, false));<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>    // The rk length itself mismatch<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>    KeyValue kv2 = new 
KeyValue(Bytes.toBytes("r12"), Bytes.toBytes("f1"),<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        Bytes.toBytes("q1"), null);<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>    Assert.assertEquals(1, 
PrivateCellUtil.findCommonPrefixInFlatKey(kv1, kv2, true, true));<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>    // part of rk is same<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>    KeyValue kv3 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f1"),<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        Bytes.toBytes("q1"), null);<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + Bytes.toBytes("r1").length,<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>      
PrivateCellUtil.findCommonPrefixInFlatKey(kv2, kv3, true, true));<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    // entire rk is same but different cf 
name<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    KeyValue kv4 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f2"),<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        Bytes.toBytes("q1"), null);<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv3.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        + Bytes.toBytes("f").length,<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv3, kv4, false, true));<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>    // rk and family are same and part of 
qualifier<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    KeyValue kv5 = new 
KeyValue(Bytes.toBytes("r14"), Bytes.toBytes("f2"),<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        Bytes.toBytes("q123"), null);<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv3.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        + kv4.getFamilyLength() + 
kv4.getQualifierLength(),<a name="line.340"></a>
+<span class="sourceLineNo">341</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv4, kv5, true, true));<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>    // rk, cf and q are same. ts 
differs<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    KeyValue kv6 = new 
KeyValue(Bytes.toBytes("rk"), 1234L);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    KeyValue kv7 = new 
KeyValue(Bytes.toBytes("rk"), 1235L);<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    // only last byte out of 8 ts bytes 
in ts part differs<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength() + 7,<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv7, true, true));<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    // rk, cf, q and ts are same. Only 
type differs<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    KeyValue kv8 = new 
KeyValue(Bytes.toBytes("rk"), 1234L, KeyValue.Type.Delete);<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength() + KeyValue.TIMESTAMP_SIZE,<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv8, true, true));<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>    // With out TS_TYPE check<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>    
Assert.assertEquals(KeyValue.ROW_LENGTH_SIZE + kv6.getRowLength() + 
KeyValue.FAMILY_LENGTH_SIZE<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        + kv6.getFamilyLength() + 
kv6.getQualifierLength(),<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        
PrivateCellUtil.findCommonPrefixInFlatKey(kv6, kv8, true, false));<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>  /**<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * Assert CellUtil makes Cell toStrings 
same way we do KeyValue toStrings.<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   */<a name="line.362"></a>
+<span class="sourceLineNo">363</span>  @Test<a name="line.363"></a>
+<span class="sourceLineNo">364</span>  public void testToString() {<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>    byte [] row = Bytes.toBytes("row");<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>    long ts = 123L;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    // Make a KeyValue and a Cell and see 
if same toString result.<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    KeyValue kv = new KeyValue(row, 
HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY,<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        ts, KeyValue.Type.Minimum, 
HConstants.EMPTY_BYTE_ARRAY);<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    Cell cell = CellUtil.createCell(row, 
HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY,<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        ts, 
KeyValue.Type.Minimum.getCode(), HConstants.EMPTY_BYTE_ARRAY);<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    String cellToString = 
CellUtil.getCellKeyAsString(cell);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    assertEquals(kv.toString(), 
cellToString);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    // Do another w/ non-null family.<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>    byte [] f = new byte [] {'f'};<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>    byte [] q = new byte [] {'q'};<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>    kv = new KeyValue(row, f, q, ts, 
KeyValue.Type.Minimum, HConstants.EMPTY_BYTE_ARRAY);<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    cell = CellUtil.createCell(row, f, q, 
ts, KeyValue.Type.Minimum.getCode(),<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        HConstants.EMPTY_BYTE_ARRAY);<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>    cellToString = 
CellUtil.getCellKeyAsString(cell);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    assertEquals(kv.toString(), 
cellToString);<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>  }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>  @Test<a name="line.385"></a>
+<span class="sourceLineNo">386</span>  public void testToString1() {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>    String row = "test.row";<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>    String family = "test.family";<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>    String qualifier = 
"test.qualifier";<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    long timestamp = 42;<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>    KeyValue.Type type = 
KeyValue.Type.Put;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    String value = "test.value";<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>    long seqId = 1042;<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    Cell cell = 
CellUtil.createCell(Bytes.toBytes(row), Bytes.toBytes(family),<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>      Bytes.toBytes(qualifier), 
timestamp, type.getCode(), Bytes.toBytes(value), seqId);<a name="line.396"></a>
 <span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>    Cell cell = 
CellUtil.createCell(Bytes.toBytes(row), Bytes.toBytes(family),<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>      Bytes.toBytes(qualifier), 
timestamp, type.getCode(), Bytes.toBytes(value), seqId);<a name="line.399"></a>
+<span class="sourceLineNo">398</span>    String nonVerbose = 
CellUtil.toString(cell, false);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    String verbose = 
CellUtil.toString(cell, true);<a name="line.399"></a>
 <span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span>    String nonVerbose = 
CellUtil.toString(cell, false);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    String verbose = 
CellUtil.toString(cell, true);<a name="line.402"></a>
+<span class="sourceLineNo">401</span>    System.out.println("nonVerbose=" + 
nonVerbose);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    System.out.println("verbose=" + 
verbose);<a name="line.402"></a>
 <span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>    System.out.println("nonVerbose=" + 
nonVerbose);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    System.out.println("verbose=" + 
verbose);<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>    Assert.assertEquals(<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>        
String.format("%s/%s:%s/%d/%s/vlen=%s/seqid=%s",<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          row, family, qualifier, 
timestamp, type.toString(),<a name="line.409"></a>
-<span class="sourceLineNo">410</span>          Bytes.toBytes(value).length, 
seqId),<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        nonVerbose);<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>    Assert.assertEquals(<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span>      
String.format("%s/%s:%s/%d/%s/vlen=%s/seqid=%s/%s",<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        row, family, qualifier, 
timestamp, type.toString(), Bytes.toBytes(value).length,<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        seqId, value),<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>      verbose);<a name="line.417"></a>
+<span class="sourceLineNo">404</span>    Assert.assertEquals(<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>        
String.format("%s/%s:%s/%d/%s/vlen=%s/seqid=%s",<a name="line.405"></a>
+<span class="sourceLineNo">406</span>          row, family, qualifier, 
timestamp, type.toString(),<a name="line.406"></a>
+<span class="sourceLineNo">407</span>          Bytes.toBytes(value).length, 
seqId),<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        nonVerbose);<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    Assert.assertEquals(<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>      
String.format("%s/%s:%s/%d/%s/vlen=%s/seqid=%s/%s",<a name="line.411"></a>
+<span class="sourceLineNo">412</span>        row, family, qualifier, 
timestamp, type.toString(), Bytes.toBytes(value).length,<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        seqId, value),<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>      verbose);<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>    // TODO: test with tags<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>  }<a name="line.417"></a>
 <span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    // TODO: test with tags<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>  @Test<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  public void 
testCloneCellFieldsFromByteBufferedCell() {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    byte[] r = Bytes.toBytes("row1");<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>    byte[] q = Bytes.toBytes("qual1");<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>    byte[] v = Bytes.toBytes("val1");<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>    byte[] tags = 
Bytes.toBytes("tag1");<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    KeyValue kv =<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        new KeyValue(r, f, q, 0, 
q.length, 1234L, KeyValue.Type.Put, v, 0, v.length, tags);<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>    ByteBuffer buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    Cell bbCell = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    byte[] rDest = 
CellUtil.cloneRow(bbCell);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    assertTrue(Bytes.equals(r, rDest));<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>    byte[] fDest = 
CellUtil.cloneFamily(bbCell);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    assertTrue(Bytes.equals(f, fDest));<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>    byte[] qDest = 
CellUtil.cloneQualifier(bbCell);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    assertTrue(Bytes.equals(q, qDest));<a 
name="line.438"></a>
-<span class="sourceLineNo">439</span>    byte[] vDest = 
CellUtil.cloneValue(bbCell);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    assertTrue(Bytes.equals(v, vDest));<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>    byte[] tDest = new 
byte[tags.length];<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    PrivateCellUtil.copyTagsTo(bbCell, 
tDest, 0);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    assertTrue(Bytes.equals(tags, 
tDest));<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>  @Test<a name="line.446"></a>
-<span class="sourceLineNo">447</span>  public void 
testMatchingCellFieldsFromByteBufferedCell() {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    byte[] r = Bytes.toBytes("row1");<a 
name="line.448"></a>
-<span class="sourceLineNo">449</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>    byte[] q1 = Bytes.toBytes("qual1");<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>    byte[] q2 = Bytes.toBytes("qual2");<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>    byte[] v = Bytes.toBytes("val1");<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>    byte[] tags = 
Bytes.toBytes("tag1");<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    KeyValue kv =<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        new KeyValue(r, f, q1, 0, 
q1.length, 1234L, KeyValue.Type.Put, v, 0, v.length, tags);<a 
name="line.455"></a>
-<span class="sourceLineNo">456</span>    ByteBuffer buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    Cell bbCell1 = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    kv = new KeyValue(r, f, q2, 0, 
q2.length, 1234L, KeyValue.Type.Put, v, 0, v.length, tags);<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>    buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    Cell bbCell2 = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    
assertTrue(CellUtil.matchingRows(bbCell1, bbCell2));<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    assertTrue(CellUtil.matchingRows(kv, 
bbCell2));<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    
assertTrue(CellUtil.matchingRows(bbCell1, r));<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    
assertTrue(CellUtil.matchingFamily(bbCell1, bbCell2));<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    
assertTrue(CellUtil.matchingFamily(kv, bbCell2));<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    
assertTrue(CellUtil.matchingFamily(bbCell1, f));<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    
assertFalse(CellUtil.matchingQualifier(bbCell1, bbCell2));<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>    
assertTrue(CellUtil.matchingQualifier(kv, bbCell2));<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    
assertTrue(CellUtil.matchingQualifier(bbCell1, q1));<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    
assertTrue(CellUtil.matchingQualifier(bbCell2, q2));<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    
assertTrue(CellUtil.matchingValue(bbCell1, bbCell2));<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    assertTrue(CellUtil.matchingValue(kv, 
bbCell2));<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    
assertTrue(CellUtil.matchingValue(bbCell1, v));<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    
assertFalse(CellUtil.matchingColumn(bbCell1, bbCell2));<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    
assertTrue(CellUtil.matchingColumn(kv, bbCell2));<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    
assertTrue(CellUtil.matchingColumn(bbCell1, f, q1));<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    
assertTrue(CellUtil.matchingColumn(bbCell2, f, q2));<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  @Test<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  public void 
testCellFieldsAsPrimitiveTypesFromByteBufferedCell() {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    int ri = 123;<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    byte[] r = Bytes.toBytes(ri);<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>    byte[] q = Bytes.toBytes("qual1");<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>    long vl = 10981L;<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>    byte[] v = Bytes.toBytes(vl);<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>    KeyValue kv = new KeyValue(r, f, q, 
v);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    ByteBuffer buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    Cell bbCell = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    assertEquals(ri, 
PrivateCellUtil.getRowAsInt(bbCell));<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    assertEquals(vl, 
PrivateCellUtil.getValueAsLong(bbCell));<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    double vd = 3005.5;<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>    v = Bytes.toBytes(vd);<a 
name="line.494"></a>
-<span class="sourceLineNo">495</span>    kv = new KeyValue(r, f, q, v);<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>    buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    bbCell = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    assertEquals(vd, 
PrivateCellUtil.getValueAsDouble(bbCell), 0.0);<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    BigDecimal bd = new 
BigDecimal(9999);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    v = Bytes.toBytes(bd);<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>    kv = new KeyValue(r, f, q, v);<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>    buffer = 
ByteBuffer.wrap(kv.getBuffer());<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    bbCell = new 
ByteBufferKeyValue(buffer, 0, buffer.remaining());<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    assertEquals(bd, 
PrivateCellUtil.getValueAsBigDecimal(bbCell));<a name="line.504"></a>
-<span class="sourceLineNo">505</span>  }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>  @Test<a name="line.507"></a>
-<span class="sourceLineNo">508</span>  public void testWriteCell() throws 
IOException {<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    byte[] r = Bytes.toBytes("row1");<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>    byte[] f = Bytes.toBytes("cf1");<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>    byte[] q1 = Bytes.toBytes("qual1");<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>    byte[] q2 = Bytes.toBytes("qual2");<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>    byte[] v = Bytes.toBytes("val1");<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    byte[] tags = 
Bytes.toBytes("tag1");<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    KeyValue kv =<a name="line.515"></a>
-<span class="sourceLineNo">516</span>        new KeyValue(r, f, q1, 0, 
q1.length, 1234L, KeyValue.Type.Put, v, 0, v.length, tags);<a 
name="line.516"></a>
-<span class="sourceLineNo">517</span>    NonExtendedCell nonExtCell = new 
NonExtendedCell(kv);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    ByteArrayOutputStream os = new 
ByteArrayOutputStream();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    int writeCell = 
PrivateCellUtil.writeCell(nonExtCell, os, true);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    byte[] byteArray = 
os.toByteArray();<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    KeyValue res = new 
KeyValue(byteArray);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    assertTrue(CellUtil.equals(kv, 
res));<a name="line.522"></a>
-<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>  private static class NonExtendedCell 
implements Cell {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    private KeyValue kv;<a 
name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>    public NonExtendedCell(KeyValue kv) 
{<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      this.kv = kv;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    }<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>    @Override<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    public byte[] getRowArray() {<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>      return this.kv.getRowArray();<a 
name="line.534"></a>
-<span class="sourceLineNo">535</span>    }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    @Override<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    public int getRowOffset() {<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>      return this.kv.getRowOffset();<a 
name="line.539"></a>
-<span class="sourceLineNo">540</span>    }<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>    @Override<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    public short getRowLength() {<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>      return this.kv.getRowLength();<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>    }<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>    @Override<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    public byte[] getFamilyArray() {<a 
name="line.548"></a>
-<span class="sourceLineNo">549</span>      return this.kv.getFamilyArray();<a 
name="line.549"></a>
-<span class="sourceLineNo">550</span>    }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>    @Override<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    public int getFamilyOffset() {<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>      return this.kv.getFamilyOffset();<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>    @Override<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    public byte getFamilyLength() {<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>      return this.kv.getFamilyLength();<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</

<TRUNCATED>

Reply via email to