hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [01/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Thu, 11 May 2017 14:59:17 GMT
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site cac6146f8 -> 1241ee85f


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1241ee85/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.EnvironmentEdgeForMemstoreTest.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.EnvironmentEdgeForMemstoreTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.EnvironmentEdgeForMemstoreTest.html
index 6db2655..e2c4f9d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.EnvironmentEdgeForMemstoreTest.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.EnvironmentEdgeForMemstoreTest.html
@@ -170,939 +170,938 @@
 <span class="sourceLineNo">162</span>    Scan scan = new Scan();<a name="line.162"></a>
 <span class="sourceLineNo">163</span>    List&lt;Cell&gt; result = new ArrayList&lt;&gt;();<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    Configuration conf = HBaseConfiguration.create();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    ScanInfo scanInfo =<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        new ScanInfo(conf, null, 0, 1, HConstants.LATEST_TIMESTAMP, KeepDeletedCells.FALSE, 0,<a name="line.166"></a>
-<span class="sourceLineNo">167</span>            this.memstore.getComparator());<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    ScanType scanType = ScanType.USER_SCAN;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    StoreScanner s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    int count = 0;<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    try {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      while (s.next(result)) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        LOG.info(result);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        count++;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        // Row count is same as column count.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        assertEquals(rowCount, result.size());<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        result.clear();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    } finally {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      s.close();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    assertEquals(rowCount, count);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    for (KeyValueScanner scanner : memstorescanners) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      scanner.close();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    // Now assert can count same number even if a snapshot mid-scan.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    count = 0;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    try {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      while (s.next(result)) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        LOG.info(result);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        // Assert the stuff is coming out in right order.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        count++;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        // Row count is same as column count.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        assertEquals(rowCount, result.size());<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        if (count == 2) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>          this.memstore.snapshot();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>          LOG.info("Snapshotted");<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        result.clear();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    } finally {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      s.close();<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    assertEquals(rowCount, count);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    for (KeyValueScanner scanner : memstorescanners) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      scanner.close();<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // Assert that new values are seen in kvset as we scan.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    long ts = System.currentTimeMillis();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    count = 0;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    int snapshotIndex = 5;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    try {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      while (s.next(result)) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        LOG.info(result);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        // Assert the stuff is coming out in right order.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        // Row count is same as column count.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        assertEquals("count=" + count + ", result=" + result, rowCount, result.size());<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        count++;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        if (count == snapshotIndex) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>          MemStoreSnapshot snapshot = this.memstore.snapshot();<a name="line.227"></a>
-<span class="sourceLineNo">228</span>          this.memstore.clearSnapshot(snapshot.getId());<a name="line.228"></a>
-<span class="sourceLineNo">229</span>          // Added more rows into kvset.  But the scanner wont see these rows.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>          addRows(this.memstore, ts);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>          LOG.info("Snapshotted, cleared it and then added values (which wont be seen)");<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        result.clear();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    } finally {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      s.close();<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    assertEquals(rowCount, count);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>  /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * A simple test which verifies the 3 possible states when scanning across snapshot.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * @throws IOException<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @throws CloneNotSupportedException<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   */<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  @Test<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public void testScanAcrossSnapshot2() throws IOException, CloneNotSupportedException {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    // we are going to the scanning across snapshot with two kvs<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // kv1 should always be returned before kv2<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    final byte[] one = Bytes.toBytes(1);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    final byte[] two = Bytes.toBytes(2);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    final byte[] f = Bytes.toBytes("f");<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    final byte[] q = Bytes.toBytes("q");<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    final byte[] v = Bytes.toBytes(3);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>    final KeyValue kv1 = new KeyValue(one, f, q, v);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    final KeyValue kv2 = new KeyValue(two, f, q, v);<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    // use case 1: both kvs in kvset<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    this.memstore.add(kv1.clone(), null);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    this.memstore.add(kv2.clone(), null);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    // use case 2: both kvs in snapshot<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    this.memstore.snapshot();<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // use case 3: first in snapshot second in kvset<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    this.memstore = new DefaultMemStore();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    this.memstore.add(kv1.clone(), null);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    this.memstore.snapshot();<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    this.memstore.add(kv2.clone(), null);<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>  protected void verifyScanAcrossSnapshot2(KeyValue kv1, KeyValue kv2)<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      throws IOException {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    List&lt;KeyValueScanner&gt; memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    assertEquals(2, memstorescanners.size());<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    final KeyValueScanner scanner0 = memstorescanners.get(0);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    final KeyValueScanner scanner1 = memstorescanners.get(1);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    scanner0.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    scanner1.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    Cell n0 = scanner0.next();<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    Cell n1 = scanner1.next();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    assertTrue(kv1.equals(n0) || kv1.equals(n1));<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    assertTrue(kv2.equals(n0)<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        || kv2.equals(n1)<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        || kv2.equals(scanner0.next())<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        || kv2.equals(scanner1.next()));<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    assertNull(scanner0.next());<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    assertNull(scanner1.next());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>  protected void assertScannerResults(KeyValueScanner scanner, KeyValue[] expected)<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      throws IOException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    scanner.seek(KeyValueUtil.createFirstOnRow(new byte[]{}));<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    List&lt;Cell&gt; returned = Lists.newArrayList();<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>    while (true) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      Cell next = scanner.next();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      if (next == null) break;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      returned.add(next);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    assertTrue(<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        "Got:\n" + Joiner.on("\n").join(returned) +<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        "\nExpected:\n" + Joiner.on("\n").join(expected),<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        Iterables.elementsEqual(Arrays.asList(expected), returned));<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    assertNull(scanner.peek());<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>  @Test<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  public void testMemstoreConcurrentControl() throws IOException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    final byte[] row = Bytes.toBytes(1);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    final byte[] f = Bytes.toBytes("family");<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    final byte[] v = Bytes.toBytes("value");<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        mvcc.begin();<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>    KeyValue kv1 = new KeyValue(row, f, q1, v);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    kv1.setSequenceId(w.getWriteNumber());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    memstore.add(kv1, null);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    assertScannerResults(s, new KeyValue[]{});<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>    mvcc.completeAndWait(w);<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    assertScannerResults(s, new KeyValue[]{kv1});<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>    w = mvcc.begin();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    KeyValue kv2 = new KeyValue(row, f, q2, v);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    kv2.setSequenceId(w.getWriteNumber());<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    memstore.add(kv2, null);<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    assertScannerResults(s, new KeyValue[]{kv1});<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>    mvcc.completeAndWait(w);<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    assertScannerResults(s, new KeyValue[]{kv1, kv2});<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>  /**<a name="line.350"></a>
-<span class="sourceLineNo">351</span>   * Regression test for HBASE-2616, HBASE-2670.<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   * When we insert a higher-memstoreTS version of a cell but with<a name="line.352"></a>
-<span class="sourceLineNo">353</span>   * the same timestamp, we still need to provide consistent reads<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * for the same scanner.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   */<a name="line.355"></a>
-<span class="sourceLineNo">356</span>  @Test<a name="line.356"></a>
-<span class="sourceLineNo">357</span>  public void testMemstoreEditsVisibilityWithSameKey() throws IOException {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    final byte[] row = Bytes.toBytes(1);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    final byte[] f = Bytes.toBytes("family");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    final byte[] v1 = Bytes.toBytes("value1");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    final byte[] v2 = Bytes.toBytes("value2");<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>    // INSERT 1: Write both columns val1<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        mvcc.begin();<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>    KeyValue kv11 = new KeyValue(row, f, q1, v1);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    kv11.setSequenceId(w.getWriteNumber());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    memstore.add(kv11, null);<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    KeyValue kv12 = new KeyValue(row, f, q2, v1);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    kv12.setSequenceId(w.getWriteNumber());<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    memstore.add(kv12, null);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    mvcc.completeAndWait(w);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>    // BEFORE STARTING INSERT 2, SEE FIRST KVS<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>    // START INSERT 2: Write both columns val2<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    w = mvcc.begin();<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    KeyValue kv21 = new KeyValue(row, f, q1, v2);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    kv21.setSequenceId(w.getWriteNumber());<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    memstore.add(kv21, null);<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>    KeyValue kv22 = new KeyValue(row, f, q2, v2);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    kv22.setSequenceId(w.getWriteNumber());<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    memstore.add(kv22, null);<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>    // BEFORE COMPLETING INSERT 2, SEE FIRST KVS<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span>    // COMPLETE INSERT 2<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    mvcc.completeAndWait(w);<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>    // NOW SHOULD SEE NEW KVS IN ADDITION TO OLD KVS.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    // See HBASE-1485 for discussion about what we should do with<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    // the duplicate-TS inserts<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    assertScannerResults(s, new KeyValue[]{kv21, kv11, kv22, kv12});<a name="line.403"></a>
-<span class="sourceLineNo">404</span>  }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>  /**<a name="line.406"></a>
-<span class="sourceLineNo">407</span>   * When we insert a higher-memstoreTS deletion of a cell but with<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   * the same timestamp, we still need to provide consistent reads<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   * for the same scanner.<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   */<a name="line.410"></a>
-<span class="sourceLineNo">411</span>  @Test<a name="line.411"></a>
-<span class="sourceLineNo">412</span>  public void testMemstoreDeletesVisibilityWithSameKey() throws IOException {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    final byte[] row = Bytes.toBytes(1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    final byte[] f = Bytes.toBytes("family");<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    final byte[] v1 = Bytes.toBytes("value1");<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    // INSERT 1: Write both columns val1<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        mvcc.begin();<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>    KeyValue kv11 = new KeyValue(row, f, q1, v1);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    kv11.setSequenceId(w.getWriteNumber());<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    memstore.add(kv11, null);<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span>    KeyValue kv12 = new KeyValue(row, f, q2, v1);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    kv12.setSequenceId(w.getWriteNumber());<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    memstore.add(kv12, null);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    mvcc.completeAndWait(w);<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>    // BEFORE STARTING INSERT 2, SEE FIRST KVS<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>    // START DELETE: Insert delete for one of the columns<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    w = mvcc.begin();<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    KeyValue kvDel = new KeyValue(row, f, q2, kv11.getTimestamp(),<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        KeyValue.Type.DeleteColumn);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    kvDel.setSequenceId(w.getWriteNumber());<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    memstore.add(kvDel, null);<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>    // BEFORE COMPLETING DELETE, SEE FIRST KVS<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // COMPLETE DELETE<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    mvcc.completeAndWait(w);<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>    // NOW WE SHOULD SEE DELETE<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    assertScannerResults(s, new KeyValue[]{kv11, kvDel, kv12});<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  }<a name="line.452"></a>
+<span class="sourceLineNo">165</span>    ScanInfo scanInfo = new ScanInfo(conf, null, 0, 1, HConstants.LATEST_TIMESTAMP,<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        KeepDeletedCells.FALSE, HConstants.DEFAULT_BLOCKSIZE, 0, this.memstore.getComparator());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    ScanType scanType = ScanType.USER_SCAN;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    StoreScanner s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    int count = 0;<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    try {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      while (s.next(result)) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        LOG.info(result);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        count++;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        // Row count is same as column count.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        assertEquals(rowCount, result.size());<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        result.clear();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    } finally {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      s.close();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    assertEquals(rowCount, count);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    for (KeyValueScanner scanner : memstorescanners) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      scanner.close();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    // Now assert can count same number even if a snapshot mid-scan.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    count = 0;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    try {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      while (s.next(result)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        LOG.info(result);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        // Assert the stuff is coming out in right order.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        count++;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        // Row count is same as column count.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        assertEquals(rowCount, result.size());<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        if (count == 2) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>          this.memstore.snapshot();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>          LOG.info("Snapshotted");<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        result.clear();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    } finally {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      s.close();<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    assertEquals(rowCount, count);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    for (KeyValueScanner scanner : memstorescanners) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      scanner.close();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    // Assert that new values are seen in kvset as we scan.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    long ts = System.currentTimeMillis();<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    s = new StoreScanner(scan, scanInfo, scanType, null, memstorescanners);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    count = 0;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    int snapshotIndex = 5;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    try {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      while (s.next(result)) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        LOG.info(result);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        // Assert the stuff is coming out in right order.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        // Row count is same as column count.<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        assertEquals("count=" + count + ", result=" + result, rowCount, result.size());<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        count++;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        if (count == snapshotIndex) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>          MemStoreSnapshot snapshot = this.memstore.snapshot();<a name="line.226"></a>
+<span class="sourceLineNo">227</span>          this.memstore.clearSnapshot(snapshot.getId());<a name="line.227"></a>
+<span class="sourceLineNo">228</span>          // Added more rows into kvset.  But the scanner wont see these rows.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>          addRows(this.memstore, ts);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>          LOG.info("Snapshotted, cleared it and then added values (which wont be seen)");<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        result.clear();<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    } finally {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      s.close();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    assertEquals(rowCount, count);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>  /**<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   * A simple test which verifies the 3 possible states when scanning across snapshot.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   * @throws IOException<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * @throws CloneNotSupportedException<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   */<a name="line.244"></a>
+<span class="sourceLineNo">245</span>  @Test<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  public void testScanAcrossSnapshot2() throws IOException, CloneNotSupportedException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // we are going to the scanning across snapshot with two kvs<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    // kv1 should always be returned before kv2<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    final byte[] one = Bytes.toBytes(1);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    final byte[] two = Bytes.toBytes(2);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    final byte[] f = Bytes.toBytes("f");<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    final byte[] q = Bytes.toBytes("q");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    final byte[] v = Bytes.toBytes(3);<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span>    final KeyValue kv1 = new KeyValue(one, f, q, v);<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    final KeyValue kv2 = new KeyValue(two, f, q, v);<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>    // use case 1: both kvs in kvset<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    this.memstore.add(kv1.clone(), null);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    this.memstore.add(kv2.clone(), null);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>    // use case 2: both kvs in snapshot<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    this.memstore.snapshot();<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>    // use case 3: first in snapshot second in kvset<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    this.memstore = new DefaultMemStore();<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    this.memstore.add(kv1.clone(), null);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    this.memstore.snapshot();<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    this.memstore.add(kv2.clone(), null);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    verifyScanAcrossSnapshot2(kv1, kv2);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  protected void verifyScanAcrossSnapshot2(KeyValue kv1, KeyValue kv2)<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      throws IOException {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    List&lt;KeyValueScanner&gt; memstorescanners = this.memstore.getScanners(mvcc.getReadPoint());<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    assertEquals(2, memstorescanners.size());<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    final KeyValueScanner scanner0 = memstorescanners.get(0);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    final KeyValueScanner scanner1 = memstorescanners.get(1);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    scanner0.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    scanner1.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    Cell n0 = scanner0.next();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    Cell n1 = scanner1.next();<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    assertTrue(kv1.equals(n0) || kv1.equals(n1));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    assertTrue(kv2.equals(n0)<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        || kv2.equals(n1)<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        || kv2.equals(scanner0.next())<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        || kv2.equals(scanner1.next()));<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    assertNull(scanner0.next());<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    assertNull(scanner1.next());<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>  protected void assertScannerResults(KeyValueScanner scanner, KeyValue[] expected)<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      throws IOException {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    scanner.seek(KeyValueUtil.createFirstOnRow(new byte[]{}));<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    List&lt;Cell&gt; returned = Lists.newArrayList();<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>    while (true) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      Cell next = scanner.next();<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      if (next == null) break;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      returned.add(next);<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>    assertTrue(<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        "Got:\n" + Joiner.on("\n").join(returned) +<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        "\nExpected:\n" + Joiner.on("\n").join(expected),<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        Iterables.elementsEqual(Arrays.asList(expected), returned));<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    assertNull(scanner.peek());<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>  @Test<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  public void testMemstoreConcurrentControl() throws IOException {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    final byte[] row = Bytes.toBytes(1);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    final byte[] f = Bytes.toBytes("family");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    final byte[] v = Bytes.toBytes("value");<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        mvcc.begin();<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span>    KeyValue kv1 = new KeyValue(row, f, q1, v);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    kv1.setSequenceId(w.getWriteNumber());<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    memstore.add(kv1, null);<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    assertScannerResults(s, new KeyValue[]{});<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>    mvcc.completeAndWait(w);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    assertScannerResults(s, new KeyValue[]{kv1});<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>    w = mvcc.begin();<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    KeyValue kv2 = new KeyValue(row, f, q2, v);<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    kv2.setSequenceId(w.getWriteNumber());<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    memstore.add(kv2, null);<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    assertScannerResults(s, new KeyValue[]{kv1});<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>    mvcc.completeAndWait(w);<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    assertScannerResults(s, new KeyValue[]{kv1, kv2});<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>  /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   * Regression test for HBASE-2616, HBASE-2670.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   * When we insert a higher-memstoreTS version of a cell but with<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   * the same timestamp, we still need to provide consistent reads<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   * for the same scanner.<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   */<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  @Test<a name="line.355"></a>
+<span class="sourceLineNo">356</span>  public void testMemstoreEditsVisibilityWithSameKey() throws IOException {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    final byte[] row = Bytes.toBytes(1);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    final byte[] f = Bytes.toBytes("family");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    final byte[] v1 = Bytes.toBytes("value1");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    final byte[] v2 = Bytes.toBytes("value2");<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>    // INSERT 1: Write both columns val1<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        mvcc.begin();<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>    KeyValue kv11 = new KeyValue(row, f, q1, v1);<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    kv11.setSequenceId(w.getWriteNumber());<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    memstore.add(kv11, null);<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>    KeyValue kv12 = new KeyValue(row, f, q2, v1);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    kv12.setSequenceId(w.getWriteNumber());<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    memstore.add(kv12, null);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    mvcc.completeAndWait(w);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>    // BEFORE STARTING INSERT 2, SEE FIRST KVS<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>    // START INSERT 2: Write both columns val2<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    w = mvcc.begin();<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    KeyValue kv21 = new KeyValue(row, f, q1, v2);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    kv21.setSequenceId(w.getWriteNumber());<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    memstore.add(kv21, null);<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>    KeyValue kv22 = new KeyValue(row, f, q2, v2);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    kv22.setSequenceId(w.getWriteNumber());<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    memstore.add(kv22, null);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // BEFORE COMPLETING INSERT 2, SEE FIRST KVS<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    // COMPLETE INSERT 2<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    mvcc.completeAndWait(w);<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>    // NOW SHOULD SEE NEW KVS IN ADDITION TO OLD KVS.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    // See HBASE-1485 for discussion about what we should do with<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    // the duplicate-TS inserts<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    assertScannerResults(s, new KeyValue[]{kv21, kv11, kv22, kv12});<a name="line.402"></a>
+<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>  /**<a name="line.405"></a>
+<span class="sourceLineNo">406</span>   * When we insert a higher-memstoreTS deletion of a cell but with<a name="line.406"></a>
+<span class="sourceLineNo">407</span>   * the same timestamp, we still need to provide consistent reads<a name="line.407"></a>
+<span class="sourceLineNo">408</span>   * for the same scanner.<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   */<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  @Test<a name="line.410"></a>
+<span class="sourceLineNo">411</span>  public void testMemstoreDeletesVisibilityWithSameKey() throws IOException {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    final byte[] row = Bytes.toBytes(1);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    final byte[] f = Bytes.toBytes("family");<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    final byte[] q2 = Bytes.toBytes("q2");<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    final byte[] v1 = Bytes.toBytes("value1");<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    // INSERT 1: Write both columns val1<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    MultiVersionConcurrencyControl.WriteEntry w =<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        mvcc.begin();<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>    KeyValue kv11 = new KeyValue(row, f, q1, v1);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    kv11.setSequenceId(w.getWriteNumber());<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    memstore.add(kv11, null);<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>    KeyValue kv12 = new KeyValue(row, f, q2, v1);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    kv12.setSequenceId(w.getWriteNumber());<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    memstore.add(kv12, null);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    mvcc.completeAndWait(w);<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>    // BEFORE STARTING INSERT 2, SEE FIRST KVS<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>    // START DELETE: Insert delete for one of the columns<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    w = mvcc.begin();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    KeyValue kvDel = new KeyValue(row, f, q2, kv11.getTimestamp(),<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        KeyValue.Type.DeleteColumn);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    kvDel.setSequenceId(w.getWriteNumber());<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    memstore.add(kvDel, null);<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    // BEFORE COMPLETING DELETE, SEE FIRST KVS<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    assertScannerResults(s, new KeyValue[]{kv11, kv12});<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>    // COMPLETE DELETE<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    mvcc.completeAndWait(w);<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>    // NOW WE SHOULD SEE DELETE<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    assertScannerResults(s, new KeyValue[]{kv11, kvDel, kv12});<a name="line.450"></a>
+<span class="sourceLineNo">451</span>  }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
 <span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span>  private static class ReadOwnWritesTester extends Thread {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    static final int NUM_TRIES = 1000;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span>    final byte[] row;<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>    final byte[] f = Bytes.toBytes("family");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    final MultiVersionConcurrencyControl mvcc;<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    final MemStore memstore;<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    final AtomicLong startSeqNum;<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>    AtomicReference&lt;Throwable&gt; caughtException;<a name="line.467"></a>
+<span class="sourceLineNo">454</span>  private static class ReadOwnWritesTester extends Thread {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    static final int NUM_TRIES = 1000;<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span>    final byte[] row;<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span>    final byte[] f = Bytes.toBytes("family");<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    final byte[] q1 = Bytes.toBytes("q1");<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span>    final MultiVersionConcurrencyControl mvcc;<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    final MemStore memstore;<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    final AtomicLong startSeqNum;<a name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span>    AtomicReference&lt;Throwable&gt; caughtException;<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
 <span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>    public ReadOwnWritesTester(int id,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>                               MemStore memstore,<a name="line.471"></a>
-<span class="sourceLineNo">472</span>                               MultiVersionConcurrencyControl mvcc,<a name="line.472"></a>
-<span class="sourceLineNo">473</span>                               AtomicReference&lt;Throwable&gt; caughtException,<a name="line.473"></a>
-<span class="sourceLineNo">474</span>                               AtomicLong startSeqNum)<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      this.mvcc = mvcc;<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      this.memstore = memstore;<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      this.caughtException = caughtException;<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      row = Bytes.toBytes(id);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      this.startSeqNum = startSeqNum;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>    @Override<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    public void run() {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      try {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>        internalRun();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      } catch (Throwable t) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>        caughtException.compareAndSet(null, t);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>    private void internalRun() throws IOException {<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      for (long i = 0; i &lt; NUM_TRIES &amp;&amp; caughtException.get() == null; i++) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        MultiVersionConcurrencyControl.WriteEntry w =<a name="line.494"></a>
-<span class="sourceLineNo">495</span>            mvcc.begin();<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span>        // Insert the sequence value (i)<a name="line.497"></a>
-<span class="sourceLineNo">498</span>        byte[] v = Bytes.toBytes(i);<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>        KeyValue kv = new KeyValue(row, f, q1, i, v);<a name="line.500"></a>
-<span class="sourceLineNo">501</span>        kv.setSequenceId(w.getWriteNumber());<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        memstore.add(kv, null);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        mvcc.completeAndWait(w);<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>        // Assert that we can read back<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        KeyValueScanner s = this.memstore.getScanners(mvcc.getReadPoint()).get(0);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        s.seek(kv);<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>        Cell ret = s.next();<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        assertNotNull("Didnt find own write at all", ret);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>        assertEquals("Didnt read own writes",<a name="line.511"></a>
-<span class="sourceLineNo">512</span>                     kv.getTimestamp(), ret.getTimestamp());<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
-<span class="sourceLineNo">515</span>  }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span>  @Test<a name="line.517"></a>
-<span class="sourceLineNo">518</span>  public void testReadOwnWritesUnderConcurrency() throws Throwable {<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span>    int NUM_THREADS = 8;<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span>    ReadOwnWritesTester threads[] = new ReadOwnWritesTester[NUM_THREADS];<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    AtomicReference&lt;Throwable&gt; caught = new AtomicReference&lt;&gt;();<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    for (int i = 0; i &lt; NUM_THREADS; i++) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      threads[i] = new ReadOwnWritesTester(i, memstore, mvcc, caught, this.startSeqNum);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      threads[i].start();<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>    for (int i = 0; i &lt; NUM_THREADS; i++) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      threads[i].join();<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    }<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if (caught.get() != null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      throw caught.get();<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>  }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span>  /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span>   * Test memstore snapshots<a name="line.540"></a>
-<span class="sourceLineNo">541</span>   * @throws IOException<a name="line.541"></a>
-<span class="sourceLineNo">542</span>   */<a name="line.542"></a>
-<span class="sourceLineNo">543</span>  @Test<a name="line.543"></a>
-<span class="sourceLineNo">544</span>  public void testSnapshotting() throws IOException {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    final int snapshotCount = 5;<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    // Add some rows, run a snapshot. Do it a few times.<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    for (int i = 0; i &lt; snapshotCount; i++) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      addRows(this.memstore);<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      runSnapshot(this.memstore);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      assertEquals("History not being cleared", 0, this.memstore.getSnapshot().getCellsCount());<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    }<a name="line.551"></a>
-<span class="sourceLineNo">552</span>  }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span>  @Test<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  public void testMultipleVersionsSimple() throws Exception {<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    DefaultMemStore m = new DefaultMemStore(new Configuration(), CellComparator.COMPARATOR);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    byte [] row = Bytes.toBytes("testRow");<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    byte [] family = Bytes.toBytes("testFamily");<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    byte [] qf = Bytes.toBytes("testQualifier");<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    long [] stamps = {1,2,3};<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    byte [][] values = {Bytes.toBytes("value0"), Bytes.toBytes("value1"),<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        Bytes.toBytes("value2")};<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    KeyValue key0 = new KeyValue(row, family, qf, stamps[0], values[0]);<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    KeyValue key1 = new KeyValue(row, family, qf, stamps[1], values[1]);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    KeyValue key2 = new KeyValue(row, family, qf, stamps[2], values[2]);<a name="line.565"></a>
-<span class="sourceLineNo">566</span><a name="line.566"></a>
-<span class="sourceLineNo">567</span>    m.add(key0, null);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    m.add(key1, null);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    m.add(key2, null);<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>    assertTrue("Expected memstore to hold 3 values, actually has " +<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        m.getActive().getCellsCount(), m.getActive().getCellsCount() == 3);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>  }<a name="line.573"></a>
-<span class="sourceLineNo">574</span><a name="line.574"></a>
-<span class="sourceLineNo">575</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.575"></a>
-<span class="sourceLineNo">576</span>  // Get tests<a name="line.576"></a>
-<span class="sourceLineNo">577</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.577"></a>
-<span class="sourceLineNo">578</span><a name="line.578"></a>
-<span class="sourceLineNo">579</span>  /** Test getNextRow from memstore<a name="line.579"></a>
-<span class="sourceLineNo">580</span>   * @throws InterruptedException<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   */<a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  public void testGetNextRow() throws Exception {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    addRows(this.memstore);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    // Add more versions to make it a little more interesting.<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    Thread.sleep(1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>    addRows(this.memstore);<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    Cell closestToEmpty = ((DefaultMemStore) this.memstore).getNextRow(KeyValue.LOWESTKEY);<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    assertTrue(CellComparator.COMPARATOR.compareRows(closestToEmpty,<a name="line.589"></a>
-<span class="sourceLineNo">590</span>        new KeyValue(Bytes.toBytes(0), System.currentTimeMillis())) == 0);<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    for (int i = 0; i &lt; ROW_COUNT; i++) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      Cell nr = ((DefaultMemStore) this.memstore).getNextRow(new KeyValue(Bytes.toBytes(i),<a name="line.592"></a>
-<span class="sourceLineNo">593</span>          System.currentTimeMillis()));<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      if (i + 1 == ROW_COUNT) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        assertEquals(nr, null);<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      } else {<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        assertTrue(CellComparator.COMPARATOR.compareRows(nr,<a name="line.597"></a>
-<span class="sourceLineNo">598</span>            new KeyValue(Bytes.toBytes(i + 1), System.currentTimeMillis())) == 0);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      }<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    //starting from each row, validate results should contain the starting row<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    Configuration conf = HBaseConfiguration.create();<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    for (int startRowId = 0; startRowId &lt; ROW_COUNT; startRowId++) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      ScanInfo scanInfo = new ScanInfo(conf, FAMILY, 0, 1, Integer.MAX_VALUE,<a name="line.604"></a>
-<span class="sourceLineNo">605</span>          KeepDeletedCells.FALSE, 0, this.memstore.getComparator());<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      ScanType scanType = ScanType.USER_SCAN;<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      try (InternalScanner scanner = new StoreScanner(new Scan(<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          Bytes.toBytes(startRowId)), scanInfo, scanType, null,<a name="line.608"></a>
-<span class="sourceLineNo">609</span>          memstore.getScanners(0))) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>        List&lt;Cell&gt; results = new ArrayList&lt;&gt;();<a name="line.610"></a>
-<span class="sourceLineNo">611</span>        for (int i = 0; scanner.next(results); i++) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>          int rowId = startRowId + i;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>          Cell left = results.get(0);<a name="line.613"></a>
-<span class="sourceLineNo">614</span>          byte[] row1 = Bytes.toBytes(rowId);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>          assertTrue(<a name="line.615"></a>
-<span class="sourceLineNo">616</span>              "Row name",<a name="line.616"></a>
-<span class="sourceLineNo">617</span>              CellComparator.COMPARATOR.compareRows(left, row1, 0, row1.length) == 0);<a name="line.617"></a>
-<span class="sourceLineNo">618</span>          assertEquals("Count of columns", QUALIFIER_COUNT, results.size());<a name="line.618"></a>
-<span class="sourceLineNo">619</span>          List&lt;Cell&gt; row = new ArrayList&lt;&gt;();<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          for (Cell kv : results) {<a name="line.620"></a>
-<span class="sourceLineNo">621</span>            row.add(kv);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>          }<a name="line.622"></a>
-<span class="sourceLineNo">623</span>          isExpectedRowWithoutTimestamps(rowId, row);<a name="line.623"></a>
-<span class="sourceLineNo">624</span>          // Clear out set.  Otherwise row results accumulate.<a name="line.624"></a>
-<span class="sourceLineNo">625</span>          results.clear();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>        }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>  }<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span>  @Test<a name="line.631"></a>
-<span class="sourceLineNo">632</span>  public void testGet_memstoreAndSnapShot() throws IOException {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    byte [] row = Bytes.toBytes("testrow");<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    byte [] fam = Bytes.toBytes("testfamily");<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    byte [] qf1 = Bytes.toBytes("testqualifier1");<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    byte [] qf2 = Bytes.toBytes("testqualifier2");<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    byte [] qf3 = Bytes.toBytes("testqualifier3");<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    byte [] qf4 = Bytes.toBytes("testqualifier4");<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    byte [] qf5 = Bytes.toBytes("testqualifier5");<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    byte [] val = Bytes.toBytes("testval");<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>    //Setting up memstore<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    memstore.add(new KeyValue(row, fam, qf1, val), null);<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    memstore.add(new KeyValue(row, fam, qf2, val), null);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    memstore.add(new KeyValue(row, fam, qf3, val), null);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    //Creating a snapshot<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    memstore.snapshot();<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    assertEquals(3, memstore.getSnapshot().getCellsCount());<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    //Adding value to "new" memstore<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    assertEquals(0, memstore.getActive().getCellsCount());<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    memstore.add(new KeyValue(row, fam ,qf4, val), null);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>    memstore.add(new KeyValue(row, fam ,qf5, val), null);<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    assertEquals(2, memstore.getActive().getCellsCount());<a name="line.653"></a>
-<span class="sourceLineNo">654</span>  }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.656"></a>
-<span class="sourceLineNo">657</span>  // Delete tests<a name="line.657"></a>
-<span class="sourceLineNo">658</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  @Test<a name="line.659"></a>
-<span class="sourceLineNo">660</span>  public void testGetWithDelete() throws IOException {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    byte [] row = Bytes.toBytes("testrow");<a name="line.661"></a>
-<span class="sourceLineNo">662</span>    byte [] fam = Bytes.toBytes("testfamily");<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    byte [] qf1 = Bytes.toBytes("testqualifier");<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    byte [] val = Bytes.toBytes("testval");<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span>    long ts1 = System.nanoTime();<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    KeyValue put1 = new KeyValue(row, fam, qf1, ts1, val);<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    long ts2 = ts1 + 1;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    KeyValue put2 = new KeyValue(row, fam, qf1, ts2, val);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    long ts3 = ts2 + 1;<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    KeyValue put3 = new KeyValue(row, fam, qf1, ts3, val);<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    memstore.add(put1, null);<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    memstore.add(put2, null);<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    memstore.add(put3, null);<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>    assertEquals(3, memstore.getActive().getCellsCount());<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span>    KeyValue del2 = new KeyValue(row, fam, qf1, ts2, KeyValue.Type.Delete, val);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    memstore.add(del2, null);<a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    List&lt;Cell&gt; expected = new ArrayList&lt;&gt;();<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    expected.add(put3);<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    expected.add(del2);<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    expected.add(put2);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    expected.add(put1);<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span>    assertEquals(4, memstore.getActive().getCellsCount());<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    int i = 0;<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    for(Cell cell : memstore.getActive().getCellSet()) {<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      assertEquals(expected.get(i++), cell);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    }<a name="line.691"></a>
-<span class="sourceLineNo">692</span>  }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span>  @Test<a name="line.694"></a>
-<span class="sourceLineNo">695</span>  public void testGetWithDeleteColumn() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    byte [] row = Bytes.toBytes("testrow");<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    byte [] fam = Bytes.toBytes("testfamily");<a name="line.697"></a>
-<span class="sourceLineNo">698</span>    byte [] qf1 = Bytes.toBytes("testqualifier");<a name="line.698"></a>
-<span class="sourceLineNo">699</span>    byte [] val = Bytes.toBytes("testval");<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span>    long ts1 = System.nanoTime();<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    KeyValue put1 = new KeyValue(row, fam, qf1, ts1, val);<a name="line.702"></a>
-<span class="sourceLineNo">703</span>    long ts2 = ts1 + 1;<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    KeyValue put2 = new KeyValue(row, fam, qf1, ts2, val);<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    long ts3 = ts2 + 1;<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    KeyValue put3 = new KeyValue(row, fam, qf1, ts3, val);<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    memstore.add(put1, null);<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    memstore.add(put2, null);<a name="line.708"></a>
-<span class="sourceLineNo">709</span>    memstore.add(put3, null);<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span>    assertEquals(3, memstore.getActive().getCellsCount());<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>    KeyValue del2 =<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      new KeyValue(row, fam, qf1, ts2, KeyValue.Type.DeleteColumn, val);<a name="line.714"></a>
-<span class="sourceLineNo">715</span>    memstore.add(del2, null);<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span>    List&lt;Cell&gt; expected = new ArrayList&lt;&gt;();<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    expected.add(put3);<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    expected.add(del2);<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    expected.add(put2);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    expected.add(put1);<a name="line.721"></a>
-<span class="sourceLineNo">722</span><a name="line.722"></a>
-<span class="sourceLineNo">723</span>    assertEquals(4, memstore.getActive().getCellsCount());<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    int i = 0;<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    for (Cell cell : memstore.getActive().getCellSet()) {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      assertEquals(expected.get(i++), cell);<a name="line.726"></a>
-<span class="sourceLineNo">727</span>    }<a name="line.727"></a>
-<span class="sourceLineNo">728</span>  }<a name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span>  @Test<a name="line.730"></a>
-<span class="sourceLineNo">731</span>  public void testGetWithDeleteFamily() throws IOException {<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    byte [] row = Bytes.toBytes("testrow");<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    byte [] fam = Bytes.toBytes("testfamily");<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    byte [] qf1 = Bytes.toBytes("testqualifier1");<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    byte [] qf2 = Bytes.toBytes("testqualifier2");<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    byte [] qf3 = Bytes.toBytes("testqualifier3");<a name="line.736"></a>
-<span class="sourceLineNo">737</span>    byte [] val = Bytes.toBytes("testval");<a name="line.737"></a>
-<span class="sourceLineNo">738</span>    long ts = System.nanoTime();<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>    KeyValue put1 = new KeyValue(row, fam, qf1, ts, val);<a name="line.740"></a>
-<span class="sourceLineNo">741</span>    KeyValue put2 = new KeyValue(row, fam, qf2, ts, val);<a name="line.741"></a>
-<span class="sourceLineNo">742</span>    KeyValue put3 = new KeyValue(row, fam, qf3, ts, val);<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    KeyValue put4 = new KeyValue(row, fam, qf3, ts+1, val);<a name="line.743"></a>
-<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span>    memstore.add(put1, null);<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    memstore.add(put2, null);<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    memstore.add(put3, null);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    memstore.add(put4, null);<a name="line.748"></a>
-<span class="sourceLineNo">749</span><a name="line.749"></a>
-<span class="sourceLineNo">750</span>    KeyValue del =<a name="line.750"></a>
-<span class="sourceLineNo">751</span>      new KeyValue(row, fam, null, ts, KeyValue.Type.DeleteFamily, val);<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    memstore.add(del, null);<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span>    List&lt;Cell&gt; expected = new ArrayList&lt;&gt;();<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    expected.add(del);<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    expected.add(put1);<a name="line.756"></a>
-<span class="sourceLineNo">757</span>    expected.add(put2);<a name="line.757"></a>
-<span class="sourceLineNo">758</span>    expected.add(put4);<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    expected.add(put3);<a name="line.759"></a>
-<span class="sourceLineNo">760</span><a name="line.760"></a>
-<span class="sourceLineNo">761</span>    assertEquals(5, memstore.getActive().getCellsCount());<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    int i = 0;<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    for (Cell cell : memstore.getActive().getCellSet()) {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      assertEquals(expected.get(i++), cell);<a name="line.764"></a>
-<span class="sourceLineNo">765</span>    }<a name="line.765"></a>
-<span class="sourceLineNo">766</span>  }<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span>  @Test<a name="line.768"></a>
-<span class="sourceLineNo">769</span>  public void testKeepDeleteInmemstore() {<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    byte [] row = Bytes.toBytes("testrow");<a name="line.770"></a>
-<span class="sourceLineNo">771</span>    byte [] fam = Bytes.toBytes("testfamily");<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    byte [] qf = Bytes.toBytes("testqualifier");<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    byte [] val = Bytes.toBytes("testval");<a name="line.773"></a>
-<span class="sourceLineNo">774</span>    long ts = System.nanoTime();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    memstore.add(new KeyValue(row, fam, qf, ts, val), null);<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    KeyValue delete = new KeyValue(row, fam, qf, ts, KeyValue.Type.Delete, val);<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    memstore.add(delete, null);<a name="line.777"></a>
-<span class="sourceLineNo">778</span>    assertEquals(2, memstore.getActive().getCellsCount());<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    assertEquals(delete, memstore.getActive().first());<a name="line.779"></a>
-<span class="sourceLineNo">780</span>  }<a name="line.780"></a>
-<span class="sourceLineNo">781</span><a name="line.781"></a>
-<span class="sourceLineNo">782</span>  @Test<a name="line.782"></a>
-<span class="sourceLineNo">783</span>  public void testRetainsDeleteVersion() throws IOException {<a name="

<TRUNCATED>

Mime
View raw message