Repository: hbase-site
Updated Branches:
  refs/heads/asf-site b905d2402 -> 4d2dcb8d7


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4d2dcb8d/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
index 96eabf4..a46dff5 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
+var methods = 
{"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -123,7 +123,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.40">TestCellFlatSet</a>
+<pre>public class <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.54">TestCellFlatSet</a>
 extends junit.framework.TestCase</pre>
 </li>
 </ul>
@@ -148,30 +148,50 @@ extends junit.framework.TestCase</pre>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#ascCbOnHeap">ascCbOnHeap</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellChunkMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#ascCCM">ascCCM</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private org.apache.hadoop.hbase.Cell[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#ascCells">ascCells</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellChunkMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#ascMultCCM">ascMultCCM</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
+<td class="colFirst"><code>private static 
org.apache.hadoop.hbase.regionserver.ChunkCreator</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#chunkCreator">chunkCreator</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private static 
org.apache.hadoop.conf.Configuration</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#CONF">CONF</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellArrayMap</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#descCbOnHeap">descCbOnHeap</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellChunkMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#descCCM">descCCM</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>private org.apache.hadoop.hbase.Cell[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#descCells">descCells</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellChunkMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#descMultCCM">descMultCCM</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private org.apache.hadoop.hbase.KeyValue</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#lowerOuterCell">lowerOuterCell</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#NUM_OF_CELLS">NUM_OF_CELLS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private org.apache.hadoop.hbase.KeyValue</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#upperOuterCell">upperOuterCell</a></span></code>&nbsp;</td>
 </tr>
@@ -190,7 +210,7 @@ extends junit.framework.TestCase</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#TestCellFlatSet--">TestCellFlatSet</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#TestCellFlatSet-java.lang.String-">TestCellFlatSet</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;chunkType)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -202,36 +222,48 @@ extends junit.framework.TestCase</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span 
class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a 
href="javascript:show(2);">Instance Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a 
href="javascript:show(8);">Concrete Methods</a></span><span 
class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span 
class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a 
href="javascript:show(1);">Static Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a 
href="javascript:show(2);">Instance Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a 
href="javascript:show(8);">Concrete Methods</a></span><span 
class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#setUp--">setUp</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>static <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#data--">data</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testAsc--">testAsc</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#setUp--">setUp</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>private void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testCellBlocks-org.apache.hadoop.hbase.regionserver.CellSet-">testCellBlocks</a></span>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)</code>&nbsp;</td>
+<td class="colFirst"><code>private 
org.apache.hadoop.hbase.regionserver.CellChunkMap</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#setUpCellChunkMap-boolean-">setUpCellChunkMap</a></span>(boolean&nbsp;asc)</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testCellBlocksOnHeap--">testCellBlocksOnHeap</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testAsc--">testAsc</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testDesc--">testDesc</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testCellArrayMapAsc--">testCellArrayMapAsc</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>private void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testIterators-org.apache.hadoop.hbase.regionserver.CellSet-">testIterators</a></span>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testCellBlocks-org.apache.hadoop.hbase.regionserver.CellSet-">testCellBlocks</a></span>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)</code>&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testCellChunkMap--">testCellChunkMap</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testDesc--">testDesc</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testIterators-org.apache.hadoop.hbase.regionserver.CellSet-">testIterators</a></span>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#testSubSet-org.apache.hadoop.hbase.regionserver.CellSet-">testSubSet</a></span>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)</code>&nbsp;</td>
 </tr>
@@ -270,7 +302,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>NUM_OF_CELLS</h4>
-<pre>private static final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.41">NUM_OF_CELLS</a></pre>
+<pre>private static final&nbsp;int <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.59">NUM_OF_CELLS</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestCellFlatSet.NUM_OF_CELLS">Constant
 Field Values</a></dd>
@@ -283,7 +315,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ascCells</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.Cell[] <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.42">ascCells</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.Cell[] <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.60">ascCells</a></pre>
 </li>
 </ul>
 <a name="ascCbOnHeap">
@@ -292,7 +324,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>ascCbOnHeap</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellArrayMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.43">ascCbOnHeap</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellArrayMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.61">ascCbOnHeap</a></pre>
 </li>
 </ul>
 <a name="descCells">
@@ -301,7 +333,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>descCells</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.Cell[] <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.44">descCells</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.Cell[] <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.62">descCells</a></pre>
 </li>
 </ul>
 <a name="descCbOnHeap">
@@ -310,7 +342,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>descCbOnHeap</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellArrayMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.45">descCbOnHeap</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellArrayMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.63">descCbOnHeap</a></pre>
 </li>
 </ul>
 <a name="CONF">
@@ -319,7 +351,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>CONF</h4>
-<pre>private static final&nbsp;org.apache.hadoop.conf.Configuration <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.46">CONF</a></pre>
+<pre>private static final&nbsp;org.apache.hadoop.conf.Configuration <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.64">CONF</a></pre>
 </li>
 </ul>
 <a name="lowerOuterCell">
@@ -328,16 +360,61 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>lowerOuterCell</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.KeyValue <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.47">lowerOuterCell</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.KeyValue <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.65">lowerOuterCell</a></pre>
 </li>
 </ul>
 <a name="upperOuterCell">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>upperOuterCell</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.KeyValue <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.48">upperOuterCell</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.KeyValue <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.66">upperOuterCell</a></pre>
+</li>
+</ul>
+<a name="ascCCM">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ascCCM</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellChunkMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.69">ascCCM</a></pre>
+</li>
+</ul>
+<a name="descCCM">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>descCCM</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellChunkMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.70">descCCM</a></pre>
+</li>
+</ul>
+<a name="ascMultCCM">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ascMultCCM</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellChunkMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.71">ascMultCCM</a></pre>
+</li>
+</ul>
+<a name="descMultCCM">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>descMultCCM</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellChunkMap <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.72">descMultCCM</a></pre>
+</li>
+</ul>
+<a name="chunkCreator">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chunkCreator</h4>
+<pre>private static&nbsp;org.apache.hadoop.hbase.regionserver.ChunkCreator <a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.73">chunkCreator</a></pre>
 </li>
 </ul>
 </li>
@@ -348,13 +425,13 @@ extends junit.framework.TestCase</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="TestCellFlatSet--">
+<a name="TestCellFlatSet-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestCellFlatSet</h4>
-<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.40">TestCellFlatSet</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.76">TestCellFlatSet</a>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;chunkType)</pre>
 </li>
 </ul>
 </li>
