hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [29/45] hbase-site git commit: Published site at 04622254f7209c5cfeadcfa137a97fbed161075a.
Date Mon, 14 Dec 2015 16:38:40 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/736088b3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
index 606c077..0f3725c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
@@ -35,865 +35,885 @@
 <span class="sourceLineNo">027</span>import java.util.NavigableSet;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import java.util.Set;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import java.util.concurrent.CountDownLatch;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.commons.logging.Log;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.commons.logging.LogFactory;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Cell;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HConstants;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.IsolationLevel;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.executor.ExecutorService;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.regionserver.ScannerContext.NextState;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.handler.ParallelSeekHandler;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>import com.google.common.annotations.VisibleForTesting;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Scanner scans both the memstore and the Store. Coalesce KeyValue stream<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * into List&amp;lt;KeyValue&amp;gt; for a single row.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@InterfaceAudience.Private<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public class StoreScanner extends NonReversedNonLazyKeyValueScanner<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    implements KeyValueScanner, InternalScanner, ChangedReadersObserver {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static final Log LOG = LogFactory.getLog(StoreScanner.class);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  // In unit tests, the store could be null<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  protected final Store store;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  protected ScanQueryMatcher matcher;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  protected KeyValueHeap heap;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  protected boolean cacheBlocks;<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  protected int countPerRow = 0;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected int storeLimit = -1;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  protected int storeOffset = 0;<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  // Used to indicate that the scanner has closed (see HBASE-1107)<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  // Doesnt need to be volatile because it's always accessed via synchronized methods<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  protected boolean closing = false;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  protected final boolean get;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  protected final boolean explicitColumnQuery;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  protected final boolean useRowColBloom;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * A flag that enables StoreFileScanner parallel-seeking<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected boolean parallelSeekEnabled = false;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  protected ExecutorService executor;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  protected final Scan scan;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected final NavigableSet&lt;byte[]&gt; columns;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  protected final long oldestUnexpiredTS;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  protected final long now;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  protected final int minVersions;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  protected final long maxRowSize;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  protected final long cellsPerHeartbeatCheck;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>  // Collects all the KVHeap that are eagerly getting closed during the<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  // course of a scan<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  protected Set&lt;KeyValueHeap&gt; heapsForDelayedClose = new HashSet&lt;KeyValueHeap&gt;();<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * The number of KVs seen by the scanner. Includes explicitly skipped KVs, but not<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * KVs skipped via seeking to next row/column. TODO: estimate them?<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  private long kvsScanned = 0;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  private Cell prevCell = null;<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  /** We don't ever expect to change this, the constant is just for clarity. */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  static final boolean LAZY_SEEK_ENABLED_BY_DEFAULT = true;<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public static final String STORESCANNER_PARALLEL_SEEK_ENABLE =<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      "hbase.storescanner.parallel.seek.enable";<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  /** Used during unit testing to ensure that lazy seek does save seek ops */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  protected static boolean lazySeekEnabledGlobally =<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      LAZY_SEEK_ENABLED_BY_DEFAULT;<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * The number of cells scanned in between timeout checks. Specifying a larger value means that<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * timeout checks will occur less frequently. Specifying a small value will lead to more frequent<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * timeout checks.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  public static final String HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK =<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      "hbase.cells.scanned.per.heartbeat.check";<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * Default value of {@link #HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK}.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public static final long DEFAULT_HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK = 10000;<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>  // if heap == null and lastTop != null, you need to reseek given the key below<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  protected Cell lastTop = null;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  // A flag whether use pread for scan<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  private boolean scanUsePread = false;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  // Indicates whether there was flush during the course of the scan<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  protected volatile boolean flushed = false;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  <a name="line.129"></a>
-<span class="sourceLineNo">130</span>  protected final long readPt;<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  // used by the injection framework to test race between StoreScanner construction and compaction<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  enum StoreScannerCompactionRace {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    BEFORE_SEEK,<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    AFTER_SEEK,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    COMPACT_COMPLETE<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">030</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.commons.logging.Log;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.commons.logging.LogFactory;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.Cell;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.IsolationLevel;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.executor.ExecutorService;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.regionserver.ScannerContext.LimitScope;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.ScannerContext.NextState;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.handler.ParallelSeekHandler;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>/**<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * Scanner scans both the memstore and the Store. Coalesce KeyValue stream<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * into List&amp;lt;KeyValue&amp;gt; for a single row.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@InterfaceAudience.Private<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public class StoreScanner extends NonReversedNonLazyKeyValueScanner<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    implements KeyValueScanner, InternalScanner, ChangedReadersObserver {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private static final Log LOG = LogFactory.getLog(StoreScanner.class);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  // In unit tests, the store could be null<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  protected final Store store;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  protected ScanQueryMatcher matcher;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  protected KeyValueHeap heap;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  protected boolean cacheBlocks;<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  protected int countPerRow = 0;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  protected int storeLimit = -1;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  protected int storeOffset = 0;<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  // Used to indicate that the scanner has closed (see HBASE-1107)<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  // Doesnt need to be volatile because it's always accessed via synchronized methods<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  protected boolean closing = false;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  protected final boolean get;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  protected final boolean explicitColumnQuery;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  protected final boolean useRowColBloom;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  /**<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   * A flag that enables StoreFileScanner parallel-seeking<a name="line.78"></a>
+<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  protected boolean parallelSeekEnabled = false;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  protected ExecutorService executor;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  protected final Scan scan;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  protected final NavigableSet&lt;byte[]&gt; columns;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  protected final long oldestUnexpiredTS;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  protected final long now;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  protected final int minVersions;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  protected final long maxRowSize;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  protected final long cellsPerHeartbeatCheck;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  // Collects all the KVHeap that are eagerly getting closed during the<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  // course of a scan<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  protected Set&lt;KeyValueHeap&gt; heapsForDelayedClose = new HashSet&lt;KeyValueHeap&gt;();<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  /**<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * The number of KVs seen by the scanner. Includes explicitly skipped KVs, but not<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * KVs skipped via seeking to next row/column. TODO: estimate them?<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   */<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  private long kvsScanned = 0;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  private Cell prevCell = null;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  /** We don't ever expect to change this, the constant is just for clarity. */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  static final boolean LAZY_SEEK_ENABLED_BY_DEFAULT = true;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public static final String STORESCANNER_PARALLEL_SEEK_ENABLE =<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      "hbase.storescanner.parallel.seek.enable";<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  /** Used during unit testing to ensure that lazy seek does save seek ops */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  protected static boolean lazySeekEnabledGlobally =<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      LAZY_SEEK_ENABLED_BY_DEFAULT;<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>   * The number of cells scanned in between timeout checks. Specifying a larger value means that<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * timeout checks will occur less frequently. Specifying a small value will lead to more frequent<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * timeout checks.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public static final String HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK =<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      "hbase.cells.scanned.per.heartbeat.check";<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * Default value of {@link #HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK}.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  public static final long DEFAULT_HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK = 10000;<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  // if heap == null and lastTop != null, you need to reseek given the key below<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  protected Cell lastTop = null;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  // A flag whether use pread for scan<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  private boolean scanUsePread = false;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  // Indicates whether there was flush during the course of the scan<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  protected volatile boolean flushed = false;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  // generally we get one file from a flush<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  protected List&lt;StoreFile&gt; flushedStoreFiles = new ArrayList&lt;StoreFile&gt;(1);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  // The current list of scanners<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  protected List&lt;KeyValueScanner&gt; currentScanners = new ArrayList&lt;KeyValueScanner&gt;();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  // flush update lock<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  private ReentrantLock flushLock = new ReentrantLock();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  <a name="line.136"></a>
+<span class="sourceLineNo">137</span>  protected final long readPt;<a name="line.137"></a>
 <span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  /** An internal constructor. */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  protected StoreScanner(Store store, Scan scan, final ScanInfo scanInfo,<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      final NavigableSet&lt;byte[]&gt; columns, long readPt, boolean cacheBlocks) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    this.readPt = readPt;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    this.store = store;<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    this.cacheBlocks = cacheBlocks;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    get = scan.isGetScan();<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    int numCol = columns == null ? 0 : columns.size();<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    explicitColumnQuery = numCol &gt; 0;<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    this.scan = scan;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    this.columns = columns;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    this.now = EnvironmentEdgeManager.currentTime();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    this.oldestUnexpiredTS = now - scanInfo.getTtl();<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    this.minVersions = scanInfo.getMinVersions();<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>     // We look up row-column Bloom filters for multi-column queries as part of<a name="line.154"></a>
-<span class="sourceLineNo">155</span>     // the seek operation. However, we also look the row-column Bloom filter<a name="line.155"></a>
-<span class="sourceLineNo">156</span>     // for multi-row (non-"get") scans because this is not done in<a name="line.156"></a>
-<span class="sourceLineNo">157</span>     // StoreFile.passesBloomFilter(Scan, SortedSet&lt;byte[]&gt;).<a name="line.157"></a>
-<span class="sourceLineNo">158</span>     this.useRowColBloom = numCol &gt; 1 || (!get &amp;&amp; numCol == 1);<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>     this.maxRowSize = scanInfo.getTableMaxRowSize();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>     this.scanUsePread = scan.isSmall()? true: scanInfo.isUsePread();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>     this.cellsPerHeartbeatCheck = scanInfo.getCellsPerTimeoutCheck();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>     // Parallel seeking is on if the config allows and more there is more than one store file.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>     if (this.store != null &amp;&amp; this.store.getStorefilesCount() &gt; 1) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>       RegionServerServices rsService = ((HStore)store).getHRegion().getRegionServerServices();<a name="line.165"></a>
-<span class="sourceLineNo">166</span>       if (rsService != null &amp;&amp; scanInfo.isParallelSeekEnabled()) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>         this.parallelSeekEnabled = true;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         this.executor = rsService.getExecutorService();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>       }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * Opens a scanner across memstore, snapshot, and all StoreFiles. Assumes we<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   * are not in a compaction.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   *<a name="line.176"></a>
-<span class="sourceLineNo">177</span>   * @param store who we scan<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   * @param scan the spec<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @param columns which columns we are scanning<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * @throws IOException<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan, final NavigableSet&lt;byte[]&gt; columns,<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      long readPt)<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  throws IOException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    this(store, scan, scanInfo, columns, readPt, scan.getCacheBlocks());<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    if (columns != null &amp;&amp; scan.isRaw()) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      throw new DoNotRetryIOException("Cannot specify any column for a raw scan");<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    matcher = new ScanQueryMatcher(scan, scanInfo, columns,<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        ScanType.USER_SCAN, Long.MAX_VALUE, HConstants.LATEST_TIMESTAMP,<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        oldestUnexpiredTS, now, store.getCoprocessorHost());<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>    this.store.addChangedReaderObserver(this);<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    // Pass columns to try to filter out unnecessary StoreFiles.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    List&lt;KeyValueScanner&gt; scanners = getScannersNoCompaction();<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>    // Seek all scanners to the start of the Row (or if the exact matching row<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // key does not exist, then to the start of the next matching Row).<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // Always check bloom filter to optimize the top row seek for delete<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    // family marker.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    seekScanners(scanners, matcher.getStartKey(), explicitColumnQuery<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        &amp;&amp; lazySeekEnabledGlobally, parallelSeekEnabled);<a name="line.203"></a>
+<span class="sourceLineNo">139</span>  // used by the injection framework to test race between StoreScanner construction and compaction<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  enum StoreScannerCompactionRace {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    BEFORE_SEEK,<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    AFTER_SEEK,<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    COMPACT_COMPLETE<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  /** An internal constructor. */<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  protected StoreScanner(Store store, Scan scan, final ScanInfo scanInfo,<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      final NavigableSet&lt;byte[]&gt; columns, long readPt, boolean cacheBlocks) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    this.readPt = readPt;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    this.store = store;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    this.cacheBlocks = cacheBlocks;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    get = scan.isGetScan();<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    int numCol = columns == null ? 0 : columns.size();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    explicitColumnQuery = numCol &gt; 0;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    this.scan = scan;<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    this.columns = columns;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    this.now = EnvironmentEdgeManager.currentTime();<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    this.oldestUnexpiredTS = now - scanInfo.getTtl();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    this.minVersions = scanInfo.getMinVersions();<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>     // We look up row-column Bloom filters for multi-column queries as part of<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     // the seek operation. However, we also look the row-column Bloom filter<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     // for multi-row (non-"get") scans because this is not done in<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     // StoreFile.passesBloomFilter(Scan, SortedSet&lt;byte[]&gt;).<a name="line.164"></a>
+<span class="sourceLineNo">165</span>     this.useRowColBloom = numCol &gt; 1 || (!get &amp;&amp; numCol == 1);<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>     this.maxRowSize = scanInfo.getTableMaxRowSize();<a name="line.167"></a>
+<span class="sourceLineNo">168</span>     this.scanUsePread = scan.isSmall()? true: scanInfo.isUsePread();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>     this.cellsPerHeartbeatCheck = scanInfo.getCellsPerTimeoutCheck();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>     // Parallel seeking is on if the config allows and more there is more than one store file.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>     if (this.store != null &amp;&amp; this.store.getStorefilesCount() &gt; 1) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>       RegionServerServices rsService = ((HStore)store).getHRegion().getRegionServerServices();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>       if (rsService != null &amp;&amp; scanInfo.isParallelSeekEnabled()) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>         this.parallelSeekEnabled = true;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>         this.executor = rsService.getExecutorService();<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>  }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>  protected void addCurrentScanners(List&lt;? extends KeyValueScanner&gt; scanners) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    this.currentScanners.addAll(scanners);<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>   * Opens a scanner across memstore, snapshot, and all StoreFiles. Assumes we<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   * are not in a compaction.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   *<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * @param store who we scan<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @param scan the spec<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @param columns which columns we are scanning<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   * @throws IOException<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan, final NavigableSet&lt;byte[]&gt; columns,<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      long readPt)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    this(store, scan, scanInfo, columns, readPt, scan.getCacheBlocks());<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (columns != null &amp;&amp; scan.isRaw()) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      throw new DoNotRetryIOException("Cannot specify any column for a raw scan");<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    matcher = new ScanQueryMatcher(scan, scanInfo, columns,<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        ScanType.USER_SCAN, Long.MAX_VALUE, HConstants.LATEST_TIMESTAMP,<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        oldestUnexpiredTS, now, store.getCoprocessorHost());<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    this.store.addChangedReaderObserver(this);<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    // set storeLimit<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    this.storeLimit = scan.getMaxResultsPerColumnFamily();<a name="line.206"></a>
+<span class="sourceLineNo">205</span>    // Pass columns to try to filter out unnecessary StoreFiles.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    List&lt;KeyValueScanner&gt; scanners = getScannersNoCompaction();<a name="line.206"></a>
 <span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    // set rowOffset<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    this.storeOffset = scan.getRowOffsetPerColumnFamily();<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>    // Combine all seeked scanners with a heap<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    resetKVHeap(scanners, store.getComparator());<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">208</span>    // Seek all scanners to the start of the Row (or if the exact matching row<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    // key does not exist, then to the start of the next matching Row).<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    // Always check bloom filter to optimize the top row seek for delete<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    // family marker.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    seekScanners(scanners, matcher.getStartKey(), explicitColumnQuery<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        &amp;&amp; lazySeekEnabledGlobally, parallelSeekEnabled);<a name="line.213"></a>
 <span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /**<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * Used for compactions.&lt;p&gt;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   *<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   * Opens a scanner across specified StoreFiles.<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   * @param store who we scan<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * @param scan the spec<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * @param scanners ancillary scanners<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * @param smallestReadPoint the readPoint that we should use for tracking<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   *          versions<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      List&lt;? extends KeyValueScanner&gt; scanners, ScanType scanType,<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      long smallestReadPoint, long earliestPutTs) throws IOException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    this(store, scanInfo, scan, scanners, scanType, smallestReadPoint, earliestPutTs, null, null);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * Used for compactions that drop deletes from a limited range of rows.&lt;p&gt;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   *<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * Opens a scanner across specified StoreFiles.<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @param store who we scan<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @param scan the spec<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @param scanners ancillary scanners<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   * @param smallestReadPoint the readPoint that we should use for tracking versions<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   * @param dropDeletesFromRow The inclusive left bound of the range; can be EMPTY_START_ROW.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * @param dropDeletesToRow The exclusive right bound of the range; can be EMPTY_END_ROW.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      List&lt;? extends KeyValueScanner&gt; scanners, long smallestReadPoint, long earliestPutTs,<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      byte[] dropDeletesFromRow, byte[] dropDeletesToRow) throws IOException {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    this(store, scanInfo, scan, scanners, ScanType.COMPACT_RETAIN_DELETES, smallestReadPoint,<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        earliestPutTs, dropDeletesFromRow, dropDeletesToRow);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>  private StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      List&lt;? extends KeyValueScanner&gt; scanners, ScanType scanType, long smallestReadPoint,<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      long earliestPutTs, byte[] dropDeletesFromRow, byte[] dropDeletesToRow) throws IOException {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    this(store, scan, scanInfo, null,<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      ((HStore)store).getHRegion().getReadpoint(IsolationLevel.READ_COMMITTED), false);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    if (dropDeletesFromRow == null) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      matcher = new ScanQueryMatcher(scan, scanInfo, null, scanType, smallestReadPoint,<a name="line.255"></a>
-<span class="sourceLineNo">256</span>          earliestPutTs, oldestUnexpiredTS, now, store.getCoprocessorHost());<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    } else {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      matcher = new ScanQueryMatcher(scan, scanInfo, null, smallestReadPoint, earliestPutTs,<a name="line.258"></a>
-<span class="sourceLineNo">259</span>          oldestUnexpiredTS, now, dropDeletesFromRow, dropDeletesToRow, store.getCoprocessorHost());<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span>    // Filter the list of scanners using Bloom filters, time range, TTL, etc.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    scanners = selectScannersFrom(scanners);<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    // Seek all scanners to the initial key<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    seekScanners(scanners, matcher.getStartKey(), false, parallelSeekEnabled);<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // Combine all seeked scanners with a heap<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    resetKVHeap(scanners, store.getComparator());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
+<span class="sourceLineNo">215</span>    // set storeLimit<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    this.storeLimit = scan.getMaxResultsPerColumnFamily();<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    // set rowOffset<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    this.storeOffset = scan.getRowOffsetPerColumnFamily();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    addCurrentScanners(scanners);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    // Combine all seeked scanners with a heap<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    resetKVHeap(scanners, store.getComparator());<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * Used for compactions.&lt;p&gt;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   *<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * Opens a scanner across specified StoreFiles.<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   * @param store who we scan<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * @param scan the spec<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * @param scanners ancillary scanners<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * @param smallestReadPoint the readPoint that we should use for tracking<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   *          versions<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      List&lt;? extends KeyValueScanner&gt; scanners, ScanType scanType,<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      long smallestReadPoint, long earliestPutTs) throws IOException {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    this(store, scanInfo, scan, scanners, scanType, smallestReadPoint, earliestPutTs, null, null);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>  /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   * Used for compactions that drop deletes from a limited range of rows.&lt;p&gt;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   *<a name="line.243"></a>
+<span class="sourceLineNo">244</span>   * Opens a scanner across specified StoreFiles.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   * @param store who we scan<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * @param scan the spec<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   * @param scanners ancillary scanners<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * @param smallestReadPoint the readPoint that we should use for tracking versions<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   * @param dropDeletesFromRow The inclusive left bound of the range; can be EMPTY_START_ROW.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   * @param dropDeletesToRow The exclusive right bound of the range; can be EMPTY_END_ROW.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>  public StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      List&lt;? extends KeyValueScanner&gt; scanners, long smallestReadPoint, long earliestPutTs,<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      byte[] dropDeletesFromRow, byte[] dropDeletesToRow) throws IOException {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    this(store, scanInfo, scan, scanners, ScanType.COMPACT_RETAIN_DELETES, smallestReadPoint,<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        earliestPutTs, dropDeletesFromRow, dropDeletesToRow);<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>  private StoreScanner(Store store, ScanInfo scanInfo, Scan scan,<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      List&lt;? extends KeyValueScanner&gt; scanners, ScanType scanType, long smallestReadPoint,<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      long earliestPutTs, byte[] dropDeletesFromRow, byte[] dropDeletesToRow) throws IOException {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    this(store, scan, scanInfo, null,<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      ((HStore)store).getHRegion().getReadpoint(IsolationLevel.READ_COMMITTED), false);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    if (dropDeletesFromRow == null) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      matcher = new ScanQueryMatcher(scan, scanInfo, null, scanType, smallestReadPoint,<a name="line.265"></a>
+<span class="sourceLineNo">266</span>          earliestPutTs, oldestUnexpiredTS, now, store.getCoprocessorHost());<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    } else {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      matcher = new ScanQueryMatcher(scan, scanInfo, null, smallestReadPoint, earliestPutTs,<a name="line.268"></a>
+<span class="sourceLineNo">269</span>          oldestUnexpiredTS, now, dropDeletesFromRow, dropDeletesToRow, store.getCoprocessorHost());<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
 <span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>  @VisibleForTesting<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  StoreScanner(final Scan scan, ScanInfo scanInfo,<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      final List&lt;KeyValueScanner&gt; scanners) throws IOException {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    this(scan, scanInfo, scanType, columns, scanners,<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        HConstants.LATEST_TIMESTAMP,<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        // 0 is passed as readpoint because the test bypasses Store<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        0);<a name="line.279"></a>
+<span class="sourceLineNo">272</span>    // Filter the list of scanners using Bloom filters, time range, TTL, etc.<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    scanners = selectScannersFrom(scanners);<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    // Seek all scanners to the initial key<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    seekScanners(scanners, matcher.getStartKey(), false, parallelSeekEnabled);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    addCurrentScanners(scanners);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    // Combine all seeked scanners with a heap<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    resetKVHeap(scanners, store.getComparator());<a name="line.279"></a>
 <span class="sourceLineNo">280</span>  }<a name="line.280"></a>
 <span class="sourceLineNo">281</span><a name="line.281"></a>
 <span class="sourceLineNo">282</span>  @VisibleForTesting<a name="line.282"></a>
 <span class="sourceLineNo">283</span>  StoreScanner(final Scan scan, ScanInfo scanInfo,<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    final List&lt;KeyValueScanner&gt; scanners, long earliestPutTs)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        throws IOException {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    this(scan, scanInfo, scanType, columns, scanners, earliestPutTs,<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      // 0 is passed as readpoint because the test bypasses Store<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      0);<a name="line.289"></a>
+<span class="sourceLineNo">284</span>      ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      final List&lt;KeyValueScanner&gt; scanners) throws IOException {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    this(scan, scanInfo, scanType, columns, scanners,<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        HConstants.LATEST_TIMESTAMP,<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        // 0 is passed as readpoint because the test bypasses Store<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        0);<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>  public StoreScanner(final Scan scan, ScanInfo scanInfo,<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      final List&lt;KeyValueScanner&gt; scanners, long earliestPutTs, long readPt)<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  throws IOException {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    this(null, scan, scanInfo, columns, readPt, scan.getCacheBlocks());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    this.matcher = new ScanQueryMatcher(scan, scanInfo, columns, scanType,<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        Long.MAX_VALUE, earliestPutTs, oldestUnexpiredTS, now, null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>    // In unit tests, the store could be null<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    if (this.store != null) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      this.store.addChangedReaderObserver(this);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    // Seek all scanners to the initial key<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    seekScanners(scanners, matcher.getStartKey(), false, parallelSeekEnabled);<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    resetKVHeap(scanners, scanInfo.getComparator());<a name="line.306"></a>
-<span class="sourceLineNo">307</span>  }<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>  /**<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   * Get a filtered list of scanners. Assumes we are not in a compaction.<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   * @return list of scanners to seek<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   */<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  protected List&lt;KeyValueScanner&gt; getScannersNoCompaction() throws IOException {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    final boolean isCompaction = false;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    boolean usePread = get || scanUsePread;<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    return selectScannersFrom(store.getScanners(cacheBlocks, get, usePread,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt));<a name="line.317"></a>
+<span class="sourceLineNo">292</span>  @VisibleForTesting<a name="line.292"></a>
+<span class="sourceLineNo">293</span>  StoreScanner(final Scan scan, ScanInfo scanInfo,<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    final List&lt;KeyValueScanner&gt; scanners, long earliestPutTs)<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        throws IOException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    this(scan, scanInfo, scanType, columns, scanners, earliestPutTs,<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      // 0 is passed as readpoint because the test bypasses Store<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      0);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>  public StoreScanner(final Scan scan, ScanInfo scanInfo,<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      ScanType scanType, final NavigableSet&lt;byte[]&gt; columns,<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      final List&lt;KeyValueScanner&gt; scanners, long earliestPutTs, long readPt)<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  throws IOException {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    this(null, scan, scanInfo, columns, readPt, scan.getCacheBlocks());<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    this.matcher = new ScanQueryMatcher(scan, scanInfo, columns, scanType,<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        Long.MAX_VALUE, earliestPutTs, oldestUnexpiredTS, now, null);<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>    // In unit tests, the store could be null<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    if (this.store != null) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      this.store.addChangedReaderObserver(this);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    // Seek all scanners to the initial key<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    seekScanners(scanners, matcher.getStartKey(), false, parallelSeekEnabled);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    addCurrentScanners(scanners);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    resetKVHeap(scanners, scanInfo.getComparator());<a name="line.317"></a>
 <span class="sourceLineNo">318</span>  }<a name="line.318"></a>
 <span class="sourceLineNo">319</span><a name="line.319"></a>
 <span class="sourceLineNo">320</span>  /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   * Seek the specified scanners with the given key<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   * @param scanners<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * @param seekKey<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   * @param isLazy true if using lazy seek<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * @param isParallelSeek true if using parallel seek<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @throws IOException<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  protected void seekScanners(List&lt;? extends KeyValueScanner&gt; scanners,<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      Cell seekKey, boolean isLazy, boolean isParallelSeek)<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throws IOException {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // Seek all scanners to the start of the Row (or if the exact matching row<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    // key does not exist, then to the start of the next matching Row).<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    // Always check bloom filter to optimize the top row seek for delete<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    // family marker.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (isLazy) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      for (KeyValueScanner scanner : scanners) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        scanner.requestSeek(seekKey, false, true);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    } else {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      if (!isParallelSeek) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        long totalScannersSoughtBytes = 0;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        for (KeyValueScanner scanner : scanners) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>          if (totalScannersSoughtBytes &gt;= maxRowSize) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>            throw new RowTooBigException("Max row size allowed: " + maxRowSize<a name="line.344"></a>
-<span class="sourceLineNo">345</span>              + ", but row is bigger than that");<a name="line.345"></a>
-<span class="sourceLineNo">346</span>          }<a name="line.346"></a>
-<span class="sourceLineNo">347</span>          scanner.seek(seekKey);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>          Cell c = scanner.peek();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>          if (c != null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>            totalScannersSoughtBytes += CellUtil.estimatedSerializedSizeOf(c);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      } else {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        parallelSeek(scanners, seekKey);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>  }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>  protected void resetKVHeap(List&lt;? extends KeyValueScanner&gt; scanners,<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      CellComparator comparator) throws IOException {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    // Combine all seeked scanners with a heap<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    heap = new KeyValueHeap(scanners, comparator);<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>  /**<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * Filters the given list of scanners using Bloom filter, time range, and<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   * TTL.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   */<a name="line.368"></a>
-<span class="sourceLineNo">369</span>  protected List&lt;KeyValueScanner&gt; selectScannersFrom(<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      final List&lt;? extends KeyValueScanner&gt; allScanners) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    boolean memOnly;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    boolean filesOnly;<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    if (scan instanceof InternalScan) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      InternalScan iscan = (InternalScan)scan;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      memOnly = iscan.isCheckOnlyMemStore();<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      filesOnly = iscan.isCheckOnlyStoreFiles();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    } else {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      memOnly = false;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      filesOnly = false;<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>    List&lt;KeyValueScanner&gt; scanners =<a name="line.382"></a>
-<span class="sourceLineNo">383</span>        new ArrayList&lt;KeyValueScanner&gt;(allScanners.size());<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>    // We can only exclude store files based on TTL if minVersions is set to 0.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    // Otherwise, we might have to return KVs that have technically expired.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    long expiredTimestampCutoff = minVersions == 0 ? oldestUnexpiredTS :<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        Long.MIN_VALUE;<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>    // include only those scan files which pass all filters<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    for (KeyValueScanner kvs : allScanners) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      boolean isFile = kvs.isFileScanner();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      if ((!isFile &amp;&amp; filesOnly) || (isFile &amp;&amp; memOnly)) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        continue;<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>      if (kvs.shouldUseScanner(scan, store, expiredTimestampCutoff)) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        scanners.add(kvs);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    return scanners;<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>  @Override<a name="line.404"></a>
-<span class="sourceLineNo">405</span>  public Cell peek() {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    checkResetHeap();<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    if (this.heap == null) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      return this.lastTop;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    return this.heap.peek();<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>  @Override<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  public KeyValue next() {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    // throw runtime exception perhaps?<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    throw new RuntimeException("Never call StoreScanner.next()");<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>  @Override<a name="line.419"></a>
-<span class="sourceLineNo">420</span>  public void close() {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    close(true);<a name="line.421"></a>
+<span class="sourceLineNo">321</span>   * Get a filtered list of scanners. Assumes we are not in a compaction.<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   * @return list of scanners to seek<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  protected List&lt;KeyValueScanner&gt; getScannersNoCompaction() throws IOException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    final boolean isCompaction = false;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    boolean usePread = get || scanUsePread;<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    return selectScannersFrom(store.getScanners(cacheBlocks, get, usePread,<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        isCompaction, matcher, scan.getStartRow(), scan.getStopRow(), this.readPt));<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>  /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   * Seek the specified scanners with the given key<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @param scanners<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * @param seekKey<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * @param isLazy true if using lazy seek<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   * @param isParallelSeek true if using parallel seek<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * @throws IOException<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   */<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  protected void seekScanners(List&lt;? extends KeyValueScanner&gt; scanners,<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      Cell seekKey, boolean isLazy, boolean isParallelSeek)<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      throws IOException {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    // Seek all scanners to the start of the Row (or if the exact matching row<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    // key does not exist, then to the start of the next matching Row).<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    // Always check bloom filter to optimize the top row seek for delete<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    // family marker.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    if (isLazy) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      for (KeyValueScanner scanner : scanners) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        scanner.requestSeek(seekKey, false, true);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      }<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    } else {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      if (!isParallelSeek) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        long totalScannersSoughtBytes = 0;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        for (KeyValueScanner scanner : scanners) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          if (totalScannersSoughtBytes &gt;= maxRowSize) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            throw new RowTooBigException("Max row size allowed: " + maxRowSize<a name="line.355"></a>
+<span class="sourceLineNo">356</span>              + ", but row is bigger than that");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>          }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          scanner.seek(seekKey);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>          Cell c = scanner.peek();<a name="line.359"></a>
+<span class="sourceLineNo">360</span>          if (c != null) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>            totalScannersSoughtBytes += CellUtil.estimatedSerializedSizeOf(c);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      } else {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        parallelSeek(scanners, seekKey);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>  protected void resetKVHeap(List&lt;? extends KeyValueScanner&gt; scanners,<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      CellComparator comparator) throws IOException {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    // Combine all seeked scanners with a heap<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    heap = new KeyValueHeap(scanners, comparator);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  }<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span>  /**<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * Filters the given list of scanners using Bloom filter, time range, and<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * TTL.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>   */<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  protected List&lt;KeyValueScanner&gt; selectScannersFrom(<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      final List&lt;? extends KeyValueScanner&gt; allScanners) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    boolean memOnly;<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    boolean filesOnly;<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    if (scan instanceof InternalScan) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      InternalScan iscan = (InternalScan)scan;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      memOnly = iscan.isCheckOnlyMemStore();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      filesOnly = iscan.isCheckOnlyStoreFiles();<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    } else {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      memOnly = false;<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      filesOnly = false;<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>    List&lt;KeyValueScanner&gt; scanners =<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        new ArrayList&lt;KeyValueScanner&gt;(allScanners.size());<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    // We can only exclude store files based on TTL if minVersions is set to 0.<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    // Otherwise, we might have to return KVs that have technically expired.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    long expiredTimestampCutoff = minVersions == 0 ? oldestUnexpiredTS :<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        Long.MIN_VALUE;<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>    // include only those scan files which pass all filters<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    for (KeyValueScanner kvs : allScanners) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      boolean isFile = kvs.isFileScanner();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      if ((!isFile &amp;&amp; filesOnly) || (isFile &amp;&amp; memOnly)) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        continue;<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>      if (kvs.shouldUseScanner(scan, store, expiredTimestampCutoff)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        scanners.add(kvs);<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>    return scanners;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>  }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>  @Override<a name="line.415"></a>
+<span class="sourceLineNo">416</span>  public Cell peek() {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    checkFlushed();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    if (this.heap == null) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      return this.lastTop;<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    return this.heap.peek();<a name="line.421"></a>
 <span class="sourceLineNo">422</span>  }<a name="line.422"></a>
 <span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>  private void close(boolean withHeapClose) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (this.closing) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      return;<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    if (withHeapClose) this.closing = true;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    // Under test, we dont have a this.store<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    if (this.store != null) this.store.deleteChangedReaderObserver(this);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    if (withHeapClose) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      for (KeyValueHeap h : this.heapsForDelayedClose) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        h.close();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      this.heapsForDelayedClose.clear();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      if (this.heap != null) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        this.heap.close();<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        this.heap = null; // CLOSED!<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      }<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      if (this.heap != null) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        this.heapsForDelayedClose.add(this.heap);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        this.heap = null;<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>    this.lastTop = null; // If both are null, we are closed.<a name="line.446"></a>
-<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>  @Override<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  public boolean seek(Cell key) throws IOException {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    checkResetHeap();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    // reset matcher state, in case that underlying store changed<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    checkReseek();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    return this.heap.seek(key);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>  @Override<a name="line.457"></a>
-<span class="sourceLineNo">458</span>  public boolean next(List&lt;Cell&gt; outResult) throws IOException {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    return next(outResult, NoLimitScannerContext.getInstance());<a name="line.459"></a>
+<span class="sourceLineNo">424</span>  @Override<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  public KeyValue next() {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    // throw runtime exception perhaps?<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    throw new RuntimeException("Never call StoreScanner.next()");<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>  @Override<a name="line.430"></a>
+<span class="sourceLineNo">431</span>  public void close() {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    close(true);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  private void close(boolean withHeapClose) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    if (this.closing) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      return;<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    if (withHeapClose) this.closing = true;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    // Under test, we dont have a this.store<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    if (this.store != null) this.store.deleteChangedReaderObserver(this);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    if (withHeapClose) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      for (KeyValueHeap h : this.heapsForDelayedClose) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        h.close();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      }<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      this.heapsForDelayedClose.clear();<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      if (this.heap != null) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        this.heap.close();<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        this.currentScanners.clear();<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        this.heap = null; // CLOSED!<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    } else {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      if (this.heap != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>        this.heapsForDelayedClose.add(this.heap);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        this.currentScanners.clear();<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        this.heap = null;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      }<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    this.lastTop = null; // If both are null, we are closed.<a name="line.459"></a>
 <span class="sourceLineNo">460</span>  }<a name="line.460"></a>
 <span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>  /**<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * Get the next row of values from this Store.<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * @param outResult<a name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @param scannerContext<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   * @return true if there are more rows, false if scanner is done<a name="line.466"></a>
-<span class="sourceLineNo">467</span>   */<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  @Override<a name="line.468"></a>
-<span class="sourceLineNo">469</span>  public boolean next(List&lt;Cell&gt; outResult, ScannerContext scannerContext) throws IOException {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    if (scannerContext == null) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      throw new IllegalArgumentException("Scanner context cannot be null");<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    checkResetHeap();<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if (checkReseek()) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      return scannerContext.setScannerState(NextState.MORE_VALUES).hasMoreValues();<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>    // if the heap was left null, then the scanners had previously run out anyways, close and<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    // return.<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    if (this.heap == null) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      // By this time partial close should happened because already heap is null<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      close(false);// Do all cleanup except heap.close()<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>    Cell cell = this.heap.peek();<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (cell == null) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      close(false);// Do all cleanup except heap.close()<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();<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>    // only call setRow if the row changes; avoids confusing the query matcher<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    // if scanning intra-row<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span>    // If no limits exists in the scope LimitScope.Between_Cells then we are sure we are changing<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    // rows. Else it is possible we are still traversing the same row so we must perform the row<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    // co

<TRUNCATED>

Mime
View raw message