hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [06/24] hbase git commit: Published site at 0d72849581c1e5a50a2aa7757b909e5531b8d12c.
Date Thu, 26 Nov 2015 21:52:30 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/2fa570dd/xref-test/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html b/xref-test/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html
index 7a0fc70..bf0d5cc 100644
--- a/xref-test/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html
+++ b/xref-test/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html
@@ -71,1032 +71,1038 @@
 <a class="jxr_linenumber" name="61" href="#61">61</a>  <strong class="jxr_keyword">import</strong> com.google.common.collect.Iterables;
 <a class="jxr_linenumber" name="62" href="#62">62</a>  <strong class="jxr_keyword">import</strong> com.google.common.collect.Lists;
 <a class="jxr_linenumber" name="63" href="#63">63</a>  
-<a class="jxr_linenumber" name="64" href="#64">64</a>  <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> memstore test case */</em>
-<a class="jxr_linenumber" name="65" href="#65">65</a>  @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, MediumTests.<strong class="jxr_keyword">class</strong>})
-<a class="jxr_linenumber" name="66" href="#66">66</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">TestDefaultMemStore</a> <strong class="jxr_keyword">extends</strong> TestCase {
-<a class="jxr_linenumber" name="67" href="#67">67</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestDefaultMemStore.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="68" href="#68">68</a>    <strong class="jxr_keyword">private</strong> DefaultMemStore memstore;
-<a class="jxr_linenumber" name="69" href="#69">69</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROW_COUNT = 10;
-<a class="jxr_linenumber" name="70" href="#70">70</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> QUALIFIER_COUNT = ROW_COUNT;
-<a class="jxr_linenumber" name="71" href="#71">71</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte [] FAMILY = Bytes.toBytes(<span class="jxr_string">"column"</span>);
-<a class="jxr_linenumber" name="72" href="#72">72</a>    <strong class="jxr_keyword">private</strong> MultiVersionConcurrencyControl mvcc;
-<a class="jxr_linenumber" name="73" href="#73">73</a>    <strong class="jxr_keyword">private</strong> AtomicLong startSeqNum = <strong class="jxr_keyword">new</strong> AtomicLong(0);
-<a class="jxr_linenumber" name="74" href="#74">74</a>  
-<a class="jxr_linenumber" name="75" href="#75">75</a>    @Override
-<a class="jxr_linenumber" name="76" href="#76">76</a>    <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="77" href="#77">77</a>      <strong class="jxr_keyword">super</strong>.setUp();
-<a class="jxr_linenumber" name="78" href="#78">78</a>      <strong class="jxr_keyword">this</strong>.mvcc = <strong class="jxr_keyword">new</strong> MultiVersionConcurrencyControl();
-<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">this</strong>.memstore = <strong class="jxr_keyword">new</strong> DefaultMemStore();
-<a class="jxr_linenumber" name="80" href="#80">80</a>    }
-<a class="jxr_linenumber" name="81" href="#81">81</a>  
-<a class="jxr_linenumber" name="82" href="#82">82</a>    <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPutSameKey() {
-<a class="jxr_linenumber" name="83" href="#83">83</a>      byte [] bytes = Bytes.toBytes(getName());
-<a class="jxr_linenumber" name="84" href="#84">84</a>      KeyValue kv = <strong class="jxr_keyword">new</strong> KeyValue(bytes, bytes, bytes, bytes);
-<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">this</strong>.memstore.add(kv);
-<a class="jxr_linenumber" name="86" href="#86">86</a>      byte [] other = Bytes.toBytes(<span class="jxr_string">"somethingelse"</span>);
-<a class="jxr_linenumber" name="87" href="#87">87</a>      KeyValue samekey = <strong class="jxr_keyword">new</strong> KeyValue(bytes, bytes, bytes, other);
-<a class="jxr_linenumber" name="88" href="#88">88</a>      <strong class="jxr_keyword">this</strong>.memstore.add(samekey);
-<a class="jxr_linenumber" name="89" href="#89">89</a>      Cell found = <strong class="jxr_keyword">this</strong>.memstore.cellSet.first();
-<a class="jxr_linenumber" name="90" href="#90">90</a>      assertEquals(1, <strong class="jxr_keyword">this</strong>.memstore.cellSet.size());
-<a class="jxr_linenumber" name="91" href="#91">91</a>      assertTrue(
-<a class="jxr_linenumber" name="92" href="#92">92</a>        Bytes.toString(found.getValueArray(), found.getValueOffset(), found.getValueLength()),
-<a class="jxr_linenumber" name="93" href="#93">93</a>        CellUtil.matchingValue(samekey, found));
-<a class="jxr_linenumber" name="94" href="#94">94</a>    }
-<a class="jxr_linenumber" name="95" href="#95">95</a>  
-<a class="jxr_linenumber" name="96" href="#96">96</a>    <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="97" href="#97">97</a>  <em class="jxr_javadoccomment">   * Test memstore snapshot happening while scanning.</em>
-<a class="jxr_linenumber" name="98" href="#98">98</a>  <em class="jxr_javadoccomment">   * @throws IOException</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a>  <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanAcrossSnapshot() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">int</strong> rowCount = addRows(<strong class="jxr_keyword">this</strong>.memstore);
-<a class="jxr_linenumber" name="102" href="#102">102</a>     List&lt;KeyValueScanner&gt; memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(0);
-<a class="jxr_linenumber" name="103" href="#103">103</a>     Scan scan = <strong class="jxr_keyword">new</strong> Scan();
-<a class="jxr_linenumber" name="104" href="#104">104</a>     List&lt;Cell&gt; result = <strong class="jxr_keyword">new</strong> ArrayList&lt;Cell&gt;();
-<a class="jxr_linenumber" name="105" href="#105">105</a>     Configuration conf = HBaseConfiguration.create();
-<a class="jxr_linenumber" name="106" href="#106">106</a>     ScanInfo scanInfo =
-<a class="jxr_linenumber" name="107" href="#107">107</a>         <strong class="jxr_keyword">new</strong> ScanInfo(conf, <strong class="jxr_keyword">null</strong>, 0, 1, HConstants.LATEST_TIMESTAMP, KeepDeletedCells.FALSE, 0,
-<a class="jxr_linenumber" name="108" href="#108">108</a>             <strong class="jxr_keyword">this</strong>.memstore.comparator);
-<a class="jxr_linenumber" name="109" href="#109">109</a>     ScanType scanType = ScanType.USER_SCAN;
-<a class="jxr_linenumber" name="110" href="#110">110</a>     StoreScanner s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
-<a class="jxr_linenumber" name="111" href="#111">111</a>     <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="113" href="#113">113</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
-<a class="jxr_linenumber" name="114" href="#114">114</a>         LOG.info(result);
-<a class="jxr_linenumber" name="115" href="#115">115</a>         count++;
-<a class="jxr_linenumber" name="116" href="#116">116</a>         <em class="jxr_comment">// Row count is same as column count.</em>
-<a class="jxr_linenumber" name="117" href="#117">117</a>         assertEquals(rowCount, result.size());
-<a class="jxr_linenumber" name="118" href="#118">118</a>         result.clear();
-<a class="jxr_linenumber" name="119" href="#119">119</a>       }
-<a class="jxr_linenumber" name="120" href="#120">120</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="121" href="#121">121</a>       s.close();
-<a class="jxr_linenumber" name="122" href="#122">122</a>     }
-<a class="jxr_linenumber" name="123" href="#123">123</a>     assertEquals(rowCount, count);
-<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">for</strong> (KeyValueScanner scanner : memstorescanners) {
-<a class="jxr_linenumber" name="125" href="#125">125</a>       scanner.close();
-<a class="jxr_linenumber" name="126" href="#126">126</a>     }
-<a class="jxr_linenumber" name="127" href="#127">127</a> 
-<a class="jxr_linenumber" name="128" href="#128">128</a>     memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
-<a class="jxr_linenumber" name="129" href="#129">129</a>     <em class="jxr_comment">// Now assert can count same number even if a snapshot mid-scan.</em>
-<a class="jxr_linenumber" name="130" href="#130">130</a>     s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
-<a class="jxr_linenumber" name="131" href="#131">131</a>     count = 0;
-<a class="jxr_linenumber" name="132" href="#132">132</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="133" href="#133">133</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
-<a class="jxr_linenumber" name="134" href="#134">134</a>         LOG.info(result);
-<a class="jxr_linenumber" name="135" href="#135">135</a>         <em class="jxr_comment">// Assert the stuff is coming out in right order.</em>
-<a class="jxr_linenumber" name="136" href="#136">136</a>         assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));
-<a class="jxr_linenumber" name="137" href="#137">137</a>         count++;
-<a class="jxr_linenumber" name="138" href="#138">138</a>         <em class="jxr_comment">// Row count is same as column count.</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a>         assertEquals(rowCount, result.size());
-<a class="jxr_linenumber" name="140" href="#140">140</a>         <strong class="jxr_keyword">if</strong> (count == 2) {
-<a class="jxr_linenumber" name="141" href="#141">141</a>           <strong class="jxr_keyword">this</strong>.memstore.snapshot();
-<a class="jxr_linenumber" name="142" href="#142">142</a>           LOG.info(<span class="jxr_string">"Snapshotted"</span>);
-<a class="jxr_linenumber" name="143" href="#143">143</a>         }
-<a class="jxr_linenumber" name="144" href="#144">144</a>         result.clear();
-<a class="jxr_linenumber" name="145" href="#145">145</a>       }
-<a class="jxr_linenumber" name="146" href="#146">146</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="147" href="#147">147</a>       s.close();
-<a class="jxr_linenumber" name="148" href="#148">148</a>     }
-<a class="jxr_linenumber" name="149" href="#149">149</a>     assertEquals(rowCount, count);
-<a class="jxr_linenumber" name="150" href="#150">150</a>     <strong class="jxr_keyword">for</strong> (KeyValueScanner scanner : memstorescanners) {
-<a class="jxr_linenumber" name="151" href="#151">151</a>       scanner.close();
-<a class="jxr_linenumber" name="152" href="#152">152</a>     }
-<a class="jxr_linenumber" name="153" href="#153">153</a>     memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
-<a class="jxr_linenumber" name="154" href="#154">154</a>     <em class="jxr_comment">// Assert that new values are seen in kvset as we scan.</em>
-<a class="jxr_linenumber" name="155" href="#155">155</a>     <strong class="jxr_keyword">long</strong> ts = System.currentTimeMillis();
-<a class="jxr_linenumber" name="156" href="#156">156</a>     s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
-<a class="jxr_linenumber" name="157" href="#157">157</a>     count = 0;
-<a class="jxr_linenumber" name="158" href="#158">158</a>     <strong class="jxr_keyword">int</strong> snapshotIndex = 5;
-<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="160" href="#160">160</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
-<a class="jxr_linenumber" name="161" href="#161">161</a>         LOG.info(result);
-<a class="jxr_linenumber" name="162" href="#162">162</a>         <em class="jxr_comment">// Assert the stuff is coming out in right order.</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a>         assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));
-<a class="jxr_linenumber" name="164" href="#164">164</a>         <em class="jxr_comment">// Row count is same as column count.</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a>         assertEquals(<span class="jxr_string">"count="</span> + count + <span class="jxr_string">", result="</span> + result, rowCount, result.size());
-<a class="jxr_linenumber" name="166" href="#166">166</a>         count++;
-<a class="jxr_linenumber" name="167" href="#167">167</a>         <strong class="jxr_keyword">if</strong> (count == snapshotIndex) {
-<a class="jxr_linenumber" name="168" href="#168">168</a>           MemStoreSnapshot snapshot = <strong class="jxr_keyword">this</strong>.memstore.snapshot();
-<a class="jxr_linenumber" name="169" href="#169">169</a>           <strong class="jxr_keyword">this</strong>.memstore.clearSnapshot(snapshot.getId());
-<a class="jxr_linenumber" name="170" href="#170">170</a>           <em class="jxr_comment">// Added more rows into kvset.  But the scanner wont see these rows.</em>
-<a class="jxr_linenumber" name="171" href="#171">171</a>           addRows(<strong class="jxr_keyword">this</strong>.memstore, ts);
-<a class="jxr_linenumber" name="172" href="#172">172</a>           LOG.info(<span class="jxr_string">"Snapshotted, cleared it and then added values (which wont be seen)"</span>);
-<a class="jxr_linenumber" name="173" href="#173">173</a>         }
-<a class="jxr_linenumber" name="174" href="#174">174</a>         result.clear();
-<a class="jxr_linenumber" name="175" href="#175">175</a>       }
-<a class="jxr_linenumber" name="176" href="#176">176</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="177" href="#177">177</a>       s.close();
-<a class="jxr_linenumber" name="178" href="#178">178</a>     }
-<a class="jxr_linenumber" name="179" href="#179">179</a>     assertEquals(rowCount, count);
-<a class="jxr_linenumber" name="180" href="#180">180</a>   }
-<a class="jxr_linenumber" name="181" href="#181">181</a> 
-<a class="jxr_linenumber" name="182" href="#182">182</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_javadoccomment">   * A simple test which verifies the 3 possible states when scanning across snapshot.</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_javadoccomment">   * @throws CloneNotSupportedException</em>
-<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="187" href="#187">187</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanAcrossSnapshot2() <strong class="jxr_keyword">throws</strong> IOException, CloneNotSupportedException {
-<a class="jxr_linenumber" name="188" href="#188">188</a>     <em class="jxr_comment">// we are going to the scanning across snapshot with two kvs</em>
-<a class="jxr_linenumber" name="189" href="#189">189</a>     <em class="jxr_comment">// kv1 should always be returned before kv2</em>
-<a class="jxr_linenumber" name="190" href="#190">190</a>     <strong class="jxr_keyword">final</strong> byte[] one = Bytes.toBytes(1);
-<a class="jxr_linenumber" name="191" href="#191">191</a>     <strong class="jxr_keyword">final</strong> byte[] two = Bytes.toBytes(2);
-<a class="jxr_linenumber" name="192" href="#192">192</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"f"</span>);
-<a class="jxr_linenumber" name="193" href="#193">193</a>     <strong class="jxr_keyword">final</strong> byte[] q = Bytes.toBytes(<span class="jxr_string">"q"</span>);
-<a class="jxr_linenumber" name="194" href="#194">194</a>     <strong class="jxr_keyword">final</strong> byte[] v = Bytes.toBytes(3);
-<a class="jxr_linenumber" name="195" href="#195">195</a> 
-<a class="jxr_linenumber" name="196" href="#196">196</a>     <strong class="jxr_keyword">final</strong> KeyValue kv1 = <strong class="jxr_keyword">new</strong> KeyValue(one, f, q, v);
-<a class="jxr_linenumber" name="197" href="#197">197</a>     <strong class="jxr_keyword">final</strong> KeyValue kv2 = <strong class="jxr_keyword">new</strong> KeyValue(two, f, q, v);
+<a class="jxr_linenumber" name="64" href="#64">64</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
+<a class="jxr_linenumber" name="65" href="#65">65</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.when;
+<a class="jxr_linenumber" name="66" href="#66">66</a>  
+<a class="jxr_linenumber" name="67" href="#67">67</a>  <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> memstore test case */</em>
+<a class="jxr_linenumber" name="68" href="#68">68</a>  @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, MediumTests.<strong class="jxr_keyword">class</strong>})
+<a class="jxr_linenumber" name="69" href="#69">69</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">TestDefaultMemStore</a> <strong class="jxr_keyword">extends</strong> TestCase {
+<a class="jxr_linenumber" name="70" href="#70">70</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestDefaultMemStore.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="71" href="#71">71</a>    <strong class="jxr_keyword">private</strong> DefaultMemStore memstore;
+<a class="jxr_linenumber" name="72" href="#72">72</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROW_COUNT = 10;
+<a class="jxr_linenumber" name="73" href="#73">73</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> QUALIFIER_COUNT = ROW_COUNT;
+<a class="jxr_linenumber" name="74" href="#74">74</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte [] FAMILY = Bytes.toBytes(<span class="jxr_string">"column"</span>);
+<a class="jxr_linenumber" name="75" href="#75">75</a>    <strong class="jxr_keyword">private</strong> MultiVersionConcurrencyControl mvcc;
+<a class="jxr_linenumber" name="76" href="#76">76</a>    <strong class="jxr_keyword">private</strong> AtomicLong startSeqNum = <strong class="jxr_keyword">new</strong> AtomicLong(0);
+<a class="jxr_linenumber" name="77" href="#77">77</a>  
+<a class="jxr_linenumber" name="78" href="#78">78</a>    @Override
+<a class="jxr_linenumber" name="79" href="#79">79</a>    <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="80" href="#80">80</a>      <strong class="jxr_keyword">super</strong>.setUp();
+<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">this</strong>.mvcc = <strong class="jxr_keyword">new</strong> MultiVersionConcurrencyControl();
+<a class="jxr_linenumber" name="82" href="#82">82</a>      <strong class="jxr_keyword">this</strong>.memstore = <strong class="jxr_keyword">new</strong> DefaultMemStore();
+<a class="jxr_linenumber" name="83" href="#83">83</a>    }
+<a class="jxr_linenumber" name="84" href="#84">84</a>  
+<a class="jxr_linenumber" name="85" href="#85">85</a>    <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPutSameKey() {
+<a class="jxr_linenumber" name="86" href="#86">86</a>      byte [] bytes = Bytes.toBytes(getName());
+<a class="jxr_linenumber" name="87" href="#87">87</a>      KeyValue kv = <strong class="jxr_keyword">new</strong> KeyValue(bytes, bytes, bytes, bytes);
+<a class="jxr_linenumber" name="88" href="#88">88</a>      <strong class="jxr_keyword">this</strong>.memstore.add(kv);
+<a class="jxr_linenumber" name="89" href="#89">89</a>      byte [] other = Bytes.toBytes(<span class="jxr_string">"somethingelse"</span>);
+<a class="jxr_linenumber" name="90" href="#90">90</a>      KeyValue samekey = <strong class="jxr_keyword">new</strong> KeyValue(bytes, bytes, bytes, other);
+<a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">this</strong>.memstore.add(samekey);
+<a class="jxr_linenumber" name="92" href="#92">92</a>      Cell found = <strong class="jxr_keyword">this</strong>.memstore.cellSet.first();
+<a class="jxr_linenumber" name="93" href="#93">93</a>      assertEquals(1, <strong class="jxr_keyword">this</strong>.memstore.cellSet.size());
+<a class="jxr_linenumber" name="94" href="#94">94</a>      assertTrue(
+<a class="jxr_linenumber" name="95" href="#95">95</a>        Bytes.toString(found.getValueArray(), found.getValueOffset(), found.getValueLength()),
+<a class="jxr_linenumber" name="96" href="#96">96</a>        CellUtil.matchingValue(samekey, found));
+<a class="jxr_linenumber" name="97" href="#97">97</a>    }
+<a class="jxr_linenumber" name="98" href="#98">98</a>  
+<a class="jxr_linenumber" name="99" href="#99">99</a>    <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment">   * Test memstore snapshot happening while scanning.</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="103" href="#103">103</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanAcrossSnapshot() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="104" href="#104">104</a>     <strong class="jxr_keyword">int</strong> rowCount = addRows(<strong class="jxr_keyword">this</strong>.memstore);
+<a class="jxr_linenumber" name="105" href="#105">105</a>     List&lt;KeyValueScanner&gt; memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(0);
+<a class="jxr_linenumber" name="106" href="#106">106</a>     Scan scan = <strong class="jxr_keyword">new</strong> Scan();
+<a class="jxr_linenumber" name="107" href="#107">107</a>     List&lt;Cell&gt; result = <strong class="jxr_keyword">new</strong> ArrayList&lt;Cell&gt;();
+<a class="jxr_linenumber" name="108" href="#108">108</a>     Configuration conf = HBaseConfiguration.create();
+<a class="jxr_linenumber" name="109" href="#109">109</a>     ScanInfo scanInfo =
+<a class="jxr_linenumber" name="110" href="#110">110</a>         <strong class="jxr_keyword">new</strong> ScanInfo(conf, <strong class="jxr_keyword">null</strong>, 0, 1, HConstants.LATEST_TIMESTAMP, KeepDeletedCells.FALSE, 0,
+<a class="jxr_linenumber" name="111" href="#111">111</a>             <strong class="jxr_keyword">this</strong>.memstore.comparator);
+<a class="jxr_linenumber" name="112" href="#112">112</a>     ScanType scanType = ScanType.USER_SCAN;
+<a class="jxr_linenumber" name="113" href="#113">113</a>     StoreScanner s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
+<a class="jxr_linenumber" name="114" href="#114">114</a>     <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="115" href="#115">115</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="116" href="#116">116</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
+<a class="jxr_linenumber" name="117" href="#117">117</a>         LOG.info(result);
+<a class="jxr_linenumber" name="118" href="#118">118</a>         count++;
+<a class="jxr_linenumber" name="119" href="#119">119</a>         <em class="jxr_comment">// Row count is same as column count.</em>
+<a class="jxr_linenumber" name="120" href="#120">120</a>         assertEquals(rowCount, result.size());
+<a class="jxr_linenumber" name="121" href="#121">121</a>         result.clear();
+<a class="jxr_linenumber" name="122" href="#122">122</a>       }
+<a class="jxr_linenumber" name="123" href="#123">123</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="124" href="#124">124</a>       s.close();
+<a class="jxr_linenumber" name="125" href="#125">125</a>     }
+<a class="jxr_linenumber" name="126" href="#126">126</a>     assertEquals(rowCount, count);
+<a class="jxr_linenumber" name="127" href="#127">127</a>     <strong class="jxr_keyword">for</strong> (KeyValueScanner scanner : memstorescanners) {
+<a class="jxr_linenumber" name="128" href="#128">128</a>       scanner.close();
+<a class="jxr_linenumber" name="129" href="#129">129</a>     }
+<a class="jxr_linenumber" name="130" href="#130">130</a> 
+<a class="jxr_linenumber" name="131" href="#131">131</a>     memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
+<a class="jxr_linenumber" name="132" href="#132">132</a>     <em class="jxr_comment">// Now assert can count same number even if a snapshot mid-scan.</em>
+<a class="jxr_linenumber" name="133" href="#133">133</a>     s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
+<a class="jxr_linenumber" name="134" href="#134">134</a>     count = 0;
+<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="136" href="#136">136</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
+<a class="jxr_linenumber" name="137" href="#137">137</a>         LOG.info(result);
+<a class="jxr_linenumber" name="138" href="#138">138</a>         <em class="jxr_comment">// Assert the stuff is coming out in right order.</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a>         assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));
+<a class="jxr_linenumber" name="140" href="#140">140</a>         count++;
+<a class="jxr_linenumber" name="141" href="#141">141</a>         <em class="jxr_comment">// Row count is same as column count.</em>
+<a class="jxr_linenumber" name="142" href="#142">142</a>         assertEquals(rowCount, result.size());
+<a class="jxr_linenumber" name="143" href="#143">143</a>         <strong class="jxr_keyword">if</strong> (count == 2) {
+<a class="jxr_linenumber" name="144" href="#144">144</a>           <strong class="jxr_keyword">this</strong>.memstore.snapshot();
+<a class="jxr_linenumber" name="145" href="#145">145</a>           LOG.info(<span class="jxr_string">"Snapshotted"</span>);
+<a class="jxr_linenumber" name="146" href="#146">146</a>         }
+<a class="jxr_linenumber" name="147" href="#147">147</a>         result.clear();
+<a class="jxr_linenumber" name="148" href="#148">148</a>       }
+<a class="jxr_linenumber" name="149" href="#149">149</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="150" href="#150">150</a>       s.close();
+<a class="jxr_linenumber" name="151" href="#151">151</a>     }
+<a class="jxr_linenumber" name="152" href="#152">152</a>     assertEquals(rowCount, count);
+<a class="jxr_linenumber" name="153" href="#153">153</a>     <strong class="jxr_keyword">for</strong> (KeyValueScanner scanner : memstorescanners) {
+<a class="jxr_linenumber" name="154" href="#154">154</a>       scanner.close();
+<a class="jxr_linenumber" name="155" href="#155">155</a>     }
+<a class="jxr_linenumber" name="156" href="#156">156</a>     memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
+<a class="jxr_linenumber" name="157" href="#157">157</a>     <em class="jxr_comment">// Assert that new values are seen in kvset as we scan.</em>
+<a class="jxr_linenumber" name="158" href="#158">158</a>     <strong class="jxr_keyword">long</strong> ts = System.currentTimeMillis();
+<a class="jxr_linenumber" name="159" href="#159">159</a>     s = <strong class="jxr_keyword">new</strong> StoreScanner(scan, scanInfo, scanType, <strong class="jxr_keyword">null</strong>, memstorescanners);
+<a class="jxr_linenumber" name="160" href="#160">160</a>     count = 0;
+<a class="jxr_linenumber" name="161" href="#161">161</a>     <strong class="jxr_keyword">int</strong> snapshotIndex = 5;
+<a class="jxr_linenumber" name="162" href="#162">162</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="163" href="#163">163</a>       <strong class="jxr_keyword">while</strong> (s.next(result)) {
+<a class="jxr_linenumber" name="164" href="#164">164</a>         LOG.info(result);
+<a class="jxr_linenumber" name="165" href="#165">165</a>         <em class="jxr_comment">// Assert the stuff is coming out in right order.</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a>         assertTrue(CellUtil.matchingRow(result.get(0), Bytes.toBytes(count)));
+<a class="jxr_linenumber" name="167" href="#167">167</a>         <em class="jxr_comment">// Row count is same as column count.</em>
+<a class="jxr_linenumber" name="168" href="#168">168</a>         assertEquals(<span class="jxr_string">"count="</span> + count + <span class="jxr_string">", result="</span> + result, rowCount, result.size());
+<a class="jxr_linenumber" name="169" href="#169">169</a>         count++;
+<a class="jxr_linenumber" name="170" href="#170">170</a>         <strong class="jxr_keyword">if</strong> (count == snapshotIndex) {
+<a class="jxr_linenumber" name="171" href="#171">171</a>           MemStoreSnapshot snapshot = <strong class="jxr_keyword">this</strong>.memstore.snapshot();
+<a class="jxr_linenumber" name="172" href="#172">172</a>           <strong class="jxr_keyword">this</strong>.memstore.clearSnapshot(snapshot.getId());
+<a class="jxr_linenumber" name="173" href="#173">173</a>           <em class="jxr_comment">// Added more rows into kvset.  But the scanner wont see these rows.</em>
+<a class="jxr_linenumber" name="174" href="#174">174</a>           addRows(<strong class="jxr_keyword">this</strong>.memstore, ts);
+<a class="jxr_linenumber" name="175" href="#175">175</a>           LOG.info(<span class="jxr_string">"Snapshotted, cleared it and then added values (which wont be seen)"</span>);
+<a class="jxr_linenumber" name="176" href="#176">176</a>         }
+<a class="jxr_linenumber" name="177" href="#177">177</a>         result.clear();
+<a class="jxr_linenumber" name="178" href="#178">178</a>       }
+<a class="jxr_linenumber" name="179" href="#179">179</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="180" href="#180">180</a>       s.close();
+<a class="jxr_linenumber" name="181" href="#181">181</a>     }
+<a class="jxr_linenumber" name="182" href="#182">182</a>     assertEquals(rowCount, count);
+<a class="jxr_linenumber" name="183" href="#183">183</a>   }
+<a class="jxr_linenumber" name="184" href="#184">184</a> 
+<a class="jxr_linenumber" name="185" href="#185">185</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_javadoccomment">   * A simple test which verifies the 3 possible states when scanning across snapshot.</em>
+<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
+<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_javadoccomment">   * @throws CloneNotSupportedException</em>
+<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="190" href="#190">190</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanAcrossSnapshot2() <strong class="jxr_keyword">throws</strong> IOException, CloneNotSupportedException {
+<a class="jxr_linenumber" name="191" href="#191">191</a>     <em class="jxr_comment">// we are going to the scanning across snapshot with two kvs</em>
+<a class="jxr_linenumber" name="192" href="#192">192</a>     <em class="jxr_comment">// kv1 should always be returned before kv2</em>
+<a class="jxr_linenumber" name="193" href="#193">193</a>     <strong class="jxr_keyword">final</strong> byte[] one = Bytes.toBytes(1);
+<a class="jxr_linenumber" name="194" href="#194">194</a>     <strong class="jxr_keyword">final</strong> byte[] two = Bytes.toBytes(2);
+<a class="jxr_linenumber" name="195" href="#195">195</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"f"</span>);
+<a class="jxr_linenumber" name="196" href="#196">196</a>     <strong class="jxr_keyword">final</strong> byte[] q = Bytes.toBytes(<span class="jxr_string">"q"</span>);
+<a class="jxr_linenumber" name="197" href="#197">197</a>     <strong class="jxr_keyword">final</strong> byte[] v = Bytes.toBytes(3);
 <a class="jxr_linenumber" name="198" href="#198">198</a> 
