You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/07/05 15:02:24 UTC

[03/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreCompactor.Action.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreCompactor.Action.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreCompactor.Action.html
index f2fcfe3..2cdeeac 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreCompactor.Action.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreCompactor.Action.html
@@ -137,6 +137,67 @@ the order they are declared.</div>
 </tr>
 </tbody>
 </table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a> with parameters of type <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegment-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-">createImmutableSegment</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                      <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                      int&nbsp;numOfCells,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">CellArrayImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#initializeCellSet-int-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">initializeCellSet</a></span>(int&nbsp;numOfCells,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">CellChunkImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#initializeCellSet-int-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">initializeCellSet</a></span>(int&nbsp;numOfCells,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a> with parameters of type <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#CellArrayImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellArrayImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
+<div class="block">------------------------------------------------------------------------
+ C-tor to be used when new CellArrayImmutableSegment is a result of compaction of a
+ list of older ImmutableSegments.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#CellChunkImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellChunkImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
+<div class="block">------------------------------------------------------------------------
+ C-tor to be used when new CellChunkImmutableSegment is built as a result of compaction/merge
+ of a list of older ImmutableSegments.</div>
+</td>
+</tr>
+</tbody>
+</table>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreLAB.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreLAB.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreLAB.html
index 99936e9..5b8c763 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreLAB.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreLAB.html
@@ -172,6 +172,16 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegment-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-">createImmutableSegment</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+                      <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                      int&nbsp;numOfCells,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">MutableSegment</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#generateMutableSegment-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">generateMutableSegment</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
@@ -186,32 +196,41 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#CellArrayImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellArrayImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
 <div class="block">------------------------------------------------------------------------
- C-tor to be used when new SKIP-LIST BASED ImmutableSegment is a result of compaction of a
+ C-tor to be used when new CellArrayImmutableSegment is a result of compaction of a
  list of older ImmutableSegments.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.ImmutableSegment.Type-boolean-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
-                int&nbsp;numOfCells,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.Type.html" title="enum in org.apache.hadoop.hbase.regionserver">ImmutableSegment.Type</a>&nbsp;type,
-                boolean&nbsp;merge)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#CellChunkImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellChunkImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
 <div class="block">------------------------------------------------------------------------
- C-tor to be used when new CELL_ARRAY BASED ImmutableSegment is a result of compaction of a
- list of older ImmutableSegments.</div>
+ C-tor to be used when new CellChunkImmutableSegment is built as a result of compaction/merge
+ of a list of older ImmutableSegments.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.regionserver.CellSet-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellSet.html" title="class in org.apache.hadoop.hbase.regionserver">CellSet</a>&nbsp;cs,
+                <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB)</code>
+<div class="block">------------------------------------------------------------------------
+ C-tor to be used to build the derived classes</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MutableSegment.html#MutableSegment-org.apache.hadoop.hbase.regionserver.CellSet-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">MutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellSet.html" title="class in org.apache.hadoop.hbase.regionserver">CellSet</a>&nbsp;cellSet,
               <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html#Segment-org.apache.hadoop.hbase.regionserver.CellSet-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">Segment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellSet.html" title="class in org.apache.hadoop.hbase.regionserver">CellSet</a>&nbsp;cellSet,
        <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSegmentsIterator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSegmentsIterator.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSegmentsIterator.html
index 673e296..d7d2075 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSegmentsIterator.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSegmentsIterator.html
@@ -126,33 +126,43 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellSet.html" title="class in org.apache.hadoop.hbase.regionserver">CellSet</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#createCellArrayMapSet-int-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-boolean-">createCellArrayMapSet</a></span>(int&nbsp;numOfCells,
-                     <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
-                     boolean&nbsp;merge)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegment-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-">createImmutableSegment</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegment-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-">createImmutableSegment</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                       <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator)</code>&nbsp;</td>
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                      int&nbsp;numOfCells,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action,
+                      <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegmentByCompaction-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-int-org.apache.hadoop.hbase.regionserver.ImmutableSegment.Type-">createImmutableSegmentByCompaction</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegmentByCompaction-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-int-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-">createImmutableSegmentByCompaction</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                   <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
                                   <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
                                   int&nbsp;numOfCells,
