hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [06/51] [partial] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Wed, 26 Jul 2017 15:07:53 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html
index 1d02fea..8032a10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/NormalUserScanQueryMatcher.html
@@ -32,121 +32,119 @@
 <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.KeepDeletedCells;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.25"></a>
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.regionserver.ScanInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Query matcher for normal user scan.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public abstract class NormalUserScanQueryMatcher extends UserScanQueryMatcher {<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>  /** Keeps track of deletes */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  private final DeleteTracker deletes;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>  /** True if we are doing a 'Get' Scan. Every Get is actually a one-row Scan. */<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  private final boolean get;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>  /** whether time range queries can see rows "behind" a delete */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  private final boolean seePastDeleteMarkers;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  protected NormalUserScanQueryMatcher(Scan scan, ScanInfo scanInfo, ColumnTracker columns,<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      boolean hasNullColumn, DeleteTracker deletes, long oldestUnexpiredTS, long now) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    super(scan, scanInfo, columns, hasNullColumn, oldestUnexpiredTS, now);<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    this.deletes = deletes;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    this.get = scan.isGetScan();<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    this.seePastDeleteMarkers = scanInfo.getKeepDeletedCells() != KeepDeletedCells.FALSE;<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>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public void beforeShipped() throws IOException {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    super.beforeShipped();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    deletes.beforeShipped();<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public MatchCode match(Cell cell) throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    if (filter != null &amp;&amp; filter.filterAllRemaining()) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      return MatchCode.DONE_SCAN;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    }<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    MatchCode returnCode = preCheck(cell);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    if (returnCode != null) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      return returnCode;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    long timestamp = cell.getTimestamp();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    byte typeByte = cell.getTypeByte();<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    if (CellUtil.isDelete(typeByte)) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      boolean includeDeleteMarker = seePastDeleteMarkers ? tr.withinTimeRange(timestamp)<a name="line.71"></a>
-<span class="sourceLineNo">072</span>          : tr.withinOrAfterTimeRange(timestamp);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      if (includeDeleteMarker) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        this.deletes.add(cell);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      }<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      return MatchCode.SKIP;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    }<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    returnCode = checkDeleted(deletes, cell);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    if (returnCode != null) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      return returnCode;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    return matchColumn(cell, timestamp, typeByte);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  @Override<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  protected void reset() {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    deletes.reset();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  @Override<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  protected boolean isGet() {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    return get;<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>  public static NormalUserScanQueryMatcher create(Scan scan, ScanInfo scanInfo,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      ColumnTracker columns, boolean hasNullColumn, long oldestUnexpiredTS, long now,<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      RegionCoprocessorHost regionCoprocessorHost) throws IOException {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    DeleteTracker deletes = instantiateDeleteTracker(regionCoprocessorHost);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (scan.isReversed()) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      if (scan.includeStopRow()) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.101"></a>
-<span class="sourceLineNo">102</span>            oldestUnexpiredTS, now) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>          @Override<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            return cmpToStopRow &gt;= 0;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>          }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>        };<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      } else {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            oldestUnexpiredTS, now) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>          @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>            return cmpToStopRow &gt; 0;<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>      }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    } else {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      if (scan.includeStopRow()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.121"></a>
-<span class="sourceLineNo">122</span>            oldestUnexpiredTS, now) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>          @Override<a name="line.124"></a>
-<span class="sourceLineNo">125</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>            return cmpToStopRow &lt;= 0;<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        };<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      } else {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.130"></a>
-<span class="sourceLineNo">131</span>            oldestUnexpiredTS, now) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>          @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            return cmpToStopRow &lt; 0;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        };<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>}<a name="line.141"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.regionserver.ScanInfo;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Query matcher for normal user scan.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>@InterfaceAudience.Private<a name="line.32"></a>
+<span class="sourceLineNo">033</span>public abstract class NormalUserScanQueryMatcher extends UserScanQueryMatcher {<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>  /** Keeps track of deletes */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>  private final DeleteTracker deletes;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>  /** True if we are doing a 'Get' Scan. Every Get is actually a one-row Scan. */<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  private final boolean get;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>  /** whether time range queries can see rows "behind" a delete */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  protected final boolean seePastDeleteMarkers;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  protected NormalUserScanQueryMatcher(Scan scan, ScanInfo scanInfo, ColumnTracker columns,<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      boolean hasNullColumn, DeleteTracker deletes, long oldestUnexpiredTS, long now) {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    super(scan, scanInfo, columns, hasNullColumn, oldestUnexpiredTS, now);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    this.deletes = deletes;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    this.get = scan.isGetScan();<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    this.seePastDeleteMarkers = scanInfo.getKeepDeletedCells() != KeepDeletedCells.FALSE;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public void beforeShipped() throws IOException {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    super.beforeShipped();<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    deletes.beforeShipped();<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public MatchCode match(Cell cell) throws IOException {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    if (filter != null &amp;&amp; filter.filterAllRemaining()) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      return MatchCode.DONE_SCAN;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    }<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    MatchCode returnCode = preCheck(cell);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    if (returnCode != null) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      return returnCode;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    long timestamp = cell.getTimestamp();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    byte typeByte = cell.getTypeByte();<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    if (CellUtil.isDelete(typeByte)) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      boolean includeDeleteMarker = seePastDeleteMarkers ? tr.withinTimeRange(timestamp)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>          : tr.withinOrAfterTimeRange(timestamp);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      if (includeDeleteMarker) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        this.deletes.add(cell);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      return MatchCode.SKIP;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    returnCode = checkDeleted(deletes, cell);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    if (returnCode != null) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      return returnCode;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    }<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    return matchColumn(cell, timestamp, typeByte);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  @Override<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  protected void reset() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    deletes.reset();<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  protected boolean isGet() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    return get;<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>  public static NormalUserScanQueryMatcher create(Scan scan, ScanInfo scanInfo,<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      ColumnTracker columns, DeleteTracker deletes, boolean hasNullColumn, long oldestUnexpiredTS,<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      long now) throws IOException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    if (scan.isReversed()) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      if (scan.includeStopRow()) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.99"></a>
+<span class="sourceLineNo">100</span>            oldestUnexpiredTS, now) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>          @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            return cmpToStopRow &gt;= 0;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        };<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      } else {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            oldestUnexpiredTS, now) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>          @Override<a name="line.111"></a>
+<span class="sourceLineNo">112</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            return cmpToStopRow &gt; 0;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>          }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        };<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    } else {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      if (scan.includeStopRow()) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            oldestUnexpiredTS, now) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>          @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            return cmpToStopRow &lt;= 0;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        };<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      } else {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        return new NormalUserScanQueryMatcher(scan, scanInfo, columns, hasNullColumn, deletes,<a name="line.128"></a>
+<span class="sourceLineNo">129</span>            oldestUnexpiredTS, now) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>          @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          protected boolean moreRowsMayExistsAfter(int cmpToStopRow) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>            return cmpToStopRow &lt; 0;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>          }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        };<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>}<a name="line.139"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html
index a93c99c..5ba50d5 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html
@@ -27,284 +27,284 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.util.Iterator;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.Cell;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.KeyValue.Type;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Tag;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TagType;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TagUtil;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.regionserver.KeyValueScanner;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.regionserver.ScanInfo;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.regionserver.ShipperListener;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker.DeleteResult;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * A query matcher that is specifically designed for the scan case.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public abstract class ScanQueryMatcher implements ShipperListener {<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  /**<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   * {@link #match} return codes. These instruct the scanner moving through memstores and StoreFiles<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * what to do with the current KeyValue.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   * &lt;p&gt;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * Additionally, this contains "early-out" language to tell the scanner to move on to the next<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * File (memstore or Storefile), or to return immediately.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  public static enum MatchCode {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span>     * Include KeyValue in the returned result<a name="line.57"></a>
-<span class="sourceLineNo">058</span>     */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    INCLUDE,<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>    /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>     * Do not include KeyValue in the returned result<a name="line.62"></a>
-<span class="sourceLineNo">063</span>     */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    SKIP,<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>     * Do not include, jump to next StoreFile or memstore (in time order)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>     */<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    NEXT,<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span>     * Do not include, return current result<a name="line.72"></a>
-<span class="sourceLineNo">073</span>     */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    DONE,<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>    /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span>     * These codes are used by the ScanQueryMatcher<a name="line.77"></a>
-<span class="sourceLineNo">078</span>     */<a name="line.78"></a>
+<span class="sourceLineNo">022</span>import java.util.NavigableSet;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Cell;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HConstants;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.KeyValue.Type;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.Tag;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TagType;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.TagUtil;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.regionserver.ScanInfo;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.regionserver.ShipperListener;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.regionserver.querymatcher.DeleteTracker.DeleteResult;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.security.visibility.VisibilityNewVersionBehaivorTracker;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.security.visibility.VisibilityScanDeleteTracker;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>/**<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * A query matcher that is specifically designed for the scan case.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@InterfaceAudience.Private<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public abstract class ScanQueryMatcher implements ShipperListener {<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>   * {@link #match} return codes. These instruct the scanner moving through memstores and StoreFiles<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * what to do with the current KeyValue.<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * &lt;p&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * Additionally, this contains "early-out" language to tell the scanner to move on to the next<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * File (memstore or Storefile), or to return immediately.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public static enum MatchCode {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    /**<a name="line.60"></a>
+<span class="sourceLineNo">061</span>     * Include KeyValue in the returned result<a name="line.61"></a>
+<span class="sourceLineNo">062</span>     */<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    INCLUDE,<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>    /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>     * Do not include KeyValue in the returned result<a name="line.66"></a>
+<span class="sourceLineNo">067</span>     */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    SKIP,<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    /**<a name="line.70"></a>
+<span class="sourceLineNo">071</span>     * Do not include, jump to next StoreFile or memstore (in time order)<a name="line.71"></a>
+<span class="sourceLineNo">072</span>     */<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    NEXT,<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span>     * Do not include, return current result<a name="line.76"></a>
+<span class="sourceLineNo">077</span>     */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    DONE,<a name="line.78"></a>
 <span class="sourceLineNo">079</span><a name="line.79"></a>
 <span class="sourceLineNo">080</span>    /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span>     * Done with the row, seek there.<a name="line.81"></a>
+<span class="sourceLineNo">081</span>     * These codes are used by the ScanQueryMatcher<a name="line.81"></a>
 <span class="sourceLineNo">082</span>     */<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    SEEK_NEXT_ROW,<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>    /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span>     * Done with column, seek to next.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>     */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    SEEK_NEXT_COL,<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span>     * Done with scan, thanks to the row filter.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>     */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    DONE_SCAN,<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>     * Seek to next key which is given as hint.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>     */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    SEEK_NEXT_USING_HINT,<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    /**<a name="line.100"></a>
-<span class="sourceLineNo">101</span>     * Include KeyValue and done with column, seek to next.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>     */<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    INCLUDE_AND_SEEK_NEXT_COL,<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>    /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span>     * Include KeyValue and done with row, seek to next.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>     */<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    INCLUDE_AND_SEEK_NEXT_ROW,<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>  /** Row comparator for the region this query is for */<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  protected final CellComparator rowComparator;<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>  /** Key to seek to in memstore and StoreFiles */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  protected final Cell startKey;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  /** Keeps track of columns and versions */<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  protected final ColumnTracker columns;<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /** The oldest timestamp we are interested in, based on TTL */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  protected final long oldestUnexpiredTS;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  protected final long now;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  /** Row the query is on */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  protected Cell currentRow;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>  protected ScanQueryMatcher(Cell startKey, ScanInfo scanInfo, ColumnTracker columns,<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      long oldestUnexpiredTS, long now) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    this.rowComparator = scanInfo.getComparator();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    this.startKey = startKey;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    this.oldestUnexpiredTS = oldestUnexpiredTS;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    this.now = now;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    this.columns = columns;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>  }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * @param cell<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   * @param oldestTimestamp<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   * @return true if the cell is expired<a name="line.140"></a>
-<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private static boolean isCellTTLExpired(final Cell cell, final long oldestTimestamp,<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      final long now) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    // Look for a TTL tag first. Use it instead of the family setting if<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // found. If a cell has multiple TTLs, resolve the conflict by using the<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    // first tag encountered.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    Iterator&lt;Tag&gt; i = CellUtil.tagsIterator(cell);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    while (i.hasNext()) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      Tag t = i.next();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      if (TagType.TTL_TAG_TYPE == t.getType()) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        // Unlike in schema cell TTLs are stored in milliseconds, no need<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        // to convert<a name="line.152"></a>
-<span class="sourceLineNo">153</span>        long ts = cell.getTimestamp();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        assert t.getValueLength() == Bytes.SIZEOF_LONG;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        long ttl = TagUtil.getValueAsLong(t);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        if (ts + ttl &lt; now) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          return true;<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        // Per cell TTLs cannot extend lifetime beyond family settings, so<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        // fall through to check that<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        break;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    return false;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<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>   * Check before the delete logic.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * @return null means continue.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   */<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  protected final MatchCode preCheck(Cell cell) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    if (currentRow == null) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      // Since the curCell is null it means we are already sure that we have moved over to the next<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      // row<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      return MatchCode.DONE;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    // if row key is changed, then we know that we have moved over to the next row<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    if (rowComparator.compareRows(currentRow, cell) != 0) {<a name="line.178"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>     * Done with the row, seek there.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>     */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    SEEK_NEXT_ROW,<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span>     * Done with column, seek to next.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>     */<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    SEEK_NEXT_COL,<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>     * Done with scan, thanks to the row filter.<a name="line.95"></a>
+<span class="sourceLineNo">096</span>     */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    DONE_SCAN,<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>     * Seek to next key which is given as hint.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>     */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    SEEK_NEXT_USING_HINT,<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>     * Include KeyValue and done with column, seek to next.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>     */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    INCLUDE_AND_SEEK_NEXT_COL,<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>     * Include KeyValue and done with row, seek to next.<a name="line.110"></a>
+<span class="sourceLineNo">111</span>     */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    INCLUDE_AND_SEEK_NEXT_ROW,<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  /** Row comparator for the region this query is for */<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  protected final CellComparator rowComparator;<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  /** Key to seek to in memstore and StoreFiles */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  protected final Cell startKey;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /** Keeps track of columns and versions */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  protected final ColumnTracker columns;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  /** The oldest timestamp we are interested in, based on TTL */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  protected final long oldestUnexpiredTS;<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  protected final long now;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>  /** Row the query is on */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  protected Cell currentRow;<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>  protected ScanQueryMatcher(Cell startKey, ScanInfo scanInfo, ColumnTracker columns,<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      long oldestUnexpiredTS, long now) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    this.rowComparator = scanInfo.getComparator();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    this.startKey = startKey;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    this.oldestUnexpiredTS = oldestUnexpiredTS;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    this.now = now;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    this.columns = columns;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   * @param cell<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   * @param oldestTimestamp<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return true if the cell is expired<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private static boolean isCellTTLExpired(final Cell cell, final long oldestTimestamp,<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      final long now) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    // Look for a TTL tag first. Use it instead of the family setting if<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    // found. If a cell has multiple TTLs, resolve the conflict by using the<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    // first tag encountered.<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    Iterator&lt;Tag&gt; i = CellUtil.tagsIterator(cell);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    while (i.hasNext()) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      Tag t = i.next();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      if (TagType.TTL_TAG_TYPE == t.getType()) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        // Unlike in schema cell TTLs are stored in milliseconds, no need<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        // to convert<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        long ts = cell.getTimestamp();<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        assert t.getValueLength() == Bytes.SIZEOF_LONG;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        long ttl = TagUtil.getValueAsLong(t);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        if (ts + ttl &lt; now) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>          return true;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        // Per cell TTLs cannot extend lifetime beyond family settings, so<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        // fall through to check that<a name="line.164"></a>
+<span class="sourceLineNo">165</span>        break;<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>    return false;<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>   * Check before the delete logic.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @return null means continue.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  protected final MatchCode preCheck(Cell cell) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    if (currentRow == null) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      // Since the curCell is null it means we are already sure that we have moved over to the next<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      // row<a name="line.178"></a>
 <span class="sourceLineNo">179</span>      return MatchCode.DONE;<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>    if (this.columns.done()) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      return MatchCode.SEEK_NEXT_ROW;<a name="line.183"></a>