-<a class="jxr_linenumber" name="199" href="#199">199</a>     <em class="jxr_comment">// use case 1: both kvs in kvset</em>
-<a class="jxr_linenumber" name="200" href="#200">200</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv1.clone());
-<a class="jxr_linenumber" name="201" href="#201">201</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv2.clone());
-<a class="jxr_linenumber" name="202" href="#202">202</a>     verifyScanAcrossSnapshot2(kv1, kv2);
-<a class="jxr_linenumber" name="203" href="#203">203</a> 
-<a class="jxr_linenumber" name="204" href="#204">204</a>     <em class="jxr_comment">// use case 2: both kvs in snapshot</em>
-<a class="jxr_linenumber" name="205" href="#205">205</a>     <strong class="jxr_keyword">this</strong>.memstore.snapshot();
-<a class="jxr_linenumber" name="206" href="#206">206</a>     verifyScanAcrossSnapshot2(kv1, kv2);
-<a class="jxr_linenumber" name="207" href="#207">207</a> 
-<a class="jxr_linenumber" name="208" href="#208">208</a>     <em class="jxr_comment">// use case 3: first in snapshot second in kvset</em>
-<a class="jxr_linenumber" name="209" href="#209">209</a>     <strong class="jxr_keyword">this</strong>.memstore = <strong class="jxr_keyword">new</strong> DefaultMemStore();
-<a class="jxr_linenumber" name="210" href="#210">210</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv1.clone());
-<a class="jxr_linenumber" name="211" href="#211">211</a>     <strong class="jxr_keyword">this</strong>.memstore.snapshot();
-<a class="jxr_linenumber" name="212" href="#212">212</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv2.clone());
-<a class="jxr_linenumber" name="213" href="#213">213</a>     verifyScanAcrossSnapshot2(kv1, kv2);
-<a class="jxr_linenumber" name="214" href="#214">214</a>   }
-<a class="jxr_linenumber" name="215" href="#215">215</a> 
-<a class="jxr_linenumber" name="216" href="#216">216</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> verifyScanAcrossSnapshot2(KeyValue kv1, KeyValue kv2)
-<a class="jxr_linenumber" name="217" href="#217">217</a>       <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="218" href="#218">218</a>     List&lt;KeyValueScanner&gt; memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
-<a class="jxr_linenumber" name="219" href="#219">219</a>     assertEquals(1, memstorescanners.size());
-<a class="jxr_linenumber" name="220" href="#220">220</a>     <strong class="jxr_keyword">final</strong> KeyValueScanner scanner = memstorescanners.get(0);
-<a class="jxr_linenumber" name="221" href="#221">221</a>     scanner.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));
-<a class="jxr_linenumber" name="222" href="#222">222</a>     assertEquals(kv1, scanner.next());
-<a class="jxr_linenumber" name="223" href="#223">223</a>     assertEquals(kv2, scanner.next());
-<a class="jxr_linenumber" name="224" href="#224">224</a>     assertNull(scanner.next());
-<a class="jxr_linenumber" name="225" href="#225">225</a>   }
-<a class="jxr_linenumber" name="226" href="#226">226</a> 
-<a class="jxr_linenumber" name="227" href="#227">227</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> assertScannerResults(KeyValueScanner scanner, KeyValue[] expected)
-<a class="jxr_linenumber" name="228" href="#228">228</a>       <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="229" href="#229">229</a>     scanner.seek(KeyValueUtil.createFirstOnRow(<strong class="jxr_keyword">new</strong> byte[]{}));
-<a class="jxr_linenumber" name="230" href="#230">230</a>     List&lt;Cell&gt; returned = Lists.newArrayList();
-<a class="jxr_linenumber" name="231" href="#231">231</a> 
-<a class="jxr_linenumber" name="232" href="#232">232</a>     <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="233" href="#233">233</a>       Cell next = scanner.next();
-<a class="jxr_linenumber" name="234" href="#234">234</a>       <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="235" href="#235">235</a>       returned.add(next);
-<a class="jxr_linenumber" name="236" href="#236">236</a>     }
-<a class="jxr_linenumber" name="237" href="#237">237</a> 
-<a class="jxr_linenumber" name="238" href="#238">238</a>     assertTrue(
-<a class="jxr_linenumber" name="239" href="#239">239</a>         <span class="jxr_string">"Got:\n"</span> + Joiner.on(<span class="jxr_string">"\n"</span>).join(returned) +
-<a class="jxr_linenumber" name="240" href="#240">240</a>         <span class="jxr_string">"\nExpected:\n"</span> + Joiner.on(<span class="jxr_string">"\n"</span>).join(expected),
-<a class="jxr_linenumber" name="241" href="#241">241</a>         Iterables.elementsEqual(Arrays.asList(expected), returned));
-<a class="jxr_linenumber" name="242" href="#242">242</a>     assertNull(scanner.peek());
-<a class="jxr_linenumber" name="243" href="#243">243</a>   }
-<a class="jxr_linenumber" name="244" href="#244">244</a> 
-<a class="jxr_linenumber" name="245" href="#245">245</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreConcurrentControl() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="246" href="#246">246</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
-<a class="jxr_linenumber" name="247" href="#247">247</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
-<a class="jxr_linenumber" name="248" href="#248">248</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
-<a class="jxr_linenumber" name="249" href="#249">249</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
-<a class="jxr_linenumber" name="250" href="#250">250</a>     <strong class="jxr_keyword">final</strong> byte[] v = Bytes.toBytes(<span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="251" href="#251">251</a> 
-<a class="jxr_linenumber" name="252" href="#252">252</a>     MultiVersionConcurrencyControl.WriteEntry w =
-<a class="jxr_linenumber" name="253" href="#253">253</a>         mvcc.begin();
+<a class="jxr_linenumber" name="199" href="#199">199</a>     <strong class="jxr_keyword">final</strong> KeyValue kv1 = <strong class="jxr_keyword">new</strong> KeyValue(one, f, q, v);
+<a class="jxr_linenumber" name="200" href="#200">200</a>     <strong class="jxr_keyword">final</strong> KeyValue kv2 = <strong class="jxr_keyword">new</strong> KeyValue(two, f, q, v);
+<a class="jxr_linenumber" name="201" href="#201">201</a> 
+<a class="jxr_linenumber" name="202" href="#202">202</a>     <em class="jxr_comment">// use case 1: both kvs in kvset</em>
+<a class="jxr_linenumber" name="203" href="#203">203</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv1.clone());
+<a class="jxr_linenumber" name="204" href="#204">204</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv2.clone());
+<a class="jxr_linenumber" name="205" href="#205">205</a>     verifyScanAcrossSnapshot2(kv1, kv2);
+<a class="jxr_linenumber" name="206" href="#206">206</a> 
+<a class="jxr_linenumber" name="207" href="#207">207</a>     <em class="jxr_comment">// use case 2: both kvs in snapshot</em>
+<a class="jxr_linenumber" name="208" href="#208">208</a>     <strong class="jxr_keyword">this</strong>.memstore.snapshot();
+<a class="jxr_linenumber" name="209" href="#209">209</a>     verifyScanAcrossSnapshot2(kv1, kv2);
+<a class="jxr_linenumber" name="210" href="#210">210</a> 
+<a class="jxr_linenumber" name="211" href="#211">211</a>     <em class="jxr_comment">// use case 3: first in snapshot second in kvset</em>
+<a class="jxr_linenumber" name="212" href="#212">212</a>     <strong class="jxr_keyword">this</strong>.memstore = <strong class="jxr_keyword">new</strong> DefaultMemStore();
+<a class="jxr_linenumber" name="213" href="#213">213</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv1.clone());
+<a class="jxr_linenumber" name="214" href="#214">214</a>     <strong class="jxr_keyword">this</strong>.memstore.snapshot();
+<a class="jxr_linenumber" name="215" href="#215">215</a>     <strong class="jxr_keyword">this</strong>.memstore.add(kv2.clone());
+<a class="jxr_linenumber" name="216" href="#216">216</a>     verifyScanAcrossSnapshot2(kv1, kv2);
+<a class="jxr_linenumber" name="217" href="#217">217</a>   }
+<a class="jxr_linenumber" name="218" href="#218">218</a> 
+<a class="jxr_linenumber" name="219" href="#219">219</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> verifyScanAcrossSnapshot2(KeyValue kv1, KeyValue kv2)
+<a class="jxr_linenumber" name="220" href="#220">220</a>       <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="221" href="#221">221</a>     List&lt;KeyValueScanner&gt; memstorescanners = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint());
+<a class="jxr_linenumber" name="222" href="#222">222</a>     assertEquals(1, memstorescanners.size());
+<a class="jxr_linenumber" name="223" href="#223">223</a>     <strong class="jxr_keyword">final</strong> KeyValueScanner scanner = memstorescanners.get(0);
+<a class="jxr_linenumber" name="224" href="#224">224</a>     scanner.seek(KeyValueUtil.createFirstOnRow(HConstants.EMPTY_START_ROW));
+<a class="jxr_linenumber" name="225" href="#225">225</a>     assertEquals(kv1, scanner.next());
+<a class="jxr_linenumber" name="226" href="#226">226</a>     assertEquals(kv2, scanner.next());
+<a class="jxr_linenumber" name="227" href="#227">227</a>     assertNull(scanner.next());
+<a class="jxr_linenumber" name="228" href="#228">228</a>   }
+<a class="jxr_linenumber" name="229" href="#229">229</a> 
+<a class="jxr_linenumber" name="230" href="#230">230</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> assertScannerResults(KeyValueScanner scanner, KeyValue[] expected)
+<a class="jxr_linenumber" name="231" href="#231">231</a>       <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="232" href="#232">232</a>     scanner.seek(KeyValueUtil.createFirstOnRow(<strong class="jxr_keyword">new</strong> byte[]{}));
+<a class="jxr_linenumber" name="233" href="#233">233</a>     List&lt;Cell&gt; returned = Lists.newArrayList();
+<a class="jxr_linenumber" name="234" href="#234">234</a> 
+<a class="jxr_linenumber" name="235" href="#235">235</a>     <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="236" href="#236">236</a>       Cell next = scanner.next();
+<a class="jxr_linenumber" name="237" href="#237">237</a>       <strong class="jxr_keyword">if</strong> (next == <strong class="jxr_keyword">null</strong>) <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="238" href="#238">238</a>       returned.add(next);
+<a class="jxr_linenumber" name="239" href="#239">239</a>     }
+<a class="jxr_linenumber" name="240" href="#240">240</a> 
+<a class="jxr_linenumber" name="241" href="#241">241</a>     assertTrue(
+<a class="jxr_linenumber" name="242" href="#242">242</a>         <span class="jxr_string">"Got:\n"</span> + Joiner.on(<span class="jxr_string">"\n"</span>).join(returned) +
+<a class="jxr_linenumber" name="243" href="#243">243</a>         <span class="jxr_string">"\nExpected:\n"</span> + Joiner.on(<span class="jxr_string">"\n"</span>).join(expected),
+<a class="jxr_linenumber" name="244" href="#244">244</a>         Iterables.elementsEqual(Arrays.asList(expected), returned));
+<a class="jxr_linenumber" name="245" href="#245">245</a>     assertNull(scanner.peek());
+<a class="jxr_linenumber" name="246" href="#246">246</a>   }
+<a class="jxr_linenumber" name="247" href="#247">247</a> 
+<a class="jxr_linenumber" name="248" href="#248">248</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreConcurrentControl() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="249" href="#249">249</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
+<a class="jxr_linenumber" name="250" href="#250">250</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
+<a class="jxr_linenumber" name="251" href="#251">251</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
+<a class="jxr_linenumber" name="252" href="#252">252</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
+<a class="jxr_linenumber" name="253" href="#253">253</a>     <strong class="jxr_keyword">final</strong> byte[] v = Bytes.toBytes(<span class="jxr_string">"value"</span>);
 <a class="jxr_linenumber" name="254" href="#254">254</a> 