-                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.Type.html" title="enum in org.apache.hadoop.hbase.regionserver">ImmutableSegment.Type</a>&nbsp;segmentType)</code>&nbsp;</td>
+                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegmentByMerge-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-int-org.apache.hadoop.hbase.regionserver.ImmutableSegment.Type-java.util.List-">createImmutableSegmentByMerge</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegmentByMerge-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-int-java.util.List-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-">createImmutableSegmentByMerge</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                              <a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
                              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
                              int&nbsp;numOfCells,
-                             <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.Type.html" title="enum in org.apache.hadoop.hbase.regionserver">ImmutableSegment.Type</a>&nbsp;segmentType,
-                             <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a>&gt;&nbsp;segments)</code>&nbsp;</td>
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a>&gt;&nbsp;segments,
+                             <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">CellArrayImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#initializeCellSet-int-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">initializeCellSet</a></span>(int&nbsp;numOfCells,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">CellChunkImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#initializeCellSet-int-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">initializeCellSet</a></span>(int&nbsp;numOfCells,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                 <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@@ -163,24 +173,25 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#CellArrayImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellArrayImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
 <div class="block">------------------------------------------------------------------------
- C-tor to be used when new SKIP-LIST BASED ImmutableSegment is a result of compaction of a
+ C-tor to be used when new CellArrayImmutableSegment is a result of compaction of a
  list of older ImmutableSegments.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.ImmutableSegment.Type-boolean-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
-                int&nbsp;numOfCells,
-                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.Type.html" title="enum in org.apache.hadoop.hbase.regionserver">ImmutableSegment.Type</a>&nbsp;type,
-                boolean&nbsp;merge)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#CellChunkImmutableSegment-org.apache.hadoop.hbase.CellComparator-org.apache.hadoop.hbase.regionserver.MemStoreSegmentsIterator-org.apache.hadoop.hbase.regionserver.MemStoreLAB-int-org.apache.hadoop.hbase.regionserver.MemStoreCompactor.Action-">CellChunkImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/CellComparator.html" title="class in org.apache.hadoop.hbase">CellComparator</a>&nbsp;comparator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSegmentsIterator.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSegmentsIterator</a>&nbsp;iterator,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreLAB.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreLAB</a>&nbsp;memStoreLAB,
+                         int&nbsp;numOfCells,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver">MemStoreCompactor.Action</a>&nbsp;action)</code>
 <div class="block">------------------------------------------------------------------------
- C-tor to be used when new CELL_ARRAY BASED ImmutableSegment is a result of compaction of a
- list of older ImmutableSegments.</div>
+ C-tor to be used when new CellChunkImmutableSegment is built as a result of compaction/merge
+ of a list of older ImmutableSegments.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemstoreSize.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemstoreSize.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemstoreSize.html
index 23a09cd..02c31af 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemstoreSize.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemstoreSize.html
@@ -309,24 +309,22 @@
                <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">RegionServerAccounting.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerAccounting.html#decGlobalMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decGlobalMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memStoreSize)</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SegmentFactory.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentFactory.html#createImmutableSegmentByFlattening-org.apache.hadoop.hbase.regionserver.CSLMImmutableSegment-org.apache.hadoop.hbase.regionserver.CompactingMemStore.IndexType-org.apache.hadoop.hbase.regionserver.MemstoreSize-">createImmutableSegmentByFlattening</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CSLMImmutableSegment</a>&nbsp;segment,
+                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver">CompactingMemStore.IndexType</a>&nbsp;idxType,
+                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MemstoreSize.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html#decMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;delta)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">RegionServerAccounting.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerAccounting.html#decGlobalMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decGlobalMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memStoreSize)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">HRegion.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#decrMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decrMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">MemstoreSize.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html#decMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;delta)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="typeNameLabel">ImmutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#flatten-org.apache.hadoop.hbase.regionserver.MemstoreSize-">flatten</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>
-<div class="block">------------------------------------------------------------------------
- Change the CellSet of this ImmutableSegment from one based on ConcurrentSkipListMap to one
- based on CellArrayMap.</div>
-</td>
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">HRegion.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#decrMemstoreSize-org.apache.hadoop.hbase.regionserver.MemstoreSize-">decrMemstoreSize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -375,18 +373,24 @@
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">Segment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html#updateMetaInfo-org.apache.hadoop.hbase.Cell-boolean-org.apache.hadoop.hbase.regionserver.MemstoreSize-">updateMetaInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cellToAdd,
+              boolean&nbsp;succ,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="typeNameLabel">AbstractMemStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#upsert-org.apache.hadoop.hbase.Cell-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">upsert</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
       long&nbsp;readpoint,
       <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">MutableSegment.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MutableSegment.html#upsert-org.apache.hadoop.hbase.Cell-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">upsert</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&nbsp;cell,
       long&nbsp;readpoint,
       <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">MemStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStore.html#upsert-java.lang.Iterable-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">upsert</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;&nbsp;cells,
       long&nbsp;readpoint,
@@ -394,13 +398,13 @@
 <div class="block">Update or insert the specified cells.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">AbstractMemStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/AbstractMemStore.html#upsert-java.lang.Iterable-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">upsert</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;&nbsp;cells,
       long&nbsp;readpoint,
       <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">HStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#upsert-java.lang.Iterable-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">upsert</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;&nbsp;cells,
       long&nbsp;readpoint,
@@ -417,6 +421,24 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html#CellArrayImmutableSegment-org.apache.hadoop.hbase.regionserver.CSLMImmutableSegment-org.apache.hadoop.hbase.regionserver.MemstoreSize-">CellArrayImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CSLMImmutableSegment</a>&nbsp;segment,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>
+<div class="block">------------------------------------------------------------------------
+ C-tor to be used when new CellChunkImmutableSegment is built as a result of flattening
+ of CSLMImmutableSegment
+ The given iterator returns the Cells that "survived" the compaction.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html#CellChunkImmutableSegment-org.apache.hadoop.hbase.regionserver.CSLMImmutableSegment-org.apache.hadoop.hbase.regionserver.MemstoreSize-">CellChunkImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CSLMImmutableSegment</a>&nbsp;segment,
+                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemstoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemstoreSize</a>&nbsp;memstoreSize)</code>
+<div class="block">------------------------------------------------------------------------
+ C-tor to be used when new CellChunkImmutableSegment is built as a result of flattening
+ of CSLMImmutableSegment
+ The given iterator returns the Cells that "survived" the compaction.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html#PrepareFlushResult-org.apache.hadoop.hbase.regionserver.Region.FlushResult-java.util.TreeMap-java.util.TreeMap-java.util.TreeMap-long-long-long-org.apache.hadoop.hbase.regionserver.MemstoreSize-">PrepareFlushResult</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.html" title="interface in org.apache.hadoop.hbase.regionserver">Region.FlushResult</a>&nbsp;result,
                   <a href="http://docs.oracle.com/javase/8/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a>&lt;byte[],<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFlushContext</a>&gt;&nbsp;storeFlushCtxs,
                   <a href="http://docs.oracle.com/javase/8/docs/api/java/util/TreeMap.html?is-external=true" title="class or interface in java.util">TreeMap</a>&lt;byte[],<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.fs.Path&gt;&gt;&nbsp;committedFiles,

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Segment.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Segment.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Segment.html
index b4bec79..bc4802c 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Segment.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Segment.html
@@ -104,6 +104,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CellArrayImmutableSegment</a></span></code>
+<div class="block">CellArrayImmutableSegment extends the API supported by a <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>Segment</code></a>,
+ and <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>ImmutableSegment</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CellChunkImmutableSegment</a></span></code>
+<div class="block">CellChunkImmutableSegment extends the API supported by a <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>Segment</code></a>,
+ and <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>ImmutableSegment</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CompositeImmutableSegment</a></span></code>
 <div class="block">The CompositeImmutableSegments is created as a collection of ImmutableSegments and supports
  the interface of a single ImmutableSegments.</div>
