http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html
index 07206f0..8ae8093 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/querymatcher/UserScanQueryMatcher.html
@@ -37,188 +37,177 @@
 <span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.io.TimeRange;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.regionserver.ScanInfo;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * Query matcher for user scan.<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span> * &lt;p&gt;<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * We do not consider mvcc here because<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span> * {@link 
org.apache.hadoop.hbase.regionserver.StoreFileScanner} and<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * {@link 
org.apache.hadoop.hbase.regionserver.SegmentScanner} will only return a cell 
whose mvcc is<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * less than or equal to given read 
point. For<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * {@link 
org.apache.hadoop.hbase.client.IsolationLevel#READ_UNCOMMITTED}, we just set 
the read<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * point to {@link Long#MAX_VALUE}, i.e. 
still do not need to consider it.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>public abstract class 
UserScanQueryMatcher extends ScanQueryMatcher {<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>  protected final boolean 
hasNullColumn;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  protected final Filter filter;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  protected final byte[] stopRow;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  protected final TimeRange tr;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private static Cell createStartKey(Scan 
scan, ScanInfo scanInfo) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    if (scan.includeStartRow()) {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>      return 
createStartKeyFromRow(scan.getStartRow(), scanInfo);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    } else {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      return 
CellUtil.createLastOnRow(scan.getStartRow());<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    }<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>  protected UserScanQueryMatcher(Scan 
scan, ScanInfo scanInfo, ColumnTracker columns,<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      boolean hasNullColumn, long 
oldestUnexpiredTS, long now) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    super(createStartKey(scan, scanInfo), 
scanInfo, columns, oldestUnexpiredTS, now);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    this.hasNullColumn = hasNullColumn;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    this.filter = scan.getFilter();<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    this.stopRow = scan.getStopRow();<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>    TimeRange timeRange = 
scan.getColumnFamilyTimeRange().get(scanInfo.getFamily());<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    if (timeRange == null) {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.tr = scan.getTimeRange();<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    } else {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      this.tr = timeRange;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>    }<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>  @Override<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  public boolean hasNullColumnInQuery() 
{<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    return hasNullColumn;<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>  @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public boolean isUserScan() {<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    return true;<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>  @Override<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  public Filter getFilter() {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    return filter;<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>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public Cell getNextKeyHint(Cell cell) 
throws IOException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    if (filter == null) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      return null;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    } else {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      return 
filter.getNextCellHint(cell);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<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>  protected final MatchCode 
matchColumn(Cell cell, long timestamp, byte typeByte)<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      throws IOException {<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    int tsCmp = tr.compare(timestamp);<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    if (tsCmp &gt; 0) {<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>      return MatchCode.SKIP;<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    if (tsCmp &lt; 0) {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      return 
columns.getNextRowOrNextColumn(cell);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    // STEP 1: Check if the column is 
part of the requested columns<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    MatchCode colChecker = 
columns.checkColumn(cell, typeByte);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    if (colChecker != MatchCode.INCLUDE) 
{<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      return colChecker;<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    ReturnCode filterResponse = 
ReturnCode.SKIP;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    // STEP 2: Yes, the column is part of 
the requested columns. Check if filter is present<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    if (filter != null) {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      // STEP 3: Filter the key value and 
return if it filters out<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      filterResponse = 
filter.filterKeyValue(cell);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      switch (filterResponse) {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        case SKIP:<a name="line.120"></a>
-<span class="sourceLineNo">121</span>          return MatchCode.SKIP;<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>        case NEXT_COL:<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>          return 
columns.getNextRowOrNextColumn(cell);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        case NEXT_ROW:<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>          return 
MatchCode.SEEK_NEXT_ROW;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        case SEEK_NEXT_USING_HINT:<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>          return 
MatchCode.SEEK_NEXT_USING_HINT;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        default:<a name="line.128"></a>
-<span class="sourceLineNo">129</span>          // It means it is either 
include or include and seek next<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          break;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    /*<a name="line.133"></a>
-<span class="sourceLineNo">134</span>     * STEP 4: Reaching this step means 
the column is part of the requested columns and either<a name="line.134"></a>
-<span class="sourceLineNo">135</span>     * the filter is null or the filter 
has returned INCLUDE or INCLUDE_AND_NEXT_COL response.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>     * Now check the number of versions 
needed. This method call returns SKIP, INCLUDE,<a name="line.136"></a>
-<span class="sourceLineNo">137</span>     * INCLUDE_AND_SEEK_NEXT_ROW, 
INCLUDE_AND_SEEK_NEXT_COL.<a name="line.137"></a>
-<span class="sourceLineNo">138</span>     *<a name="line.138"></a>
-<span class="sourceLineNo">139</span>     * FilterResponse            
ColumnChecker               Desired behavior<a name="line.139"></a>
-<span class="sourceLineNo">140</span>     * INCLUDE                   SKIP     
                   row has already been included, SKIP.<a name="line.140"></a>
-<span class="sourceLineNo">141</span>     * INCLUDE                   INCLUDE  
                   INCLUDE<a name="line.141"></a>
-<span class="sourceLineNo">142</span>     * INCLUDE                   
INCLUDE_AND_SEEK_NEXT_COL   INCLUDE_AND_SEEK_NEXT_COL<a name="line.142"></a>
-<span class="sourceLineNo">143</span>     * INCLUDE                   
INCLUDE_AND_SEEK_NEXT_ROW   INCLUDE_AND_SEEK_NEXT_ROW<a name="line.143"></a>
-<span class="sourceLineNo">144</span>     * INCLUDE_AND_SEEK_NEXT_COL SKIP     
                   row has already been included, SKIP.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>     * INCLUDE_AND_SEEK_NEXT_COL INCLUDE  
                   INCLUDE_AND_SEEK_NEXT_COL<a name="line.145"></a>
-<span class="sourceLineNo">146</span>     * INCLUDE_AND_SEEK_NEXT_COL 
INCLUDE_AND_SEEK_NEXT_COL   INCLUDE_AND_SEEK_NEXT_COL<a name="line.146"></a>
-<span class="sourceLineNo">147</span>     * INCLUDE_AND_SEEK_NEXT_COL 
INCLUDE_AND_SEEK_NEXT_ROW   INCLUDE_AND_SEEK_NEXT_ROW<a name="line.147"></a>
-<span class="sourceLineNo">148</span>     *<a name="line.148"></a>
-<span class="sourceLineNo">149</span>     * In all the above scenarios, we 
return the column checker return value except for<a name="line.149"></a>
-<span class="sourceLineNo">150</span>     * FilterResponse 
(INCLUDE_AND_SEEK_NEXT_COL) and ColumnChecker(INCLUDE)<a name="line.150"></a>
-<span class="sourceLineNo">151</span>     */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    colChecker = 
columns.checkVersions(cell, timestamp, typeByte, false);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    if (filterResponse == 
ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (colChecker != MatchCode.SKIP) 
{<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        return 
MatchCode.INCLUDE_AND_SEEK_NEXT_ROW;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return MatchCode.SEEK_NEXT_ROW;<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    return (filterResponse == 
ReturnCode.INCLUDE_AND_NEXT_COL &amp;&amp; colChecker == MatchCode.INCLUDE)<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>        ? 
MatchCode.INCLUDE_AND_SEEK_NEXT_COL : colChecker;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>  protected abstract boolean isGet();<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  protected abstract boolean 
moreRowsMayExistsAfter(int cmpToStopRow);<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public boolean 
moreRowsMayExistAfter(Cell cell) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    // If a 'get' Scan -- we are doing a 
Get (every Get is a single-row Scan in implementation) --<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    // then we are looking at one row 
only, the one specified in the Get coordinate..so we know<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    // for sure that there are no more 
rows on this Scan<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    if (isGet()) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      return false;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    // If no stopRow, return that there 
may be more rows. The tests that follow depend on a<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    // non-empty, non-default stopRow so 
this little test below short-circuits out doing the<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    // following compares.<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    if (this.stopRow == null || 
this.stopRow.length == 0) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      return true;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    return 
moreRowsMayExistsAfter(rowComparator.compareRows(cell, stopRow, 0, 
stopRow.length));<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>  public static UserScanQueryMatcher 
create(Scan scan, ScanInfo scanInfo,<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      NavigableSet&lt;byte[]&gt; columns, 
long oldestUnexpiredTS, long now,<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      RegionCoprocessorHost 
regionCoprocessorHost) throws IOException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    int maxVersions = scan.isRaw() ? 
scan.getMaxVersions()<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        : Math.min(scan.getMaxVersions(), 
scanInfo.getMaxVersions());<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    boolean hasNullColumn;<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    ColumnTracker columnTracker;<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    if (columns == null || 
columns.isEmpty()) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      // there is always a null column in 
the wildcard column query.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      hasNullColumn = true;<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      // use a specialized scan for 
wildcard column tracker.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      columnTracker = new 
ScanWildcardColumnTracker(scanInfo.getMinVersions(), maxVersions,<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>          oldestUnexpiredTS);<a 
name="line.196"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Query matcher for user scan.<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span> * &lt;p&gt;<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * We do not consider mvcc here because<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span> * {@link 
org.apache.hadoop.hbase.regionserver.StoreFileScanner} and<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * {@link 
org.apache.hadoop.hbase.regionserver.SegmentScanner} will only return a cell 
whose mvcc is<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * less than or equal to given read 
point. For<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * {@link 
org.apache.hadoop.hbase.client.IsolationLevel#READ_UNCOMMITTED}, we just set 
the read<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * point to {@link Long#MAX_VALUE}, i.e. 
still do not need to consider it.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@InterfaceAudience.Private<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>public abstract class 
UserScanQueryMatcher extends ScanQueryMatcher {<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  protected final boolean 
hasNullColumn;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  protected final Filter filter;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  protected final byte[] stopRow;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  protected final TimeRange tr;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  private static Cell createStartKey(Scan 
scan, ScanInfo scanInfo) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    if (scan.includeStartRow()) {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>      return 
createStartKeyFromRow(scan.getStartRow(), scanInfo);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    } else {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      return 
CellUtil.createLastOnRow(scan.getStartRow());<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><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  protected UserScanQueryMatcher(Scan 
scan, ScanInfo scanInfo, ColumnTracker columns,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      boolean hasNullColumn, long 
oldestUnexpiredTS, long now) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    super(createStartKey(scan, scanInfo), 
scanInfo, columns, oldestUnexpiredTS, now);<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    this.hasNullColumn = hasNullColumn;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    this.filter = scan.getFilter();<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    this.stopRow = scan.getStopRow();<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>    TimeRange timeRange = 
scan.getColumnFamilyTimeRange().get(scanInfo.getFamily());<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    if (timeRange == null) {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>      this.tr = scan.getTimeRange();<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    } else {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.tr = timeRange;<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><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  @Override<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  public boolean hasNullColumnInQuery() 
{<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    return hasNullColumn;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public boolean isUserScan() {<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>    return true;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @Override<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public Filter getFilter() {<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    return filter;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>  @Override<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  public Cell getNextKeyHint(Cell cell) 
throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    if (filter == null) {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      return null;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    } else {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      return 
filter.getNextCellHint(cell);<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><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  protected final MatchCode 
matchColumn(Cell cell, long timestamp, byte typeByte)<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      throws IOException {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    int tsCmp = tr.compare(timestamp);<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    if (tsCmp &gt; 0) {<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>      return MatchCode.SKIP;<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    if (tsCmp &lt; 0) {<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      return 
columns.getNextRowOrNextColumn(cell);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    }<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    // STEP 1: Check if the column is 
part of the requested columns<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    MatchCode colChecker = 
columns.checkColumn(cell, typeByte);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (colChecker != MatchCode.INCLUDE) 
{<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      return colChecker;<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    ReturnCode filterResponse = 
ReturnCode.SKIP;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    // STEP 2: Yes, the column is part of 
the requested columns. Check if filter is present<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (filter != null) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      // STEP 3: Filter the key value and 
return if it filters out<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      filterResponse = 
filter.filterKeyValue(cell);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      switch (filterResponse) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>        case SKIP:<a name="line.121"></a>
+<span class="sourceLineNo">122</span>          return MatchCode.SKIP;<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>        case NEXT_COL:<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>          return 
columns.getNextRowOrNextColumn(cell);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        case NEXT_ROW:<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>          return 
MatchCode.SEEK_NEXT_ROW;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        case SEEK_NEXT_USING_HINT:<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>          return 
MatchCode.SEEK_NEXT_USING_HINT;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        default:<a name="line.129"></a>
+<span class="sourceLineNo">130</span>          // It means it is either 
include or include and seek next<a name="line.130"></a>
+<span class="sourceLineNo">131</span>          break;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    /*<a name="line.134"></a>
+<span class="sourceLineNo">135</span>     * STEP 4: Reaching this step means 
the column is part of the requested columns and either<a name="line.135"></a>
+<span class="sourceLineNo">136</span>     * the filter is null or the filter 
has returned INCLUDE or INCLUDE_AND_NEXT_COL response.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     * Now check the number of versions 
needed. This method call returns SKIP, INCLUDE,<a name="line.137"></a>
+<span class="sourceLineNo">138</span>     * INCLUDE_AND_SEEK_NEXT_ROW, 
INCLUDE_AND_SEEK_NEXT_COL.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>     *<a name="line.139"></a>
+<span class="sourceLineNo">140</span>     * FilterResponse            
ColumnChecker               Desired behavior<a name="line.140"></a>
+<span class="sourceLineNo">141</span>     * INCLUDE                   SKIP     
                   row has already been included, SKIP.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>     * INCLUDE                   INCLUDE  
                   INCLUDE<a name="line.142"></a>
+<span class="sourceLineNo">143</span>     * INCLUDE                   
INCLUDE_AND_SEEK_NEXT_COL   INCLUDE_AND_SEEK_NEXT_COL<a name="line.143"></a>
+<span class="sourceLineNo">144</span>     * INCLUDE                   
INCLUDE_AND_SEEK_NEXT_ROW   INCLUDE_AND_SEEK_NEXT_ROW<a name="line.144"></a>
+<span class="sourceLineNo">145</span>     * INCLUDE_AND_SEEK_NEXT_COL SKIP     
                   row has already been included, SKIP.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>     * INCLUDE_AND_SEEK_NEXT_COL INCLUDE  
                   INCLUDE_AND_SEEK_NEXT_COL<a name="line.146"></a>
+<span class="sourceLineNo">147</span>     * INCLUDE_AND_SEEK_NEXT_COL 
INCLUDE_AND_SEEK_NEXT_COL   INCLUDE_AND_SEEK_NEXT_COL<a name="line.147"></a>
+<span class="sourceLineNo">148</span>     * INCLUDE_AND_SEEK_NEXT_COL 
INCLUDE_AND_SEEK_NEXT_ROW   INCLUDE_AND_SEEK_NEXT_ROW<a name="line.148"></a>
+<span class="sourceLineNo">149</span>     *<a name="line.149"></a>
+<span class="sourceLineNo">150</span>     * In all the above scenarios, we 
return the column checker return value except for<a name="line.150"></a>
+<span class="sourceLineNo">151</span>     * FilterResponse 
(INCLUDE_AND_SEEK_NEXT_COL) and ColumnChecker(INCLUDE)<a name="line.151"></a>
+<span class="sourceLineNo">152</span>     */<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    colChecker = 
columns.checkVersions(cell, timestamp, typeByte, false);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (filterResponse == 
ReturnCode.INCLUDE_AND_SEEK_NEXT_ROW) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (colChecker != MatchCode.SKIP) 
{<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        return 
MatchCode.INCLUDE_AND_SEEK_NEXT_ROW;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      return MatchCode.SEEK_NEXT_ROW;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    return (filterResponse == 
ReturnCode.INCLUDE_AND_NEXT_COL &amp;&amp; colChecker == MatchCode.INCLUDE)<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        ? 
MatchCode.INCLUDE_AND_SEEK_NEXT_COL : colChecker;<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>  protected abstract boolean isGet();<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  protected abstract boolean 
moreRowsMayExistsAfter(int cmpToStopRow);<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  public boolean 
moreRowsMayExistAfter(Cell cell) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // If a 'get' Scan -- we are doing a 
Get (every Get is a single-row Scan in implementation) --<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    // then we are looking at one row 
only, the one specified in the Get coordinate..so we know<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    // for sure that there are no more 
rows on this Scan<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    if (isGet()) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return false;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    // If no stopRow, return that there 
may be more rows. The tests that follow depend on a<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    // non-empty, non-default stopRow so 
this little test below short-circuits out doing the<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    // following compares.<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>    if (this.stopRow == null || 
this.stopRow.length == 0) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      return true;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    return 
moreRowsMayExistsAfter(rowComparator.compareRows(cell, stopRow, 0, 
stopRow.length));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public static UserScanQueryMatcher 
create(Scan scan, ScanInfo scanInfo,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      NavigableSet&lt;byte[]&gt; columns, 
long oldestUnexpiredTS, long now,<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      RegionCoprocessorHost 
regionCoprocessorHost) throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    boolean hasNullColumn =<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>        !(columns != null &amp;&amp; 
columns.size() != 0 &amp;&amp; columns.first().length != 0);<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    Pair&lt;DeleteTracker, 
ColumnTracker&gt; trackers = getTrackers(regionCoprocessorHost, columns,<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>        scanInfo, oldestUnexpiredTS, 
scan);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    DeleteTracker deleteTracker = 
trackers.getFirst();<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    ColumnTracker columnTracker = 
trackers.getSecond();<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (scan.isRaw()) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      return 
RawScanQueryMatcher.create(scan, scanInfo, columnTracker, hasNullColumn,<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        oldestUnexpiredTS, now);<a 
name="line.196"></a>
 <span class="sourceLineNo">197</span>    } else {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      // We can share the 
ExplicitColumnTracker, diff is we reset<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      // between rows, not between 
storefiles.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      // whether there is null column in 
the explicit column query<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      hasNullColumn = 
columns.first().length == 0;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      columnTracker = new 
ExplicitColumnTracker(columns, scanInfo.getMinVersions(), maxVersions,<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>          oldestUnexpiredTS);<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    if (scan.isRaw()) {<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>      return 
RawScanQueryMatcher.create(scan, scanInfo, columnTracker, hasNullColumn,<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>        oldestUnexpiredTS, now);<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>    } else {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return 
NormalUserScanQueryMatcher.create(scan, scanInfo, columnTracker, 
hasNullColumn,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        oldestUnexpiredTS, now, 
regionCoprocessorHost);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>}<a name="line.213"></a>
+<span class="sourceLineNo">198</span>      return 
NormalUserScanQueryMatcher.create(scan, scanInfo, columnTracker, 
deleteTracker,<a name="line.198"></a>
+<span class="sourceLineNo">199</span>          hasNullColumn, 
oldestUnexpiredTS, now);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>}<a name="line.202"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.TagInfo.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.TagInfo.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.TagInfo.html
new file mode 100644
index 0000000..7f46600
--- /dev/null
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.TagInfo.html
@@ -0,0 +1,274 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" 
href="../../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> *<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * distributed with this work for 
additional information<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * "License"); you may not use this file 
except in compliance<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * with the License.  You may obtain a 
copy of the License at<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
+<span class="sourceLineNo">012</span> *<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * See the License for the specific 
language governing permissions and<a name="line.16"></a>
+<span class="sourceLineNo">017</span> * limitations under the License.<a 
name="line.17"></a>
+<span class="sourceLineNo">018</span> */<a name="line.18"></a>
+<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.security.visibility;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.ArrayList;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.HashMap;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Map;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.NavigableMap;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.SortedMap;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.SortedSet;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.TreeMap;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.TreeSet;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.commons.logging.LogFactory;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Tag;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.regionserver.querymatcher.NewVersionBehaviorTracker;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Similar to MvccSensitiveTracker but 
tracks the visibility expression also before<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * deciding if a Cell can be considered 
deleted<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public class 
VisibilityNewVersionBehaivorTracker extends NewVersionBehaviorTracker {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private static final Log LOG = 
LogFactory.getLog(VisibilityNewVersionBehaivorTracker.class);<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  public 
VisibilityNewVersionBehaivorTracker(NavigableSet&lt;byte[]&gt; columns, int 
minVersion,<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      int maxVersion,<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>      int resultMaxVersions, long 
oldestUnexpiredTS) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    super(columns, minVersion, 
maxVersion, resultMaxVersions, oldestUnexpiredTS);<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>  private static class TagInfo {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    List&lt;Tag&gt; tags;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>    Byte format;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>    private TagInfo(Cell c) {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>      tags = new ArrayList&lt;&gt;();<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      format = 
VisibilityUtils.extractVisibilityTags(c, tags);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>    private TagInfo() {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>      tags = new ArrayList&lt;&gt;();<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><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  private class 
VisibilityDeleteVersionsNode extends DeleteVersionsNode {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    private TagInfo tagInfo;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // &lt;timestamp, 
set&lt;mvcc&gt;&gt;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    // Key is ts of version deletes, 
value is its mvccs.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    // We may delete more than one time 
for a version.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    private Map&lt;Long, 
SortedMap&lt;Long, TagInfo&gt;&gt; deletesMap = new HashMap&lt;&gt;();<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>    // &lt;mvcc, set&lt;mvcc&gt;&gt;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    // Key is mvcc of version deletes, 
value is mvcc of visible puts before the delete effect.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    private NavigableMap&lt;Long, 
SortedSet&lt;Long&gt;&gt; mvccCountingMap = new TreeMap&lt;&gt;();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>    protected 
VisibilityDeleteVersionsNode(long ts, long mvcc, TagInfo tagInfo) {<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>      this.tagInfo = tagInfo;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>      this.ts = ts;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      this.mvcc = mvcc;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>      mvccCountingMap.put(Long.MAX_VALUE, 
new TreeSet&lt;Long&gt;());<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>    protected 
VisibilityDeleteVersionsNode getDeepCopy() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      VisibilityDeleteVersionsNode node = 
new VisibilityDeleteVersionsNode(ts, mvcc, tagInfo);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      for (Map.Entry&lt;Long, 
SortedMap&lt;Long, TagInfo&gt;&gt; e : deletesMap.entrySet()) {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>        node.deletesMap.put(e.getKey(), 
new TreeMap&lt;&gt;(e.getValue()));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      for (Map.Entry&lt;Long, 
SortedSet&lt;Long&gt;&gt; e : mvccCountingMap.entrySet()) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>        
node.mvccCountingMap.put(e.getKey(), new TreeSet&lt;&gt;(e.getValue()));<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      return node;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>    public void addVersionDelete(Cell 
cell) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      SortedMap&lt;Long, TagInfo&gt; set 
= deletesMap.get(cell.getTimestamp());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      if (set == null) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        set = new TreeMap&lt;&gt;();<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>        
deletesMap.put(cell.getTimestamp(), set);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      set.put(cell.getSequenceId(), new 
TagInfo(cell));<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      // The init set should be the puts 
whose mvcc is smaller than this Delete. Because<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      // there may be some Puts masked by 
them. The Puts whose mvcc is larger than this Delete can<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      // not be copied to this node 
because we may delete one version and the oldest put may not be<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      // masked.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      SortedSet&lt;Long&gt; nextValue = 
mvccCountingMap.ceilingEntry(cell.getSequenceId()).getValue();<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      SortedSet&lt;Long&gt; thisValue = 
new TreeSet&lt;&gt;(nextValue.headSet(cell.getSequenceId()));<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      
mvccCountingMap.put(cell.getSequenceId(), thisValue);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<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><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  @Override<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public void add(Cell cell) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    prepare(cell);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    byte type = cell.getTypeByte();<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    switch 
(KeyValue.Type.codeToType(type)) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // By the order of seen. We put null 
cq at first.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    case DeleteFamily: // Delete all 
versions of all columns of the specified family<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      
delFamMap.put(cell.getSequenceId(),<a name="line.123"></a>
+<span class="sourceLineNo">124</span>          new 
VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>              new TagInfo(cell)));<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      break;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    case DeleteFamilyVersion: // Delete 
all columns of the specified family and specified version<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      
delFamMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a
 name="line.128"></a>
+<span class="sourceLineNo">129</span>      break;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // These two kinds of markers are mix 
with Puts.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    case DeleteColumn: // Delete all 
versions of the specified column<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      
delColMap.put(cell.getSequenceId(),<a name="line.133"></a>
+<span class="sourceLineNo">134</span>          new 
VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>              new TagInfo(cell)));<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      break;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    case Delete: // Delete the specified 
version of the specified column.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      
delColMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a
 name="line.138"></a>
+<span class="sourceLineNo">139</span>      break;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    default:<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      throw new AssertionError("Unknown 
delete marker type for " + cell);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private boolean tagMatched(Cell put, 
TagInfo delInfo) throws IOException {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    List&lt;Tag&gt; putVisTags = new 
ArrayList&lt;&gt;();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Byte putCellVisTagsFormat = 
VisibilityUtils.extractVisibilityTags(put, putVisTags);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    return putVisTags.isEmpty() == 
delInfo.tags.isEmpty() &amp;&amp; (<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        putVisTags.isEmpty() &amp;&amp; 
delInfo.tags.isEmpty() || VisibilityLabelServiceManager<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            
.getInstance().getVisibilityLabelService()<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            .matchVisibility(putVisTags, 
putCellVisTagsFormat, delInfo.tags, delInfo.format));<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  public DeleteResult isDeleted(Cell 
cell) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    try {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      long duplicateMvcc = 
prepare(cell);<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>      for (Map.Entry&lt;Long, 
DeleteVersionsNode&gt; e : delColMap.tailMap(cell.getSequenceId())<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>          .entrySet()) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        VisibilityDeleteVersionsNode node 
= (VisibilityDeleteVersionsNode) e.getValue();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        long deleteMvcc = 
Long.MAX_VALUE;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        SortedMap&lt;Long, TagInfo&gt; 
deleteVersionMvccs = node.deletesMap.get(cell.getTimestamp());<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>        if (deleteVersionMvccs != null) 
{<a name="line.164"></a>
+<span class="sourceLineNo">165</span>          SortedMap&lt;Long, TagInfo&gt; 
tail = deleteVersionMvccs.tailMap(cell.getSequenceId());<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          for (Map.Entry&lt;Long, 
TagInfo&gt; entry : tail.entrySet()) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>            if (tagMatched(cell, 
entry.getValue())) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              deleteMvcc = 
tail.firstKey();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              break;<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>        SortedMap&lt;Long, 
SortedSet&lt;Long&gt;&gt; subMap = node.mvccCountingMap<a name="line.173"></a>
+<span class="sourceLineNo">174</span>            .subMap(cell.getSequenceId(), 
true, Math.min(duplicateMvcc, deleteMvcc), true);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        for (Map.Entry&lt;Long, 
SortedSet&lt;Long&gt;&gt; seg : subMap.entrySet()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          if (seg.getValue().size() &gt;= 
maxVersions) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            return 
DeleteResult.VERSION_MASKED;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          
seg.getValue().add(cell.getSequenceId());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        if (deleteMvcc &lt; 
Long.MAX_VALUE) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          return 
DeleteResult.VERSION_DELETED;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>        if (cell.getTimestamp() &lt;= 
node.ts &amp;&amp; tagMatched(cell, node.tagInfo)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>          return 
DeleteResult.COLUMN_DELETED;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      if (duplicateMvcc &lt; 
Long.MAX_VALUE) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        return 
DeleteResult.VERSION_MASKED;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    } catch (IOException e) {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      LOG.error("Error in isDeleted() 
check! Will treat cell as not deleted", e);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    return DeleteResult.NOT_DELETED;<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  protected void resetInternal() {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    delFamMap.put(Long.MAX_VALUE,<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>        new 
VisibilityDeleteVersionsNode(Long.MIN_VALUE, Long.MAX_VALUE, new TagInfo()));<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>}<a name="line.202"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.VisibilityDeleteVersionsNode.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.VisibilityDeleteVersionsNode.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.VisibilityDeleteVersionsNode.html
new file mode 100644
index 0000000..7f46600
--- /dev/null
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.VisibilityDeleteVersionsNode.html
@@ -0,0 +1,274 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" 
href="../../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> *<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * distributed with this work for 
additional information<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * "License"); you may not use this file 
except in compliance<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * with the License.  You may obtain a 
copy of the License at<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
+<span class="sourceLineNo">012</span> *<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * See the License for the specific 
language governing permissions and<a name="line.16"></a>
+<span class="sourceLineNo">017</span> * limitations under the License.<a 
name="line.17"></a>
+<span class="sourceLineNo">018</span> */<a name="line.18"></a>
+<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.security.visibility;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.ArrayList;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.HashMap;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Map;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.NavigableMap;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.SortedMap;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.SortedSet;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.TreeMap;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.TreeSet;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.commons.logging.LogFactory;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Cell;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.KeyValue;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Tag;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.regionserver.querymatcher.NewVersionBehaviorTracker;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * Similar to MvccSensitiveTracker but 
tracks the visibility expression also before<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * deciding if a Cell can be considered 
deleted<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public class 
VisibilityNewVersionBehaivorTracker extends NewVersionBehaviorTracker {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private static final Log LOG = 
LogFactory.getLog(VisibilityNewVersionBehaivorTracker.class);<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  public 
VisibilityNewVersionBehaivorTracker(NavigableSet&lt;byte[]&gt; columns, int 
minVersion,<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      int maxVersion,<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>      int resultMaxVersions, long 
oldestUnexpiredTS) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    super(columns, minVersion, 
maxVersion, resultMaxVersions, oldestUnexpiredTS);<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>  private static class TagInfo {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    List&lt;Tag&gt; tags;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>    Byte format;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>    private TagInfo(Cell c) {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>      tags = new ArrayList&lt;&gt;();<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      format = 
VisibilityUtils.extractVisibilityTags(c, tags);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>    private TagInfo() {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>      tags = new ArrayList&lt;&gt;();<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><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  private class 
VisibilityDeleteVersionsNode extends DeleteVersionsNode {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    private TagInfo tagInfo;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // &lt;timestamp, 
set&lt;mvcc&gt;&gt;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    // Key is ts of version deletes, 
value is its mvccs.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    // We may delete more than one time 
for a version.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    private Map&lt;Long, 
SortedMap&lt;Long, TagInfo&gt;&gt; deletesMap = new HashMap&lt;&gt;();<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>    // &lt;mvcc, set&lt;mvcc&gt;&gt;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    // Key is mvcc of version deletes, 
value is mvcc of visible puts before the delete effect.<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    private NavigableMap&lt;Long, 
SortedSet&lt;Long&gt;&gt; mvccCountingMap = new TreeMap&lt;&gt;();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>    protected 
VisibilityDeleteVersionsNode(long ts, long mvcc, TagInfo tagInfo) {<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>      this.tagInfo = tagInfo;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>      this.ts = ts;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      this.mvcc = mvcc;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>      mvccCountingMap.put(Long.MAX_VALUE, 
new TreeSet&lt;Long&gt;());<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>    protected 
VisibilityDeleteVersionsNode getDeepCopy() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      VisibilityDeleteVersionsNode node = 
new VisibilityDeleteVersionsNode(ts, mvcc, tagInfo);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      for (Map.Entry&lt;Long, 
SortedMap&lt;Long, TagInfo&gt;&gt; e : deletesMap.entrySet()) {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>        node.deletesMap.put(e.getKey(), 
new TreeMap&lt;&gt;(e.getValue()));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      for (Map.Entry&lt;Long, 
SortedSet&lt;Long&gt;&gt; e : mvccCountingMap.entrySet()) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>        
node.mvccCountingMap.put(e.getKey(), new TreeSet&lt;&gt;(e.getValue()));<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      return node;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>    public void addVersionDelete(Cell 
cell) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      SortedMap&lt;Long, TagInfo&gt; set 
= deletesMap.get(cell.getTimestamp());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      if (set == null) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        set = new TreeMap&lt;&gt;();<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>        
deletesMap.put(cell.getTimestamp(), set);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      set.put(cell.getSequenceId(), new 
TagInfo(cell));<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      // The init set should be the puts 
whose mvcc is smaller than this Delete. Because<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      // there may be some Puts masked by 
them. The Puts whose mvcc is larger than this Delete can<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      // not be copied to this node 
because we may delete one version and the oldest put may not be<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      // masked.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      SortedSet&lt;Long&gt; nextValue = 
mvccCountingMap.ceilingEntry(cell.getSequenceId()).getValue();<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      SortedSet&lt;Long&gt; thisValue = 
new TreeSet&lt;&gt;(nextValue.headSet(cell.getSequenceId()));<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      
mvccCountingMap.put(cell.getSequenceId(), thisValue);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<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><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  @Override<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public void add(Cell cell) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    prepare(cell);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    byte type = cell.getTypeByte();<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    switch 
(KeyValue.Type.codeToType(type)) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // By the order of seen. We put null 
cq at first.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    case DeleteFamily: // Delete all 
versions of all columns of the specified family<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      
delFamMap.put(cell.getSequenceId(),<a name="line.123"></a>
+<span class="sourceLineNo">124</span>          new 
VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>              new TagInfo(cell)));<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      break;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    case DeleteFamilyVersion: // Delete 
all columns of the specified family and specified version<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      
delFamMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a
 name="line.128"></a>
+<span class="sourceLineNo">129</span>      break;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // These two kinds of markers are mix 
with Puts.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    case DeleteColumn: // Delete all 
versions of the specified column<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      
delColMap.put(cell.getSequenceId(),<a name="line.133"></a>
+<span class="sourceLineNo">134</span>          new 
VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>              new TagInfo(cell)));<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      break;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    case Delete: // Delete the specified 
version of the specified column.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      
delColMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a
 name="line.138"></a>
+<span class="sourceLineNo">139</span>      break;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    default:<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      throw new AssertionError("Unknown 
delete marker type for " + cell);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private boolean tagMatched(Cell put, 
TagInfo delInfo) throws IOException {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    List&lt;Tag&gt; putVisTags = new 
ArrayList&lt;&gt;();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Byte putCellVisTagsFormat = 
VisibilityUtils.extractVisibilityTags(put, putVisTags);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    return putVisTags.isEmpty() == 
delInfo.tags.isEmpty() &amp;&amp; (<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        putVisTags.isEmpty() &amp;&amp; 
delInfo.tags.isEmpty() || VisibilityLabelServiceManager<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            
.getInstance().getVisibilityLabelService()<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            .matchVisibility(putVisTags, 
putCellVisTagsFormat, delInfo.tags, delInfo.format));<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  public DeleteResult isDeleted(Cell 
cell) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    try {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      long duplicateMvcc = 
prepare(cell);<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>      for (Map.Entry&lt;Long, 
DeleteVersionsNode&gt; e : delColMap.tailMap(cell.getSequenceId())<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>          .entrySet()) {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        VisibilityDeleteVersionsNode node 
= (VisibilityDeleteVersionsNode) e.getValue();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        long deleteMvcc = 
Long.MAX_VALUE;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        SortedMap&lt;Long, TagInfo&gt; 
deleteVersionMvccs = node.deletesMap.get(cell.getTimestamp());<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>        if (deleteVersionMvccs != null) 
{<a name="line.164"></a>
+<span class="sourceLineNo">165</span>          SortedMap&lt;Long, TagInfo&gt; 
tail = deleteVersionMvccs.tailMap(cell.getSequenceId());<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          for (Map.Entry&lt;Long, 
TagInfo&gt; entry : tail.entrySet()) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>            if (tagMatched(cell, 
entry.getValue())) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>              deleteMvcc = 
tail.firstKey();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>              break;<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>        SortedMap&lt;Long, 
SortedSet&lt;Long&gt;&gt; subMap = node.mvccCountingMap<a name="line.173"></a>
+<span class="sourceLineNo">174</span>            .subMap(cell.getSequenceId(), 
true, Math.min(duplicateMvcc, deleteMvcc), true);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        for (Map.Entry&lt;Long, 
SortedSet&lt;Long&gt;&gt; seg : subMap.entrySet()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          if (seg.getValue().size() &gt;= 
maxVersions) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            return 
DeleteResult.VERSION_MASKED;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          
seg.getValue().add(cell.getSequenceId());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        if (deleteMvcc &lt; 
Long.MAX_VALUE) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          return 
DeleteResult.VERSION_DELETED;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>        if (cell.getTimestamp() &lt;= 
node.ts &amp;&amp; tagMatched(cell, node.tagInfo)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>          return 
DeleteResult.COLUMN_DELETED;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      if (duplicateMvcc &lt; 
Long.MAX_VALUE) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        return 
DeleteResult.VERSION_MASKED;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    } catch (IOException e) {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      LOG.error("Error in isDeleted() 
check! Will treat cell as not deleted", e);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    return DeleteResult.NOT_DELETED;<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  protected void resetInternal() {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    delFamMap.put(Long.MAX_VALUE,<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>        new 
VisibilityDeleteVersionsNode(Long.MIN_VALUE, Long.MAX_VALUE, new TagInfo()));<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>}<a name="line.202"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

Reply via email to