-<a class="jxr_linenumber" name="255" href="#255">255</a>     KeyValue kv1 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v);
-<a class="jxr_linenumber" name="256" href="#256">256</a>     kv1.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="257" href="#257">257</a>     memstore.add(kv1);
-<a class="jxr_linenumber" name="258" href="#258">258</a> 
-<a class="jxr_linenumber" name="259" href="#259">259</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="260" href="#260">260</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{});
+<a class="jxr_linenumber" name="255" href="#255">255</a>     MultiVersionConcurrencyControl.WriteEntry w =
+<a class="jxr_linenumber" name="256" href="#256">256</a>         mvcc.begin();
+<a class="jxr_linenumber" name="257" href="#257">257</a> 
+<a class="jxr_linenumber" name="258" href="#258">258</a>     KeyValue kv1 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v);
+<a class="jxr_linenumber" name="259" href="#259">259</a>     kv1.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="260" href="#260">260</a>     memstore.add(kv1);
 <a class="jxr_linenumber" name="261" href="#261">261</a> 
-<a class="jxr_linenumber" name="262" href="#262">262</a>     mvcc.completeAndWait(w);
-<a class="jxr_linenumber" name="263" href="#263">263</a> 
-<a class="jxr_linenumber" name="264" href="#264">264</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="265" href="#265">265</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1});
+<a class="jxr_linenumber" name="262" href="#262">262</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="263" href="#263">263</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{});
+<a class="jxr_linenumber" name="264" href="#264">264</a> 
+<a class="jxr_linenumber" name="265" href="#265">265</a>     mvcc.completeAndWait(w);
 <a class="jxr_linenumber" name="266" href="#266">266</a> 