@@ -111,12 +125,19 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">CSLMImmutableSegment</a></span></code>
+<div class="block">CSLMImmutableSegment is an abstract class that extends the API supported by a <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>Segment</code></a>,
+ and <a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>ImmutableSegment</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">ImmutableSegment</a></span></code>
 <div class="block">ImmutableSegment is an abstract class that extends the API supported by a <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>Segment</code></a>,
  and is not needed for a <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver"><code>MutableSegment</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/MutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver">MutableSegment</a></span></code>
 <div class="block">A mutable segment in memstore, specifically the active segment.</div>
@@ -254,19 +275,25 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.regionserver.Segment-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html#CSLMImmutableSegment-org.apache.hadoop.hbase.regionserver.Segment-">CSLMImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment)</code>
 <div class="block">------------------------------------------------------------------------
- Copy C-tor to be used when new ImmutableSegment is being built from a Mutable one.</div>
+ Copy C-tor to be used when new CSLMImmutableSegment is being built from a Mutable one.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html#Segment-org.apache.hadoop.hbase.regionserver.Segment-">Segment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/ImmutableSegment.html#ImmutableSegment-org.apache.hadoop.hbase.regionserver.Segment-">ImmutableSegment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment)</code>
+<div class="block">------------------------------------------------------------------------
+ Copy C-tor to be used when new CSLMImmutableSegment (derived) is being built from a Mutable one.</div>
+</td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html#Segment-org.apache.hadoop.hbase.regionserver.Segment-">Segment</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentScanner.html#SegmentScanner-org.apache.hadoop.hbase.regionserver.Segment-long-">SegmentScanner</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment,
               long&nbsp;readPoint)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/regionserver/SegmentScanner.html#SegmentScanner-org.apache.hadoop.hbase.regionserver.Segment-long-long-">SegmentScanner</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Segment.html" title="class in org.apache.hadoop.hbase.regionserver">Segment</a>&nbsp;segment,
               long&nbsp;readPoint,
               long&nbsp;scannerOrder)</code>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca9f6925/devapidocs/org/apache/hadoop/hbase/regionserver/package-frame.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-frame.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-frame.html