+<span class="sourceLineNo">181</span>    // if row key is changed, then we know that we have moved over to the next row<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    if (rowComparator.compareRows(currentRow, cell) != 0) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return MatchCode.DONE;<a name="line.183"></a>
 <span class="sourceLineNo">184</span>    }<a name="line.184"></a>
 <span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>    long timestamp = cell.getTimestamp();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    // check if this is a fake cell. The fake cell is an optimization, we should make the scanner<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    // seek to next column or next row. See StoreFileScanner.requestSeek for more details.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    // check for early out based on timestamp alone<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    if (timestamp == HConstants.OLDEST_TIMESTAMP || columns.isDone(timestamp)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      return columns.getNextRowOrNextColumn(cell);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    // check if the cell is expired by cell TTL<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    if (isCellTTLExpired(cell, this.oldestUnexpiredTS, this.now)) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      return MatchCode.SKIP;<a name="line.195"></a>
+<span class="sourceLineNo">186</span>    if (this.columns.done()) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      return MatchCode.SEEK_NEXT_ROW;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    long timestamp = cell.getTimestamp();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    // check if this is a fake cell. The fake cell is an optimization, we should make the scanner<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    // seek to next column or next row. See StoreFileScanner.requestSeek for more details.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    // check for early out based on timestamp alone<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (timestamp == HConstants.OLDEST_TIMESTAMP || columns.isDone(timestamp)) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return columns.getNextRowOrNextColumn(cell);<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    return null;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>  protected final MatchCode checkDeleted(DeleteTracker deletes, Cell cell) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    if (deletes.isEmpty()) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      return null;<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    DeleteResult deleteResult = deletes.isDeleted(cell);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    switch (deleteResult) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      case FAMILY_DELETED:<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      case COLUMN_DELETED:<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        return columns.getNextRowOrNextColumn(cell);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      case VERSION_DELETED:<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      case FAMILY_VERSION_DELETED:<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        return MatchCode.SKIP;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      case NOT_DELETED:<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        return null;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      default:<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        throw new RuntimeException("Unexpected delete result: " + deleteResult);<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>  /**<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * Determines if the caller should do one of several things:<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * &lt;ul&gt;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * &lt;li&gt;seek/skip to the next row (MatchCode.SEEK_NEXT_ROW)&lt;/li&gt;<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * &lt;li&gt;seek/skip to the next column (MatchCode.SEEK_NEXT_COL)&lt;/li&gt;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * &lt;li&gt;include the current KeyValue (MatchCode.INCLUDE)&lt;/li&gt;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   * &lt;li&gt;ignore the current KeyValue (MatchCode.SKIP)&lt;/li&gt;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   * &lt;li&gt;got to the next row (MatchCode.DONE)&lt;/li&gt;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   * &lt;/ul&gt;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   * @param cell KeyValue to check<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * @return The match code instance.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * @throws IOException in case there is an internal consistency problem caused by a data<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   *           corruption.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   */<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  public abstract MatchCode match(Cell cell) throws IOException;<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>   * @return the start key<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  public Cell getStartKey() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    return startKey;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  }<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>  /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * @return whether there is an null column in the query<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   */<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public abstract boolean hasNullColumnInQuery();<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>  /**<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   * @return a cell represent the current row<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   */<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  public Cell currentRow() {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    return currentRow;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  /**<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   * Make {@link #currentRow()} return null.<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
-<span class="sourceLineNo">257</span>  public void clearCurrentRow() {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    currentRow = null;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  protected abstract void reset();<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>   * Set the row when there is change in row<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @param currentRow<a name="line.265"></a>
+<span class="sourceLineNo">197</span>    // check if the cell is expired by cell TTL<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    if (isCellTTLExpired(cell, this.oldestUnexpiredTS, this.now)) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      return MatchCode.SKIP;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    return null;<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  protected final MatchCode checkDeleted(DeleteTracker deletes, Cell cell) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    if (deletes.isEmpty() &amp;&amp; !(deletes instanceof NewVersionBehaviorTracker)) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return null;<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    // MvccSensitiveTracker always need check all cells to save some infos.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    DeleteResult deleteResult = deletes.isDeleted(cell);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    switch (deleteResult) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      case FAMILY_DELETED:<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      case COLUMN_DELETED:<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        if (!(deletes instanceof NewVersionBehaviorTracker)) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          // MvccSensitive can not seek to next because the Put with lower ts may have higher mvcc<a name="line.214"></a>
+<span class="sourceLineNo">215</span>          return columns.getNextRowOrNextColumn(cell);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      case VERSION_DELETED:<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      case FAMILY_VERSION_DELETED:<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      case VERSION_MASKED:<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        return MatchCode.SKIP;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      case NOT_DELETED:<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        return null;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      default:<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        throw new RuntimeException("Unexpected delete result: " + deleteResult);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Determines if the caller should do one of several things:<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * &lt;ul&gt;<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * &lt;li&gt;seek/skip to the next row (MatchCode.SEEK_NEXT_ROW)&lt;/li&gt;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * &lt;li&gt;seek/skip to the next column (MatchCode.SEEK_NEXT_COL)&lt;/li&gt;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * &lt;li&gt;include the current KeyValue (MatchCode.INCLUDE)&lt;/li&gt;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * &lt;li&gt;ignore the current KeyValue (MatchCode.SKIP)&lt;/li&gt;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * &lt;li&gt;got to the next row (MatchCode.DONE)&lt;/li&gt;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * &lt;/ul&gt;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * @param cell KeyValue to check<a name="line.238"></a>
+<span class="sourceLineNo">239</span>   * @return The match code instance.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>   * @throws IOException in case there is an internal consistency problem caused by a data<a name="line.240"></a>
+<span class="sourceLineNo">241</span>   *           corruption.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   */<a name="line.242"></a>
+<span class="sourceLineNo">243</span>  public abstract MatchCode match(Cell cell) throws IOException;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>  /**<a name="line.245"></a>
+<span class="sourceLineNo">246</span>   * @return the start key<a name="line.246"></a>
+<span class="sourceLineNo">247</span>   */<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  public Cell getStartKey() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    return startKey;<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>   * @return whether there is an null column in the query<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  public abstract boolean hasNullColumnInQuery();<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>   * @return a cell represent the current row<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  public Cell currentRow() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    return currentRow;<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>   * Make {@link #currentRow()} return null.<a name="line.265"></a>
 <span class="sourceLineNo">266</span>   */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public void setToNewRow(Cell currentRow) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    this.currentRow = currentRow;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    columns.reset();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    reset();<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
+<span class="sourceLineNo">267</span>  public void clearCurrentRow() {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    currentRow = null;<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>  protected abstract void reset();<a name="line.271"></a>
 <span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>  public abstract boolean isUserScan();<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>  /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * @return Returns false if we know there are no more rows to be scanned (We've reached the<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   *         &lt;code&gt;stopRow&lt;/code&gt; or we are scanning on row only because this Scan is for a Get,<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   *         etc.<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   */<a name="line.279"></a>
-<span class="sourceLineNo">280</span>  public abstract boolean moreRowsMayExistAfter(Cell cell);<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>  public Cell getKeyForNextColumn(Cell cell) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    ColumnCount nextColumn = columns.getColumnHint();<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    if (nextColumn == null) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      return CellUtil.createLastOnRowCol(cell);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      return CellUtil.createFirstOnRowCol(cell, nextColumn.getBuffer(), nextColumn.getOffset(),<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        nextColumn.getLength());<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  }<a name="line.290"></a>
+<span class="sourceLineNo">273</span>  /**<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   * Set the row when there is change in row<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   * @param currentRow<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public void setToNewRow(Cell currentRow) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    this.currentRow = currentRow;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    columns.reset();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    reset();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public abstract boolean isUserScan();<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>  /**<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * @return Returns false if we know there are no more rows to be scanned (We've reached the<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   *         &lt;code&gt;stopRow&lt;/code&gt; or we are scanning on row only because this Scan is for a Get,<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   *         etc.<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public abstract boolean moreRowsMayExistAfter(Cell cell);<a name="line.290"></a>
 <span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  /**<a name="line.292"></a>
-<span class="sourceLineNo">293</span>   * @param nextIndexed the key of the next entry in the block index (if any)<a name="line.293"></a>
-<span class="sourceLineNo">294</span>   * @param currentCell The Cell we're using to calculate the seek key<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   * @return result of the compare between the indexed key and the key portion of the passed cell<a name="line.295"></a>
-<span class="sourceLineNo">296</span>   */<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public int compareKeyForNextRow(Cell nextIndexed, Cell currentCell) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell, 0, 0, null, 0, 0,<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      HConstants.OLDEST_TIMESTAMP, Type.Minimum.getCode());<a name="line.299"></a>
+<span class="sourceLineNo">292</span>  public Cell getKeyForNextColumn(Cell cell) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    ColumnCount nextColumn = columns.getColumnHint();<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    if (nextColumn == null) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      return CellUtil.createLastOnRowCol(cell);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    } else {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      return CellUtil.createFirstOnRowCol(cell, nextColumn.getBuffer(), nextColumn.getOffset(),<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        nextColumn.getLength());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    }<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>  /**<a name="line.302"></a>
@@ -312,64 +312,105 @@
 <span class="sourceLineNo">304</span>   * @param currentCell The Cell we're using to calculate the seek key<a name="line.304"></a>
 <span class="sourceLineNo">305</span>   * @return result of the compare between the indexed key and the key portion of the passed cell<a name="line.305"></a>
 <span class="sourceLineNo">306</span>   */<a name="line.306"></a>
-<span class="sourceLineNo">307</span>  public int compareKeyForNextColumn(Cell nextIndexed, Cell currentCell) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    ColumnCount nextColumn = columns.getColumnHint();<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    if (nextColumn == null) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell, 0, 0, null, 0, 0,<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        HConstants.OLDEST_TIMESTAMP, Type.Minimum.getCode());<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    } else {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell,<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        currentCell.getFamilyOffset(), currentCell.getFamilyLength(), nextColumn.getBuffer(),<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        nextColumn.getOffset(), nextColumn.getLength(), HConstants.LATEST_TIMESTAMP,<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        Type.Maximum.getCode());<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><a name="line.319"></a>
-<span class="sourceLineNo">320</span>  /**<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   * @return the Filter<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   */<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  public abstract Filter getFilter();<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * Delegate to {@link Filter#getNextCellHint(Cell)}. If no filter, return {@code null}.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  public abstract Cell getNextKeyHint(Cell cell) throws IOException;<a name="line.328"></a>
+<span class="sourceLineNo">307</span>  public int compareKeyForNextRow(Cell nextIndexed, Cell currentCell) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell, 0, 0, null, 0, 0,<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      HConstants.OLDEST_TIMESTAMP, Type.Minimum.getCode());<a name="line.309"></a>
+<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>  /**<a name="line.312"></a>
+<span class="sourceLineNo">313</span>   * @param nextIndexed the key of the next entry in the block index (if any)<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   * @param currentCell The Cell we're using to calculate the seek key<a name="line.314"></a>
+<span class="sourceLineNo">315</span>   * @return result of the compare between the indexed key and the key portion of the passed cell<a name="line.315"></a>
+<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
+<span class="sourceLineNo">317</span>  public int compareKeyForNextColumn(Cell nextIndexed, Cell currentCell) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    ColumnCount nextColumn = columns.getColumnHint();<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    if (nextColumn == null) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell, 0, 0, null, 0, 0,<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        HConstants.OLDEST_TIMESTAMP, Type.Minimum.getCode());<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      return rowComparator.compareKeyBasedOnColHint(nextIndexed, currentCell,<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        currentCell.getFamilyOffset(), currentCell.getFamilyLength(), nextColumn.getBuffer(),<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        nextColumn.getOffset(), nextColumn.getLength(), HConstants.LATEST_TIMESTAMP,<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        Type.Maximum.getCode());<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><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Override<a name="line.330"></a>
-<span class="sourceLineNo">331</span>  public void beforeShipped() throws IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    if (this.currentRow != null) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      this.currentRow = CellUtil.createFirstOnRow(CellUtil.copyRow(this.currentRow));<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (columns != null) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      columns.beforeShipped();<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">330</span>  /**<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @return the Filter<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public abstract Filter getFilter();<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>  /**<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   * Delegate to {@link Filter#getNextCellHint(Cell)}. If no filter, return {@code null}.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   */<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  public abstract Cell getNextKeyHint(Cell cell) throws IOException;<a name="line.338"></a>
 <span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>  protected static Cell createStartKeyFromRow(byte[] startRow, ScanInfo scanInfo) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return CellUtil.createFirstDeleteFamilyCellOnRow(startRow, scanInfo.getFamily());<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>  protected static DeleteTracker instantiateDeleteTracker(RegionCoprocessorHost host)<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      throws IOException {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    DeleteTracker tracker = new ScanDeleteTracker();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    if (host != null) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      tracker = host.postInstantiateDeleteTracker(tracker);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    return tracker;<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>  // Used only for testing purposes<a name="line.353"></a>
-<span class="sourceLineNo">354</span>  static MatchCode checkColumn(ColumnTracker columnTracker, byte[] bytes, int offset, int length,<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      long ttl, byte type, boolean ignoreCount) throws IOException {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    KeyValue kv = KeyValueUtil.createFirstOnRow(HConstants.EMPTY_BYTE_ARRAY, 0, 0,<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      HConstants.EMPTY_BYTE_ARRAY, 0, 0, bytes, offset, length);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    MatchCode matchCode = columnTracker.checkColumn(kv, type);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (matchCode == MatchCode.INCLUDE) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      return columnTracker.checkVersions(kv, ttl, type, ignoreCount);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    return matchCode;<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">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void beforeShipped() throws IOException {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    if (this.currentRow != null) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      this.currentRow = CellUtil.createFirstOnRow(CellUtil.copyRow(this.currentRow));<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    if (columns != null) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      columns.beforeShipped();<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>  protected static Cell createStartKeyFromRow(byte[] startRow, ScanInfo scanInfo) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    return CellUtil.createFirstDeleteFamilyCellOnRow(startRow, scanInfo.getFamily());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span>  protected static Pair&lt;DeleteTracker, ColumnTracker&gt; getTrackers(RegionCoprocessorHost host,<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      NavigableSet&lt;byte[]&gt; columns, ScanInfo scanInfo, long oldestUnexpiredTS, Scan userScan)<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      throws IOException {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    int resultMaxVersion = scanInfo.getMaxVersions();<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (userScan != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      if (userScan.isRaw()) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        resultMaxVersion = userScan.getMaxVersions();<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      } else {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        resultMaxVersion = Math.min(userScan.getMaxVersions(), scanInfo.getMaxVersions());<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>    DeleteTracker deleteTracker;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    if (scanInfo.isNewVersionBehavior() &amp;&amp; (userScan == null || !userScan.isRaw())) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      deleteTracker = new NewVersionBehaviorTracker(columns, scanInfo.getMinVersions(),<a name="line.367"></a>
+<span class="sourceLineNo">368</span>          scanInfo.getMaxVersions(), resultMaxVersion, oldestUnexpiredTS);<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    } else {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      deleteTracker = new ScanDeleteTracker();<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    if (host != null) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      deleteTracker = host.postInstantiateDeleteTracker(deleteTracker);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      if (deleteTracker instanceof VisibilityScanDeleteTracker &amp;&amp; scanInfo.isNewVersionBehavior()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        deleteTracker = new VisibilityNewVersionBehaivorTracker(columns, scanInfo.getMinVersions(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>            scanInfo.getMaxVersions(), resultMaxVersion, oldestUnexpiredTS);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span>    ColumnTracker columnTracker;<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>    if (deleteTracker instanceof NewVersionBehaviorTracker) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      columnTracker = (NewVersionBehaviorTracker) deleteTracker;<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    } else if (columns == null || columns.size() == 0) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      columnTracker = new ScanWildcardColumnTracker(scanInfo.getMinVersions(), resultMaxVersion,<a name="line.385"></a>
+<span class="sourceLineNo">386</span>          oldestUnexpiredTS);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    } else {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      columnTracker = new ExplicitColumnTracker(columns, scanInfo.getMinVersions(),<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          resultMaxVersion, oldestUnexpiredTS);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    return new Pair&lt;&gt;(deleteTracker, columnTracker);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span>  // Used only for testing purposes<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  static MatchCode checkColumn(ColumnTracker columnTracker, byte[] bytes, int offset, int length,<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      long ttl, byte type, boolean ignoreCount) throws IOException {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    KeyValue kv = KeyValueUtil.createFirstOnRow(HConstants.EMPTY_BYTE_ARRAY, 0, 0,<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      HConstants.EMPTY_BYTE_ARRAY, 0, 0, bytes, offset, length);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    MatchCode matchCode = columnTracker.checkColumn(kv, type);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    if (matchCode == MatchCode.INCLUDE) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      return columnTracker.checkVersions(kv, ttl, type, ignoreCount);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    return matchCode;<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>
 
 
 


Mime
View raw message