-<a class="jxr_linenumber" name="267" href="#267">267</a>     w = mvcc.begin();
-<a class="jxr_linenumber" name="268" href="#268">268</a>     KeyValue kv2 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v);
-<a class="jxr_linenumber" name="269" href="#269">269</a>     kv2.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="270" href="#270">270</a>     memstore.add(kv2);
-<a class="jxr_linenumber" name="271" href="#271">271</a> 
-<a class="jxr_linenumber" name="272" href="#272">272</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="273" href="#273">273</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1});
+<a class="jxr_linenumber" name="267" href="#267">267</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="268" href="#268">268</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1});
+<a class="jxr_linenumber" name="269" href="#269">269</a> 
+<a class="jxr_linenumber" name="270" href="#270">270</a>     w = mvcc.begin();
+<a class="jxr_linenumber" name="271" href="#271">271</a>     KeyValue kv2 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v);
+<a class="jxr_linenumber" name="272" href="#272">272</a>     kv2.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="273" href="#273">273</a>     memstore.add(kv2);
 <a class="jxr_linenumber" name="274" href="#274">274</a> 
-<a class="jxr_linenumber" name="275" href="#275">275</a>     mvcc.completeAndWait(w);
-<a class="jxr_linenumber" name="276" href="#276">276</a> 
-<a class="jxr_linenumber" name="277" href="#277">277</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="278" href="#278">278</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1, kv2});
-<a class="jxr_linenumber" name="279" href="#279">279</a>   }
-<a class="jxr_linenumber" name="280" href="#280">280</a> 
-<a class="jxr_linenumber" name="281" href="#281">281</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_javadoccomment">   * Regression test for HBASE-2616, HBASE-2670.</em>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_javadoccomment">   * When we insert a higher-memstoreTS version of a cell but with</em>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_javadoccomment">   * the same timestamp, we still need to provide consistent reads</em>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_javadoccomment">   * for the same scanner.</em>
-<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="287" href="#287">287</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreEditsVisibilityWithSameKey() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="288" href="#288">288</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
-<a class="jxr_linenumber" name="289" href="#289">289</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
-<a class="jxr_linenumber" name="290" href="#290">290</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
-<a class="jxr_linenumber" name="291" href="#291">291</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
-<a class="jxr_linenumber" name="292" href="#292">292</a>     <strong class="jxr_keyword">final</strong> byte[] v1 = Bytes.toBytes(<span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">final</strong> byte[] v2 = Bytes.toBytes(<span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="294" href="#294">294</a> 
-<a class="jxr_linenumber" name="295" href="#295">295</a>     <em class="jxr_comment">// INSERT 1: Write both columns val1</em>
-<a class="jxr_linenumber" name="296" href="#296">296</a>     MultiVersionConcurrencyControl.WriteEntry w =
-<a class="jxr_linenumber" name="297" href="#297">297</a>         mvcc.begin();
-<a class="jxr_linenumber" name="298" href="#298">298</a> 
-<a class="jxr_linenumber" name="299" href="#299">299</a>     KeyValue kv11 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v1);
-<a class="jxr_linenumber" name="300" href="#300">300</a>     kv11.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="301" href="#301">301</a>     memstore.add(kv11);
-<a class="jxr_linenumber" name="302" href="#302">302</a> 
-<a class="jxr_linenumber" name="303" href="#303">303</a>     KeyValue kv12 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v1);
-<a class="jxr_linenumber" name="304" href="#304">304</a>     kv12.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="305" href="#305">305</a>     memstore.add(kv12);
-<a class="jxr_linenumber" name="306" href="#306">306</a>     mvcc.completeAndWait(w);
-<a class="jxr_linenumber" name="307" href="#307">307</a> 
-<a class="jxr_linenumber" name="308" href="#308">308</a>     <em class="jxr_comment">// BEFORE STARTING INSERT 2, SEE FIRST KVS</em>
-<a class="jxr_linenumber" name="309" href="#309">309</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="310" href="#310">310</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
-<a class="jxr_linenumber" name="311" href="#311">311</a> 
-<a class="jxr_linenumber" name="312" href="#312">312</a>     <em class="jxr_comment">// START INSERT 2: Write both columns val2</em>
-<a class="jxr_linenumber" name="313" href="#313">313</a>     w = mvcc.begin();
-<a class="jxr_linenumber" name="314" href="#314">314</a>     KeyValue kv21 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v2);
-<a class="jxr_linenumber" name="315" href="#315">315</a>     kv21.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="316" href="#316">316</a>     memstore.add(kv21);
-<a class="jxr_linenumber" name="317" href="#317">317</a> 
-<a class="jxr_linenumber" name="318" href="#318">318</a>     KeyValue kv22 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v2);
-<a class="jxr_linenumber" name="319" href="#319">319</a>     kv22.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="320" href="#320">320</a>     memstore.add(kv22);
-<a class="jxr_linenumber" name="321" href="#321">321</a> 
-<a class="jxr_linenumber" name="322" href="#322">322</a>     <em class="jxr_comment">// BEFORE COMPLETING INSERT 2, SEE FIRST KVS</em>
-<a class="jxr_linenumber" name="323" href="#323">323</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="324" href="#324">324</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
-<a class="jxr_linenumber" name="325" href="#325">325</a> 
-<a class="jxr_linenumber" name="326" href="#326">326</a>     <em class="jxr_comment">// COMPLETE INSERT 2</em>
-<a class="jxr_linenumber" name="327" href="#327">327</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="275" href="#275">275</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="276" href="#276">276</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1});
+<a class="jxr_linenumber" name="277" href="#277">277</a> 
+<a class="jxr_linenumber" name="278" href="#278">278</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="279" href="#279">279</a> 
+<a class="jxr_linenumber" name="280" href="#280">280</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="281" href="#281">281</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv1, kv2});
+<a class="jxr_linenumber" name="282" href="#282">282</a>   }
+<a class="jxr_linenumber" name="283" href="#283">283</a> 
+<a class="jxr_linenumber" name="284" href="#284">284</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_javadoccomment">   * Regression test for HBASE-2616, HBASE-2670.</em>
+<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_javadoccomment">   * When we insert a higher-memstoreTS version of a cell but with</em>
+<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_javadoccomment">   * the same timestamp, we still need to provide consistent reads</em>
+<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_javadoccomment">   * for the same scanner.</em>
+<a class="jxr_linenumber" name="289" href="#289">289</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="290" href="#290">290</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreEditsVisibilityWithSameKey() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="291" href="#291">291</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
+<a class="jxr_linenumber" name="292" href="#292">292</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
+<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
+<a class="jxr_linenumber" name="294" href="#294">294</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
+<a class="jxr_linenumber" name="295" href="#295">295</a>     <strong class="jxr_keyword">final</strong> byte[] v1 = Bytes.toBytes(<span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="296" href="#296">296</a>     <strong class="jxr_keyword">final</strong> byte[] v2 = Bytes.toBytes(<span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="297" href="#297">297</a> 
+<a class="jxr_linenumber" name="298" href="#298">298</a>     <em class="jxr_comment">// INSERT 1: Write both columns val1</em>
+<a class="jxr_linenumber" name="299" href="#299">299</a>     MultiVersionConcurrencyControl.WriteEntry w =
+<a class="jxr_linenumber" name="300" href="#300">300</a>         mvcc.begin();
+<a class="jxr_linenumber" name="301" href="#301">301</a> 
+<a class="jxr_linenumber" name="302" href="#302">302</a>     KeyValue kv11 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v1);
+<a class="jxr_linenumber" name="303" href="#303">303</a>     kv11.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="304" href="#304">304</a>     memstore.add(kv11);
+<a class="jxr_linenumber" name="305" href="#305">305</a> 
+<a class="jxr_linenumber" name="306" href="#306">306</a>     KeyValue kv12 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v1);
+<a class="jxr_linenumber" name="307" href="#307">307</a>     kv12.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="308" href="#308">308</a>     memstore.add(kv12);
+<a class="jxr_linenumber" name="309" href="#309">309</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="310" href="#310">310</a> 
+<a class="jxr_linenumber" name="311" href="#311">311</a>     <em class="jxr_comment">// BEFORE STARTING INSERT 2, SEE FIRST KVS</em>
+<a class="jxr_linenumber" name="312" href="#312">312</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="313" href="#313">313</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
+<a class="jxr_linenumber" name="314" href="#314">314</a> 
+<a class="jxr_linenumber" name="315" href="#315">315</a>     <em class="jxr_comment">// START INSERT 2: Write both columns val2</em>
+<a class="jxr_linenumber" name="316" href="#316">316</a>     w = mvcc.begin();
+<a class="jxr_linenumber" name="317" href="#317">317</a>     KeyValue kv21 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v2);
+<a class="jxr_linenumber" name="318" href="#318">318</a>     kv21.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="319" href="#319">319</a>     memstore.add(kv21);
+<a class="jxr_linenumber" name="320" href="#320">320</a> 
+<a class="jxr_linenumber" name="321" href="#321">321</a>     KeyValue kv22 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v2);
+<a class="jxr_linenumber" name="322" href="#322">322</a>     kv22.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="323" href="#323">323</a>     memstore.add(kv22);
+<a class="jxr_linenumber" name="324" href="#324">324</a> 
+<a class="jxr_linenumber" name="325" href="#325">325</a>     <em class="jxr_comment">// BEFORE COMPLETING INSERT 2, SEE FIRST KVS</em>
+<a class="jxr_linenumber" name="326" href="#326">326</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="327" href="#327">327</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
 <a class="jxr_linenumber" name="328" href="#328">328</a> 