index 66120f9..2cf8f0e 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-frame.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-frame.html
@@ -71,7 +71,9 @@
 <li><a href="BaseRowProcessor.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">BaseRowProcessor</a></li>
 <li><a href="BusyRegionSplitPolicy.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">BusyRegionSplitPolicy</a></li>
 <li><a href="ByteBufferChunkCell.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">ByteBufferChunkCell</a></li>
+<li><a href="CellArrayImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellArrayImmutableSegment</a></li>
 <li><a href="CellArrayMap.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellArrayMap</a></li>
+<li><a href="CellChunkImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellChunkImmutableSegment</a></li>
 <li><a href="CellChunkMap.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellChunkMap</a></li>
 <li><a href="CellFlatMap.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellFlatMap</a></li>
 <li><a href="CellSet.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CellSet</a></li>
@@ -89,6 +91,7 @@
 <li><a href="CompactSplit.Rejection.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CompactSplit.Rejection</a></li>
 <li><a href="CompositeImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CompositeImmutableSegment</a></li>
 <li><a href="ConstantSizeRegionSplitPolicy.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">ConstantSizeRegionSplitPolicy</a></li>
+<li><a href="CSLMImmutableSegment.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">CSLMImmutableSegment</a></li>
 <li><a href="DateTieredMultiFileWriter.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">DateTieredMultiFileWriter</a></li>
 <li><a href="DateTieredStoreEngine.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">DateTieredStoreEngine</a></li>
 <li><a href="DefaultHeapMemoryTuner.html" title="class in org.apache.hadoop.hbase.regionserver" target="classFrame">DefaultHeapMemoryTuner</a></li>
@@ -262,9 +265,9 @@
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
 <li><a href="BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">BloomType</a></li>
+<li><a href="CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">CompactingMemStore.IndexType</a></li>
 <li><a href="DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">DefaultHeapMemoryTuner.StepDirection</a></li>
 <li><a href="FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">FlushType</a></li>
-<li><a href="ImmutableSegment.Type.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">ImmutableSegment.Type</a></li>
 <li><a href="MemStoreCompactor.Action.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">MemStoreCompactor.Action</a></li>
 <li><a href="MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">MetricsRegionServerSourceFactoryImpl.FactoryStorage</a></li>
 <li><a href="Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver" target="classFrame">Region.FlushResult.Result</a></li>