http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7816cbde/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html
index 35716ee..258f095 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html
@@ -148,317 +148,311 @@
 <span class="sourceLineNo">140</span>   * &lt;p&gt;<a name="line.140"></a>
 <span class="sourceLineNo">141</span>   * This can ONLY be called when you are 
using Scanners that implement InternalScanner as well as<a name="line.141"></a>
 <span class="sourceLineNo">142</span>   * KeyValueScanner (a {@link 
StoreScanner}).<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * @param result<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * @return true if more rows exist 
after this one, false if scanner is done<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public boolean next(List&lt;Cell&gt; 
result) throws IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    return next(result, 
NoLimitScannerContext.getInstance());<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>  @Override<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public boolean next(List&lt;Cell&gt; 
result, ScannerContext scannerContext) throws IOException {<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    if (this.current == null) {<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>      return 
scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    InternalScanner currentAsInternal = 
(InternalScanner)this.current;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    boolean moreCells = 
currentAsInternal.next(result, scannerContext);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    Cell pee = this.current.peek();<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>     * By definition, any InternalScanner 
must return false only when it has no<a name="line.161"></a>
-<span class="sourceLineNo">162</span>     * further rows to be fetched. So, we 
can close a scanner if it returns<a name="line.162"></a>
-<span class="sourceLineNo">163</span>     * false. All existing 
implementations seem to be fine with this. It is much<a name="line.163"></a>
-<span class="sourceLineNo">164</span>     * more efficient to close scanners 
which are not needed than keep them in<a name="line.164"></a>
-<span class="sourceLineNo">165</span>     * the heap. This is also required 
for certain optimizations.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     */<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    if (pee == null || !moreCells) {<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>      // add the scanner that is to be 
closed<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      
this.scannersForDelayedClose.add(this.current);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.heap.add(this.current);<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    this.current = null;<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    this.current = pollRealKV();<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>    if (this.current == null) {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      moreCells = 
scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    return moreCells;<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  protected static class 
KVScannerComparator implements Comparator&lt;KeyValueScanner&gt; {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    protected CellComparator 
kvComparator;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    /**<a name="line.184"></a>
-<span class="sourceLineNo">185</span>     * Constructor<a name="line.185"></a>
-<span class="sourceLineNo">186</span>     * @param kvComparator<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>     */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public 
KVScannerComparator(CellComparator kvComparator) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      this.kvComparator = kvComparator;<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    public int compare(KeyValueScanner 
left, KeyValueScanner right) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      int comparison = 
compare(left.peek(), right.peek());<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (comparison != 0) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        return comparison;<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>      } else {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        // Since both the keys are 
exactly the same, we break the tie in favor of higher ordered<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>        // scanner since it'll have newer 
data. Since higher value should come first, we reverse<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        // sort here.<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>        return 
Long.compare(right.getScannerOrder(), left.getScannerOrder());<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    /**<a name="line.202"></a>
-<span class="sourceLineNo">203</span>     * Compares two KeyValue<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>     * @param left<a name="line.204"></a>
-<span class="sourceLineNo">205</span>     * @param right<a name="line.205"></a>
-<span class="sourceLineNo">206</span>     * @return less than 0 if left is 
smaller, 0 if equal etc..<a name="line.206"></a>
+<span class="sourceLineNo">143</span>   * @return true if more rows exist 
after this one, false if scanner is done<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   */<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  @Override<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  public boolean next(List&lt;Cell&gt; 
result, ScannerContext scannerContext) throws IOException {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    if (this.current == null) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>      return 
scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    InternalScanner currentAsInternal = 
(InternalScanner)this.current;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    boolean moreCells = 
currentAsInternal.next(result, scannerContext);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    Cell pee = this.current.peek();<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>    /*<a name="line.154"></a>
+<span class="sourceLineNo">155</span>     * By definition, any InternalScanner 
must return false only when it has no<a name="line.155"></a>
+<span class="sourceLineNo">156</span>     * further rows to be fetched. So, we 
can close a scanner if it returns<a name="line.156"></a>
+<span class="sourceLineNo">157</span>     * false. All existing 
implementations seem to be fine with this. It is much<a name="line.157"></a>
+<span class="sourceLineNo">158</span>     * more efficient to close scanners 
which are not needed than keep them in<a name="line.158"></a>
+<span class="sourceLineNo">159</span>     * the heap. This is also required 
for certain optimizations.<a name="line.159"></a>
+<span class="sourceLineNo">160</span>     */<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>    if (pee == null || !moreCells) {<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      // add the scanner that is to be 
closed<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      
this.scannersForDelayedClose.add(this.current);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    } else {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      this.heap.add(this.current);<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    this.current = null;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    this.current = pollRealKV();<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>    if (this.current == null) {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>      moreCells = 
scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    return moreCells;<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>  protected static class 
KVScannerComparator implements Comparator&lt;KeyValueScanner&gt; {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    protected CellComparator 
kvComparator;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span>     * Constructor<a name="line.179"></a>
+<span class="sourceLineNo">180</span>     * @param kvComparator<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>     */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    public 
KVScannerComparator(CellComparator kvComparator) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      this.kvComparator = kvComparator;<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    public int compare(KeyValueScanner 
left, KeyValueScanner right) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      int comparison = 
compare(left.peek(), right.peek());<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      if (comparison != 0) {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        return comparison;<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      } else {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        // Since both the keys are 
exactly the same, we break the tie in favor of higher ordered<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>        // scanner since it'll have newer 
data. Since higher value should come first, we reverse<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        // sort here.<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>        return 
Long.compare(right.getScannerOrder(), left.getScannerOrder());<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    /**<a name="line.196"></a>
+<span class="sourceLineNo">197</span>     * Compares two KeyValue<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>     * @param left<a name="line.198"></a>
+<span class="sourceLineNo">199</span>     * @param right<a name="line.199"></a>
+<span class="sourceLineNo">200</span>     * @return less than 0 if left is 
smaller, 0 if equal etc..<a name="line.200"></a>
+<span class="sourceLineNo">201</span>     */<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    public int compare(Cell left, Cell 
right) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      return 
this.kvComparator.compare(left, right);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span>     * @return KVComparator<a 
name="line.206"></a>
 <span class="sourceLineNo">207</span>     */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public int compare(Cell left, Cell 
right) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return 
this.kvComparator.compare(left, right);<a name="line.209"></a>
+<span class="sourceLineNo">208</span>    public CellComparator getComparator() 
{<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return this.kvComparator;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>    }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span>     * @return KVComparator<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>     */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    public CellComparator getComparator() 
{<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      return this.kvComparator;<a 
name="line.215"></a>
+<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public void close() {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    for (KeyValueScanner scanner : 
this.scannersForDelayedClose) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      scanner.close();<a 
name="line.215"></a>
 <span class="sourceLineNo">216</span>    }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>  public void close() {<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    for (KeyValueScanner scanner : 
this.scannersForDelayedClose) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      scanner.close();<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    
this.scannersForDelayedClose.clear();<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    if (this.current != null) {<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      this.current.close();<a 
name="line.225"></a>
+<span class="sourceLineNo">217</span>    
this.scannersForDelayedClose.clear();<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    if (this.current != null) {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>      this.current.close();<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    if (this.heap != null) {<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>      KeyValueScanner scanner;<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>      while ((scanner = this.heap.poll()) 
!= null) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        scanner.close();<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>    if (this.heap != null) {<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>      KeyValueScanner scanner;<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      while ((scanner = this.heap.poll()) 
!= null) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        scanner.close();<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>  /**<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * Seeks all scanners at or below the 
specified seek key.  If we earlied-out<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * of a row, we may end up skipping 
values that were never reached yet.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   * Rather than iterating down, we want 
to give the opportunity to re-seek.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   * &lt;p&gt;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * As individual scanners may run past 
their ends, those scanners are<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * automatically closed and removed 
from the heap.<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   * &lt;p&gt;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * This function (and {@link 
#reseek(Cell)}) does not do multi-column<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * Bloom filter and lazy-seek 
optimizations. To enable those, call<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   * {@link #requestSeek(Cell, boolean, 
boolean)}.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   * @param seekKey KeyValue to seek at 
or after<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   * @return true if KeyValues exist at 
or after specified key, false if not<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   * @throws IOException<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  public boolean seek(Cell seekKey) 
throws IOException {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    return generalizedSeek(false,    // 
This is not a lazy seek<a name="line.252"></a>
-<span class="sourceLineNo">253</span>                           seekKey,<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>                           false,    // 
forward (false: this is not a reseek)<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                           false);   // 
Not using Bloom filters<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  }<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>  /**<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   * This function is identical to the 
{@link #seek(Cell)} function except<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   * that scanner.seek(seekKey) is 
changed to scanner.reseek(seekKey).<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   */<a name="line.261"></a>
-<span class="sourceLineNo">262</span>  @Override<a name="line.262"></a>
-<span class="sourceLineNo">263</span>  public boolean reseek(Cell seekKey) 
throws IOException {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    return generalizedSeek(false,    // 
This is not a lazy seek<a name="line.264"></a>
-<span class="sourceLineNo">265</span>                           seekKey,<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>                           true,     // 
forward (true because this is reseek)<a name="line.266"></a>
-<span class="sourceLineNo">267</span>                           false);   // 
Not using Bloom filters<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   * {@inheritDoc}<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   */<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  @Override<a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public boolean requestSeek(Cell key, 
boolean forward,<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      boolean useBloom) throws 
IOException {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    return generalizedSeek(true, key, 
forward, useBloom);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>  }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>  /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @param isLazy whether we are trying 
to seek to exactly the given row/col.<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   *          Enables Bloom filter and 
most-recent-file-first optimizations for<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   *          multi-column get/scan 
queries.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param seekKey key to seek to<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @param forward whether to seek 
forward (also known as reseek)<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @param useBloom whether to optimize 
seeks using Bloom filters<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   */<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  private boolean generalizedSeek(boolean 
isLazy, Cell seekKey,<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      boolean forward, boolean useBloom) 
throws IOException {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    if (!isLazy &amp;&amp; useBloom) {<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>      throw new 
IllegalArgumentException("Multi-column Bloom filter " +<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          "optimization requires a lazy 
seek");<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>    if (current == null) {<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>      return false;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>    KeyValueScanner scanner = current;<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>    try {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      while (scanner != null) {<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>        Cell topKey = scanner.peek();<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>        if 
(comparator.getComparator().compare(seekKey, topKey) &lt;= 0) {<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>          // Top KeyValue is at-or-after 
Seek KeyValue. We only know that all<a name="line.303"></a>
-<span class="sourceLineNo">304</span>          // scanners are at or after 
seekKey (because fake keys of<a name="line.304"></a>
-<span class="sourceLineNo">305</span>          // scanners where a lazy-seek 
operation has been done are not greater<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          // than their real next keys) 
but we still need to enforce our<a name="line.306"></a>
-<span class="sourceLineNo">307</span>          // invariant that the top 
scanner has done a real seek. This way<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          // StoreScanner and 
RegionScanner do not have to worry about fake<a name="line.308"></a>
-<span class="sourceLineNo">309</span>          // keys.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          heap.add(scanner);<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>          scanner = null;<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>          current = pollRealKV();<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>          return current != null;<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>        }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>        boolean seekResult;<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>        if (isLazy &amp;&amp; heap.size() 
&gt; 0) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          // If there is only one scanner 
left, we don't do lazy seek.<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          seekResult = 
scanner.requestSeek(seekKey, forward, useBloom);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        } else {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>          seekResult = 
NonLazyKeyValueScanner.doRealSeek(scanner, seekKey,<a name="line.321"></a>
-<span class="sourceLineNo">322</span>              forward);<a 
name="line.322"></a>
+<span class="sourceLineNo">227</span>  }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Seeks all scanners at or below the 
specified seek key.  If we earlied-out<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * of a row, we may end up skipping 
values that were never reached yet.<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * Rather than iterating down, we want 
to give the opportunity to re-seek.<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * &lt;p&gt;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * As individual scanners may run past 
their ends, those scanners are<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * automatically closed and removed 
from the heap.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * &lt;p&gt;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * This function (and {@link 
#reseek(Cell)}) does not do multi-column<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * Bloom filter and lazy-seek 
optimizations. To enable those, call<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   * {@link #requestSeek(Cell, boolean, 
boolean)}.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   * @param seekKey KeyValue to seek at 
or after<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   * @return true if KeyValues exist at 
or after specified key, false if not<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   * @throws IOException<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>   */<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  @Override<a name="line.244"></a>
+<span class="sourceLineNo">245</span>  public boolean seek(Cell seekKey) 
throws IOException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    return generalizedSeek(false,    // 
This is not a lazy seek<a name="line.246"></a>
+<span class="sourceLineNo">247</span>                           seekKey,<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>                           false,    // 
forward (false: this is not a reseek)<a name="line.248"></a>
+<span class="sourceLineNo">249</span>                           false);   // 
Not using Bloom filters<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>  /**<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * This function is identical to the 
{@link #seek(Cell)} function except<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   * that scanner.seek(seekKey) is 
changed to scanner.reseek(seekKey).<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   */<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  @Override<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public boolean reseek(Cell seekKey) 
throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    return generalizedSeek(false,    // 
This is not a lazy seek<a name="line.258"></a>
+<span class="sourceLineNo">259</span>                           seekKey,<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>                           true,     // 
forward (true because this is reseek)<a name="line.260"></a>
+<span class="sourceLineNo">261</span>                           false);   // 
Not using Bloom filters<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>  /**<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * {@inheritDoc}<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   */<a name="line.266"></a>
+<span class="sourceLineNo">267</span>  @Override<a name="line.267"></a>
+<span class="sourceLineNo">268</span>  public boolean requestSeek(Cell key, 
boolean forward,<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      boolean useBloom) throws 
IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    return generalizedSeek(true, key, 
forward, useBloom);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>  /**<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   * @param isLazy whether we are trying 
to seek to exactly the given row/col.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   *          Enables Bloom filter and 
most-recent-file-first optimizations for<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   *          multi-column get/scan 
queries.<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   * @param seekKey key to seek to<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>   * @param forward whether to seek 
forward (also known as reseek)<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   * @param useBloom whether to optimize 
seeks using Bloom filters<a name="line.279"></a>
+<span class="sourceLineNo">280</span>   */<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  private boolean generalizedSeek(boolean 
isLazy, Cell seekKey,<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      boolean forward, boolean useBloom) 
throws IOException {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    if (!isLazy &amp;&amp; useBloom) {<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>      throw new 
IllegalArgumentException("Multi-column Bloom filter " +<a name="line.284"></a>
+<span class="sourceLineNo">285</span>          "optimization requires a lazy 
seek");<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>    if (current == null) {<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>      return false;<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>    KeyValueScanner scanner = current;<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>    try {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      while (scanner != null) {<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>        Cell topKey = scanner.peek();<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>        if 
(comparator.getComparator().compare(seekKey, topKey) &lt;= 0) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>          // Top KeyValue is at-or-after 
Seek KeyValue. We only know that all<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          // scanners are at or after 
seekKey (because fake keys of<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          // scanners where a lazy-seek 
operation has been done are not greater<a name="line.299"></a>
+<span class="sourceLineNo">300</span>          // than their real next keys) 
but we still need to enforce our<a name="line.300"></a>
+<span class="sourceLineNo">301</span>          // invariant that the top 
scanner has done a real seek. This way<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          // StoreScanner and 
RegionScanner do not have to worry about fake<a name="line.302"></a>
+<span class="sourceLineNo">303</span>          // keys.<a name="line.303"></a>
+<span class="sourceLineNo">304</span>          heap.add(scanner);<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>          scanner = null;<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>          current = pollRealKV();<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>          return current != null;<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>        boolean seekResult;<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span>        if (isLazy &amp;&amp; heap.size() 
&gt; 0) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          // If there is only one scanner 
left, we don't do lazy seek.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>          seekResult = 
scanner.requestSeek(seekKey, forward, useBloom);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        } else {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>          seekResult = 
NonLazyKeyValueScanner.doRealSeek(scanner, seekKey,<a name="line.315"></a>
+<span class="sourceLineNo">316</span>              forward);<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>        }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>        if (!seekResult) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>          
this.scannersForDelayedClose.add(scanner);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        } else {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>          heap.add(scanner);<a 
name="line.322"></a>
 <span class="sourceLineNo">323</span>        }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>        if (!seekResult) {<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>          
this.scannersForDelayedClose.add(scanner);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        } else {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          heap.add(scanner);<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        scanner = heap.poll();<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>        if (scanner == null) {<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>          current = null;<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>        }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    } catch (Exception e) {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>      if (scanner != null) {<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>        try {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>          scanner.close();<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>        } catch (Exception ce) {<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>          LOG.warn("close KeyValueScanner 
error", ce);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        }<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      throw e;<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>    // Heap is returning empty, scanner 
is done<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    return false;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>  /**<a name="line.350"></a>
-<span class="sourceLineNo">351</span>   * Fetches the top sub-scanner from the 
priority queue, ensuring that a real<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   * seek has been done on it. Works by 
fetching the top sub-scanner, and if it<a name="line.352"></a>
-<span class="sourceLineNo">353</span>   * has not done a real seek, making it 
do so (which will modify its top KV),<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * putting it back, and repeating this 
until success. Relies on the fact that<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * on a lazy seek we set the current 
key of a StoreFileScanner to a KV that<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * is not greater than the real next KV 
to be read from that file, so the<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * scanner that bubbles up to the top 
of the heap will have global next KV in<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * this scanner heap if (1) it has done 
a real seek and (2) its KV is the top<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * among all top KVs (some of which are 
fake) in the scanner heap.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   */<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  protected KeyValueScanner pollRealKV() 
throws IOException {<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    KeyValueScanner kvScanner = 
heap.poll();<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    if (kvScanner == null) {<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>      return null;<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>    while (kvScanner != null &amp;&amp; 
!kvScanner.realSeekDone()) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>      if (kvScanner.peek() != null) {<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>        try {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>          kvScanner.enforceSeek();<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>        } catch (IOException ioe) {<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>          // Add the item to delayed 
close set in case it is leak from close<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          
this.scannersForDelayedClose.add(kvScanner);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          throw ioe;<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>        }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        Cell curKV = kvScanner.peek();<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>        if (curKV != null) {<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>          KeyValueScanner 
nextEarliestScanner = heap.peek();<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          if (nextEarliestScanner == 
null) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            // The heap is empty. Return 
the only possible scanner.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>            return kvScanner;<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>          }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>          // Compare the current scanner 
to the next scanner. We try to avoid<a name="line.384"></a>
-<span class="sourceLineNo">385</span>          // putting the current one back 
into the heap if possible.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          Cell nextKV = 
nextEarliestScanner.peek();<a name="line.386"></a>
-<span class="sourceLineNo">387</span>          if (nextKV == null || 
comparator.compare(curKV, nextKV) &lt; 0) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>            // We already have the 
scanner with the earliest KV, so return it.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            return kvScanner;<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>          }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>          // Otherwise, put the scanner 
back into the heap and let it compete<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          // against all other scanners 
(both those that have done a "real<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          // seek" and a "lazy seek").<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>          heap.add(kvScanner);<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>        } else {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>          // Close the scanner because we 
did a real seek and found out there<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          // are no more KVs.<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>          
this.scannersForDelayedClose.add(kvScanner);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      } else {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        // Close the scanner because it 
has already run out of KVs even before<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        // we had to do a real seek on 
it.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        
this.scannersForDelayedClose.add(kvScanner);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      kvScanner = heap.poll();<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>    return kvScanner;<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>  /**<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   * @return the current Heap<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span>   */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>  public 
PriorityQueue&lt;KeyValueScanner&gt; getHeap() {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    return this.heap;<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>  }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  /**<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   * @see 
KeyValueScanner#getScannerOrder()<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
-<span class="sourceLineNo">422</span>  @Override<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  public long getScannerOrder() {<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>    return 0;<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>  @VisibleForTesting<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>  KeyValueScanner getCurrentForTesting() 
{<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    return current;<a name="line.429"></a>
+<span class="sourceLineNo">324</span>        scanner = heap.poll();<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>        if (scanner == null) {<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>          current = null;<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>    } catch (Exception e) {<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>      if (scanner != null) {<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>        try {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>          scanner.close();<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>        } catch (Exception ce) {<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>          LOG.warn("close KeyValueScanner 
error", ce);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>        }<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      throw e;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>    // Heap is returning empty, scanner 
is done<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    return false;<a name="line.341"></a>
+<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>  /**<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   * Fetches the top sub-scanner from the 
priority queue, ensuring that a real<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   * seek has been done on it. Works by 
fetching the top sub-scanner, and if it<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * has not done a real seek, making it 
do so (which will modify its top KV),<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   * putting it back, and repeating this 
until success. Relies on the fact that<a name="line.348"></a>
+<span class="sourceLineNo">349</span>   * on a lazy seek we set the current 
key of a StoreFileScanner to a KV that<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   * is not greater than the real next KV 
to be read from that file, so the<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   * scanner that bubbles up to the top 
of the heap will have global next KV in<a name="line.351"></a>
+<span class="sourceLineNo">352</span>   * this scanner heap if (1) it has done 
a real seek and (2) its KV is the top<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   * among all top KVs (some of which are 
fake) in the scanner heap.<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   */<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  protected KeyValueScanner pollRealKV() 
throws IOException {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    KeyValueScanner kvScanner = 
heap.poll();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    if (kvScanner == null) {<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>      return null;<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span>    while (kvScanner != null &amp;&amp; 
!kvScanner.realSeekDone()) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      if (kvScanner.peek() != null) {<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>        try {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>          kvScanner.enforceSeek();<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>        } catch (IOException ioe) {<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>          // Add the item to delayed 
close set in case it is leak from close<a name="line.366"></a>
+<span class="sourceLineNo">367</span>          
this.scannersForDelayedClose.add(kvScanner);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>          throw ioe;<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>        }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>        Cell curKV = kvScanner.peek();<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>        if (curKV != null) {<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>          KeyValueScanner 
nextEarliestScanner = heap.peek();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>          if (nextEarliestScanner == 
null) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>            // The heap is empty. Return 
the only possible scanner.<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            return kvScanner;<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>          }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>          // Compare the current scanner 
to the next scanner. We try to avoid<a name="line.378"></a>
+<span class="sourceLineNo">379</span>          // putting the current one back 
into the heap if possible.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          Cell nextKV = 
nextEarliestScanner.peek();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          if (nextKV == null || 
comparator.compare(curKV, nextKV) &lt; 0) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>            // We already have the 
scanner with the earliest KV, so return it.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>            return kvScanner;<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>          }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>          // Otherwise, put the scanner 
back into the heap and let it compete<a name="line.386"></a>
+<span class="sourceLineNo">387</span>          // against all other scanners 
(both those that have done a "real<a name="line.387"></a>
+<span class="sourceLineNo">388</span>          // seek" and a "lazy seek").<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>          heap.add(kvScanner);<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>        } else {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          // Close the scanner because we 
did a real seek and found out there<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          // are no more KVs.<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>          
this.scannersForDelayedClose.add(kvScanner);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        }<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      } else {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        // Close the scanner because it 
has already run out of KVs even before<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        // we had to do a real seek on 
it.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>        
this.scannersForDelayedClose.add(kvScanner);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      kvScanner = heap.poll();<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>    return kvScanner;<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>  }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>  /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span>   * @return the current Heap<a 
name="line.407"></a>
+<span class="sourceLineNo">408</span>   */<a name="line.408"></a>
+<span class="sourceLineNo">409</span>  public 
PriorityQueue&lt;KeyValueScanner&gt; getHeap() {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    return this.heap;<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>  }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>  /**<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   * @see 
KeyValueScanner#getScannerOrder()<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   */<a name="line.415"></a>
+<span class="sourceLineNo">416</span>  @Override<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  public long getScannerOrder() {<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>    return 0;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  @VisibleForTesting<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>  KeyValueScanner getCurrentForTesting() 
{<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    return current;<a name="line.423"></a>
+<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>  @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  public Cell getNextIndexedKey() {<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>    // here we return the next index key 
from the top scanner<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    return current == null ? null : 
current.getNextIndexedKey();<a name="line.429"></a>
 <span class="sourceLineNo">430</span>  }<a name="line.430"></a>
 <span class="sourceLineNo">431</span><a name="line.431"></a>
 <span class="sourceLineNo">432</span>  @Override<a name="line.432"></a>
-<span class="sourceLineNo">433</span>  public Cell getNextIndexedKey() {<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span>    // here we return the next index key 
from the top scanner<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    return current == null ? null : 
current.getNextIndexedKey();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  @Override<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  public void shipped() throws 
IOException {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    for (KeyValueScanner scanner : 
this.scannersForDelayedClose) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      scanner.close(); // There wont be 
further fetch of Cells from these scanners. Just close.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    }<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    
this.scannersForDelayedClose.clear();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    if (this.current != null) {<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>      this.current.shipped();<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    if (this.heap != null) {<a 
name="line.447"></a>
-<span class="sourceLineNo">448</span>      for (KeyValueScanner scanner : 
this.heap) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        scanner.shipped();<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>      }<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    }<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  }<a name="line.452"></a>
-<span class="sourceLineNo">453</span>}<a name="line.453"></a>
+<span class="sourceLineNo">433</span>  public void shipped() throws 
IOException {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    for (KeyValueScanner scanner : 
this.scannersForDelayedClose) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      scanner.close(); // There wont be 
further fetch of Cells from these scanners. Just close.<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    
this.scannersForDelayedClose.clear();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    if (this.current != null) {<a 
name="line.438"></a>
+<span class="sourceLineNo">439</span>      this.current.shipped();<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    if (this.heap != null) {<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>      for (KeyValueScanner scanner : 
this.heap) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        scanner.shipped();<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>      }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    }<a name="line.445"></a>
+<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>}<a name="line.447"></a>
 
 
 

Reply via email to