@@ -365,14 +442,23 @@ extends junit.framework.TestCase</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="data--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>data</h4>
+<pre>public static&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>[]&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.56">data</a>()</pre>
+</li>
+</ul>
 <a name="setUp--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setUp</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.51">setUp</a>()
-              throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.94">setUp</a>()
+           throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>setUp</code>&nbsp;in 
class&nbsp;<code>junit.framework.TestCase</code></dd>
@@ -381,14 +467,28 @@ extends junit.framework.TestCase</pre>
 </dl>
 </li>
 </ul>
-<a name="testCellBlocksOnHeap--">
+<a name="testCellArrayMapAsc--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCellArrayMapAsc</h4>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.134">testCellArrayMapAsc</a>()
+                         throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testCellChunkMap--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>testCellBlocksOnHeap</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.80">testCellBlocksOnHeap</a>()
-                          throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
+<h4>testCellChunkMap</h4>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.142">testCellChunkMap</a>()
+                      throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></code></dd>
@@ -401,7 +501,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>testAsc</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.86">testAsc</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.157">testAsc</a>()
              throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -415,7 +515,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>testDesc</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.92">testDesc</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.163">testDesc</a>()
               throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -429,7 +529,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>testSubSet</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.98">testSubSet</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.169">testSubSet</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
                  throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -443,7 +543,7 @@ extends junit.framework.TestCase</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>testCellBlocks</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.141">testCellBlocks</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.212">testCellBlocks</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
                      throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -454,10 +554,10 @@ extends junit.framework.TestCase</pre>
 <a name="testIterators-org.apache.hadoop.hbase.regionserver.CellSet-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>testIterators</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.179">testIterators</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.250">testIterators</a>(org.apache.hadoop.hbase.regionserver.CellSet&nbsp;cs)
                     throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -465,6 +565,15 @@ extends junit.framework.TestCase</pre>
 </dl>
 </li>
 </ul>