-<a class="jxr_linenumber" name="329" href="#329">329</a>     <em class="jxr_comment">// NOW SHOULD SEE NEW KVS IN ADDITION TO OLD KVS.</em>
-<a class="jxr_linenumber" name="330" href="#330">330</a>     <em class="jxr_comment">// See HBASE-1485 for discussion about what we should do with</em>
-<a class="jxr_linenumber" name="331" href="#331">331</a>     <em class="jxr_comment">// the duplicate-TS inserts</em>
-<a class="jxr_linenumber" name="332" href="#332">332</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="333" href="#333">333</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv21, kv11, kv22, kv12});
-<a class="jxr_linenumber" name="334" href="#334">334</a>   }
-<a class="jxr_linenumber" name="335" href="#335">335</a> 
-<a class="jxr_linenumber" name="336" href="#336">336</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="337" href="#337">337</a> <em class="jxr_javadoccomment">   * When we insert a higher-memstoreTS deletion of a cell but with</em>
-<a class="jxr_linenumber" name="338" href="#338">338</a> <em class="jxr_javadoccomment">   * the same timestamp, we still need to provide consistent reads</em>
-<a class="jxr_linenumber" name="339" href="#339">339</a> <em class="jxr_javadoccomment">   * for the same scanner.</em>
-<a class="jxr_linenumber" name="340" href="#340">340</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="341" href="#341">341</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreDeletesVisibilityWithSameKey() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="342" href="#342">342</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
-<a class="jxr_linenumber" name="343" href="#343">343</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
-<a class="jxr_linenumber" name="344" href="#344">344</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
-<a class="jxr_linenumber" name="345" href="#345">345</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
-<a class="jxr_linenumber" name="346" href="#346">346</a>     <strong class="jxr_keyword">final</strong> byte[] v1 = Bytes.toBytes(<span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="347" href="#347">347</a>     <em class="jxr_comment">// INSERT 1: Write both columns val1</em>
-<a class="jxr_linenumber" name="348" href="#348">348</a>     MultiVersionConcurrencyControl.WriteEntry w =
-<a class="jxr_linenumber" name="349" href="#349">349</a>         mvcc.begin();
-<a class="jxr_linenumber" name="350" href="#350">350</a> 
-<a class="jxr_linenumber" name="351" href="#351">351</a>     KeyValue kv11 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v1);
-<a class="jxr_linenumber" name="352" href="#352">352</a>     kv11.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="353" href="#353">353</a>     memstore.add(kv11);
-<a class="jxr_linenumber" name="354" href="#354">354</a> 
-<a class="jxr_linenumber" name="355" href="#355">355</a>     KeyValue kv12 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v1);
-<a class="jxr_linenumber" name="356" href="#356">356</a>     kv12.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="357" href="#357">357</a>     memstore.add(kv12);
-<a class="jxr_linenumber" name="358" href="#358">358</a>     mvcc.completeAndWait(w);
-<a class="jxr_linenumber" name="359" href="#359">359</a> 
-<a class="jxr_linenumber" name="360" href="#360">360</a>     <em class="jxr_comment">// BEFORE STARTING INSERT 2, SEE FIRST KVS</em>
-<a class="jxr_linenumber" name="361" href="#361">361</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="362" href="#362">362</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
-<a class="jxr_linenumber" name="363" href="#363">363</a> 
-<a class="jxr_linenumber" name="364" href="#364">364</a>     <em class="jxr_comment">// START DELETE: Insert delete for one of the columns</em>
-<a class="jxr_linenumber" name="365" href="#365">365</a>     w = mvcc.begin();
-<a class="jxr_linenumber" name="366" href="#366">366</a>     KeyValue kvDel = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, kv11.getTimestamp(),
-<a class="jxr_linenumber" name="367" href="#367">367</a>         KeyValue.Type.DeleteColumn);
-<a class="jxr_linenumber" name="368" href="#368">368</a>     kvDel.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="369" href="#369">369</a>     memstore.add(kvDel);
-<a class="jxr_linenumber" name="370" href="#370">370</a> 
-<a class="jxr_linenumber" name="371" href="#371">371</a>     <em class="jxr_comment">// BEFORE COMPLETING DELETE, SEE FIRST KVS</em>
-<a class="jxr_linenumber" name="372" href="#372">372</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="373" href="#373">373</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
-<a class="jxr_linenumber" name="374" href="#374">374</a> 
-<a class="jxr_linenumber" name="375" href="#375">375</a>     <em class="jxr_comment">// COMPLETE DELETE</em>
-<a class="jxr_linenumber" name="376" href="#376">376</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="329" href="#329">329</a>     <em class="jxr_comment">// COMPLETE INSERT 2</em>
+<a class="jxr_linenumber" name="330" href="#330">330</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="331" href="#331">331</a> 
+<a class="jxr_linenumber" name="332" href="#332">332</a>     <em class="jxr_comment">// NOW SHOULD SEE NEW KVS IN ADDITION TO OLD KVS.</em>
+<a class="jxr_linenumber" name="333" href="#333">333</a>     <em class="jxr_comment">// See HBASE-1485 for discussion about what we should do with</em>
+<a class="jxr_linenumber" name="334" href="#334">334</a>     <em class="jxr_comment">// the duplicate-TS inserts</em>
+<a class="jxr_linenumber" name="335" href="#335">335</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="336" href="#336">336</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv21, kv11, kv22, kv12});
+<a class="jxr_linenumber" name="337" href="#337">337</a>   }
+<a class="jxr_linenumber" name="338" href="#338">338</a> 
+<a class="jxr_linenumber" name="339" href="#339">339</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="340" href="#340">340</a> <em class="jxr_javadoccomment">   * When we insert a higher-memstoreTS deletion of a cell but with</em>
+<a class="jxr_linenumber" name="341" href="#341">341</a> <em class="jxr_javadoccomment">   * the same timestamp, we still need to provide consistent reads</em>
+<a class="jxr_linenumber" name="342" href="#342">342</a> <em class="jxr_javadoccomment">   * for the same scanner.</em>
+<a class="jxr_linenumber" name="343" href="#343">343</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="344" href="#344">344</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMemstoreDeletesVisibilityWithSameKey() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="345" href="#345">345</a>     <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(1);
+<a class="jxr_linenumber" name="346" href="#346">346</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
+<a class="jxr_linenumber" name="347" href="#347">347</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
+<a class="jxr_linenumber" name="348" href="#348">348</a>     <strong class="jxr_keyword">final</strong> byte[] q2 = Bytes.toBytes(<span class="jxr_string">"q2"</span>);
+<a class="jxr_linenumber" name="349" href="#349">349</a>     <strong class="jxr_keyword">final</strong> byte[] v1 = Bytes.toBytes(<span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="350" href="#350">350</a>     <em class="jxr_comment">// INSERT 1: Write both columns val1</em>
+<a class="jxr_linenumber" name="351" href="#351">351</a>     MultiVersionConcurrencyControl.WriteEntry w =
+<a class="jxr_linenumber" name="352" href="#352">352</a>         mvcc.begin();
+<a class="jxr_linenumber" name="353" href="#353">353</a> 
+<a class="jxr_linenumber" name="354" href="#354">354</a>     KeyValue kv11 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, v1);
+<a class="jxr_linenumber" name="355" href="#355">355</a>     kv11.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="356" href="#356">356</a>     memstore.add(kv11);
+<a class="jxr_linenumber" name="357" href="#357">357</a> 
+<a class="jxr_linenumber" name="358" href="#358">358</a>     KeyValue kv12 = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, v1);
+<a class="jxr_linenumber" name="359" href="#359">359</a>     kv12.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="360" href="#360">360</a>     memstore.add(kv12);
+<a class="jxr_linenumber" name="361" href="#361">361</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="362" href="#362">362</a> 
+<a class="jxr_linenumber" name="363" href="#363">363</a>     <em class="jxr_comment">// BEFORE STARTING INSERT 2, SEE FIRST KVS</em>
+<a class="jxr_linenumber" name="364" href="#364">364</a>     KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="365" href="#365">365</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
+<a class="jxr_linenumber" name="366" href="#366">366</a> 
+<a class="jxr_linenumber" name="367" href="#367">367</a>     <em class="jxr_comment">// START DELETE: Insert delete for one of the columns</em>
+<a class="jxr_linenumber" name="368" href="#368">368</a>     w = mvcc.begin();
+<a class="jxr_linenumber" name="369" href="#369">369</a>     KeyValue kvDel = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q2, kv11.getTimestamp(),
+<a class="jxr_linenumber" name="370" href="#370">370</a>         KeyValue.Type.DeleteColumn);
+<a class="jxr_linenumber" name="371" href="#371">371</a>     kvDel.setSequenceId(w.getWriteNumber());
+<a class="jxr_linenumber" name="372" href="#372">372</a>     memstore.add(kvDel);
+<a class="jxr_linenumber" name="373" href="#373">373</a> 
+<a class="jxr_linenumber" name="374" href="#374">374</a>     <em class="jxr_comment">// BEFORE COMPLETING DELETE, SEE FIRST KVS</em>
+<a class="jxr_linenumber" name="375" href="#375">375</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="376" href="#376">376</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kv12});
 <a class="jxr_linenumber" name="377" href="#377">377</a> 
