http://git-wip-us.apache.org/repos/asf/hbase-site/blob/991224b9/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
index 49ff09e..c27dc14 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
@@ -179,177 +179,179 @@
 <span class="sourceLineNo">171</span>  }<a name="line.171"></a>
 <span class="sourceLineNo">172</span><a name="line.172"></a>
 <span class="sourceLineNo">173</span>  MemStoreSizing getSnapshotSizing() {<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>    return new 
MemStoreSizing(this.snapshot.keySize(), this.snapshot.heapSize());<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public String toString() {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>    StringBuilder buf = new 
StringBuilder();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    int i = 1;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    try {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      for (Segment segment : 
getSegments()) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        buf.append("Segment (" + i + ") " 
+ segment.toString() + "; ");<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        i++;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    } catch (IOException e){<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>      return e.toString();<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    return buf.toString();<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>  protected Configuration 
getConfiguration() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    return conf;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>  }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>  protected void dump(Logger log) {<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>    active.dump(log);<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    snapshot.dump(log);<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  /*<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   * Inserts the specified Cell into 
MemStore and deletes any existing<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * versions of the same 
row/family/qualifier as the specified Cell.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * &lt;p&gt;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * First, the specified Cell is 
inserted into the Memstore.<a name="line.206"></a>
+<span class="sourceLineNo">174</span>    return new 
MemStoreSizing(this.snapshot.keySize(),<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        this.snapshot.heapSize(),<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>        this.snapshot.offHeapSize());<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>  }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>  @Override<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public String toString() {<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>    StringBuilder buf = new 
StringBuilder();<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    int i = 1;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    try {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      for (Segment segment : 
getSegments()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>        buf.append("Segment (" + i + ") " 
+ segment.toString() + "; ");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        i++;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    } catch (IOException e){<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      return e.toString();<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    return buf.toString();<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>  protected Configuration 
getConfiguration() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    return conf;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  protected void dump(Logger log) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    active.dump(log);<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>    snapshot.dump(log);<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  /*<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * Inserts the specified Cell into 
MemStore and deletes any existing<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * versions of the same 
row/family/qualifier as the specified Cell.<a name="line.206"></a>
 <span class="sourceLineNo">207</span>   * &lt;p&gt;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * If there are any existing Cell in 
this MemStore with the same row,<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   * family, and qualifier, they are 
removed.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * &lt;p&gt;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   * Callers must hold the read lock.<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>   *<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   * @param cell the cell to be updated<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>   * @param readpoint readpoint below 
which we can safely remove duplicate KVs<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * @param memstoreSize<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  private void upsert(Cell cell, long 
readpoint, MemStoreSizing memstoreSizing) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    // Add the Cell to the MemStore<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    // Use the internalAdd method here 
since we (a) already have a lock<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    // and (b) cannot safely use the 
MSLAB here without potentially<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    // hitting OOME - see 
TestMemStore.testUpsertMSLAB for a<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    // test that triggers the 
pathological case if we don't avoid MSLAB<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    // here.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    // This cell data is backed by the 
same byte[] where we read request in RPC(See HBASE-15180). We<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    // must do below deep copy. Or else 
we will keep referring to the bigger chunk of memory and<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    // prevent it from getting GCed.<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>    cell = deepCopyIfNeeded(cell);<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    this.active.upsert(cell, readpoint, 
memstoreSizing);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    setOldestEditTimeToNow();<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    checkActiveSize();<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>  /*<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * @param a<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @param b<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @return Return lowest of a or b or 
null if both a and b are null<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  protected Cell getLowest(final Cell a, 
final Cell b) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    if (a == null) {<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      return b;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (b == null) {<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      return a;<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    return comparator.compareRows(a, b) 
&lt;= 0? a: b;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<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>   * @param key Find row that follows 
this one.  If null, return first.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * @param set Set to look in for a row 
beyond &lt;code&gt;row&lt;/code&gt;.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   * @return Next row or null if none 
found.  If one found, will be a new<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * KeyValue -- can be destroyed by 
subsequent calls to this method.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  protected Cell getNextRow(final Cell 
key,<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      final NavigableSet&lt;Cell&gt; set) 
{<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    Cell result = null;<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>    SortedSet&lt;Cell&gt; tail = key == 
null? set: set.tailSet(key);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    // Iterate until we fall into the 
next row; i.e. move off current row<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    for (Cell cell: tail) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      if (comparator.compareRows(cell, 
key) &lt;= 0) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        continue;<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      // Note: Not suppressing deletes or 
expired cells.  Needs to be handled<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      // by higher up functions.<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>      result = cell;<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      break;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    return result;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>  /**<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   * If the segment has a memory 
allocator the cell is being cloned to this space, and returned;<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>   * Otherwise the given cell is 
returned<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   *<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   * When a cell's size is too big 
(bigger than maxAlloc), it is not allocated on MSLAB.<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * Since the process of flattening to 
CellChunkMap assumes that all cells are allocated on MSLAB,<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>   * during this process, the input 
parameter forceCloneOfBigCell is set to 'true'<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * and the cell is copied into MSLAB.<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>   *<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param cell the cell to clone<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param forceCloneOfBigCell true only 
during the process of flattening to CellChunkMap.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @return either the given cell or its 
clone<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  private Cell 
maybeCloneWithAllocator(Cell cell, boolean forceCloneOfBigCell) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    return 
active.maybeCloneWithAllocator(cell, forceCloneOfBigCell);<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>  }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>  /*<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * Internal version of add() that 
doesn't clone Cells with the<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * allocator, and doesn't take the 
lock.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   *<a name="line.291"></a>
-<span class="sourceLineNo">292</span>   * Callers should ensure they already 
have the read lock taken<a name="line.292"></a>
-<span class="sourceLineNo">293</span>   * @param toAdd the cell to add<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>   * @param mslabUsed whether using 
MSLAB<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   * @param memstoreSize<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>   */<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  private void internalAdd(final Cell 
toAdd, final boolean mslabUsed, MemStoreSizing memstoreSizing) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    active.add(toAdd, mslabUsed, 
memstoreSizing);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    setOldestEditTimeToNow();<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    checkActiveSize();<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>  private void setOldestEditTimeToNow() 
{<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    if (timeOfOldestEdit == 
Long.MAX_VALUE) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      timeOfOldestEdit = 
EnvironmentEdgeManager.currentTime();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>  }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>  /**<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   * @return The total size of cells in 
this memstore. We will not consider cells in the snapshot<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
-<span class="sourceLineNo">312</span>  protected abstract long keySize();<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>  /**<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   * @return The total heap size of cells 
in this memstore. We will not consider cells in the<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   *         snapshot<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>   */<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  protected abstract long heapSize();<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  protected CellComparator 
getComparator() {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    return comparator;<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>  }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>  @VisibleForTesting<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>  MutableSegment getActive() {<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>    return active;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @VisibleForTesting<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>  ImmutableSegment getSnapshot() {<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>    return snapshot;<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>  /**<a name="line.334"></a>
-<span class="sourceLineNo">335</span>   * Check whether anything need to be 
done based on the current active set size<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   */<a name="line.336"></a>
-<span class="sourceLineNo">337</span>  protected abstract void 
checkActiveSize();<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>  /**<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * @return an ordered list of segments 
from most recent to oldest in memstore<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  protected abstract List&lt;Segment&gt; 
getSegments() throws IOException;<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>}<a name="line.344"></a>
+<span class="sourceLineNo">208</span>   * First, the specified Cell is 
inserted into the Memstore.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * &lt;p&gt;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * If there are any existing Cell in 
this MemStore with the same row,<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * family, and qualifier, they are 
removed.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * &lt;p&gt;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * Callers must hold the read lock.<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>   *<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * @param cell the cell to be updated<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>   * @param readpoint readpoint below 
which we can safely remove duplicate KVs<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   * @param memstoreSize<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>   */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  private void upsert(Cell cell, long 
readpoint, MemStoreSizing memstoreSizing) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    // Add the Cell to the MemStore<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    // Use the internalAdd method here 
since we (a) already have a lock<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    // and (b) cannot safely use the 
MSLAB here without potentially<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    // hitting OOME - see 
TestMemStore.testUpsertMSLAB for a<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    // test that triggers the 
pathological case if we don't avoid MSLAB<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    // here.<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    // This cell data is backed by the 
same byte[] where we read request in RPC(See HBASE-15180). We<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    // must do below deep copy. Or else 
we will keep referring to the bigger chunk of memory and<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    // prevent it from getting GCed.<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>    cell = deepCopyIfNeeded(cell);<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>    this.active.upsert(cell, readpoint, 
memstoreSizing);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    setOldestEditTimeToNow();<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>    checkActiveSize();<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>  /*<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @param a<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * @param b<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * @return Return lowest of a or b or 
null if both a and b are null<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  protected Cell getLowest(final Cell a, 
final Cell b) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    if (a == null) {<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>      return b;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    if (b == null) {<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>      return a;<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    return comparator.compareRows(a, b) 
&lt;= 0? a: b;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>  /*<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * @param key Find row that follows 
this one.  If null, return first.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * @param set Set to look in for a row 
beyond &lt;code&gt;row&lt;/code&gt;.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @return Next row or null if none 
found.  If one found, will be a new<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   * KeyValue -- can be destroyed by 
subsequent calls to this method.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  protected Cell getNextRow(final Cell 
key,<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      final NavigableSet&lt;Cell&gt; set) 
{<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    Cell result = null;<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>    SortedSet&lt;Cell&gt; tail = key == 
null? set: set.tailSet(key);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    // Iterate until we fall into the 
next row; i.e. move off current row<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    for (Cell cell: tail) {<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      if (comparator.compareRows(cell, 
key) &lt;= 0) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        continue;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      // Note: Not suppressing deletes or 
expired cells.  Needs to be handled<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      // by higher up functions.<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>      result = cell;<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>      break;<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    return result;<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>  /**<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   * If the segment has a memory 
allocator the cell is being cloned to this space, and returned;<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>   * Otherwise the given cell is 
returned<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   *<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   * When a cell's size is too big 
(bigger than maxAlloc), it is not allocated on MSLAB.<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   * Since the process of flattening to 
CellChunkMap assumes that all cells are allocated on MSLAB,<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>   * during this process, the input 
parameter forceCloneOfBigCell is set to 'true'<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   * and the cell is copied into MSLAB.<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>   *<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * @param cell the cell to clone<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>   * @param forceCloneOfBigCell true only 
during the process of flattening to CellChunkMap.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   * @return either the given cell or its 
clone<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   */<a name="line.285"></a>
+<span class="sourceLineNo">286</span>  private Cell 
maybeCloneWithAllocator(Cell cell, boolean forceCloneOfBigCell) {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>    return 
active.maybeCloneWithAllocator(cell, forceCloneOfBigCell);<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>  /*<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * Internal version of add() that 
doesn't clone Cells with the<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * allocator, and doesn't take the 
lock.<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   *<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   * Callers should ensure they already 
have the read lock taken<a name="line.294"></a>
+<span class="sourceLineNo">295</span>   * @param toAdd the cell to add<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>   * @param mslabUsed whether using 
MSLAB<a name="line.296"></a>
+<span class="sourceLineNo">297</span>   * @param memstoreSize<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>   */<a name="line.298"></a>
+<span class="sourceLineNo">299</span>  private void internalAdd(final Cell 
toAdd, final boolean mslabUsed, MemStoreSizing memstoreSizing) {<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>    active.add(toAdd, mslabUsed, 
memstoreSizing);<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    setOldestEditTimeToNow();<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    checkActiveSize();<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>  private void setOldestEditTimeToNow() 
{<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    if (timeOfOldestEdit == 
Long.MAX_VALUE) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>      timeOfOldestEdit = 
EnvironmentEdgeManager.currentTime();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>  }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span>  /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   * @return The total size of cells in 
this memstore. We will not consider cells in the snapshot<a name="line.312"></a>
+<span class="sourceLineNo">313</span>   */<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  protected abstract long keySize();<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 The total heap size of cells 
in this memstore. We will not consider cells in the<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   *         snapshot<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>   */<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  protected abstract long heapSize();<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>  protected CellComparator 
getComparator() {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    return comparator;<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>  }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>  @VisibleForTesting<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>  MutableSegment getActive() {<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>    return active;<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>  @VisibleForTesting<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>  ImmutableSegment getSnapshot() {<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>    return snapshot;<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  /**<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * Check whether anything need to be 
done based on the current active set size<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   */<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  protected abstract void 
checkActiveSize();<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * @return an ordered list of segments 
from most recent to oldest in memstore<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  protected abstract List&lt;Segment&gt; 
getSegments() throws IOException;<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>}<a name="line.346"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/991224b9/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html
index bc384aa..35c5095 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CSLMImmutableSegment.html
@@ -47,18 +47,19 @@
 <span class="sourceLineNo">039</span>  protected CSLMImmutableSegment(Segment 
segment) {<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    super(segment);<a name="line.40"></a>
 <span class="sourceLineNo">041</span>    // update the segment metadata heap 
size<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    incSize(0, 
-MutableSegment.DEEP_OVERHEAD + DEEP_OVERHEAD_CSLM);<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  }<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  @Override<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  protected long indexEntrySize() {<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>    return 
ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @Override protected boolean 
canBeFlattened() {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    return true;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
-<span class="sourceLineNo">053</span>}<a name="line.53"></a>
+<span class="sourceLineNo">042</span>    long indexOverhead = 
-MutableSegment.DEEP_OVERHEAD + DEEP_OVERHEAD_CSLM;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    incSize(0, indexOverhead, 0); // CSLM 
is always on-heap<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  }<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  @Override<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  protected long indexEntrySize() {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>    return 
ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  @Override protected boolean 
canBeFlattened() {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    return true;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
+<span class="sourceLineNo">054</span>}<a name="line.54"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/991224b9/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html
index 5972246..1bfa25d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.html
@@ -53,7 +53,7 @@
 <span class="sourceLineNo">045</span>  protected 
CellArrayImmutableSegment(CellComparator comparator, MemStoreSegmentsIterator 
iterator,<a name="line.45"></a>
 <span class="sourceLineNo">046</span>      MemStoreLAB memStoreLAB, int 
numOfCells, MemStoreCompactionStrategy.Action action) {<a name="line.46"></a>
 <span class="sourceLineNo">047</span>    super(null, comparator, memStoreLAB); 
// initiailize the CellSet with NULL<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    incSize(0, DEEP_OVERHEAD_CAM);<a 
name="line.48"></a>
+<span class="sourceLineNo">048</span>    incSize(0, DEEP_OVERHEAD_CAM, 0); // 
CAM is always on-heap<a name="line.48"></a>
 <span class="sourceLineNo">049</span>    // build the new CellSet based on 
CellArrayMap and update the CellSet of the new Segment<a name="line.49"></a>
 <span class="sourceLineNo">050</span>    initializeCellSet(numOfCells, 
iterator, action);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  }<a name="line.51"></a>
@@ -66,119 +66,120 @@
 <span class="sourceLineNo">058</span>  protected 
CellArrayImmutableSegment(CSLMImmutableSegment segment, MemStoreSizing 
memstoreSizing,<a name="line.58"></a>
 <span class="sourceLineNo">059</span>      MemStoreCompactionStrategy.Action 
action) {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    super(segment); // initiailize the 
upper class<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    incSize(0, DEEP_OVERHEAD_CAM - 
CSLMImmutableSegment.DEEP_OVERHEAD_CSLM);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    int numOfCells = 
segment.getCellsCount();<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    // build the new CellSet based on 
CellChunkMap and update the CellSet of this Segment<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    reinitializeCellSet(numOfCells, 
segment.getScanner(Long.MAX_VALUE), segment.getCellSet(),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        action);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    // arrange the meta-data size, 
decrease all meta-data sizes related to SkipList;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    // add sizes of CellArrayMap entry 
(reinitializeCellSet doesn't take the care for the sizes)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    long newSegmentSizeDelta = 
numOfCells*(indexEntrySize()-ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    incSize(0, newSegmentSizeDelta);<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>    memstoreSizing.incMemStoreSize(0, 
newSegmentSizeDelta);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  @Override<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  protected long indexEntrySize() {<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    return 
ClassSize.CELL_ARRAY_MAP_ENTRY;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  @Override<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected boolean canBeFlattened() {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>    return false;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  /////////////////////  PRIVATE METHODS  
/////////////////////<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  
/*------------------------------------------------------------------------*/<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>  // Create CellSet based on CellArrayMap 
from compacting iterator<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private void initializeCellSet(int 
numOfCells, MemStoreSegmentsIterator iterator,<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      MemStoreCompactionStrategy.Action 
action) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    boolean merge = (action == 
MemStoreCompactionStrategy.Action.MERGE ||<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        action == 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS);<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    Cell[] cells = new Cell[numOfCells];  
 // build the Cell Array<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    int i = 0;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    int numUniqueKeys=0;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    Cell prev = null;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>    while (iterator.hasNext()) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      Cell c = iterator.next();<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>      // The scanner behind the iterator 
is doing all the elimination logic<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      if (merge) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        // if this is merge we just move 
the Cell object without copying MSLAB<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        // the sizes still need to be 
updated in the new segment<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        cells[i] = c;<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>      } else {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        // now we just copy it to the new 
segment (also MSLAB copy)<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        cells[i] = 
maybeCloneWithAllocator(c, false);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      // second parameter true, because 
in compaction/merge the addition of the cell to new segment<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      // is always successful<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      updateMetaInfo(cells[i], true, 
null); // updates the size per cell<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      if(action == 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS) {<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>        //counting number of unique 
keys<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        if (prev != null) {<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>          if 
(!CellUtil.matchingRowColumnBytes(prev, c)) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            numUniqueKeys++;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>          }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>        } else {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>          numUniqueKeys++;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      prev = c;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      i++;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    if(action == 
MemStoreCompactionStrategy.Action.COMPACT) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      numUniqueKeys = numOfCells;<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>    } else if(action != 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS) {<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>      numUniqueKeys = 
CellSet.UNKNOWN_NUM_UNIQUES;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    // build the immutable CellSet<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    CellArrayMap cam = new 
CellArrayMap(getComparator(), cells, 0, i, false);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    this.setCellSet(null, new 
CellSet(cam, numUniqueKeys));   // update the CellSet of this Segment<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>  
/*------------------------------------------------------------------------*/<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>  // Create CellSet based on CellChunkMap 
from current ConcurrentSkipListMap based CellSet<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  // (without compacting iterator)<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>  // We do not consider cells bigger than 
chunks!<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  private void reinitializeCellSet(<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      int numOfCells, KeyValueScanner 
segmentScanner, CellSet oldCellSet,<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      MemStoreCompactionStrategy.Action 
action) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    Cell[] cells = new Cell[numOfCells];  
 // build the Cell Array<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    Cell curCell;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    int idx = 0;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    int numUniqueKeys=0;<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    Cell prev = null;<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      while ((curCell = 
segmentScanner.next()) != null) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        cells[idx++] = curCell;<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>        if(action == 
MemStoreCompactionStrategy.Action.FLATTEN_COUNT_UNIQUE_KEYS) {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>          //counting number of unique 
keys<a name="line.148"></a>
-<span class="sourceLineNo">149</span>          if (prev != null) {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>            if 
(!CellUtil.matchingRowColumn(prev, curCell)) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>              numUniqueKeys++;<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>            }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          } else {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>            numUniqueKeys++;<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        prev = curCell;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    } catch (IOException ie) {<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      throw new 
IllegalStateException(ie);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    } finally {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      segmentScanner.close();<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    if(action != 
MemStoreCompactionStrategy.Action.FLATTEN_COUNT_UNIQUE_KEYS) {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>      numUniqueKeys = 
CellSet.UNKNOWN_NUM_UNIQUES;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    // build the immutable CellSet<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    CellArrayMap cam = new 
CellArrayMap(getComparator(), cells, 0, idx, false);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    // update the CellSet of this 
Segment<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    this.setCellSet(oldCellSet, new 
CellSet(cam, numUniqueKeys));<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>}<a name="line.173"></a>
+<span class="sourceLineNo">061</span>    long indexOverhead = 
DEEP_OVERHEAD_CAM - CSLMImmutableSegment.DEEP_OVERHEAD_CSLM;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    incSize(0, indexOverhead, 0); // CAM 
is always on-heap<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    int numOfCells = 
segment.getCellsCount();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    // build the new CellSet based on 
CellChunkMap and update the CellSet of this Segment<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    reinitializeCellSet(numOfCells, 
segment.getScanner(Long.MAX_VALUE), segment.getCellSet(),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>        action);<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    // arrange the meta-data size, 
decrease all meta-data sizes related to SkipList;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    // add sizes of CellArrayMap entry 
(reinitializeCellSet doesn't take the care for the sizes)<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    long newSegmentSizeDelta = 
numOfCells*(indexEntrySize()-ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    incSize(0, newSegmentSizeDelta, 0);<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    memstoreSizing.incMemStoreSize(0, 
newSegmentSizeDelta, 0);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  protected long indexEntrySize() {<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    return 
ClassSize.CELL_ARRAY_MAP_ENTRY;<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>  @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  protected boolean canBeFlattened() {<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>    return false;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  /////////////////////  PRIVATE METHODS  
/////////////////////<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  
/*------------------------------------------------------------------------*/<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>  // Create CellSet based on CellArrayMap 
from compacting iterator<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  private void initializeCellSet(int 
numOfCells, MemStoreSegmentsIterator iterator,<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      MemStoreCompactionStrategy.Action 
action) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    boolean merge = (action == 
MemStoreCompactionStrategy.Action.MERGE ||<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        action == 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS);<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    Cell[] cells = new Cell[numOfCells];  
 // build the Cell Array<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    int i = 0;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    int numUniqueKeys=0;<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    Cell prev = null;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    while (iterator.hasNext()) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>      Cell c = iterator.next();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      // The scanner behind the iterator 
is doing all the elimination logic<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      if (merge) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        // if this is merge we just move 
the Cell object without copying MSLAB<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        // the sizes still need to be 
updated in the new segment<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        cells[i] = c;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>      } else {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        // now we just copy it to the new 
segment (also MSLAB copy)<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        cells[i] = 
maybeCloneWithAllocator(c, false);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      // second parameter true, because 
in compaction/merge the addition of the cell to new segment<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      // is always successful<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>      updateMetaInfo(cells[i], true, 
null); // updates the size per cell<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      if(action == 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS) {<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>        //counting number of unique 
keys<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        if (prev != null) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>          if 
(!CellUtil.matchingRowColumnBytes(prev, c)) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            numUniqueKeys++;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>          }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        } else {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>          numUniqueKeys++;<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>        }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      prev = c;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      i++;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    if(action == 
MemStoreCompactionStrategy.Action.COMPACT) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      numUniqueKeys = numOfCells;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    } else if(action != 
MemStoreCompactionStrategy.Action.MERGE_COUNT_UNIQUE_KEYS) {<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      numUniqueKeys = 
CellSet.UNKNOWN_NUM_UNIQUES;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // build the immutable CellSet<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    CellArrayMap cam = new 
CellArrayMap(getComparator(), cells, 0, i, false);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    this.setCellSet(null, new 
CellSet(cam, numUniqueKeys));   // update the CellSet of this Segment<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>  
/*------------------------------------------------------------------------*/<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>  // Create CellSet based on CellChunkMap 
from current ConcurrentSkipListMap based CellSet<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  // (without compacting iterator)<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>  // We do not consider cells bigger than 
chunks!<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  private void reinitializeCellSet(<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>      int numOfCells, KeyValueScanner 
segmentScanner, CellSet oldCellSet,<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      MemStoreCompactionStrategy.Action 
action) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    Cell[] cells = new Cell[numOfCells];  
 // build the Cell Array<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    Cell curCell;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    int idx = 0;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    int numUniqueKeys=0;<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    Cell prev = null;<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    try {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      while ((curCell = 
segmentScanner.next()) != null) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        cells[idx++] = curCell;<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>        if(action == 
MemStoreCompactionStrategy.Action.FLATTEN_COUNT_UNIQUE_KEYS) {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>          //counting number of unique 
keys<a name="line.149"></a>
+<span class="sourceLineNo">150</span>          if (prev != null) {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>            if 
(!CellUtil.matchingRowColumn(prev, curCell)) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>              numUniqueKeys++;<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>            }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          } else {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            numUniqueKeys++;<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>          }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        prev = curCell;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    } catch (IOException ie) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      throw new 
IllegalStateException(ie);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    } finally {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      segmentScanner.close();<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if(action != 
MemStoreCompactionStrategy.Action.FLATTEN_COUNT_UNIQUE_KEYS) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      numUniqueKeys = 
CellSet.UNKNOWN_NUM_UNIQUES;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    // build the immutable CellSet<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    CellArrayMap cam = new 
CellArrayMap(getComparator(), cells, 0, idx, false);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // update the CellSet of this 
Segment<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    this.setCellSet(oldCellSet, new 
CellSet(cam, numUniqueKeys));<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>}<a name="line.174"></a>
 
 
 

Reply via email to