http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2777c693/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStore.DummyStoreEngine.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStore.DummyStoreEngine.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStore.DummyStoreEngine.html
index 4196a6c..6c65fd1 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStore.DummyStoreEngine.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestStore.DummyStoreEngine.html
@@ -114,1476 +114,1636 @@
 <span class="sourceLineNo">106</span>import org.mockito.Mockito;<a 
name="line.106"></a>
 <span class="sourceLineNo">107</span><a name="line.107"></a>
 <span class="sourceLineNo">108</span>import com.google.common.collect.Lists;<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>/**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * Test class for the Store<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span>@Category({RegionServerTests.class, 
MediumTests.class})<a name="line.113"></a>
-<span class="sourceLineNo">114</span>public class TestStore {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>  private static final Log LOG = 
LogFactory.getLog(TestStore.class);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  @Rule public TestName name = new 
TestName();<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>  HStore store;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  byte [] table = 
Bytes.toBytes("table");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  byte [] family = 
Bytes.toBytes("family");<a name="line.120"></a>
+<span class="sourceLineNo">109</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>import 
org.apache.hadoop.hbase.filter.FilterBase;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>import static 
org.junit.Assert.assertEquals;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>import static 
org.junit.Assert.assertTrue;<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>/**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Test class for the Store<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>@Category({RegionServerTests.class, 
MediumTests.class})<a name="line.117"></a>
+<span class="sourceLineNo">118</span>public class TestStore {<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>  private static final Log LOG = 
LogFactory.getLog(TestStore.class);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  @Rule public TestName name = new 
TestName();<a name="line.120"></a>
 <span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>  byte [] row = Bytes.toBytes("row");<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>  byte [] row2 = Bytes.toBytes("row2");<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>  byte [] qf1 = Bytes.toBytes("qf1");<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>  byte [] qf2 = Bytes.toBytes("qf2");<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>  byte [] qf3 = Bytes.toBytes("qf3");<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>  byte [] qf4 = Bytes.toBytes("qf4");<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>  byte [] qf5 = Bytes.toBytes("qf5");<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>  byte [] qf6 = Bytes.toBytes("qf6");<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  NavigableSet&lt;byte[]&gt; qualifiers = 
new ConcurrentSkipListSet&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  List&lt;Cell&gt; expected = new 
ArrayList&lt;&gt;();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  List&lt;Cell&gt; result = new 
ArrayList&lt;&gt;();<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  long id = System.currentTimeMillis();<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>  Get get = new Get(row);<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private HBaseTestingUtility TEST_UTIL = 
new HBaseTestingUtility();<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  private final String DIR = 
TEST_UTIL.getDataTestDir("TestStore").toString();<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">122</span>  HStore store;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  byte [] table = 
Bytes.toBytes("table");<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  byte [] family = 
Bytes.toBytes("family");<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  byte [] row = Bytes.toBytes("row");<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>  byte [] row2 = Bytes.toBytes("row2");<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>  byte [] qf1 = Bytes.toBytes("qf1");<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>  byte [] qf2 = Bytes.toBytes("qf2");<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>  byte [] qf3 = Bytes.toBytes("qf3");<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>  byte [] qf4 = Bytes.toBytes("qf4");<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>  byte [] qf5 = Bytes.toBytes("qf5");<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  byte [] qf6 = Bytes.toBytes("qf6");<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  NavigableSet&lt;byte[]&gt; qualifiers = 
new ConcurrentSkipListSet&lt;&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>  List&lt;Cell&gt; expected = new 
ArrayList&lt;&gt;();<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  List&lt;Cell&gt; result = new 
ArrayList&lt;&gt;();<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  long id = System.currentTimeMillis();<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>  Get get = new Get(row);<a 
name="line.141"></a>
 <span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * Setup<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @throws IOException<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>   */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  @Before<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  public void setUp() throws IOException 
{<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    qualifiers.add(qf1);<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    qualifiers.add(qf3);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    qualifiers.add(qf5);<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    Iterator&lt;byte[]&gt; iter = 
qualifiers.iterator();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    while(iter.hasNext()){<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>      byte [] next = iter.next();<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      expected.add(new KeyValue(row, 
family, next, 1, (byte[])null));<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      get.addColumn(family, next);<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  private void init(String methodName) 
throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    init(methodName, 
TEST_UTIL.getConfiguration());<a name="line.162"></a>
+<span class="sourceLineNo">143</span>  private HBaseTestingUtility TEST_UTIL = 
new HBaseTestingUtility();<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  private final String DIR = 
TEST_UTIL.getDataTestDir("TestStore").toString();<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>  /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * Setup<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @throws IOException<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Before<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void setUp() throws IOException 
{<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    qualifiers.add(qf1);<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    qualifiers.add(qf3);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    qualifiers.add(qf5);<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    Iterator&lt;byte[]&gt; iter = 
qualifiers.iterator();<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    while(iter.hasNext()){<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      byte [] next = iter.next();<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>      expected.add(new KeyValue(row, 
family, next, 1, (byte[])null));<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      get.addColumn(family, next);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
 <span class="sourceLineNo">163</span>  }<a name="line.163"></a>
 <span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  private Store init(String methodName, 
Configuration conf)<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  throws IOException {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    // some of the tests write 4 versions 
and then flush<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    // (with HBASE-4241, lower versions 
are collected on flush)<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    hcd.setMaxVersions(4);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    return init(methodName, conf, hcd);<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private Store init(String methodName, 
Configuration conf,<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      HColumnDescriptor hcd) throws 
IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    HTableDescriptor htd = new 
HTableDescriptor(TableName.valueOf(table));<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    return init(methodName, conf, htd, 
hcd);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      HColumnDescriptor hcd) throws 
IOException {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    return init(methodName, conf, htd, 
hcd, null);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @SuppressWarnings("deprecation")<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      HColumnDescriptor hcd, 
MyScannerHook hook) throws IOException {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    return init(methodName, conf, htd, 
hcd, hook, false);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  @SuppressWarnings("deprecation")<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      HColumnDescriptor hcd, 
MyScannerHook hook, boolean switchToPread) throws IOException {<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    //Setting up a Store<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>    Path basedir = new 
Path(DIR+methodName);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    Path tableDir = 
FSUtils.getTableDir(basedir, htd.getTableName());<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    final Path logdir = new Path(basedir, 
AbstractFSWALProvider.getWALDirectoryName(methodName));<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    fs.delete(logdir, true);<a 
name="line.200"></a>
+<span class="sourceLineNo">165</span>  private void init(String methodName) 
throws IOException {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    init(methodName, 
TEST_UTIL.getConfiguration());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private Store init(String methodName, 
Configuration conf)<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  throws IOException {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    // some of the tests write 4 versions 
and then flush<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    // (with HBASE-4241, lower versions 
are collected on flush)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    hcd.setMaxVersions(4);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>    return init(methodName, conf, hcd);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>  private Store init(String methodName, 
Configuration conf,<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      HColumnDescriptor hcd) throws 
IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    HTableDescriptor htd = new 
HTableDescriptor(TableName.valueOf(table));<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    return init(methodName, conf, htd, 
hcd);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      HColumnDescriptor hcd) throws 
IOException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    return init(methodName, conf, htd, 
hcd, null);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>  @SuppressWarnings("deprecation")<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      HColumnDescriptor hcd, MyStoreHook 
hook) throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    return init(methodName, conf, htd, 
hcd, hook, false);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  @SuppressWarnings("deprecation")<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>  private Store init(String methodName, 
Configuration conf, HTableDescriptor htd,<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      HColumnDescriptor hcd, MyStoreHook 
hook, boolean switchToPread) throws IOException {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    //Setting up a Store<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    Path basedir = new 
Path(DIR+methodName);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    Path tableDir = 
FSUtils.getTableDir(basedir, htd.getTableName());<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    final Path logdir = new Path(basedir, 
AbstractFSWALProvider.getWALDirectoryName(methodName));<a name="line.200"></a>
 <span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>    if (htd.hasFamily(hcd.getName())) {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      htd.modifyFamily(hcd);<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    } else {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      htd.addFamily(hcd);<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false,<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      MemStoreLABImpl.CHUNK_SIZE_DEFAULT, 
1, 0, null);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    HRegionInfo info = new 
HRegionInfo(htd.getTableName(), null, null, false);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    final Configuration walConf = new 
Configuration(conf);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    FSUtils.setRootDir(walConf, 
basedir);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    final WALFactory wals = new 
WALFactory(walConf, null, methodName);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    HRegion region = new 
HRegion(tableDir, wals.getWAL(info.getEncodedNameAsBytes(),<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>            
info.getTable().getNamespace()), fs, conf, info, htd, null);<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    if (hook == null) {<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>      store = new HStore(region, hcd, 
conf);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    } else {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      store = new MyStore(region, hcd, 
conf, hook, switchToPread);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    return store;<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>  /**<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * Test we do not lose data if we fail 
a flush and then close.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   * Part of HBase-10466<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>   * @throws Exception<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>   */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  @Test<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  public void testFlushSizeAccounting() 
throws Exception {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    LOG.info("Setting up a faulty file 
system that cannot write in " +<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      this.name.getMethodName());<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    final Configuration conf = 
HBaseConfiguration.create();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    // Only retry once.<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    
conf.setInt("hbase.hstore.flush.retries.number", 1);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    User user = 
User.createUserForTesting(conf, this.name.getMethodName(),<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>      new String[]{"foo"});<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>    // Inject our faulty 
LocalFileSystem<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    conf.setClass("fs.file.impl", 
FaultyFileSystem.class, FileSystem.class);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    user.runAs(new 
PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      @Override<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      public Object run() throws 
Exception {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        // Make sure it worked (above is 
sensitive to caching details in hadoop core)<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        FileSystem fs = 
FileSystem.get(conf);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        
Assert.assertEquals(FaultyFileSystem.class, fs.getClass());<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>        FaultyFileSystem ffs = 
(FaultyFileSystem)fs;<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>        // Initialize region<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>        init(name.getMethodName(), 
conf);<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>        MemstoreSize size = 
store.memstore.getFlushableSize();<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        Assert.assertEquals(0, 
size.getDataSize());<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        LOG.info("Adding some data");<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>        MemstoreSize kvSize = new 
MemstoreSize();<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        store.add(new KeyValue(row, 
family, qf1, 1, (byte[]) null), kvSize);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        // add the heap size of active 
(mutable) segment<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        kvSize.incMemstoreSize(0, 
MutableSegment.DEEP_OVERHEAD);<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        size = 
store.memstore.getFlushableSize();<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        Assert.assertEquals(kvSize, 
size);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        // Flush.  Bug #1 from 
HBASE-10466.  Make sure size calculation on failed flush is right.<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>        try {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>          LOG.info("Flushing");<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>          flushStore(store, id++);<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>          Assert.fail("Didn't bubble up 
IOE!");<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        } catch (IOException ioe) {<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>          
Assert.assertTrue(ioe.getMessage().contains("Fault injected"));<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>        }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        // due to snapshot, change 
mutable to immutable segment<a name="line.267"></a>
-<span class="sourceLineNo">268</span>        kvSize.incMemstoreSize(0,<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>            
CSLMImmutableSegment.DEEP_OVERHEAD_CSLM-MutableSegment.DEEP_OVERHEAD);<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>        size = 
store.memstore.getFlushableSize();<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        Assert.assertEquals(kvSize, 
size);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>        MemstoreSize kvSize2 = new 
MemstoreSize();<a name="line.272"></a>
-<span class="sourceLineNo">273</span>        store.add(new KeyValue(row, 
family, qf2, 2, (byte[])null), kvSize2);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        kvSize2.incMemstoreSize(0, 
MutableSegment.DEEP_OVERHEAD);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>        // Even though we add a new kv, 
we expect the flushable size to be 'same' since we have<a name="line.275"></a>
-<span class="sourceLineNo">276</span>        // not yet cleared the snapshot 
-- the above flush failed.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        Assert.assertEquals(kvSize, 
size);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        ffs.fault.set(false);<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>        flushStore(store, id++);<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>        size = 
store.memstore.getFlushableSize();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        // Size should be the foreground 
kv size.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        Assert.assertEquals(kvSize2, 
size);<a name="line.282"></a>
+<span class="sourceLineNo">202</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>    fs.delete(logdir, true);<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>    if (htd.hasFamily(hcd.getName())) {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>      htd.modifyFamily(hcd);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    } else {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      htd.addFamily(hcd);<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    
ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false,<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>      MemStoreLABImpl.CHUNK_SIZE_DEFAULT, 
1, 0, null);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    HRegionInfo info = new 
HRegionInfo(htd.getTableName(), null, null, false);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    final Configuration walConf = new 
Configuration(conf);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    FSUtils.setRootDir(walConf, 
basedir);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    final WALFactory wals = new 
WALFactory(walConf, null, methodName);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    HRegion region = new 
HRegion(tableDir, wals.getWAL(info.getEncodedNameAsBytes(),<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>            
info.getTable().getNamespace()), fs, conf, info, htd, null);<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>    if (hook == null) {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      store = new HStore(region, hcd, 
conf);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    } else {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      store = new MyStore(region, hcd, 
conf, hook, switchToPread);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    return store;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>  /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * Test we do not lose data if we fail 
a flush and then close.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   * Part of HBase-10466<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>   * @throws Exception<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>   */<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  @Test<a name="line.232"></a>
+<span class="sourceLineNo">233</span>  public void testFlushSizeAccounting() 
throws Exception {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    LOG.info("Setting up a faulty file 
system that cannot write in " +<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      this.name.getMethodName());<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>    final Configuration conf = 
HBaseConfiguration.create();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    // Only retry once.<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>    
conf.setInt("hbase.hstore.flush.retries.number", 1);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    User user = 
User.createUserForTesting(conf, this.name.getMethodName(),<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>      new String[]{"foo"});<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    // Inject our faulty 
LocalFileSystem<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    conf.setClass("fs.file.impl", 
FaultyFileSystem.class, FileSystem.class);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    user.runAs(new 
PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      @Override<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      public Object run() throws 
Exception {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        // Make sure it worked (above is 
sensitive to caching details in hadoop core)<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        FileSystem fs = 
FileSystem.get(conf);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        
Assert.assertEquals(FaultyFileSystem.class, fs.getClass());<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        FaultyFileSystem ffs = 
(FaultyFileSystem)fs;<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>        // Initialize region<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>        init(name.getMethodName(), 
conf);<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>        MemstoreSize size = 
store.memstore.getFlushableSize();<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        Assert.assertEquals(0, 
size.getDataSize());<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        LOG.info("Adding some data");<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>        MemstoreSize kvSize = new 
MemstoreSize();<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        store.add(new KeyValue(row, 
family, qf1, 1, (byte[]) null), kvSize);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        // add the heap size of active 
(mutable) segment<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        kvSize.incMemstoreSize(0, 
MutableSegment.DEEP_OVERHEAD);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        size = 
store.memstore.getFlushableSize();<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        Assert.assertEquals(kvSize, 
size);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        // Flush.  Bug #1 from 
HBASE-10466.  Make sure size calculation on failed flush is right.<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>        try {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>          LOG.info("Flushing");<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>          flushStore(store, id++);<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>          Assert.fail("Didn't bubble up 
IOE!");<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        } catch (IOException ioe) {<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>          
Assert.assertTrue(ioe.getMessage().contains("Fault injected"));<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>        }<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        // due to snapshot, change 
mutable to immutable segment<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        kvSize.incMemstoreSize(0,<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>            
CSLMImmutableSegment.DEEP_OVERHEAD_CSLM-MutableSegment.DEEP_OVERHEAD);<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>        size = 
store.memstore.getFlushableSize();<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        Assert.assertEquals(kvSize, 
size);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>        MemstoreSize kvSize2 = new 
MemstoreSize();<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        store.add(new KeyValue(row, 
family, qf2, 2, (byte[])null), kvSize2);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        kvSize2.incMemstoreSize(0, 
MutableSegment.DEEP_OVERHEAD);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        // Even though we add a new kv, 
we expect the flushable size to be 'same' since we have<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        // not yet cleared the snapshot 
-- the above flush failed.<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        Assert.assertEquals(kvSize, 
size);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>        ffs.fault.set(false);<a 
name="line.282"></a>
 <span class="sourceLineNo">283</span>        flushStore(store, id++);<a 
name="line.283"></a>
 <span class="sourceLineNo">284</span>        size = 
store.memstore.getFlushableSize();<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        assertEquals(0, 
size.getDataSize());<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        
assertEquals(MutableSegment.DEEP_OVERHEAD, size.getHeapSize());<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        return null;<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>      }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    });<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  /**<a name="line.292"></a>
-<span class="sourceLineNo">293</span>   * Verify that compression and data 
block encoding are respected by the<a name="line.293"></a>
-<span class="sourceLineNo">294</span>   * Store.createWriterInTmp() method, 
used on store flush.<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   */<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  @Test<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public void testCreateWriter() throws 
Exception {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    
hcd.setCompressionType(Compression.Algorithm.GZ);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    
hcd.setDataBlockEncoding(DataBlockEncoding.DIFF);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    init(name.getMethodName(), conf, 
hcd);<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    // Test createWriterInTmp()<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    StoreFileWriter writer = 
store.createWriterInTmp(4, hcd.getCompressionType(), false, true, false);<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    Path path = writer.getPath();<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    writer.append(new KeyValue(row, 
family, qf1, Bytes.toBytes(1)));<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    writer.append(new KeyValue(row, 
family, qf2, Bytes.toBytes(2)));<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    writer.append(new KeyValue(row2, 
family, qf1, Bytes.toBytes(3)));<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    writer.append(new KeyValue(row2, 
family, qf2, Bytes.toBytes(4)));<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    writer.close();<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    // Verify that compression and 
encoding settings are respected<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    HFile.Reader reader = 
HFile.createReader(fs, path, new CacheConfig(conf), true, conf);<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>    
Assert.assertEquals(hcd.getCompressionType(), 
reader.getCompressionAlgorithm());<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    
Assert.assertEquals(hcd.getDataBlockEncoding(), 
reader.getDataBlockEncoding());<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    reader.close();<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>  @Test<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  public void 
testDeleteExpiredStoreFiles() throws Exception {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    testDeleteExpiredStoreFiles(0);<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>    testDeleteExpiredStoreFiles(1);<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>  /*<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param minVersions the MIN_VERSIONS 
for the column family<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   */<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  public void 
testDeleteExpiredStoreFiles(int minVersions) throws Exception {<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>    int storeFileNum = 4;<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>    int ttl = 4;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    IncrementingEnvironmentEdge edge = 
new IncrementingEnvironmentEdge();<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    
EnvironmentEdgeManagerTestHelper.injectEdge(edge);<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    // Enable the expired store file 
deletion<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    
conf.setBoolean("hbase.store.delete.expired.storefile", true);<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>    // Set the compaction threshold 
higher to avoid normal compactions.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    
conf.setInt(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MIN_KEY, 5);<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    hcd.setMinVersions(minVersions);<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>    hcd.setTimeToLive(ttl);<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>    init(name.getMethodName() + "-" + 
minVersions, conf, hcd);<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>    long storeTtl = 
this.store.getScanInfo().getTtl();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    long sleepTime = storeTtl / 
storeFileNum;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    long timeStamp;<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    // There are 4 store files and the 
max time stamp difference among these<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    // store files will be 
(this.store.ttl / storeFileNum)<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    for (int i = 1; i &lt;= storeFileNum; 
i++) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      LOG.info("Adding some data for the 
store file #" + i);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      timeStamp = 
EnvironmentEdgeManager.currentTime();<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.store.add(new KeyValue(row, 
family, qf1, timeStamp, (byte[]) null), null);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      this.store.add(new KeyValue(row, 
family, qf2, timeStamp, (byte[]) null), null);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      this.store.add(new KeyValue(row, 
family, qf3, timeStamp, (byte[]) null), null);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      flush(i);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      edge.incrementTime(sleepTime);<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>    // Verify the total number of store 
files<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    Assert.assertEquals(storeFileNum, 
this.store.getStorefiles().size());<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>     // Each call will find one expired 
store file and delete it before compaction happens.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>     // There will be no compaction due 
to threshold above. Last file will not be replaced.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    for (int i = 1; i &lt;= storeFileNum 
- 1; i++) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      // verify the expired store file.<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>      
assertNull(this.store.requestCompaction());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      Collection&lt;StoreFile&gt; sfs = 
this.store.getStorefiles();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      // Ensure i files are gone.<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>      if (minVersions == 0) {<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>        assertEquals(storeFileNum - i, 
sfs.size());<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        // Ensure only non-expired files 
remain.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        for (StoreFile sf : sfs) {<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>          
assertTrue(sf.getReader().getMaxTimestamp() &gt;= (edge.currentTime() - 
storeTtl));<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        }<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        assertEquals(storeFileNum, 
sfs.size());<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      // Let the next store file 
expired.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      edge.incrementTime(sleepTime);<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    
assertNull(this.store.requestCompaction());<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>    Collection&lt;StoreFile&gt; sfs = 
this.store.getStorefiles();<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    // Assert the last expired file is 
not removed.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (minVersions == 0) {<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>      assertEquals(1, sfs.size());<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    long ts = 
sfs.iterator().next().getReader().getMaxTimestamp();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    assertTrue(ts &lt; 
(edge.currentTime() - storeTtl));<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>    for (StoreFile sf : sfs) {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>      sf.closeReader(true);<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>  }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>  @Test<a name="line.400"></a>
-<span class="sourceLineNo">401</span>  public void 
testLowestModificationTime() throws Exception {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    // Initialize region<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>    init(name.getMethodName(), conf);<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>    int storeFileNum = 4;<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>    for (int i = 1; i &lt;= storeFileNum; 
i++) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      LOG.info("Adding some data for the 
store file #"+i);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      this.store.add(new KeyValue(row, 
family, qf1, i, (byte[])null), null);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      this.store.add(new KeyValue(row, 
family, qf2, i, (byte[])null), null);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      this.store.add(new KeyValue(row, 
family, qf3, i, (byte[])null), null);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      flush(i);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    // after flush; check the lowest time 
stamp<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    long lowestTimeStampFromManager = 
StoreUtils.getLowestTimestamp(store.getStorefiles());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    long lowestTimeStampFromFS = 
getLowestTimeStampFromFS(fs, store.getStorefiles());<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    
Assert.assertEquals(lowestTimeStampFromManager,lowestTimeStampFromFS);<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>    // after compact; check the lowest 
time stamp<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    
store.compact(store.requestCompaction(), NoLimitThroughputController.INSTANCE, 
null);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    lowestTimeStampFromManager = 
StoreUtils.getLowestTimestamp(store.getStorefiles());<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    lowestTimeStampFromFS = 
getLowestTimeStampFromFS(fs, store.getStorefiles());<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    
Assert.assertEquals(lowestTimeStampFromManager, lowestTimeStampFromFS);<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>  }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>  private static long 
getLowestTimeStampFromFS(FileSystem fs,<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      final Collection&lt;StoreFile&gt; 
candidates) throws IOException {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    long minTs = Long.MAX_VALUE;<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (candidates.isEmpty()) {<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>      return minTs;<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    Path[] p = new 
Path[candidates.size()];<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    int i = 0;<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    for (StoreFile sf : candidates) {<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>      p[i] = sf.getPath();<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>      ++i;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>    FileStatus[] stats = 
fs.listStatus(p);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (stats == null || stats.length == 
0) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      return minTs;<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    for (FileStatus s : stats) {<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>      minTs = Math.min(minTs, 
s.getModificationTime());<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    return minTs;<a name="line.447"></a>
-<span class="sourceLineNo">448</span>  }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span>  
//////////////////////////////////////////////////////////////////////////////<a
 name="line.450"></a>
-<span class="sourceLineNo">451</span>  // Get tests<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  
//////////////////////////////////////////////////////////////////////////////<a
 name="line.452"></a>
+<span class="sourceLineNo">285</span>        // Size should be the foreground 
kv size.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        Assert.assertEquals(kvSize2, 
size);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        flushStore(store, id++);<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>        size = 
store.memstore.getFlushableSize();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        assertEquals(0, 
size.getDataSize());<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        
assertEquals(MutableSegment.DEEP_OVERHEAD, size.getHeapSize());<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>        return null;<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>  }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>  /**<a name="line.296"></a>
+<span class="sourceLineNo">297</span>   * Verify that compression and data 
block encoding are respected by the<a name="line.297"></a>
+<span class="sourceLineNo">298</span>   * Store.createWriterInTmp() method, 
used on store flush.<a name="line.298"></a>
+<span class="sourceLineNo">299</span>   */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  @Test<a name="line.300"></a>
+<span class="sourceLineNo">301</span>  public void testCreateWriter() throws 
Exception {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    
hcd.setCompressionType(Compression.Algorithm.GZ);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    
hcd.setDataBlockEncoding(DataBlockEncoding.DIFF);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    init(name.getMethodName(), conf, 
hcd);<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>    // Test createWriterInTmp()<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span>    StoreFileWriter writer = 
store.createWriterInTmp(4, hcd.getCompressionType(), false, true, false);<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    Path path = writer.getPath();<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>    writer.append(new KeyValue(row, 
family, qf1, Bytes.toBytes(1)));<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    writer.append(new KeyValue(row, 
family, qf2, Bytes.toBytes(2)));<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    writer.append(new KeyValue(row2, 
family, qf1, Bytes.toBytes(3)));<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    writer.append(new KeyValue(row2, 
family, qf2, Bytes.toBytes(4)));<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    writer.close();<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>    // Verify that compression and 
encoding settings are respected<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    HFile.Reader reader = 
HFile.createReader(fs, path, new CacheConfig(conf), true, conf);<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>    
Assert.assertEquals(hcd.getCompressionType(), 
reader.getCompressionAlgorithm());<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    
Assert.assertEquals(hcd.getDataBlockEncoding(), 
reader.getDataBlockEncoding());<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    reader.close();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>  @Test<a name="line.326"></a>
+<span class="sourceLineNo">327</span>  public void 
testDeleteExpiredStoreFiles() throws Exception {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    testDeleteExpiredStoreFiles(0);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>    testDeleteExpiredStoreFiles(1);<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /*<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @param minVersions the MIN_VERSIONS 
for the column family<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  public void 
testDeleteExpiredStoreFiles(int minVersions) throws Exception {<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>    int storeFileNum = 4;<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>    int ttl = 4;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    IncrementingEnvironmentEdge edge = 
new IncrementingEnvironmentEdge();<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    
EnvironmentEdgeManagerTestHelper.injectEdge(edge);<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    // Enable the expired store file 
deletion<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    
conf.setBoolean("hbase.store.delete.expired.storefile", true);<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>    // Set the compaction threshold 
higher to avoid normal compactions.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    
conf.setInt(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MIN_KEY, 5);<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>    HColumnDescriptor hcd = new 
HColumnDescriptor(family);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    hcd.setMinVersions(minVersions);<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    hcd.setTimeToLive(ttl);<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    init(name.getMethodName() + "-" + 
minVersions, conf, hcd);<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>    long storeTtl = 
this.store.getScanInfo().getTtl();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    long sleepTime = storeTtl / 
storeFileNum;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    long timeStamp;<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    // There are 4 store files and the 
max time stamp difference among these<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    // store files will be 
(this.store.ttl / storeFileNum)<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    for (int i = 1; i &lt;= storeFileNum; 
i++) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      LOG.info("Adding some data for the 
store file #" + i);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      timeStamp = 
EnvironmentEdgeManager.currentTime();<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      this.store.add(new KeyValue(row, 
family, qf1, timeStamp, (byte[]) null), null);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      this.store.add(new KeyValue(row, 
family, qf2, timeStamp, (byte[]) null), null);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      this.store.add(new KeyValue(row, 
family, qf3, timeStamp, (byte[]) null), null);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      flush(i);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      edge.incrementTime(sleepTime);<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>    }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span>    // Verify the total number of store 
files<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    Assert.assertEquals(storeFileNum, 
this.store.getStorefiles().size());<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>     // Each call will find one expired 
store file and delete it before compaction happens.<a name="line.370"></a>
+<span class="sourceLineNo">371</span>     // There will be no compaction due 
to threshold above. Last file will not be replaced.<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    for (int i = 1; i &lt;= storeFileNum 
- 1; i++) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      // verify the expired store file.<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>      
assertNull(this.store.requestCompaction());<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      Collection&lt;StoreFile&gt; sfs = 
this.store.getStorefiles();<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      // Ensure i files are gone.<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>      if (minVersions == 0) {<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>        assertEquals(storeFileNum - i, 
sfs.size());<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        // Ensure only non-expired files 
remain.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        for (StoreFile sf : sfs) {<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>          
assertTrue(sf.getReader().getMaxTimestamp() &gt;= (edge.currentTime() - 
storeTtl));<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      } else {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        assertEquals(storeFileNum, 
sfs.size());<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      // Let the next store file 
expired.<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      edge.incrementTime(sleepTime);<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    
assertNull(this.store.requestCompaction());<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    Collection&lt;StoreFile&gt; sfs = 
this.store.getStorefiles();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    // Assert the last expired file is 
not removed.<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    if (minVersions == 0) {<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>      assertEquals(1, sfs.size());<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>    }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    long ts = 
sfs.iterator().next().getReader().getMaxTimestamp();<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    assertTrue(ts &lt; 
(edge.currentTime() - storeTtl));<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span>    for (StoreFile sf : sfs) {<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>      sf.closeReader(true);<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>  @Test<a name="line.404"></a>
+<span class="sourceLineNo">405</span>  public void 
testLowestModificationTime() throws Exception {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    // Initialize region<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>    init(name.getMethodName(), conf);<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>    int storeFileNum = 4;<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>    for (int i = 1; i &lt;= storeFileNum; 
i++) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      LOG.info("Adding some data for the 
store file #"+i);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      this.store.add(new KeyValue(row, 
family, qf1, i, (byte[])null), null);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      this.store.add(new KeyValue(row, 
family, qf2, i, (byte[])null), null);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      this.store.add(new KeyValue(row, 
family, qf3, i, (byte[])null), null);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      flush(i);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    // after flush; check the lowest time 
stamp<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    long lowestTimeStampFromManager = 
StoreUtils.getLowestTimestamp(store.getStorefiles());<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    long lowestTimeStampFromFS = 
getLowestTimeStampFromFS(fs, store.getStorefiles());<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    
Assert.assertEquals(lowestTimeStampFromManager,lowestTimeStampFromFS);<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>    // after compact; check the lowest 
time stamp<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    
store.compact(store.requestCompaction(), NoLimitThroughputController.INSTANCE, 
null);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    lowestTimeStampFromManager = 
StoreUtils.getLowestTimestamp(store.getStorefiles());<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    lowestTimeStampFromFS = 
getLowestTimeStampFromFS(fs, store.getStorefiles());<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    
Assert.assertEquals(lowestTimeStampFromManager, lowestTimeStampFromFS);<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>  }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>  private static long 
getLowestTimeStampFromFS(FileSystem fs,<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      final Collection&lt;StoreFile&gt; 
candidates) throws IOException {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    long minTs = Long.MAX_VALUE;<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>    if (candidates.isEmpty()) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>      return minTs;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    Path[] p = new 
Path[candidates.size()];<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    int i = 0;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    for (StoreFile sf : candidates) {<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>      p[i] = sf.getPath();<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>      ++i;<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span>    FileStatus[] stats = 
fs.listStatus(p);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    if (stats == null || stats.length == 
0) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      return minTs;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    }<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    for (FileStatus s : stats) {<a 
name="line.448"></a>
+<span class="sourceLineNo">449</span>      minTs = Math.min(minTs, 
s.getModificationTime());<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    }<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    return minTs;<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>  private static final int 
BLOCKSIZE_SMALL = 8192;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>  /**<a name="line.455"></a>
-<span class="sourceLineNo">456</span>   * Test for hbase-1686.<a 
name="line.456"></a>
-<span class="sourceLineNo">457</span>   * @throws IOException<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>   */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>  @Test<a name="line.459"></a>
-<span class="sourceLineNo">460</span>  public void testEmptyStoreFile() throws 
IOException {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    init(this.name.getMethodName());<a 
name="line.461"></a>
-<span class="sourceLineNo">462</span>    // Write a store file.<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    flush(1);<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    // Now put in place an empty store 
file.  Its a little tricky.  Have to<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    // do manually with hacked in 
sequence id.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    StoreFile f = 
this.store.getStorefiles().iterator().next();<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    Path storedir = 
f.getPath().getParent();<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    long seqid = f.getMaxSequenceId();<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>    Configuration c = 
HBaseConfiguration.create();<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    FileSystem fs = FileSystem.get(c);<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>    HFileContext meta = new 
HFileContextBuilder().withBlockSize(BLOCKSIZE_SMALL).build();<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>    StoreFileWriter w = new 
StoreFileWriter.Builder(c, new CacheConfig(c),<a name="line.474"></a>
-<span class="sourceLineNo">475</span>        fs)<a name="line.475"></a>
-<span class="sourceLineNo">476</span>            .withOutputDir(storedir)<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>            .withFileContext(meta)<a 
name="line.477"></a>
-<span class="sourceLineNo">478</span>            .build();<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>    w.appendMetadata(seqid + 1, false);<a 
name="line.479"></a>
-<span class="sourceLineNo">480</span>    w.close();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    this.store.close();<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>    // Reopen it... should pick up two 
files<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    this.store = new 
HStore(this.store.getHRegion(), this.store.getColumnFamilyDescriptor(), c);<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>    Assert.assertEquals(2, 
this.store.getStorefilesCount());<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.486"></a>
-<span class="sourceLineNo">487</span>        get.getRow(),<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>        qualifiers);<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>    Assert.assertEquals(1, 
result.size());<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>  /**<a name="line.492"></a>
-<span class="sourceLineNo">493</span>   * Getting data from memstore only<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>   * @throws IOException<a 
name="line.494"></a>
-<span class="sourceLineNo">495</span>   */<a name="line.495"></a>
-<span class="sourceLineNo">496</span>  @Test<a name="line.496"></a>
-<span class="sourceLineNo">497</span>  public void testGet_FromMemStoreOnly() 
throws IOException {<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    init(this.name.getMethodName());<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    //Put data in memstore<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    this.store.add(new KeyValue(row, 
family, qf3, 1, (byte[])null), null);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    this.store.add(new KeyValue(row, 
family, qf4, 1, (byte[])null), null);<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    this.store.add(new KeyValue(row, 
family, qf5, 1, (byte[])null), null);<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    this.store.add(new KeyValue(row, 
family, qf6, 1, (byte[])null), null);<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>    //Get<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        get.getRow(), qualifiers);<a 
name="line.510"></a>
+<span class="sourceLineNo">454</span>  
//////////////////////////////////////////////////////////////////////////////<a
 name="line.454"></a>
+<span class="sourceLineNo">455</span>  // Get tests<a name="line.455"></a>
+<span class="sourceLineNo">456</span>  
//////////////////////////////////////////////////////////////////////////////<a
 name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>  private static final int 
BLOCKSIZE_SMALL = 8192;<a name="line.458"></a>
+<span class="sourceLineNo">459</span>  /**<a name="line.459"></a>
+<span class="sourceLineNo">460</span>   * Test for hbase-1686.<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>   * @throws IOException<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>   */<a name="line.462"></a>
+<span class="sourceLineNo">463</span>  @Test<a name="line.463"></a>
+<span class="sourceLineNo">464</span>  public void testEmptyStoreFile() throws 
IOException {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    init(this.name.getMethodName());<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>    // Write a store file.<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    flush(1);<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    // Now put in place an empty store 
file.  Its a little tricky.  Have to<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    // do manually with hacked in 
sequence id.<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    StoreFile f = 
this.store.getStorefiles().iterator().next();<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    Path storedir = 
f.getPath().getParent();<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    long seqid = f.getMaxSequenceId();<a 
name="line.474"></a>
+<span class="sourceLineNo">475</span>    Configuration c = 
HBaseConfiguration.create();<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    FileSystem fs = FileSystem.get(c);<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>    HFileContext meta = new 
HFileContextBuilder().withBlockSize(BLOCKSIZE_SMALL).build();<a 
name="line.477"></a>
+<span class="sourceLineNo">478</span>    StoreFileWriter w = new 
StoreFileWriter.Builder(c, new CacheConfig(c),<a name="line.478"></a>
+<span class="sourceLineNo">479</span>        fs)<a name="line.479"></a>
+<span class="sourceLineNo">480</span>            .withOutputDir(storedir)<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>            .withFileContext(meta)<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>            .build();<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>    w.appendMetadata(seqid + 1, false);<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>    w.close();<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    this.store.close();<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>    // Reopen it... should pick up two 
files<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    this.store = new 
HStore(this.store.getHRegion(), this.store.getColumnFamilyDescriptor(), c);<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>    Assert.assertEquals(2, 
this.store.getStorefilesCount());<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        get.getRow(),<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>        qualifiers);<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>    Assert.assertEquals(1, 
result.size());<a name="line.493"></a>
+<span class="sourceLineNo">494</span>  }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>  /**<a name="line.496"></a>
+<span class="sourceLineNo">497</span>   * Getting data from memstore only<a 
name="line.497"></a>
+<span class="sourceLineNo">498</span>   * @throws IOException<a 
name="line.498"></a>
+<span class="sourceLineNo">499</span>   */<a name="line.499"></a>
+<span class="sourceLineNo">500</span>  @Test<a name="line.500"></a>
+<span class="sourceLineNo">501</span>  public void testGet_FromMemStoreOnly() 
throws IOException {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    init(this.name.getMethodName());<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span>    //Put data in memstore<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    this.store.add(new KeyValue(row, 
family, qf3, 1, (byte[])null), null);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    this.store.add(new KeyValue(row, 
family, qf4, 1, (byte[])null), null);<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    this.store.add(new KeyValue(row, 
family, qf5, 1, (byte[])null), null);<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    this.store.add(new KeyValue(row, 
family, qf6, 1, (byte[])null), null);<a name="line.510"></a>
 <span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>    //Compare<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    assertCheck();<a name="line.513"></a>
-<span class="sourceLineNo">514</span>  }<a name="line.514"></a>
+<span class="sourceLineNo">512</span>    //Get<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        get.getRow(), qualifiers);<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>   * Getting data from files only<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>   * @throws IOException<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>   */<a name="line.519"></a>
-<span class="sourceLineNo">520</span>  @Test<a name="line.520"></a>
-<span class="sourceLineNo">521</span>  public void testGet_FromFilesOnly() 
throws IOException {<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    init(this.name.getMethodName());<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span>    //Put data in memstore<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    //flush<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    flush(1);<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>    //Add more data<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    this.store.add(new KeyValue(row, 
family, qf3, 1, (byte[])null), null);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    this.store.add(new KeyValue(row, 
family, qf4, 1, (byte[])null), null);<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    //flush<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    flush(2);<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span>    //Add more data<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    this.store.add(new KeyValue(row, 
family, qf5, 1, (byte[])null), null);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    this.store.add(new KeyValue(row, 
family, qf6, 1, (byte[])null), null);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    //flush<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    flush(3);<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>    //Get<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        get.getRow(),<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>        qualifiers);<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>    //this.store.get(get, qualifiers, 
result);<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>    //Need to sort the result since 
multiple files<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    Collections.sort(result, 
CellComparator.COMPARATOR);<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span>    //Compare<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    assertCheck();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  }<a name="line.553"></a>
+<span class="sourceLineNo">516</span>    //Compare<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    assertCheck();<a name="line.517"></a>
+<span class="sourceLineNo">518</span>  }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span>  /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span>   * Getting data from files only<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span>   * @throws IOException<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span>   */<a name="line.523"></a>
+<span class="sourceLineNo">524</span>  @Test<a name="line.524"></a>
+<span class="sourceLineNo">525</span>  public void testGet_FromFilesOnly() 
throws IOException {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    init(this.name.getMethodName());<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span>    //Put data in memstore<a 
name="line.528"></a>
+<span class="sourceLineNo">529</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    this.store.add(new KeyValue(row, 
family, qf2, 1, (byte[])null), null);<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    //flush<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    flush(1);<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>    //Add more data<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    this.store.add(new KeyValue(row, 
family, qf3, 1, (byte[])null), null);<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    this.store.add(new KeyValue(row, 
family, qf4, 1, (byte[])null), null);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    //flush<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    flush(2);<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span>    //Add more data<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    this.store.add(new KeyValue(row, 
family, qf5, 1, (byte[])null), null);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    this.store.add(new KeyValue(row, 
family, qf6, 1, (byte[])null), null);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    //flush<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    flush(3);<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>    //Get<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    result = 
HBaseTestingUtility.getFromStoreFile(store,<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        get.getRow(),<a 
name="line.548"></a>
+<span class="sourceLineNo">549</span>        qualifiers);<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span>    //this.store.get(get, qualifiers, 
result);<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span>    //Need to sort the result since 
multiple files<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    Collections.sort(result, 
CellComparator.COMPARATOR);<a name="line.553"></a>
 <span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>  /**<a name="line.555"></a>
-<span class="sourceLineNo">556</span>   * Getting data from memstore and 
files<a name="line.556"></a>
-<span class="sourceLineNo">557</span>   * @throws IOException<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>   */<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  @Test<a name="line.559"></a>
-<span class="sourceLineNo">560</span>  public void 
testGet_FromMemStoreAndFiles() throws IOException {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    init(this.name.getMethodName());<a 
name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span>    //Put data in memstore<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>    this.store.add(new KeyValue(row, 
family, qf1, 1, (byte[])null), null);<a name="line.564"></a>
-<span c

<TRUNCATED>

Reply via email to