-<a class="jxr_linenumber" name="378" href="#378">378</a>     <em class="jxr_comment">// NOW WE SHOULD SEE DELETE</em>
-<a class="jxr_linenumber" name="379" href="#379">379</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="380" href="#380">380</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kvDel, kv12});
-<a class="jxr_linenumber" name="381" href="#381">381</a>   }
-<a class="jxr_linenumber" name="382" href="#382">382</a> 
-<a class="jxr_linenumber" name="383" href="#383">383</a> 
-<a class="jxr_linenumber" name="384" href="#384">384</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">ReadOwnWritesTester</a> <strong class="jxr_keyword">extends</strong> Thread {
-<a class="jxr_linenumber" name="385" href="#385">385</a>     <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_TRIES = 1000;
+<a class="jxr_linenumber" name="378" href="#378">378</a>     <em class="jxr_comment">// COMPLETE DELETE</em>
+<a class="jxr_linenumber" name="379" href="#379">379</a>     mvcc.completeAndWait(w);
+<a class="jxr_linenumber" name="380" href="#380">380</a> 
+<a class="jxr_linenumber" name="381" href="#381">381</a>     <em class="jxr_comment">// NOW WE SHOULD SEE DELETE</em>
+<a class="jxr_linenumber" name="382" href="#382">382</a>     s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
+<a class="jxr_linenumber" name="383" href="#383">383</a>     assertScannerResults(s, <strong class="jxr_keyword">new</strong> KeyValue[]{kv11, kvDel, kv12});
+<a class="jxr_linenumber" name="384" href="#384">384</a>   }
+<a class="jxr_linenumber" name="385" href="#385">385</a> 
 <a class="jxr_linenumber" name="386" href="#386">386</a> 
