http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16541468/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
index ecc21f4..54d784d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
@@ -45,207 +45,208 @@
 <span class="sourceLineNo">037</span> * &lt;p&gt;<a name="line.37"></a>
 <span class="sourceLineNo">038</span> * Note: Use of this filter overrides any 
time range/time stamp<a name="line.38"></a>
 <span class="sourceLineNo">039</span> * options specified using {@link 
org.apache.hadoop.hbase.client.Get#setTimeRange(long, long)},<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span> * {@link 
org.apache.hadoop.hbase.client.Scan#setTimeRange(long, long)}, {@link 
org.apache.hadoop.hbase.client.Get#setTimeStamp(long)},<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * or {@link 
org.apache.hadoop.hbase.client.Scan#setTimeStamp(long)}.<a name="line.41"></a>
-<span class="sourceLineNo">042</span> */<a name="line.42"></a>
-<span class="sourceLineNo">043</span>@InterfaceAudience.Public<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>public class TimestampsFilter extends 
FilterBase {<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private final boolean canHint;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>  TreeSet&lt;Long&gt; timestamps;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>  private static final int 
MAX_LOG_TIMESTAMPS = 5;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  // Used during scans to hint the scan 
to stop early<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  // once the timestamps fall below the 
minTimeStamp.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  long minTimeStamp = Long.MAX_VALUE;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  /**<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * Constructor for filter that retains 
only the specified timestamps in the list.<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * @param timestamps<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>   */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public 
TimestampsFilter(List&lt;Long&gt; timestamps) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    this(timestamps, false);<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>   * Constructor for filter that retains 
only those<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * cells whose timestamp (version) is 
in the specified<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * list of timestamps.<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>   *<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   * @param timestamps list of timestamps 
that are wanted.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * @param canHint should the filter 
provide a seek hint? This can skip<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   *                past delete 
tombstones, so it should only be used when that<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   *                is not an issue ( no 
deletes, or don't care if data<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   *                becomes visible)<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>   */<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public 
TimestampsFilter(List&lt;Long&gt; timestamps, boolean canHint) {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    for (Long timestamp : timestamps) {<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>      
Preconditions.checkArgument(timestamp &gt;= 0, "must be positive %s", 
timestamp);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    this.canHint = canHint;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    this.timestamps = new 
TreeSet&lt;&gt;(timestamps);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    init();<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>  /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * @return the list of timestamps<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public List&lt;Long&gt; getTimestamps() 
{<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    List&lt;Long&gt; list = new 
ArrayList&lt;&gt;(timestamps.size());<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    list.addAll(timestamps);<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    return list;<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>  private void init() {<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    if (this.timestamps.size() &gt; 0) 
{<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      minTimeStamp = 
this.timestamps.first();<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><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * Gets the minimum timestamp requested 
by filter.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @return  minimum timestamp requested 
by filter.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public long getMin() {<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    return minTimeStamp;<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>  @Override<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public boolean filterRowKey(Cell cell) 
throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    return false;<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>  @Deprecated<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  @Override<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    return filterCell(c);<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>  @Override<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    if 
(this.timestamps.contains(c.getTimestamp())) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return ReturnCode.INCLUDE;<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    } else if (c.getTimestamp() &lt; 
minTimeStamp) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      // The remaining versions of this 
column are guaranteed<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      // to be lesser than all of the 
other values.<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      return ReturnCode.NEXT_COL;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    return canHint ? 
ReturnCode.SEEK_NEXT_USING_HINT : ReturnCode.SKIP;<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">040</span> * {@link 
org.apache.hadoop.hbase.client.Scan#setTimeRange(long, long)},<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span> * {@link 
org.apache.hadoop.hbase.client.Get#setTimestamp(long)},<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * or {@link 
org.apache.hadoop.hbase.client.Scan#setTimestamp(long)}.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@InterfaceAudience.Public<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>public class TimestampsFilter extends 
FilterBase {<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private final boolean canHint;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>  TreeSet&lt;Long&gt; timestamps;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>  private static final int 
MAX_LOG_TIMESTAMPS = 5;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  // Used during scans to hint the scan 
to stop early<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  // once the timestamps fall below the 
minTimestamp.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  long minTimestamp = Long.MAX_VALUE;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * Constructor for filter that retains 
only the specified timestamps in the list.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * @param timestamps<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public 
TimestampsFilter(List&lt;Long&gt; timestamps) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    this(timestamps, false);<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>  /**<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   * Constructor for filter that retains 
only those<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * cells whose timestamp (version) is 
in the specified<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * list of timestamps.<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>   *<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @param timestamps list of timestamps 
that are wanted.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * @param canHint should the filter 
provide a seek hint? This can skip<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   *                past delete 
tombstones, so it should only be used when that<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   *                is not an issue ( no 
deletes, or don't care if data<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   *                becomes visible)<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public 
TimestampsFilter(List&lt;Long&gt; timestamps, boolean canHint) {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    for (Long timestamp : timestamps) {<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>      
Preconditions.checkArgument(timestamp &gt;= 0, "must be positive %s", 
timestamp);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    }<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    this.canHint = canHint;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    this.timestamps = new 
TreeSet&lt;&gt;(timestamps);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    init();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  }<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>   * @return the list of timestamps<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>   */<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public List&lt;Long&gt; getTimestamps() 
{<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    List&lt;Long&gt; list = new 
ArrayList&lt;&gt;(timestamps.size());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    list.addAll(timestamps);<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    return list;<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>  private void init() {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    if (this.timestamps.size() &gt; 0) 
{<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      minTimestamp = 
this.timestamps.first();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    }<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>  /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   * Gets the minimum timestamp requested 
by filter.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * @return  minimum timestamp requested 
by filter.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public long getMin() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    return minTimestamp;<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>  @Override<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  public boolean filterRowKey(Cell cell) 
throws IOException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    // Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    return false;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  @Deprecated<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  @Override<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public ReturnCode filterKeyValue(final 
Cell c) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    return filterCell(c);<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>  @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public ReturnCode filterCell(final Cell 
c) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    if 
(this.timestamps.contains(c.getTimestamp())) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      return ReturnCode.INCLUDE;<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    } else if (c.getTimestamp() &lt; 
minTimestamp) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      // The remaining versions of this 
column are guaranteed<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      // to be lesser than all of the 
other values.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      return ReturnCode.NEXT_COL;<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return canHint ? 
ReturnCode.SEEK_NEXT_USING_HINT : ReturnCode.SKIP;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   * Pick the next cell that the scanner 
should seek to. Since this can skip any number of cells<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * any of which can be a delete this 
can resurect old data.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   *<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * The method will only be used if 
canHint was set to true while creating the filter.<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   *<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   * @throws IOException This will never 
happen.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  public Cell getNextCellHint(Cell 
currentCell) throws IOException {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    if (!canHint) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return null;<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>    Long nextTimestampObject = 
timestamps.lower(currentCell.getTimestamp());<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    if (nextTimestampObject == null) {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      // This should only happen if the 
current column's<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // timestamp is below the last one 
in the list.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      //<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      // It should never happen as the 
filterCell should return NEXT_COL<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      // but it's always better to be 
extra safe and protect against future<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      // behavioral changes.<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return 
PrivateCellUtil.createLastOnRowCol(currentCell);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>    // Since we know the 
nextTimestampObject isn't null here there must still be<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    // timestamps that can be included. 
Cast the Long to a long and return the<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    // a cell with the current row/cf/col 
and the next found timestamp.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    long nextTimestamp = 
nextTimestampObject;<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return 
PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<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>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    ArrayList&lt;Long&gt; timestamps = 
new ArrayList&lt;&gt;(filterArguments.size());<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    for (int i = 0; 
i&lt;filterArguments.size(); i++) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      long timestamp = 
ParseFilter.convertByteArrayToLong(filterArguments.get(i));<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      timestamps.add(timestamp);<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    return new 
TimestampsFilter(timestamps);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>  /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @return The filter serialized using 
pb<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   */<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public byte[] toByteArray() {<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    FilterProtos.TimestampsFilter.Builder 
builder =<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        
FilterProtos.TimestampsFilter.newBuilder();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    
builder.addAllTimestamps(this.timestamps);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    builder.setCanHint(canHint);<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   * @param pbBytes A pb serialized 
{@link TimestampsFilter} instance<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   *<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   * @return An instance of {@link 
TimestampsFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>   * @see #toByteArray<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  public static TimestampsFilter 
parseFrom(final byte[] pbBytes)<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      throws DeserializationException {<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    FilterProtos.TimestampsFilter 
proto;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      proto = 
FilterProtos.TimestampsFilter.parseFrom(pbBytes);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      throw new 
DeserializationException(e);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return new 
TimestampsFilter(proto.getTimestampsList(),<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        proto.hasCanHint() &amp;&amp; 
proto.getCanHint());<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  /**<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param o the other filter to compare 
with<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    if (o == this) return true;<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>    if (!(o instanceof TimestampsFilter)) 
return false;<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span>    TimestampsFilter other = 
(TimestampsFilter)o;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    return 
this.getTimestamps().equals(other.getTimestamps());<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>  @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  public String toString() {<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    return 
toString(MAX_LOG_TIMESTAMPS);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>  protected String toString(int 
maxTimestamps) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    StringBuilder tsList = new 
StringBuilder();<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>    int count = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    for (Long ts : this.timestamps) {<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>      if (count &gt;= maxTimestamps) {<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>        break;<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      ++count;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      tsList.append(ts.toString());<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>      if (count &lt; 
this.timestamps.size() &amp;&amp; count &lt; maxTimestamps) {<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>        tsList.append(", ");<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><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    return String.format("%s (%d/%d): 
[%s] canHint: [%b]", this.getClass().getSimpleName(),<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        count, this.timestamps.size(), 
tsList.toString(), canHint);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
-<span class="sourceLineNo">240</span>}<a name="line.240"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  /**<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * Pick the next cell that the scanner 
should seek to. Since this can skip any number of cells<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   * any of which can be a delete this 
can resurect old data.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   *<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * The method will only be used if 
canHint was set to true while creating the filter.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   *<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * @throws IOException This will never 
happen.<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public Cell getNextCellHint(Cell 
currentCell) throws IOException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    if (!canHint) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      return null;<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>    Long nextTimestampObject = 
timestamps.lower(currentCell.getTimestamp());<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    if (nextTimestampObject == null) {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>      // This should only happen if the 
current column's<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      // timestamp is below the last one 
in the list.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      //<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      // It should never happen as the 
filterCell should return NEXT_COL<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      // but it's always better to be 
extra safe and protect against future<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      // behavioral changes.<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>      return 
PrivateCellUtil.createLastOnRowCol(currentCell);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    // Since we know the 
nextTimestampObject isn't null here there must still be<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    // timestamps that can be included. 
Cast the Long to a long and return the<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    // a cell with the current row/cf/col 
and the next found timestamp.<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    long nextTimestamp = 
nextTimestampObject;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    return 
PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public static Filter 
createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    ArrayList&lt;Long&gt; timestamps = 
new ArrayList&lt;&gt;(filterArguments.size());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    for (int i = 0; 
i&lt;filterArguments.size(); i++) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      long timestamp = 
ParseFilter.convertByteArrayToLong(filterArguments.get(i));<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      timestamps.add(timestamp);<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    return new 
TimestampsFilter(timestamps);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>  /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * @return The filter serialized using 
pb<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  @Override<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public byte[] toByteArray() {<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>    FilterProtos.TimestampsFilter.Builder 
builder =<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        
FilterProtos.TimestampsFilter.newBuilder();<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    
builder.addAllTimestamps(this.timestamps);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    builder.setCanHint(canHint);<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    return 
builder.build().toByteArray();<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>  /**<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * @param pbBytes A pb serialized 
{@link TimestampsFilter} instance<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   *<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @return An instance of {@link 
TimestampsFilter} made from &lt;code&gt;bytes&lt;/code&gt;<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>   * @see #toByteArray<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>   */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  public static TimestampsFilter 
parseFrom(final byte[] pbBytes)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      throws DeserializationException {<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>    FilterProtos.TimestampsFilter 
proto;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    try {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      proto = 
FilterProtos.TimestampsFilter.parseFrom(pbBytes);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    } catch 
(InvalidProtocolBufferException e) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      throw new 
DeserializationException(e);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    return new 
TimestampsFilter(proto.getTimestampsList(),<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        proto.hasCanHint() &amp;&amp; 
proto.getCanHint());<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>  /**<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * @param o the other filter to compare 
with<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   * @return true if and only if the 
fields of the filter that are serialized<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * are equal to the corresponding 
fields in other.  Used for testing.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  @Override<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  boolean areSerializedFieldsEqual(Filter 
o) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    if (o == this) return true;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    if (!(o instanceof TimestampsFilter)) 
return false;<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    TimestampsFilter other = 
(TimestampsFilter)o;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    return 
this.getTimestamps().equals(other.getTimestamps());<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>  @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  public String toString() {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    return 
toString(MAX_LOG_TIMESTAMPS);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  protected String toString(int 
maxTimestamps) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    StringBuilder tsList = new 
StringBuilder();<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>    int count = 0;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    for (Long ts : this.timestamps) {<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>      if (count &gt;= maxTimestamps) {<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>        break;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      ++count;<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      tsList.append(ts.toString());<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (count &lt; 
this.timestamps.size() &amp;&amp; count &lt; maxTimestamps) {<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>        tsList.append(", ");<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    return String.format("%s (%d/%d): 
[%s] canHint: [%b]", this.getClass().getSimpleName(),<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        count, this.timestamps.size(), 
tsList.toString(), canHint);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16541468/apidocs/src-html/org/apache/hadoop/hbase/io/TimeRange.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/io/TimeRange.html 
b/apidocs/src-html/org/apache/hadoop/hbase/io/TimeRange.html
index c772f43..1281c8a 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/io/TimeRange.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/io/TimeRange.html
@@ -45,202 +45,219 @@
 <span class="sourceLineNo">037</span>public class TimeRange {<a 
name="line.37"></a>
 <span class="sourceLineNo">038</span>  public static final long 
INITIAL_MIN_TIMESTAMP = 0L;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>  public static final long 
INITIAL_MAX_TIMESTAMP = Long.MAX_VALUE;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  private final long minStamp;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>  private final long maxStamp;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>  private final boolean allTime;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  /**<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   * Default constructor.<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>   * Represents interval [0, 
Long.MAX_VALUE) (allTime)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>   * changed to private or removed in 
3.0.<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @Deprecated<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  @InterfaceAudience.Private<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>  public TimeRange() {<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>    this(INITIAL_MIN_TIMESTAMP, 
INITIAL_MAX_TIMESTAMP);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * Represents interval [minStamp, 
Long.MAX_VALUE)<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   * @param minStamp the minimum 
timestamp value, inclusive<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>   * changed to private or removed in 
3.0.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  @Deprecated<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @InterfaceAudience.Private<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>  public TimeRange(long minStamp) {<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>    this(minStamp, 
INITIAL_MAX_TIMESTAMP);<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>  /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   * Represents interval [minStamp, 
Long.MAX_VALUE)<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * @param minStamp the minimum 
timestamp value, inclusive<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>   * changed to private or removed in 
3.0.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  @Deprecated<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  @InterfaceAudience.Private<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>  public TimeRange(byte [] minStamp) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    this(Bytes.toLong(minStamp));<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  }<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>   * Represents interval [minStamp, 
maxStamp)<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * @param minStamp the minimum 
timestamp, inclusive<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * @param maxStamp the maximum 
timestamp, exclusive<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>   * changed to private or removed in 
3.0.<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  @Deprecated<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @InterfaceAudience.Private<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>  public TimeRange(byte [] minStamp, byte 
[] maxStamp) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    this(Bytes.toLong(minStamp), 
Bytes.toLong(maxStamp));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<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>   * Represents interval [minStamp, 
maxStamp)<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * @param minStamp the minimum 
timestamp, inclusive<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @param maxStamp the maximum 
timestamp, exclusive<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * @throws IllegalArgumentException if 
either &lt;0,<a name="line.97"></a>
+<span class="sourceLineNo">040</span>  private static final TimeRange ALL_TIME 
= new TimeRange(INITIAL_MIN_TIMESTAMP,<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    INITIAL_MAX_TIMESTAMP);<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public static TimeRange allTime() {<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>    return ALL_TIME;<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>  public static TimeRange at(long ts) {<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>    if (ts &lt; 0 || ts == 
Long.MAX_VALUE) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      throw new 
IllegalArgumentException("invalid ts:" + ts);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    }<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    return new TimeRange(ts, ts + 1);<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 final long minStamp;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>  private final long maxStamp;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>  private final boolean allTime;<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>   * Default constructor.<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>   * Represents interval [0, 
Long.MAX_VALUE) (allTime)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>   * changed to private or removed in 
3.0.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  @Deprecated<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @InterfaceAudience.Private<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>  public TimeRange() {<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    this(INITIAL_MIN_TIMESTAMP, 
INITIAL_MAX_TIMESTAMP);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  }<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>   * Represents interval [minStamp, 
Long.MAX_VALUE)<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * @param minStamp the minimum 
timestamp value, inclusive<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>   * changed to private or removed in 
3.0.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  @Deprecated<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  @InterfaceAudience.Private<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>  public TimeRange(long minStamp) {<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    this(minStamp, 
INITIAL_MAX_TIMESTAMP);<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>  /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * Represents interval [minStamp, 
Long.MAX_VALUE)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * @param minStamp the minimum 
timestamp value, inclusive<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>   * changed to private or removed in 
3.0.<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  @Deprecated<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  @InterfaceAudience.Private<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>  public TimeRange(byte [] minStamp) {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    this(Bytes.toLong(minStamp));<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>  /**<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * Represents interval [minStamp, 
maxStamp)<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   * @param minStamp the minimum 
timestamp, inclusive<a name="line.96"></a>
+<span class="sourceLineNo">097</span>   * @param maxStamp the maximum 
timestamp, exclusive<a name="line.97"></a>
 <span class="sourceLineNo">098</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.98"></a>
 <span class="sourceLineNo">099</span>   * changed to private or removed in 
3.0.<a name="line.99"></a>
 <span class="sourceLineNo">100</span>   */<a name="line.100"></a>
 <span class="sourceLineNo">101</span>  @Deprecated<a name="line.101"></a>
 <span class="sourceLineNo">102</span>  @InterfaceAudience.Private<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>  public TimeRange(long minStamp, long 
maxStamp) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    check(minStamp, maxStamp);<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>    this.minStamp = minStamp;<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>    this.maxStamp = maxStamp;<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    this.allTime = isAllTime(minStamp, 
maxStamp);<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>  private static boolean isAllTime(long 
minStamp, long maxStamp) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    return minStamp == 
INITIAL_MIN_TIMESTAMP &amp;&amp; maxStamp == INITIAL_MAX_TIMESTAMP;<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>  private static void check(long 
minStamp, long maxStamp) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (minStamp &lt; 0 || maxStamp &lt; 
0) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. minStamp:" + minStamp<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>        + ", maxStamp:" + maxStamp);<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    if (maxStamp &lt; minStamp) {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      throw new 
IllegalArgumentException("maxStamp is smaller than minStamp");<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
+<span class="sourceLineNo">103</span>  public TimeRange(byte [] minStamp, byte 
[] maxStamp) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    this(Bytes.toLong(minStamp), 
Bytes.toLong(maxStamp));<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>  /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * Represents interval [minStamp, 
maxStamp)<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * @param minStamp the minimum 
timestamp, inclusive<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * @param maxStamp the maximum 
timestamp, exclusive<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * @throws IllegalArgumentException if 
either &lt;0,<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>   * changed to private or removed in 
3.0.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Deprecated<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  @InterfaceAudience.Private<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>  public TimeRange(long minStamp, long 
maxStamp) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    check(minStamp, maxStamp);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    this.minStamp = minStamp;<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    this.maxStamp = maxStamp;<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    this.allTime = isAllTime(minStamp, 
maxStamp);<a name="line.121"></a>
 <span class="sourceLineNo">122</span>  }<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   * @return the smallest timestamp that 
should be considered<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   */<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public long getMin() {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    return minStamp;<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * @return the biggest timestamp that 
should be considered<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public long getMax() {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    return maxStamp;<a 
name="line.135"></a>
+<span class="sourceLineNo">124</span>  private static boolean isAllTime(long 
minStamp, long maxStamp) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return minStamp == 
INITIAL_MIN_TIMESTAMP &amp;&amp; maxStamp == INITIAL_MAX_TIMESTAMP;<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  private static void check(long 
minStamp, long maxStamp) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    if (minStamp &lt; 0 || maxStamp &lt; 
0) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      throw new 
IllegalArgumentException("Timestamp cannot be negative. minStamp:" + minStamp<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>        + ", maxStamp:" + maxStamp);<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    if (maxStamp &lt; minStamp) {<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      throw new 
IllegalArgumentException("maxStamp is smaller than minStamp");<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>   * Check if it is for all time<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>   * @return true if it is for all time<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  public boolean isAllTime() {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    return allTime;<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  /**<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   * Check if the specified timestamp is 
within this TimeRange.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   * &lt;p&gt;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * Returns true if within interval 
[minStamp, maxStamp), false if not.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   * @param bytes timestamp to check<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>   * @param offset offset into the 
bytes<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * @return true if within TimeRange, 
false if not<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  public boolean withinTimeRange(byte [] 
bytes, int offset) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    if (allTime) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      return true;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return 
withinTimeRange(Bytes.toLong(bytes, offset));<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * Check if the specified timestamp is 
within this TimeRange.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * &lt;p&gt;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * Returns true if within interval 
[minStamp, maxStamp), false<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * if not.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * @param timestamp timestamp to 
check<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * @return true if within TimeRange, 
false if not<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  public boolean withinTimeRange(long 
timestamp) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    assert timestamp &gt;= 0;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    if (this.allTime) {<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      return true;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    // check if &gt;= minStamp<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>    return (minStamp &lt;= timestamp 
&amp;&amp; timestamp &lt; maxStamp);<a name="line.175"></a>
+<span class="sourceLineNo">139</span>   * @return the smallest timestamp that 
should be considered<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public long getMin() {<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    return minStamp;<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>  /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @return the biggest timestamp that 
should be considered<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  public long getMax() {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    return maxStamp;<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * Check if it is for all time<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>   * @return true if it is for all time<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  public boolean isAllTime() {<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    return allTime;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   * Check if the specified timestamp is 
within this TimeRange.<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   * &lt;p&gt;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * Returns true if within interval 
[minStamp, maxStamp), false if not.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   * @param bytes timestamp to check<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>   * @param offset offset into the 
bytes<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   * @return true if within TimeRange, 
false if not<a name="line.166"></a>
+<span class="sourceLineNo">167</span>   * @deprecated This is made 
@InterfaceAudience.Private in the 2.0 line and above and may be<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>   *   changed to private or removed in 
3.0. Use {@link #withinTimeRange(long)} instead<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   */<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  @Deprecated<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  public boolean withinTimeRange(byte [] 
bytes, int offset) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    if (allTime) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      return true;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    return 
withinTimeRange(Bytes.toLong(bytes, offset));<a name="line.175"></a>
 <span class="sourceLineNo">176</span>  }<a name="line.176"></a>
 <span class="sourceLineNo">177</span><a name="line.177"></a>
 <span class="sourceLineNo">178</span>  /**<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * Check if the range has any overlap 
with TimeRange<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * @param tr TimeRange<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>   * @return True if there is overlap, 
false otherwise<a name="line.181"></a>
-<span class="sourceLineNo">182</span>   */<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  // This method came from 
TimeRangeTracker. We used to go there for this function but better<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>  // to come here to the immutable, 
unsynchronized datastructure at read time.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  public boolean includesTimeRange(final 
TimeRange tr) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    if (this.allTime) {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>      return true;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    assert tr.getMin() &gt;= 0;<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    return getMin() &lt; tr.getMax() 
&amp;&amp; getMax() &gt;= tr.getMin();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  /**<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * Check if the specified timestamp is 
within or after this TimeRange.<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * &lt;p&gt;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * Returns true if greater than 
minStamp, false if not.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param timestamp timestamp to 
check<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @return true if within or after 
TimeRange, false if not<a name="line.198"></a>
+<span class="sourceLineNo">179</span>   * Check if the specified timestamp is 
within this TimeRange.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * &lt;p&gt;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * Returns true if within interval 
[minStamp, maxStamp), false<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * if not.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   * @param timestamp timestamp to 
check<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   * @return true if within TimeRange, 
false if not<a name="line.184"></a>
+<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  public boolean withinTimeRange(long 
timestamp) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    assert timestamp &gt;= 0;<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    if (this.allTime) {<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      return true;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    // check if &gt;= minStamp<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    return (minStamp &lt;= timestamp 
&amp;&amp; timestamp &lt; maxStamp);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * Check if the range has any overlap 
with TimeRange<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @param tr TimeRange<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @return True if there is overlap, 
false otherwise<a name="line.198"></a>
 <span class="sourceLineNo">199</span>   */<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  public boolean 
withinOrAfterTimeRange(long timestamp) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    assert timestamp &gt;= 0;<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>    if (allTime) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      return true;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    // check if &gt;= minStamp<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>    return timestamp &gt;= minStamp;<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>  /**<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * Compare the timestamp to 
timerange.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   * @return -1 if timestamp is less than 
timerange,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   * 0 if timestamp is within 
timerange,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   * 1 if timestamp is greater than 
timerange<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   */<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  public int compare(long timestamp) {<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    assert timestamp &gt;= 0;<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    if (this.allTime) {<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>      return 0;<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    if (timestamp &lt; minStamp) {<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>      return -1;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    return timestamp &gt;= maxStamp? 1: 
0;<a name="line.223"></a>
+<span class="sourceLineNo">200</span>  // This method came from 
TimeRangeTracker. We used to go there for this function but better<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>  // to come here to the immutable, 
unsynchronized datastructure at read time.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  public boolean includesTimeRange(final 
TimeRange tr) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    if (this.allTime) {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>      return true;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    assert tr.getMin() &gt;= 0;<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    return getMin() &lt; tr.getMax() 
&amp;&amp; getMax() &gt;= tr.getMin();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * Check if the specified timestamp is 
within or after this TimeRange.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * &lt;p&gt;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * Returns true if greater than 
minStamp, false if not.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>   * @param timestamp timestamp to 
check<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * @return true if within or after 
TimeRange, false if not<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  public boolean 
withinOrAfterTimeRange(long timestamp) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    assert timestamp &gt;= 0;<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>    if (allTime) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      return true;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    // check if &gt;= minStamp<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    return timestamp &gt;= minStamp;<a 
name="line.223"></a>
 <span class="sourceLineNo">224</span>  }<a name="line.224"></a>
 <span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Override<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public String toString() {<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    StringBuilder sb = new 
StringBuilder();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    sb.append("maxStamp=");<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    sb.append(this.maxStamp);<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>    sb.append(", minStamp=");<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    sb.append(this.minStamp);<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>    return sb.toString();<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">226</span>  /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * Compare the timestamp to 
timerange.<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * @return -1 if timestamp is less than 
timerange,<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   * 0 if timestamp is within 
timerange,<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * 1 if timestamp is greater than 
timerange<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   */<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  public int compare(long timestamp) {<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>    assert timestamp &gt;= 0;<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>    if (this.allTime) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      return 0;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    if (timestamp &lt; minStamp) {<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>      return -1;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    return timestamp &gt;= maxStamp? 1: 
0;<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>  @Override<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  public String toString() {<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    StringBuilder sb = new 
StringBuilder();<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    sb.append("maxStamp=");<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>    sb.append(this.maxStamp);<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>    sb.append(", minStamp=");<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    sb.append(this.minStamp);<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>    return sb.toString();<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16541468/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
index 2ca8a6c..d77f37b 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormat.html
@@ -172,7 +172,7 @@
 <span class="sourceLineNo">164</span>    }<a name="line.164"></a>
 <span class="sourceLineNo">165</span><a name="line.165"></a>
 <span class="sourceLineNo">166</span>    if (conf.get(SCAN_TIMESTAMP) != null) 
{<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      
scan.setTimeStamp(Long.parseLong(conf.get(SCAN_TIMESTAMP)));<a 
name="line.167"></a>
+<span class="sourceLineNo">167</span>      
scan.setTimestamp(Long.parseLong(conf.get(SCAN_TIMESTAMP)));<a 
name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
 <span class="sourceLineNo">169</span><a name="line.169"></a>
 <span class="sourceLineNo">170</span>    if (conf.get(SCAN_TIMERANGE_START) != 
null &amp;&amp; conf.get(SCAN_TIMERANGE_END) != null) {<a name="line.170"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16541468/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSink.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSink.html 
b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSink.html
index 51c7598..e6e0d0a 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSink.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSink.html
@@ -26,24 +26,32 @@
 <span class="sourceLineNo">018</span>@InterfaceAudience.Public<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span>public class ReplicationLoadSink {<a 
name="line.19"></a>
 <span class="sourceLineNo">020</span>  private final long 
ageOfLastAppliedOp;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>  private final long 
timeStampsOfLastAppliedOp;<a name="line.21"></a>
+<span class="sourceLineNo">021</span>  private final long 
timestampsOfLastAppliedOp;<a name="line.21"></a>
 <span class="sourceLineNo">022</span><a name="line.22"></a>
 <span class="sourceLineNo">023</span>  // TODO: add the builder for this 
class<a name="line.23"></a>
 <span class="sourceLineNo">024</span>  @InterfaceAudience.Private<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>  public ReplicationLoadSink(long age, 
long timeStamp) {<a name="line.25"></a>
+<span class="sourceLineNo">025</span>  public ReplicationLoadSink(long age, 
long timestamp) {<a name="line.25"></a>
 <span class="sourceLineNo">026</span>    this.ageOfLastAppliedOp = age;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>    this.timeStampsOfLastAppliedOp = 
timeStamp;<a name="line.27"></a>
+<span class="sourceLineNo">027</span>    this.timestampsOfLastAppliedOp = 
timestamp;<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>  public long getAgeOfLastAppliedOp() {<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>    return this.ageOfLastAppliedOp;<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>  public long 
getTimeStampsOfLastAppliedOp() {<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    return 
this.timeStampsOfLastAppliedOp;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>  }<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>}<a name="line.38"></a>
+<span class="sourceLineNo">034</span>  /**<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   * @deprecated Since hbase-2.0.0. Will 
be removed in 3.0.0.<a name="line.35"></a>
+<span class="sourceLineNo">036</span>   * @see 
#getTimestampsOfLastAppliedOp()<a name="line.36"></a>
+<span class="sourceLineNo">037</span>   */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  @Deprecated<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public long 
getTimeStampsOfLastAppliedOp() {<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    return 
getTimestampsOfLastAppliedOp();<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>  public long 
getTimestampsOfLastAppliedOp() {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    return 
this.timestampsOfLastAppliedOp;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/16541468/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSource.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSource.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSource.html
index 44c13a8..b9e8cbf 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSource.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationLoadSource.html
@@ -28,16 +28,16 @@
 <span class="sourceLineNo">020</span>  private final String peerID;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>  private final long 
ageOfLastShippedOp;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>  private final int sizeOfLogQueue;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>  private final long 
timeStampOfLastShippedOp;<a name="line.23"></a>
+<span class="sourceLineNo">023</span>  private final long 
timestampOfLastShippedOp;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>  private final long replicationLag;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>  // TODO: add the builder for this 
class<a name="line.26"></a>
 <span class="sourceLineNo">027</span>  @InterfaceAudience.Private<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>  public ReplicationLoadSource(String id, 
long age, int size, long timeStamp, long lag) {<a name="line.28"></a>
+<span class="sourceLineNo">028</span>  public ReplicationLoadSource(String id, 
long age, int size, long timestamp, long lag) {<a name="line.28"></a>
 <span class="sourceLineNo">029</span>    this.peerID = id;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>    this.ageOfLastShippedOp = age;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>    this.sizeOfLogQueue = size;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>    this.timeStampOfLastShippedOp = 
timeStamp;<a name="line.32"></a>
+<span class="sourceLineNo">032</span>    this.timestampOfLastShippedOp = 
timestamp;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>    this.replicationLag = lag;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>  }<a name="line.34"></a>
 <span class="sourceLineNo">035</span><a name="line.35"></a>
@@ -53,14 +53,23 @@
 <span class="sourceLineNo">045</span>    return this.sizeOfLogQueue;<a 
name="line.45"></a>
 <span class="sourceLineNo">046</span>  }<a name="line.46"></a>
 <span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  public long 
getTimeStampOfLastShippedOp() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    return 
this.timeStampOfLastShippedOp;<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>  public long getReplicationLag() {<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>    return this.replicationLag;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
-<span class="sourceLineNo">055</span>}<a name="line.55"></a>
+<span class="sourceLineNo">048</span>  /**<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   * @deprecated Since 2.0.0. Will be 
removed in 3.0.0.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   * @see 
#getTimestampOfLastShippedOp()<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   */<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @Deprecated<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public long 
getTimeStampOfLastShippedOp() {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    return 
getTimestampOfLastShippedOp();<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public long 
getTimestampOfLastShippedOp() {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    return 
this.timestampOfLastShippedOp;<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>  public long getReplicationLag() {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    return this.replicationLag;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span>}<a name="line.64"></a>
 
 
 

Reply via email to