+<a name="setUpCellChunkMap-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setUpCellChunkMap</h4>
+<pre>private&nbsp;org.apache.hadoop.hbase.regionserver.CellChunkMap&nbsp;<a 
href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#line.276">setUpCellChunkMap</a>(boolean&nbsp;asc)</pre>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4d2dcb8d/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 0f7cd61..bca3a63 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -610,8 +610,8 @@
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4d2dcb8d/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 1bd6b38..7fb5da5 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -248,10 +248,10 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4d2dcb8d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
index 298b221..e969198 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html
@@ -26,189 +26,307 @@
 <span class="sourceLineNo">018</span> */<a name="line.18"></a>
 <span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.regionserver;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.Iterator;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.NavigableMap;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.NavigableSet;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.SortedSet;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import junit.framework.TestCase;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.CellComparator;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.Test;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.junit.experimental.categories.Category;<a name="line.35"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
java.lang.management.ManagementFactory;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.nio.ByteBuffer;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Iterator;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.NavigableMap;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.SortedSet;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import junit.framework.TestCase;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.CellComparator;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.CellUtil;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.KeyValueUtil;<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.io.util.MemorySizeUtil;<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>@Category({RegionServerTests.class, 
SmallTests.class})<a name="line.39"></a>
-<span class="sourceLineNo">040</span>public class TestCellFlatSet extends 
TestCase {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private static final int NUM_OF_CELLS = 
4;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>  private Cell ascCells[];<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>  private CellArrayMap ascCbOnHeap;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>  private Cell descCells[];<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>  private CellArrayMap descCbOnHeap;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  private final static Configuration CONF 
= new Configuration();<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  private KeyValue lowerOuterCell;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>  private KeyValue upperOuterCell;<a 
name="line.48"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.ByteBufferUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Before;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.Test;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.junit.experimental.categories.Category;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.runner.RunWith;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.runners.Parameterized;<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>  protected void setUp() throws Exception 
{<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    super.setUp();<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>    // create array of Cells to bass to 
the CellFlatMap under CellSet<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    final byte[] one = 
Bytes.toBytes(15);<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    final byte[] two = 
Bytes.toBytes(25);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    final byte[] three = 
Bytes.toBytes(35);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    final byte[] four = 
Bytes.toBytes(45);<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>    final byte[] f = 
Bytes.toBytes("f");<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    final byte[] q = 
Bytes.toBytes("q");<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    final byte[] v = Bytes.toBytes(4);<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>    final KeyValue kv1 = new 
KeyValue(one, f, q, 10, v);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    final KeyValue kv2 = new 
KeyValue(two, f, q, 20, v);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    final KeyValue kv3 = new 
KeyValue(three, f, q, 30, v);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    final KeyValue kv4 = new 
KeyValue(four, f, q, 40, v);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    lowerOuterCell = new 
KeyValue(Bytes.toBytes(10), f, q, 10, v);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    upperOuterCell = new 
KeyValue(Bytes.toBytes(50), f, q, 10, v);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    ascCells = new Cell[] 
{kv1,kv2,kv3,kv4};<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    ascCbOnHeap = new 
CellArrayMap(CellComparator.COMPARATOR,ascCells,0,NUM_OF_CELLS,false);<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    descCells = new Cell[] 
{kv4,kv3,kv2,kv1};<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    descCbOnHeap = new 
CellArrayMap(CellComparator.COMPARATOR,descCells,0,NUM_OF_CELLS,true);<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    
CONF.setBoolean(MemStoreLAB.USEMSLAB_KEY, true);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    
CONF.setFloat(MemStoreLAB.CHUNK_POOL_MAXSIZE_KEY, 0.2f);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    ChunkCreator.chunkPoolDisabled = 
false;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  /* Create and test CellSet based on 
CellArrayMap */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  public void testCellBlocksOnHeap() 
throws Exception {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    CellSet cs = new 
CellSet(ascCbOnHeap);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    testCellBlocks(cs);<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    testIterators(cs);<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  @Test<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public void testAsc() throws Exception 
{<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    CellSet ascCs = new 
CellSet(ascCbOnHeap);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    assertEquals(NUM_OF_CELLS, 
ascCs.size());<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    testSubSet(ascCs);<a 
name="line.89"></a>
+<span class="sourceLineNo">050</span>import static 
org.junit.Assert.assertTrue;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>@Category({RegionServerTests.class, 
SmallTests.class})<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@RunWith(Parameterized.class)<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>public class TestCellFlatSet extends 
TestCase {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  @Parameterized.Parameters<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>  public static Object[] data() {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    return new Object[] { "SMALL_CHUNKS", 
"NORMAL_CHUNKS" }; // test with different chunk sizes<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private static final int NUM_OF_CELLS = 
4;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private Cell ascCells[];<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>  private CellArrayMap ascCbOnHeap;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  private Cell descCells[];<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>  private CellArrayMap descCbOnHeap;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>  private final static Configuration CONF 
= new Configuration();<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private KeyValue lowerOuterCell;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>  private KeyValue upperOuterCell;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private CellChunkMap ascCCM;   // for 
testing ascending CellChunkMap with one chunk in array<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  private CellChunkMap descCCM;  // for 
testing descending CellChunkMap with one chunk in array<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private CellChunkMap ascMultCCM; // 
testing ascending CellChunkMap with multiple chunks in array<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  private CellChunkMap descMultCCM;// 
testing descending CellChunkMap with multiple chunks in array<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>  private static ChunkCreator 
chunkCreator;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public TestCellFlatSet(String 
chunkType){<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    long globalMemStoreLimit = (long) 
(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage()<a name="line.77"></a>
+<span class="sourceLineNo">078</span>        .getMax() * 
MemorySizeUtil.getGlobalMemStoreHeapPercent(CONF, false));<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    if (chunkType == "NORMAL_CHUNKS") {<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      chunkCreator = 
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false,<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>          globalMemStoreLimit, 0.2f, 
MemStoreLAB.POOL_INITIAL_SIZE_DEFAULT, null);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      assertTrue(chunkCreator != null);<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    } else {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      // chunkCreator with smaller chunk 
size, so only 3 cell-representations can accommodate a chunk<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      chunkCreator = 
ChunkCreator.initialize(64, false,<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          globalMemStoreLimit, 0.2f, 
MemStoreLAB.POOL_INITIAL_SIZE_DEFAULT, null);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      assertTrue(chunkCreator != null);<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
 <span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  @Test<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public void testDesc() throws Exception 
{<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    CellSet descCs = new 
CellSet(descCbOnHeap);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    assertEquals(NUM_OF_CELLS, 
descCs.size());<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    testSubSet(descCs);<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  private void testSubSet(CellSet cs) 
throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      NavigableSet&lt;Cell&gt; 
excludeTail = cs.tailSet(ascCells[i], false);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      NavigableSet&lt;Cell&gt; 
includeTail = cs.tailSet(ascCells[i], true);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      assertEquals(ascCells.length - 1 - 
i, excludeTail.size());<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      assertEquals(ascCells.length - i, 
includeTail.size());<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      Iterator&lt;Cell&gt; excludeIter = 
excludeTail.iterator();<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      Iterator&lt;Cell&gt; includeIter = 
includeTail.iterator();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      for (int j = 1 + i; j != 
ascCells.length; ++j) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        assertEquals(true, 
CellUtil.equals(excludeIter.next(), ascCells[j]));<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      for (int j = i; j != 
ascCells.length; ++j) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        assertEquals(true, 
CellUtil.equals(includeIter.next(), ascCells[j]));<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    assertEquals(NUM_OF_CELLS, 
cs.tailSet(lowerOuterCell, false).size());<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    assertEquals(0, 
cs.tailSet(upperOuterCell, false).size());<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      NavigableSet&lt;Cell&gt; 
excludeHead = cs.headSet(ascCells[i], false);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      NavigableSet&lt;Cell&gt; 
includeHead = cs.headSet(ascCells[i], true);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      assertEquals(i, 
excludeHead.size());<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      assertEquals(i + 1, 
includeHead.size());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      Iterator&lt;Cell&gt; excludeIter = 
excludeHead.iterator();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      Iterator&lt;Cell&gt; includeIter = 
includeHead.iterator();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      for (int j = 0; j != i; ++j) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        assertEquals(true, 
CellUtil.equals(excludeIter.next(), ascCells[j]));<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      for (int j = 0; j != i + 1; ++j) 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        assertEquals(true, 
CellUtil.equals(includeIter.next(), ascCells[j]));<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>    assertEquals(0, 
cs.headSet(lowerOuterCell, false).size());<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    assertEquals(NUM_OF_CELLS, 
cs.headSet(upperOuterCell, false).size());<a name="line.130"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>  @Before<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public void setUp() throws Exception 
{<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    super.setUp();<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    // create array of Cells to bass to 
the CellFlatMap under CellSet<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    final byte[] one = 
Bytes.toBytes(15);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    final byte[] two = 
Bytes.toBytes(25);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    final byte[] three = 
Bytes.toBytes(35);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    final byte[] four = 
Bytes.toBytes(45);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>    final byte[] f = 
Bytes.toBytes("f");<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    final byte[] q = 
Bytes.toBytes("q");<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    final byte[] v = Bytes.toBytes(4);<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>    final KeyValue kv1 = new 
KeyValue(one, f, q, 10, v);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    final KeyValue kv2 = new 
KeyValue(two, f, q, 20, v);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    final KeyValue kv3 = new 
KeyValue(three, f, q, 30, v);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    final KeyValue kv4 = new 
KeyValue(four, f, q, 40, v);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    lowerOuterCell = new 
KeyValue(Bytes.toBytes(10), f, q, 10, v);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    upperOuterCell = new 
KeyValue(Bytes.toBytes(50), f, q, 10, v);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    ascCells = new Cell[] 
{kv1,kv2,kv3,kv4};<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    ascCbOnHeap = new 
CellArrayMap(CellComparator.COMPARATOR,ascCells,0,NUM_OF_CELLS,false);<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    descCells = new Cell[] 
{kv4,kv3,kv2,kv1};<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    descCbOnHeap = new 
CellArrayMap(CellComparator.COMPARATOR,descCells,0,NUM_OF_CELLS,true);<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>    
CONF.setBoolean(MemStoreLAB.USEMSLAB_KEY, true);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    
CONF.setFloat(MemStoreLAB.CHUNK_POOL_MAXSIZE_KEY, 0.2f);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    ChunkCreator.chunkPoolDisabled = 
false;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    // create ascending and descending 
CellChunkMaps<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    // according to parameter, once built 
with normal chunks and at second with small chunks<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    ascCCM = setUpCellChunkMap(true);<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    descCCM = setUpCellChunkMap(false);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>//    ascMultCCM = 
setUpCellChunkMap(true);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>//    descMultCCM = 
setUpCellChunkMap(false);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  }<a name="line.130"></a>
 <span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    NavigableMap&lt;Cell, Cell&gt; sub = 
cs.getDelegatee().subMap(lowerOuterCell, true, upperOuterCell, true);<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    assertEquals(NUM_OF_CELLS, 
sub.size());<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    Iterator&lt;Cell&gt; iter = 
sub.values().iterator();<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      assertEquals(true, 
CellUtil.equals(iter.next(), ascCells[i]));<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">132</span>  /* Create and test ascending CellSet 
based on CellArrayMap */<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  @Test<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  public void testCellArrayMapAsc() 
throws Exception {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    CellSet cs = new 
CellSet(ascCbOnHeap);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    testCellBlocks(cs);<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    testIterators(cs);<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>  }<a name="line.138"></a>
 <span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  /* Generic basic test for immutable 
CellSet */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private void testCellBlocks(CellSet cs) 
throws Exception {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    final byte[] oneAndHalf = 
Bytes.toBytes(20);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    final byte[] f = 
Bytes.toBytes("f");<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    final byte[] q = 
Bytes.toBytes("q");<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    final byte[] v = Bytes.toBytes(4);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    final KeyValue outerCell = new 
KeyValue(oneAndHalf, f, q, 10, v);<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    assertEquals(NUM_OF_CELLS, 
cs.size());          // check size<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    assertFalse(cs.contains(outerCell));  
          // check outer cell<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    assertTrue(cs.contains(ascCells[0])); 
             // check existence of the first<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    Cell first = cs.first();<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    
assertTrue(ascCells[0].equals(first));<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    
assertTrue(cs.contains(ascCells[NUM_OF_CELLS - 1]));  // check last<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    Cell last = cs.last();<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    assertTrue(ascCells[NUM_OF_CELLS - 
1].equals(last));<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    SortedSet&lt;Cell&gt; tail = 
cs.tailSet(ascCells[1]);    // check tail abd head sizes<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    assertEquals(NUM_OF_CELLS - 1, 
tail.size());<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    SortedSet&lt;Cell&gt; head = 
cs.headSet(ascCells[1]);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    assertEquals(1, head.size());<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    SortedSet&lt;Cell&gt; tailOuter = 
cs.tailSet(outerCell);  // check tail starting from outer cell<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    assertEquals(NUM_OF_CELLS - 1, 
tailOuter.size());<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>    Cell tailFirst = tail.first();<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    
assertTrue(ascCells[1].equals(tailFirst));<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    Cell tailLast = tail.last();<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>    assertTrue(ascCells[NUM_OF_CELLS - 
1].equals(tailLast));<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    Cell headFirst = head.first();<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    
assertTrue(ascCells[0].equals(headFirst));<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    Cell headLast = head.last();<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    
assertTrue(ascCells[0].equals(headLast));<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  /* Generic iterators test for immutable 
CellSet */<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  private void testIterators(CellSet cs) 
throws Exception {<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // Assert that we have NUM_OF_CELLS 
values and that they are in order<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    int count = 0;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    for (Cell kv: cs) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      
assertEquals("\n\n-------------------------------------------------------------------\n"<a
 name="line.184"></a>
-<span class="sourceLineNo">185</span>              + "Comparing iteration 
number " + (count + 1) + " the returned cell: " + kv<a name="line.185"></a>
-<span class="sourceLineNo">186</span>              + ", the first Cell in the 
CellBlocksMap: " + ascCells[count]<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              + ", and the same 
transformed to String: " + ascCells[count].toString()<a name="line.187"></a>
-<span class="sourceLineNo">188</span>              + 
"\n-------------------------------------------------------------------\n",<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>              ascCells[count], kv);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      count++;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    assertEquals(NUM_OF_CELLS, count);<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    // Test descending iterator<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    count = 0;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    for (Iterator&lt;Cell&gt; i = 
cs.descendingIterator(); i.hasNext();) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      Cell kv = i.next();<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      assertEquals(ascCells[NUM_OF_CELLS 
- (count + 1)], kv);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      count++;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    assertEquals(NUM_OF_CELLS, count);<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">140</span>  /* Create and test ascending and 
descending CellSet based on CellChunkMap */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  @Test<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public void testCellChunkMap() throws 
Exception {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    CellSet cs = new CellSet(ascCCM);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    testCellBlocks(cs);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    testIterators(cs);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    testSubSet(cs);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    cs = new CellSet(descCCM);<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>    testSubSet(cs);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>//    cs = new CellSet(ascMultCCM);<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>//    testCellBlocks(cs);<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>//    testSubSet(cs);<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>//    cs = new CellSet(descMultCCM);<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>//    testSubSet(cs);<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  @Test<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public void testAsc() throws Exception 
{<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    CellSet ascCs = new 
CellSet(ascCbOnHeap);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    assertEquals(NUM_OF_CELLS, 
ascCs.size());<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    testSubSet(ascCs);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  public void testDesc() throws Exception 
{<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    CellSet descCs = new 
CellSet(descCbOnHeap);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    assertEquals(NUM_OF_CELLS, 
descCs.size());<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    testSubSet(descCs);<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>  private void testSubSet(CellSet cs) 
throws Exception {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      NavigableSet&lt;Cell&gt; 
excludeTail = cs.tailSet(ascCells[i], false);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      NavigableSet&lt;Cell&gt; 
includeTail = cs.tailSet(ascCells[i], true);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      assertEquals(ascCells.length - 1 - 
i, excludeTail.size());<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      assertEquals(ascCells.length - i, 
includeTail.size());<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      Iterator&lt;Cell&gt; excludeIter = 
excludeTail.iterator();<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      Iterator&lt;Cell&gt; includeIter = 
includeTail.iterator();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      for (int j = 1 + i; j != 
ascCells.length; ++j) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        assertEquals(true, 
CellUtil.equals(excludeIter.next(), ascCells[j]));<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      for (int j = i; j != 
ascCells.length; ++j) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        assertEquals(true, 
CellUtil.equals(includeIter.next(), ascCells[j]));<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    assertEquals(NUM_OF_CELLS, 
cs.tailSet(lowerOuterCell, false).size());<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    assertEquals(0, 
cs.tailSet(upperOuterCell, false).size());<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      NavigableSet&lt;Cell&gt; 
excludeHead = cs.headSet(ascCells[i], false);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      NavigableSet&lt;Cell&gt; 
includeHead = cs.headSet(ascCells[i], true);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      assertEquals(i, 
excludeHead.size());<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      assertEquals(i + 1, 
includeHead.size());<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      Iterator&lt;Cell&gt; excludeIter = 
excludeHead.iterator();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      Iterator&lt;Cell&gt; includeIter = 
includeHead.iterator();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      for (int j = 0; j != i; ++j) {<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>        assertEquals(true, 
CellUtil.equals(excludeIter.next(), ascCells[j]));<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      for (int j = 0; j != i + 1; ++j) 
{<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        assertEquals(true, 
CellUtil.equals(includeIter.next(), ascCells[j]));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    assertEquals(0, 
cs.headSet(lowerOuterCell, false).size());<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    assertEquals(NUM_OF_CELLS, 
cs.headSet(upperOuterCell, false).size());<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    NavigableMap&lt;Cell, Cell&gt; sub = 
cs.getDelegatee().subMap(lowerOuterCell, true, upperOuterCell, true);<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    assertEquals(NUM_OF_CELLS, 
sub.size());<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    Iterator&lt;Cell&gt; iter = 
sub.values().iterator();<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    for (int i = 0; i != ascCells.length; 
++i) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      assertEquals(true, 
CellUtil.equals(iter.next(), ascCells[i]));<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>  /* Generic basic test for immutable 
CellSet */<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  private void testCellBlocks(CellSet cs) 
throws Exception {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    final byte[] oneAndHalf = 
Bytes.toBytes(20);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    final byte[] f = 
Bytes.toBytes("f");<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    final byte[] q = 
Bytes.toBytes("q");<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    final byte[] v = Bytes.toBytes(4);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>    final KeyValue outerCell = new 
KeyValue(oneAndHalf, f, q, 10, v);<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    assertEquals(NUM_OF_CELLS, 
cs.size());          // check size<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    assertFalse(cs.contains(outerCell));  
          // check outer cell<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>    assertTrue(cs.contains(ascCells[0])); 
          // check existence of the first<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    Cell first = cs.first();<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    
assertTrue(ascCells[0].equals(first));<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>    
assertTrue(cs.contains(ascCells[NUM_OF_CELLS - 1]));  // check last<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    Cell last = cs.last();<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    assertTrue(ascCells[NUM_OF_CELLS - 
1].equals(last));<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    SortedSet&lt;Cell&gt; tail = 
cs.tailSet(ascCells[1]);    // check tail abd head sizes<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    assertEquals(NUM_OF_CELLS - 1, 
tail.size());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    SortedSet&lt;Cell&gt; head = 
cs.headSet(ascCells[1]);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    assertEquals(1, head.size());<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    SortedSet&lt;Cell&gt; tailOuter = 
cs.tailSet(outerCell);  // check tail starting from outer cell<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>    assertEquals(NUM_OF_CELLS - 1, 
tailOuter.size());<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    Cell tailFirst = tail.first();<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>    
assertTrue(ascCells[1].equals(tailFirst));<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    Cell tailLast = tail.last();<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    assertTrue(ascCells[NUM_OF_CELLS - 
1].equals(tailLast));<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>    Cell headFirst = head.first();<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>    
assertTrue(ascCells[0].equals(headFirst));<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    Cell headLast = head.last();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>    
assertTrue(ascCells[0].equals(headLast));<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>  /* Generic iterators test for immutable 
CellSet */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  private void testIterators(CellSet cs) 
throws Exception {<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    // Assert that we have NUM_OF_CELLS 
values and that they are in order<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    int count = 0;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    for (Cell kv: cs) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      
assertEquals("\n\n-------------------------------------------------------------------\n"<a
 name="line.255"></a>
+<span class="sourceLineNo">256</span>              + "Comparing iteration 
number " + (count + 1) + " the returned cell: " + kv<a name="line.256"></a>
+<span class="sourceLineNo">257</span>              + ", the first Cell in the 
CellBlocksMap: " + ascCells[count]<a name="line.257"></a>
+<span class="sourceLineNo">258</span>              + ", and the same 
transformed to String: " + ascCells[count].toString()<a name="line.258"></a>
+<span class="sourceLineNo">259</span>              + 
"\n-------------------------------------------------------------------\n",<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>              ascCells[count], kv);<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>      count++;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    }<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    assertEquals(NUM_OF_CELLS, count);<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>    // Test descending iterator<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>    count = 0;<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    for (Iterator&lt;Cell&gt; i = 
cs.descendingIterator(); i.hasNext();) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      Cell kv = i.next();<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>      assertEquals(ascCells[NUM_OF_CELLS 
- (count + 1)], kv);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      count++;<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    assertEquals(NUM_OF_CELLS, count);<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  /* Create CellChunkMap with four cells 
inside the index chunk */<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  private CellChunkMap 
setUpCellChunkMap(boolean asc) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    // allocate new chunks and use the 
data chunk to hold the full data of the cells<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    // and the index chunk to hold the 
cell-representations<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    Chunk dataChunk = 
chunkCreator.getChunk();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    Chunk idxChunk  = 
chunkCreator.getChunk();<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    // the array of index chunks to be 
used as a basis for CellChunkMap<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    Chunk chunkArray[] = new Chunk[8];  
// according to test currently written 8 is way enough<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    int chunkArrayIdx = 0;<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>    chunkArray[chunkArrayIdx++] = 
idxChunk;<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    ByteBuffer idxBuffer = 
idxChunk.getData();  // the buffers of the chunks<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    ByteBuffer dataBuffer = 
dataChunk.getData();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    int dataOffset = Bytes.SIZEOF_INT;    
      // offset inside data buffer<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    int idxOffset = Bytes.SIZEOF_INT;     
      // skip the space for chunk ID<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    Cell[] cellArray = asc ? ascCells : 
descCells;<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>    for (Cell kv: cellArray) {<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>      // do we have enough space to write 
the cell data on the data chunk?<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (dataOffset + 
KeyValueUtil.length(kv) &gt; chunkCreator.getChunkSize()) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        dataChunk = 
chunkCreator.getChunk();    // allocate more data chunks if needed<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>        dataBuffer = 
dataChunk.getData();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        dataOffset = Bytes.SIZEOF_INT;<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>      }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      int dataStartOfset = dataOffset;<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>      dataOffset = 
KeyValueUtil.appendTo(kv, dataBuffer, dataOffset, false); // write deep cell 
data<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>      // do we have enough space to write 
the cell-representation on the index chunk?<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      if (idxOffset + 
CellChunkMap.SIZEOF_CELL_REP &gt; chunkCreator.getChunkSize()) {<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>        idxChunk = 
chunkCreator.getChunk();    // allocate more index chunks if needed<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>        idxBuffer = idxChunk.getData();<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>        idxOffset = Bytes.SIZEOF_INT;<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>        chunkArray[chunkArrayIdx++] = 
idxChunk;<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      idxOffset = 
ByteBufferUtils.putInt(idxBuffer, idxOffset, dataChunk.getId()); // write data 
chunk id<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      idxOffset = 
ByteBufferUtils.putInt(idxBuffer, idxOffset, dataStartOfset);          // 
offset<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      idxOffset = 
ByteBufferUtils.putInt(idxBuffer, idxOffset, KeyValueUtil.length(kv)); // 
length<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      idxOffset = 
ByteBufferUtils.putLong(idxBuffer, idxOffset, kv.getSequenceId());     // 
seqId<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    return asc ?<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        new 
CellChunkMap(CellComparator.COMPARATOR,chunkArray,0,NUM_OF_CELLS,false) :<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>        new 
CellChunkMap(CellComparator.COMPARATOR,chunkArray,0,NUM_OF_CELLS,true);<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>  }<a name="line.320"></a>
+<span class="sourceLineNo">321</span>}<a name="line.321"></a>
 
 
 

Reply via email to