-<a class="jxr_linenumber" name="387" href="#387">387</a>     <strong class="jxr_keyword">final</strong> byte[] row;
-<a class="jxr_linenumber" name="388" href="#388">388</a> 
-<a class="jxr_linenumber" name="389" href="#389">389</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
-<a class="jxr_linenumber" name="390" href="#390">390</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
+<a class="jxr_linenumber" name="387" href="#387">387</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">ReadOwnWritesTester</a> <strong class="jxr_keyword">extends</strong> Thread {
+<a class="jxr_linenumber" name="388" href="#388">388</a>     <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_TRIES = 1000;
+<a class="jxr_linenumber" name="389" href="#389">389</a> 
+<a class="jxr_linenumber" name="390" href="#390">390</a>     <strong class="jxr_keyword">final</strong> byte[] row;
 <a class="jxr_linenumber" name="391" href="#391">391</a> 
-<a class="jxr_linenumber" name="392" href="#392">392</a>     <strong class="jxr_keyword">final</strong> MultiVersionConcurrencyControl mvcc;
-<a class="jxr_linenumber" name="393" href="#393">393</a>     <strong class="jxr_keyword">final</strong> MemStore memstore;
-<a class="jxr_linenumber" name="394" href="#394">394</a>     <strong class="jxr_keyword">final</strong> AtomicLong startSeqNum;
-<a class="jxr_linenumber" name="395" href="#395">395</a> 
-<a class="jxr_linenumber" name="396" href="#396">396</a>     AtomicReference&lt;Throwable&gt; caughtException;
-<a class="jxr_linenumber" name="397" href="#397">397</a> 
+<a class="jxr_linenumber" name="392" href="#392">392</a>     <strong class="jxr_keyword">final</strong> byte[] f = Bytes.toBytes(<span class="jxr_string">"family"</span>);
+<a class="jxr_linenumber" name="393" href="#393">393</a>     <strong class="jxr_keyword">final</strong> byte[] q1 = Bytes.toBytes(<span class="jxr_string">"q1"</span>);
+<a class="jxr_linenumber" name="394" href="#394">394</a> 
+<a class="jxr_linenumber" name="395" href="#395">395</a>     <strong class="jxr_keyword">final</strong> MultiVersionConcurrencyControl mvcc;
+<a class="jxr_linenumber" name="396" href="#396">396</a>     <strong class="jxr_keyword">final</strong> MemStore memstore;
+<a class="jxr_linenumber" name="397" href="#397">397</a>     <strong class="jxr_keyword">final</strong> AtomicLong startSeqNum;
 <a class="jxr_linenumber" name="398" href="#398">398</a> 
-<a class="jxr_linenumber" name="399" href="#399">399</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">ReadOwnWritesTester</a>(<strong class="jxr_keyword">int</strong> id,
-<a class="jxr_linenumber" name="400" href="#400">400</a>                                MemStore memstore,
-<a class="jxr_linenumber" name="401" href="#401">401</a>                                MultiVersionConcurrencyControl mvcc,
-<a class="jxr_linenumber" name="402" href="#402">402</a>                                AtomicReference&lt;Throwable&gt; caughtException,
-<a class="jxr_linenumber" name="403" href="#403">403</a>                                AtomicLong startSeqNum)
-<a class="jxr_linenumber" name="404" href="#404">404</a>     {
-<a class="jxr_linenumber" name="405" href="#405">405</a>       <strong class="jxr_keyword">this</strong>.mvcc = mvcc;
-<a class="jxr_linenumber" name="406" href="#406">406</a>       <strong class="jxr_keyword">this</strong>.memstore = memstore;
-<a class="jxr_linenumber" name="407" href="#407">407</a>       <strong class="jxr_keyword">this</strong>.caughtException = caughtException;
-<a class="jxr_linenumber" name="408" href="#408">408</a>       row = Bytes.toBytes(id);
-<a class="jxr_linenumber" name="409" href="#409">409</a>       <strong class="jxr_keyword">this</strong>.startSeqNum = startSeqNum;
-<a class="jxr_linenumber" name="410" href="#410">410</a>     }
-<a class="jxr_linenumber" name="411" href="#411">411</a> 
-<a class="jxr_linenumber" name="412" href="#412">412</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
-<a class="jxr_linenumber" name="413" href="#413">413</a>       <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="414" href="#414">414</a>         internalRun();
-<a class="jxr_linenumber" name="415" href="#415">415</a>       } <strong class="jxr_keyword">catch</strong> (Throwable t) {
-<a class="jxr_linenumber" name="416" href="#416">416</a>         caughtException.compareAndSet(<strong class="jxr_keyword">null</strong>, t);
-<a class="jxr_linenumber" name="417" href="#417">417</a>       }
-<a class="jxr_linenumber" name="418" href="#418">418</a>     }
-<a class="jxr_linenumber" name="419" href="#419">419</a> 
-<a class="jxr_linenumber" name="420" href="#420">420</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> internalRun() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="421" href="#421">421</a>       <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">long</strong> i = 0; i &lt; NUM_TRIES &amp;&amp; caughtException.get() == <strong class="jxr_keyword">null</strong>; i++) {
-<a class="jxr_linenumber" name="422" href="#422">422</a>         MultiVersionConcurrencyControl.WriteEntry w =
-<a class="jxr_linenumber" name="423" href="#423">423</a>             mvcc.begin();
-<a class="jxr_linenumber" name="424" href="#424">424</a> 
-<a class="jxr_linenumber" name="425" href="#425">425</a>         <em class="jxr_comment">// Insert the sequence value (i)</em>
-<a class="jxr_linenumber" name="426" href="#426">426</a>         byte[] v = Bytes.toBytes(i);
+<a class="jxr_linenumber" name="399" href="#399">399</a>     AtomicReference&lt;Throwable&gt; caughtException;
+<a class="jxr_linenumber" name="400" href="#400">400</a> 
+<a class="jxr_linenumber" name="401" href="#401">401</a> 
+<a class="jxr_linenumber" name="402" href="#402">402</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.html">ReadOwnWritesTester</a>(<strong class="jxr_keyword">int</strong> id,
+<a class="jxr_linenumber" name="403" href="#403">403</a>                                MemStore memstore,
+<a class="jxr_linenumber" name="404" href="#404">404</a>                                MultiVersionConcurrencyControl mvcc,
+<a class="jxr_linenumber" name="405" href="#405">405</a>                                AtomicReference&lt;Throwable&gt; caughtException,
+<a class="jxr_linenumber" name="406" href="#406">406</a>                                AtomicLong startSeqNum)
+<a class="jxr_linenumber" name="407" href="#407">407</a>     {
+<a class="jxr_linenumber" name="408" href="#408">408</a>       <strong class="jxr_keyword">this</strong>.mvcc = mvcc;
+<a class="jxr_linenumber" name="409" href="#409">409</a>       <strong class="jxr_keyword">this</strong>.memstore = memstore;
+<a class="jxr_linenumber" name="410" href="#410">410</a>       <strong class="jxr_keyword">this</strong>.caughtException = caughtException;
+<a class="jxr_linenumber" name="411" href="#411">411</a>       row = Bytes.toBytes(id);
+<a class="jxr_linenumber" name="412" href="#412">412</a>       <strong class="jxr_keyword">this</strong>.startSeqNum = startSeqNum;
+<a class="jxr_linenumber" name="413" href="#413">413</a>     }
+<a class="jxr_linenumber" name="414" href="#414">414</a> 
+<a class="jxr_linenumber" name="415" href="#415">415</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
+<a class="jxr_linenumber" name="416" href="#416">416</a>       <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="417" href="#417">417</a>         internalRun();
+<a class="jxr_linenumber" name="418" href="#418">418</a>       } <strong class="jxr_keyword">catch</strong> (Throwable t) {
+<a class="jxr_linenumber" name="419" href="#419">419</a>         caughtException.compareAndSet(<strong class="jxr_keyword">null</strong>, t);
+<a class="jxr_linenumber" name="420" href="#420">420</a>       }
+<a class="jxr_linenumber" name="421" href="#421">421</a>     }
+<a class="jxr_linenumber" name="422" href="#422">422</a> 
+<a class="jxr_linenumber" name="423" href="#423">423</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> internalRun() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="424" href="#424">424</a>       <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">long</strong> i = 0; i &lt; NUM_TRIES &amp;&amp; caughtException.get() == <strong class="jxr_keyword">null</strong>; i++) {
+<a class="jxr_linenumber" name="425" href="#425">425</a>         MultiVersionConcurrencyControl.WriteEntry w =
+<a class="jxr_linenumber" name="426" href="#426">426</a>             mvcc.begin();
 <a class="jxr_linenumber" name="427" href="#427">427</a> 
-<a class="jxr_linenumber" name="428" href="#428">428</a>         KeyValue kv = <strong class="jxr_keyword">new</strong> KeyValue(row, f, q1, i, v);
-<a class="jxr_linenumber" name="429" href="#429">429</a>         kv.setSequenceId(w.getWriteNumber());
-<a class="jxr_linenumber" name="430" href="#430">430</a>         memstore.add(kv);
-<a class="jxr_linenumber" name="431" href="#431">431</a>         mvcc.completeAndWait(w);
-<a class="jxr_linenumber" name="432" href="#432">432</a> 
-<a class="jxr_linenumber" name="433" href="#433">433</a>         <em class="jxr_comment">// Assert that we can read back</em>
-<a class="jxr_linenumber" name="434" href="#434">434</a>         KeyValueScanner s = <strong class="jxr_keyword">this</strong>.memstore.getScanners(mvcc.getReadPoint()).get(0);
-<a class="jxr_linenumber" name="435" href="#435">435</a>         s.seek(kv);
-<a class="jxr_linenumber" name="436" href="#436">436</a> 
-<a class="jxr_linenumber" name="437" href="#437">437</a>         Cell ret = s.next();
-<a class="jxr_linenumber" name="438" href="#438">438</a>         assertNotNull(<span class="jxr_string">"Didnt find own write at all"</span>, ret);
-<a class="jxr_linenumber" name="439" href="#439">439</a>         assertEquals(<span class="jxr_string">"Didnt read own writes"</span>,
-<a class="jxr_linenumber" name="440" href="#440">440</a>                      kv.getTimestamp(), ret.getTimestamp());
-<a class="jxr_linenumber" name="441" href="#441">441</a>       }
-<a class="jxr_linenumber" name="442" href="#442">442</a>     }
-<a class="jxr_linenumber" name="443" href="#443">443</a>   }
-<a class="jxr

<TRUNCATED>

Mime
View raw message