You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/04/19 14:46:49 UTC
[22/43] hbase-site git commit: Published site at
556b22374423ff087c0583d02ae4298d4d4f2e6b.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/SegmentScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/SegmentScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/SegmentScanner.html
index df992af..7e921cb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/SegmentScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/SegmentScanner.html
@@ -43,375 +43,357 @@
<span class="sourceLineNo">035</span>@InterfaceAudience.Private<a name="line.35"></a>
<span class="sourceLineNo">036</span>public class SegmentScanner implements KeyValueScanner {<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">039</span> * Order of this scanner relative to other scanners. See<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * {@link KeyValueScanner#getScannerOrder()}.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> */<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private long scannerOrder;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private static final long DEFAULT_SCANNER_ORDER = Long.MAX_VALUE;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span> // the observed structure<a name="line.45"></a>
-<span class="sourceLineNo">046</span> protected final Segment segment;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> // the highest relevant MVCC<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private long readPoint;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> // the current iterator that can be reinitialized by<a name="line.49"></a>
-<span class="sourceLineNo">050</span> // seek(), backwardSeek(), or reseek()<a name="line.50"></a>
-<span class="sourceLineNo">051</span> protected Iterator<Cell> iter;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> // the pre-calculated cell to be returned by peek()<a name="line.52"></a>
-<span class="sourceLineNo">053</span> protected Cell current = null;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> // or next()<a name="line.54"></a>
-<span class="sourceLineNo">055</span> // A flag represents whether could stop skipping KeyValues for MVCC<a name="line.55"></a>
-<span class="sourceLineNo">056</span> // if have encountered the next row. Only used for reversed scan<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private boolean stopSkippingKVsIfNextRow = false;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> // last iterated KVs by seek (to restore the iterator state after reseek)<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private Cell last = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> // flag to indicate if this scanner is closed<a name="line.61"></a>
-<span class="sourceLineNo">062</span> protected boolean closed = false;<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> protected SegmentScanner(Segment segment, long readPoint) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> this(segment, readPoint, DEFAULT_SCANNER_ORDER);<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> * @param scannerOrder see {@link KeyValueScanner#getScannerOrder()}.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * Scanners are ordered from 0 (oldest) to newest in increasing order.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> */<a name="line.71"></a>
-<span class="sourceLineNo">072</span> protected SegmentScanner(Segment segment, long readPoint, long scannerOrder) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> this.segment = segment;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> this.readPoint = readPoint;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> //increase the reference count so the underlying structure will not be de-allocated<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.segment.incScannerCount();<a name="line.76"></a>
-<span class="sourceLineNo">077</span> iter = segment.iterator();<a name="line.77"></a>
-<span class="sourceLineNo">078</span> // the initialization of the current is required for working with heap of SegmentScanners<a name="line.78"></a>
-<span class="sourceLineNo">079</span> updateCurrent();<a name="line.79"></a>
-<span class="sourceLineNo">080</span> this.scannerOrder = scannerOrder;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> if (current == null) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> // nothing to fetch from this scanner<a name="line.82"></a>
-<span class="sourceLineNo">083</span> close();<a name="line.83"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span> // the observed structure<a name="line.39"></a>
+<span class="sourceLineNo">040</span> protected final Segment segment;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> // the highest relevant MVCC<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private long readPoint;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> // the current iterator that can be reinitialized by<a name="line.43"></a>
+<span class="sourceLineNo">044</span> // seek(), backwardSeek(), or reseek()<a name="line.44"></a>
+<span class="sourceLineNo">045</span> protected Iterator<Cell> iter;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> // the pre-calculated cell to be returned by peek()<a name="line.46"></a>
+<span class="sourceLineNo">047</span> protected Cell current = null;<a name="line.47"></a>
+<span class="sourceLineNo">048</span> // or next()<a name="line.48"></a>
+<span class="sourceLineNo">049</span> // A flag represents whether could stop skipping KeyValues for MVCC<a name="line.49"></a>
+<span class="sourceLineNo">050</span> // if have encountered the next row. Only used for reversed scan<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private boolean stopSkippingKVsIfNextRow = false;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> // last iterated KVs by seek (to restore the iterator state after reseek)<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private Cell last = null;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> // flag to indicate if this scanner is closed<a name="line.55"></a>
+<span class="sourceLineNo">056</span> protected boolean closed = false;<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> /**<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Scanners are ordered from 0 (oldest) to newest in increasing order.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span> protected SegmentScanner(Segment segment, long readPoint) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.segment = segment;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.readPoint = readPoint;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> //increase the reference count so the underlying structure will not be de-allocated<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.segment.incScannerCount();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> iter = segment.iterator();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> // the initialization of the current is required for working with heap of SegmentScanners<a name="line.68"></a>
+<span class="sourceLineNo">069</span> updateCurrent();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (current == null) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> // nothing to fetch from this scanner<a name="line.71"></a>
+<span class="sourceLineNo">072</span> close();<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> /**<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Look at the next Cell in this scanner, but do not iterate the scanner<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @return the currently observed Cell<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public Cell peek() { // sanity check, the current should be always valid<a name="line.81"></a>
+<span class="sourceLineNo">082</span> if (closed) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return null;<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><a name="line.86"></a>
-<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Look at the next Cell in this scanner, but do not iterate the scanner<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @return the currently observed Cell<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 peek() { // sanity check, the current should be always valid<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (closed) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return null;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (current!=null && current.getSequenceId() > readPoint) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> throw new RuntimeException("current is invalid: read point is "+readPoint+", " +<a name="line.97"></a>
-<span class="sourceLineNo">098</span> "while current sequence id is " +current.getSequenceId());<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> return current;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * Return the next Cell in this scanner, iterating the scanner<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @return the next Cell or null if end of scanner<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> @Override<a name="line.107"></a>
-<span class="sourceLineNo">108</span> public Cell next() throws IOException {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (closed) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> return null;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> Cell oldCurrent = current;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> updateCurrent(); // update the currently observed Cell<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return oldCurrent;<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> /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * Seek the scanner at or after the specified Cell.<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param cell seek value<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @return true if scanner has values left, false if end of scanner<a name="line.120"></a>
-<span class="sourceLineNo">121</span> */<a name="line.121"></a>
-<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean seek(Cell cell) throws IOException {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> if (closed) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return false;<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> if(cell == null) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> close();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> return false;<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // restart the iterator from new key<a name="line.131"></a>
-<span class="sourceLineNo">132</span> iter = getIterator(cell);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // last is going to be reinitialized in the next getNext() call<a name="line.133"></a>
-<span class="sourceLineNo">134</span> last = null;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> updateCurrent();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> return (current != null);<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> protected Iterator<Cell> getIterator(Cell cell) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return segment.tailSet(cell).iterator();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<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> * Reseek the scanner at or after the specified KeyValue.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * This method is guaranteed to seek at or after the required key only if the<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * key comes after the current position of the scanner. Should not be used<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * to seek to a key which may come before the current position.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> *<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * @param cell seek value (should be non-null)<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @return true if scanner has values left, false if end of scanner<a name="line.150"></a>
-<span class="sourceLineNo">151</span> */<a name="line.151"></a>
-<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public boolean reseek(Cell cell) throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> if (closed) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return false;<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> See HBASE-4195 & HBASE-3855 & HBASE-6591 for the background on this implementation.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> This code is executed concurrently with flush and puts, without locks.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> The ideal implementation for performance would use the sub skip list implicitly<a name="line.160"></a>
-<span class="sourceLineNo">161</span> pointed by the iterator. Unfortunately the Java API does not offer a method to<a name="line.161"></a>
-<span class="sourceLineNo">162</span> get it. So we remember the last keys we iterated to and restore<a name="line.162"></a>
-<span class="sourceLineNo">163</span> the reseeked set to at least that point.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> iter = getIterator(getHighest(cell, last));<a name="line.165"></a>
-<span class="sourceLineNo">166</span> updateCurrent();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return (current != null);<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> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Seek the scanner at or before the row of specified Cell, it firstly<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * tries to seek the scanner at or after the specified Cell, return if<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * peek KeyValue of scanner has the same row with specified Cell,<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * otherwise seek the scanner at the first Cell of the row which is the<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * previous row of specified KeyValue<a name="line.175"></a>
-<span class="sourceLineNo">176</span> *<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @param key seek Cell<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @return true if the scanner is at the valid KeyValue, false if such Cell does not exist<a name="line.178"></a>
-<span class="sourceLineNo">179</span> */<a name="line.179"></a>
-<span class="sourceLineNo">180</span> @Override<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public boolean backwardSeek(Cell key) throws IOException {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (closed) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return false;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> seek(key); // seek forward then go backward<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (peek() == null || segment.compareRows(peek(), key) > 0) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> return seekToPreviousRow(key);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<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><a name="line.191"></a>
-<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * Seek the scanner at the first Cell of the row which is the previous row<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * of specified key<a name="line.194"></a>
-<span class="sourceLineNo">195</span> *<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * @param cell seek value<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @return true if the scanner at the first valid Cell of previous row,<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * false if not existing such Cell<a name="line.198"></a>
-<span class="sourceLineNo">199</span> */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Override<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public boolean seekToPreviousRow(Cell cell) throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (closed) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> return false;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> boolean keepSeeking;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> Cell key = cell;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> do {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> Cell firstKeyOnRow = PrivateCellUtil.createFirstOnRow(key);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> SortedSet<Cell> cellHead = segment.headSet(firstKeyOnRow);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Cell lastCellBeforeRow = cellHead.isEmpty() ? null : cellHead.last();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (lastCellBeforeRow == null) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> current = null;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> return false;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span> Cell firstKeyOnPreviousRow = PrivateCellUtil.createFirstOnRow(lastCellBeforeRow);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> this.stopSkippingKVsIfNextRow = true;<a name="line.216"></a>
-<span class="sourceLineNo">217</span> seek(firstKeyOnPreviousRow);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> this.stopSkippingKVsIfNextRow = false;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (peek() == null<a name="line.219"></a>
-<span class="sourceLineNo">220</span> || segment.getComparator().compareRows(peek(), firstKeyOnPreviousRow) > 0) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> keepSeeking = true;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> key = firstKeyOnPreviousRow;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> continue;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> } else {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> keepSeeking = false;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> } while (keepSeeking);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return true;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * Seek the scanner at the first KeyValue of last row<a name="line.232"></a>
-<span class="sourceLineNo">233</span> *<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * @return true if scanner has values left, false if the underlying data is empty<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public boolean seekToLastRow() throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (closed) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return false;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> Cell higherCell = segment.isEmpty() ? null : segment.last();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (higherCell == null) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> return false;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> Cell firstCellOnLastRow = PrivateCellUtil.createFirstOnRow(higherCell);<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (seek(firstCellOnLastRow)) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return true;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> } else {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> return seekToPreviousRow(higherCell);<a name="line.251"></a>
+<span class="sourceLineNo">085</span> if (current!=null && current.getSequenceId() > readPoint) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> throw new RuntimeException("current is invalid: read point is "+readPoint+", " +<a name="line.86"></a>
+<span class="sourceLineNo">087</span> "while current sequence id is " +current.getSequenceId());<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return current;<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> /**<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * Return the next Cell in this scanner, iterating the scanner<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @return the next Cell or null if end of scanner<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> @Override<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public Cell next() throws IOException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> if (closed) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return null;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Cell oldCurrent = current;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> updateCurrent(); // update the currently observed Cell<a name="line.102"></a>
+<span class="sourceLineNo">103</span> return oldCurrent;<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> /**<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * Seek the scanner at or after the specified Cell.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @param cell seek value<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * @return true if scanner has values left, false if end of scanner<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> @Override<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public boolean seek(Cell cell) throws IOException {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (closed) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return false;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if(cell == null) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> close();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> return false;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span> // restart the iterator from new key<a name="line.120"></a>
+<span class="sourceLineNo">121</span> iter = getIterator(cell);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> // last is going to be reinitialized in the next getNext() call<a name="line.122"></a>
+<span class="sourceLineNo">123</span> last = null;<a name="line.123"></a>
+<span class="sourceLineNo">124</span> updateCurrent();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return (current != null);<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> protected Iterator<Cell> getIterator(Cell cell) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return segment.tailSet(cell).iterator();<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> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Reseek the scanner at or after the specified KeyValue.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * This method is guaranteed to seek at or after the required key only if the<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * key comes after the current position of the scanner. Should not be used<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * to seek to a key which may come before the current position.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> *<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @param cell seek value (should be non-null)<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @return true if scanner has values left, false if end of scanner<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public boolean reseek(Cell cell) throws IOException {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (closed) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return false;<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> See HBASE-4195 & HBASE-3855 & HBASE-6591 for the background on this implementation.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> This code is executed concurrently with flush and puts, without locks.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> The ideal implementation for performance would use the sub skip list implicitly<a name="line.149"></a>
+<span class="sourceLineNo">150</span> pointed by the iterator. Unfortunately the Java API does not offer a method to<a name="line.150"></a>
+<span class="sourceLineNo">151</span> get it. So we remember the last keys we iterated to and restore<a name="line.151"></a>
+<span class="sourceLineNo">152</span> the reseeked set to at least that point.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> iter = getIterator(getHighest(cell, last));<a name="line.154"></a>
+<span class="sourceLineNo">155</span> updateCurrent();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return (current != null);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<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> * Seek the scanner at or before the row of specified Cell, it firstly<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * tries to seek the scanner at or after the specified Cell, return if<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * peek KeyValue of scanner has the same row with specified Cell,<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * otherwise seek the scanner at the first Cell of the row which is the<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * previous row of specified KeyValue<a name="line.164"></a>
+<span class="sourceLineNo">165</span> *<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @param key seek Cell<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @return true if the scanner is at the valid KeyValue, false if such Cell does not exist<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span> public boolean backwardSeek(Cell key) throws IOException {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (closed) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> seek(key); // seek forward then go backward<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (peek() == null || segment.compareRows(peek(), key) > 0) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return seekToPreviousRow(key);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return true;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> /**<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Seek the scanner at the first Cell of the row which is the previous row<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * of specified key<a name="line.183"></a>
+<span class="sourceLineNo">184</span> *<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @param cell seek value<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * @return true if the scanner at the first valid Cell of previous row,<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * false if not existing such Cell<a name="line.187"></a>
+<span class="sourceLineNo">188</span> */<a name="line.188"></a>
+<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
+<span class="sourceLineNo">190</span> public boolean seekToPreviousRow(Cell cell) throws IOException {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (closed) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return false;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span> boolean keepSeeking;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> Cell key = cell;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> do {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> Cell firstKeyOnRow = PrivateCellUtil.createFirstOnRow(key);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> SortedSet<Cell> cellHead = segment.headSet(firstKeyOnRow);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> Cell lastCellBeforeRow = cellHead.isEmpty() ? null : cellHead.last();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (lastCellBeforeRow == null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> current = null;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return false;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> Cell firstKeyOnPreviousRow = PrivateCellUtil.createFirstOnRow(lastCellBeforeRow);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> this.stopSkippingKVsIfNextRow = true;<a name="line.205"></a>
+<span class="sourceLineNo">206</span> seek(firstKeyOnPreviousRow);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> this.stopSkippingKVsIfNextRow = false;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (peek() == null<a name="line.208"></a>
+<span class="sourceLineNo">209</span> || segment.getComparator().compareRows(peek(), firstKeyOnPreviousRow) > 0) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> keepSeeking = true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> key = firstKeyOnPreviousRow;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> continue;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> } else {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> keepSeeking = false;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> } while (keepSeeking);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return true;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> /**<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * Seek the scanner at the first KeyValue of last row<a name="line.221"></a>
+<span class="sourceLineNo">222</span> *<a name="line.222"></a>
+<span class="sourceLineNo">223</span> * @return true if scanner has values left, false if the underlying data is empty<a name="line.223"></a>
+<span class="sourceLineNo">224</span> */<a name="line.224"></a>
+<span class="sourceLineNo">225</span> @Override<a name="line.225"></a>
+<span class="sourceLineNo">226</span> public boolean seekToLastRow() throws IOException {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> if (closed) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> Cell higherCell = segment.isEmpty() ? null : segment.last();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (higherCell == null) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return false;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> Cell firstCellOnLastRow = PrivateCellUtil.createFirstOnRow(higherCell);<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> if (seek(firstCellOnLastRow)) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return true;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } else {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> return seekToPreviousRow(higherCell);<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><a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * Close the KeyValue scanner.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> */<a name="line.247"></a>
+<span class="sourceLineNo">248</span> @Override<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public void close() {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (closed) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> return;<a name="line.251"></a>
<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> /**<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * @see KeyValueScanner#getScannerOrder()<a name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public long getScannerOrder() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return scannerOrder;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * Close the KeyValue scanner.<a name="line.264"></a>
-<span class="sourceLineNo">265</span> */<a name="line.265"></a>
-<span class="sourceLineNo">266</span> @Override<a name="line.266"></a>
-<span class="sourceLineNo">267</span> public void close() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (closed) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> getSegment().decScannerCount();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> closed = true;<a name="line.272"></a>
+<span class="sourceLineNo">253</span> getSegment().decScannerCount();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> closed = true;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * This functionality should be resolved in the higher level which is<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * MemStoreScanner, currently returns true as default. Doesn't throw<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * IllegalStateException in order not to change the signature of the<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * overridden method<a name="line.261"></a>
+<span class="sourceLineNo">262</span> */<a name="line.262"></a>
+<span class="sourceLineNo">263</span> @Override<a name="line.263"></a>
+<span class="sourceLineNo">264</span> public boolean shouldUseScanner(Scan scan, HStore store, long oldestUnexpiredTS) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return getSegment().shouldSeek(scan.getColumnFamilyTimeRange()<a name="line.265"></a>
+<span class="sourceLineNo">266</span> .getOrDefault(store.getColumnFamilyDescriptor().getName(), scan.getTimeRange()), oldestUnexpiredTS);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public boolean requestSeek(Cell c, boolean forward, boolean useBloom)<a name="line.270"></a>
+<span class="sourceLineNo">271</span> throws IOException {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return NonLazyKeyValueScanner.doRealSeek(this, c, forward);<a name="line.272"></a>
<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span><a name="line.274"></a>
<span class="sourceLineNo">275</span> /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * This functionality should be resolved in the higher level which is<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * MemStoreScanner, currently returns true as default. Doesn't throw<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * IllegalStateException in order not to change the signature of the<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * overridden method<a name="line.279"></a>
-<span class="sourceLineNo">280</span> */<a name="line.280"></a>
-<span class="sourceLineNo">281</span> @Override<a name="line.281"></a>
-<span class="sourceLineNo">282</span> public boolean shouldUseScanner(Scan scan, HStore store, long oldestUnexpiredTS) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return getSegment().shouldSeek(scan.getColumnFamilyTimeRange()<a name="line.283"></a>
-<span class="sourceLineNo">284</span> .getOrDefault(store.getColumnFamilyDescriptor().getName(), scan.getTimeRange()), oldestUnexpiredTS);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> @Override<a name="line.287"></a>
-<span class="sourceLineNo">288</span> public boolean requestSeek(Cell c, boolean forward, boolean useBloom)<a name="line.288"></a>
-<span class="sourceLineNo">289</span> throws IOException {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return NonLazyKeyValueScanner.doRealSeek(this, c, forward);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * This scanner is working solely on the in-memory MemStore and doesn't work on<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * store files, MutableCellSetSegmentScanner always does the seek,<a name="line.295"></a>
-<span class="sourceLineNo">296</span> * therefore always returning true.<a name="line.296"></a>
+<span class="sourceLineNo">276</span> * This scanner is working solely on the in-memory MemStore and doesn't work on<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * store files, MutableCellSetSegmentScanner always does the seek,<a name="line.277"></a>
+<span class="sourceLineNo">278</span> * therefore always returning true.<a name="line.278"></a>
+<span class="sourceLineNo">279</span> */<a name="line.279"></a>
+<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
+<span class="sourceLineNo">281</span> public boolean realSeekDone() {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return true;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> /**<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * This function should be never called on scanners that always do real seek operations (i.e. most<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * of the scanners and also this one). The easiest way to achieve this is to call<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * {@link #realSeekDone()} first.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void enforceSeek() throws IOException {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> throw new NotImplementedException("enforceSeek cannot be called on a SegmentScanner");<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> /**<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @return true if this is a file scanner. Otherwise a memory scanner is assumed.<a name="line.296"></a>
<span class="sourceLineNo">297</span> */<a name="line.297"></a>
<span class="sourceLineNo">298</span> @Override<a name="line.298"></a>
-<span class="sourceLineNo">299</span> public boolean realSeekDone() {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> return true;<a name="line.300"></a>
+<span class="sourceLineNo">299</span> public boolean isFileScanner() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return false;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> /**<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * This function should be never called on scanners that always do real seek operations (i.e. most<a name="line.304"></a>
-<span class="sourceLineNo">305</span> * of the scanners and also this one). The easiest way to achieve this is to call<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * {@link #realSeekDone()} first.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> */<a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public void enforceSeek() throws IOException {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> throw new NotImplementedException("enforceSeek cannot be called on a SegmentScanner");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> /**<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * @return true if this is a file scanner. Otherwise a memory scanner is assumed.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> */<a name="line.315"></a>
-<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
-<span class="sourceLineNo">317</span> public boolean isFileScanner() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> return false;<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> @Override<a name="line.321"></a>
-<span class="sourceLineNo">322</span> public Path getFilePath() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> return null;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> /**<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @return the next key in the index (the key to seek to the next block)<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * if known, or null otherwise<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * Not relevant for in-memory scanner<a name="line.329"></a>
-<span class="sourceLineNo">330</span> */<a name="line.330"></a>
-<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public Cell getNextIndexedKey() {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return null;<a name="line.333"></a>
+<span class="sourceLineNo">303</span> @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Path getFilePath() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return null;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @return the next key in the index (the key to seek to the next block)<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * if known, or null otherwise<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * Not relevant for in-memory scanner<a name="line.311"></a>
+<span class="sourceLineNo">312</span> */<a name="line.312"></a>
+<span class="sourceLineNo">313</span> @Override<a name="line.313"></a>
+<span class="sourceLineNo">314</span> public Cell getNextIndexedKey() {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> /**<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * Called after a batch of rows scanned (RPC) and set to be returned to client. Any in between<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * cleanup can be done here. Nothing to be done for MutableCellSetSegmentScanner.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> */<a name="line.321"></a>
+<span class="sourceLineNo">322</span> @Override<a name="line.322"></a>
+<span class="sourceLineNo">323</span> public void shipped() throws IOException {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> // do nothing<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> //debug method<a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Override<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public String toString() {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> String res = "Store segment scanner of type "+this.getClass().getName()+"; ";<a name="line.330"></a>
+<span class="sourceLineNo">331</span> res += "Scanner order " + getScannerOrder() + "; ";<a name="line.331"></a>
+<span class="sourceLineNo">332</span> res += getSegment().toString();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return res;<a name="line.333"></a>
<span class="sourceLineNo">334</span> }<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> /**<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * Called after a batch of rows scanned (RPC) and set to be returned to client. Any in between<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * cleanup can be done here. Nothing to be done for MutableCellSetSegmentScanner.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
-<span class="sourceLineNo">341</span> public void shipped() throws IOException {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> // do nothing<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> //debug method<a name="line.345"></a>
-<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
-<span class="sourceLineNo">347</span> public String toString() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> String res = "Store segment scanner of type "+this.getClass().getName()+"; ";<a name="line.348"></a>
-<span class="sourceLineNo">349</span> res += "Scanner order " + getScannerOrder() + "; ";<a name="line.349"></a>
-<span class="sourceLineNo">350</span> res += getSegment().toString();<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return res;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span> /********************* Private Methods **********************/<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> private Segment getSegment(){<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return segment;<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span> /**<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * Private internal method for iterating over the segment,<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * skipping the cells with irrelevant MVCC<a name="line.362"></a>
-<span class="sourceLineNo">363</span> */<a name="line.363"></a>
-<span class="sourceLineNo">364</span> protected void updateCurrent() {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> Cell startKV = current;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> Cell next = null;<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> try {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> while (iter.hasNext()) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> next = iter.next();<a name="line.370"></a>
-<span class="sourceLineNo">371</span> if (next.getSequenceId() <= this.readPoint) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> current = next;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return;// skip irrelevant versions<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span> if (stopSkippingKVsIfNextRow && // for backwardSeek() stay in the<a name="line.375"></a>
-<span class="sourceLineNo">376</span> startKV != null && // boundaries of a single row<a name="line.376"></a>
-<span class="sourceLineNo">377</span> segment.compareRows(next, startKV) > 0) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> current = null;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> return;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span> } // end of while<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> current = null; // nothing found<a name="line.383"></a>
-<span class="sourceLineNo">384</span> } finally {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> if (next != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> // in all cases, remember the last KV we iterated to, needed for reseek()<a name="line.386"></a>
-<span class="sourceLineNo">387</span> last = next;<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> /**<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * Private internal method that returns the higher of the two key values, or null<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * if they are both null<a name="line.394"></a>
-<span class="sourceLineNo">395</span> */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> private Cell getHighest(Cell first, Cell second) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> if (first == null && second == null) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return null;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span> if (first != null && second != null) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> int compare = segment.compare(first, second);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return (compare > 0 ? first : second);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return (first != null ? first : second);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>}<a name="line.406"></a>
+<span class="sourceLineNo">336</span> /********************* Private Methods **********************/<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> private Segment getSegment(){<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return segment;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
+<span class="sourceLineNo">343</span> * Private internal method for iterating over the segment,<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * skipping the cells with irrelevant MVCC<a name="line.344"></a>
+<span class="sourceLineNo">345</span> */<a name="line.345"></a>
+<span class="sourceLineNo">346</span> protected void updateCurrent() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Cell startKV = current;<a name="line.347"></a>
+<span class="sourceLineNo">348</span> Cell next = null;<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> try {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> while (iter.hasNext()) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> next = iter.next();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (next.getSequenceId() <= this.readPoint) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> current = next;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return;// skip irrelevant versions<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> if (stopSkippingKVsIfNextRow && // for backwardSeek() stay in the<a name="line.357"></a>
+<span class="sourceLineNo">358</span> startKV != null && // boundaries of a single row<a name="line.358"></a>
+<span class="sourceLineNo">359</span> segment.compareRows(next, startKV) > 0) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> current = null;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> return;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> } // end of while<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> current = null; // nothing found<a name="line.365"></a>
+<span class="sourceLineNo">366</span> } finally {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (next != null) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> // in all cases, remember the last KV we iterated to, needed for reseek()<a name="line.368"></a>
+<span class="sourceLineNo">369</span> last = next;<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span> /**<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * Private internal method that returns the higher of the two key values, or null<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * if they are both null<a name="line.376"></a>
+<span class="sourceLineNo">377</span> */<a name="line.377"></a>
+<span class="sourceLineNo">378</span> private Cell getHighest(Cell first, Cell second) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> if (first == null && second == null) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> return null;<a name="line.380"></a>
+<span class="sourceLineNo">381</span> }<a name="line.381"></a>
+<span class="sourceLineNo">382</span> if (first != null && second != null) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> int compare = segment.compare(first, second);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> return (compare > 0 ? first : second);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return (first != null ? first : second);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span>}<a name="line.388"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 4f63e3a..ef16ae7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -1054,108 +1054,101 @@
<span class="sourceLineNo">1046</span> return false;<a name="line.1046"></a>
<span class="sourceLineNo">1047</span> }<a name="line.1047"></a>
<span class="sourceLineNo">1048</span><a name="line.1048"></a>
-<span class="sourceLineNo">1049</span> /**<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span> * @see KeyValueScanner#getScannerOrder()<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span> */<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span> @Override<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span> public long getScannerOrder() {<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span> return 0;<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span> }<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span><a name="line.1056"></a>
-<span class="sourceLineNo">1057</span> /**<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span> * Seek storefiles in parallel to optimize IO latency as much as possible<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span> * @param scanners the list {@link KeyValueScanner}s to be read from<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span> * @param kv the KeyValue on which the operation is being requested<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span> * @throws IOException<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span> */<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span> private void parallelSeek(final List<? extends KeyValueScanner><a name="line.1063"></a>
-<span class="sourceLineNo">1064</span> scanners, final Cell kv) throws IOException {<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span> if (scanners.isEmpty()) return;<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span> int storeFileScannerCount = scanners.size();<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span> CountDownLatch latch = new CountDownLatch(storeFileScannerCount);<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span> List<ParallelSeekHandler> handlers = new ArrayList<>(storeFileScannerCount);<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span> for (KeyValueScanner scanner : scanners) {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span> if (scanner instanceof StoreFileScanner) {<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span> ParallelSeekHandler seekHandler = new ParallelSeekHandler(scanner, kv,<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> this.readPt, latch);<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> executor.submit(seekHandler);<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span> handlers.add(seekHandler);<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span> } else {<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> scanner.seek(kv);<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span> latch.countDown();<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span> }<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> }<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span><a name="line.1080"></a>
-<span class="sourceLineNo">1081</span> try {<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span> latch.await();<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span> } catch (InterruptedException ie) {<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span> throw (InterruptedIOException)new InterruptedIOException().initCause(ie);<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span> }<a name="line.1085"></a>
+<span class="sourceLineNo">1049</span><a name="line.1049"></a>
+<span class="sourceLineNo">1050</span> /**<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span> * Seek storefiles in parallel to optimize IO latency as much as possible<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span> * @param scanners the list {@link KeyValueScanner}s to be read from<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span> * @param kv the KeyValue on which the operation is being requested<a name="line.1053"></a>
+<span class="sourceLineNo">1054</span> * @throws IOException<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span> */<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span> private void parallelSeek(final List<? extends KeyValueScanner><a name="line.1056"></a>
+<span class="sourceLineNo">1057</span> scanners, final Cell kv) throws IOException {<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span> if (scanners.isEmpty()) return;<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span> int storeFileScannerCount = scanners.size();<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span> CountDownLatch latch = new CountDownLatch(storeFileScannerCount);<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span> List<ParallelSeekHandler> handlers = new ArrayList<>(storeFileScannerCount);<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span> for (KeyValueScanner scanner : scanners) {<a name="line.1062"></a>
+<span class="sourceLineNo">1063</span> if (scanner instanceof StoreFileScanner) {<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span> ParallelSeekHandler seekHandler = new ParallelSeekHandler(scanner, kv,<a name="line.1064"></a>
+<span class="sourceLineNo">1065</span> this.readPt, latch);<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span> executor.submit(seekHandler);<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span> handlers.add(seekHandler);<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span> } else {<a name="line.1068"></a>
+<span class="sourceLineNo">1069</span> scanner.seek(kv);<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span> latch.countDown();<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span> }<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span> }<a name="line.1072"></a>
+<span class="sourceLineNo">1073</span><a name="line.1073"></a>
+<span class="sourceLineNo">1074</span> try {<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span> latch.await();<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span> } catch (InterruptedException ie) {<a name="line.1076"></a>
+<span class="sourceLineNo">1077</span> throw (InterruptedIOException)new InterruptedIOException().initCause(ie);<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span> }<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span><a name="line.1079"></a>
+<span class="sourceLineNo">1080</span> for (ParallelSeekHandler handler : handlers) {<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span> if (handler.getErr() != null) {<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span> throw new IOException(handler.getErr());<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span> }<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span> }<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span> }<a name="line.1085"></a>
<span class="sourceLineNo">1086</span><a name="line.1086"></a>
-<span class="sourceLineNo">1087</span> for (ParallelSeekHandler handler : handlers) {<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span> if (handler.getErr() != null) {<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span> throw new IOException(handler.getErr());<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span> }<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span> }<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span> }<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span><a name="line.1093"></a>
-<span class="sourceLineNo">1094</span> /**<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span> * Used in testing.<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span> * @return all scanners in no particular order<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span> */<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span> @VisibleForTesting<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span> List<KeyValueScanner> getAllScannersForTesting() {<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span> List<KeyValueScanner> allScanners = new ArrayList<>();<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span> KeyValueScanner current = heap.getCurrentForTesting();<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span> if (current != null)<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span> allScanners.add(current);<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span> for (KeyValueScanner scanner : heap.getHeap())<a name="line.1104"></a>
-<span class="sourceLineNo">1105</span> allScanners.add(scanner);<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span> return allScanners;<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span> }<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span><a name="line.1108"></a>
-<span class="sourceLineNo">1109</span> static void enableLazySeekGlobally(boolean enable) {<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span> lazySeekEnabledGlobally = enable;<a name="line.1110"></a>
+<span class="sourceLineNo">1087</span> /**<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span> * Used in testing.<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span> * @return all scanners in no particular order<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span> */<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span> @VisibleForTesting<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span> List<KeyValueScanner> getAllScannersForTesting() {<a name="line.1092"></a>
+<span class="sourceLineNo">1093</span> List<KeyValueScanner> allScanners = new ArrayList<>();<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span> KeyValueScanner current = heap.getCurrentForTesting();<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span> if (current != null)<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span> allScanners.add(current);<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span> for (KeyValueScanner scanner : heap.getHeap())<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span> allScanners.add(scanner);<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span> return allScanners;<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span> }<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span><a name="line.1101"></a>
+<span class="sourceLineNo">1102</span> static void enableLazySeekGlobally(boolean enable) {<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span> lazySeekEnabledGlobally = enable;<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span> }<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span><a name="line.1105"></a>
+<span class="sourceLineNo">1106</span> /**<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span> * @return The estimated number of KVs seen by this scanner (includes some skipped KVs).<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span> */<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span> public long getEstimatedNumberOfKvsScanned() {<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span> return this.kvsScanned;<a name="line.1110"></a>
<span class="sourceLineNo">1111</span> }<a name="line.1111"></a>
<span class="sourceLineNo">1112</span><a name="line.1112"></a>
-<span class="sourceLineNo">1113</span> /**<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span> * @return The estimated number of KVs seen by this scanner (includes some skipped KVs).<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span> */<a name="line.1115"></a>
-<span class="sourceLineNo">1116</span> public long getEstimatedNumberOfKvsScanned() {<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span> return this.kvsScanned;<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span> }<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span><a name="line.1119"></a>
-<span class="sourceLineNo">1120</span> @Override<a name="line.1120"></a>
-<span class="sourceLineNo">1121</span> public Cell getNextIndexedKey() {<a name="line.1121"></a>
-<span class="sourceLineNo">1122</span> return this.heap.getNextIndexedKey();<a name="line.1122"></a>
-<span class="sourceLineNo">1123</span> }<a name="line.1123"></a>
-<span class="sourceLineNo">1124</span><a name="line.1124"></a>
-<span class="sourceLineNo">1125</span> @Override<a name="line.1125"></a>
-<span class="sourceLineNo">1126</span> public void shipped() throws IOException {<a name="line.1126"></a>
-<span class="sourceLineNo">1127</span> if (prevCell != null) {<a name="line.1127"></a>
-<span class="sourceLineNo">1128</span> // Do the copy here so that in case the prevCell ref is pointing to the previous<a name="line.1128"></a>
-<span class="sourceLineNo">1129</span> // blocks we can safely release those blocks.<a name="line.1129"></a>
-<span class="sourceLineNo">1130</span> // This applies to blocks that are got from Bucket cache, L1 cache and the blocks<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span> // fetched from HDFS. Copying this would ensure that we let go the references to these<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span> // blocks so that they can be GCed safely(in case of bucket cache)<a name="line.1132"></a>
-<span class="sourceLineNo">1133</span> prevCell = KeyValueUtil.toNewKeyCell(this.prevCell);<a name="line.1133"></a>
-<span class="sourceLineNo">1134</span> }<a name="line.1134"></a>
-<span class="sourceLineNo">1135</span> matcher.beforeShipped();<a name="line.1135"></a>
-<span class="sourceLineNo">1136</span> // There wont be further fetch of Cells from these scanners. Just close.<a name="line.1136"></a>
-<span class="sourceLineNo">1137</span> clearAndClose(scannersForDelayedClose);<a name="line.1137"></a>
-<span class="sourceLineNo">1138</span> if (this.heap != null) {<a name="line.1138"></a>
-<span class="sourceLineNo">1139</span> this.heap.shipped();<a name="line.1139"></a>
-<span class="sourceLineNo">1140</span> // When switching from pread to stream, we will open a new scanner for each store file, but<a name="line.1140"></a>
-<span class="sourceLineNo">1141</span> // the old scanner may still track the HFileBlocks we have scanned but not sent back to client<a name="line.1141"></a>
-<span class="sourceLineNo">1142</span> // yet. If we close the scanner immediately then the HFileBlocks may be messed up by others<a name="line.1142"></a>
-<span class="sourceLineNo">1143</span> // before we serialize and send it back to client. The HFileBlocks will be released in shipped<a name="line.1143"></a>
-<span class="sourceLineNo">1144</span> // method, so we here will also open new scanners and close old scanners in shipped method.<a name="line.1144"></a>
-<span class="sourceLineNo">1145</span> // See HBASE-18055 for more details.<a name="line.1145"></a>
-<span class="sourceLineNo">1146</span> trySwitchToStreamRead();<a name="line.1146"></a>
-<span class="sourceLineNo">1147</span> }<a name="line.1147"></a>
-<span class="sourceLineNo">1148</span> }<a name="line.1148"></a>
-<span class="sourceLineNo">1149</span>}<a name="line.1149"></a>
-<span class="sourceLineNo">1150</span><a name="line.1150"></a>
+<span class="sourceLineNo">1113</span> @Override<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span> public Cell getNextIndexedKey() {<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span> return this.heap.getNextIndexedKey();<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span> }<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span><a name="line.1117"></a>
+<span class="sourceLineNo">1118</span> @Override<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span> public void shipped() throws IOException {<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span> if (prevCell != null) {<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span> // Do the copy here so that in case the prevCell ref is pointing to the previous<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span> // blocks we can safely release those blocks.<a name="line.1122"></a>
+<span class="sourceLineNo">1123</span> // This applies to blocks that are got from Bucket cache, L1 cache and the blocks<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span> // fetched from HDFS. Copying this would ensure that we let go the references to these<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span> // blocks so that they can be GCed safely(in case of bucket cache)<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span> prevCell = KeyValueUtil.toNewKeyCell(this.prevCell);<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span> }<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span> matcher.beforeShipped();<a name="line.1128"></a>
+<span class="sourceLineNo">1129</span> // There wont be further fetch of Cells from these scanners. Just close.<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span> clearAndClose(scannersForDelayedClose);<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span> if (this.heap != null) {<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span> this.heap.shipped();<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span> // When switching from pread to stream, we will open a new scanner for each store file, but<a name="line.1133"></a>
+<span class="sourceLineNo">1134</span> // the old scanner may still track the HFileBlocks we have scanned but not sent back to client<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span> // yet. If we close the scanner immediately then the HFileBlocks may be messed up by others<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span> // before we serialize and send it back to client. The HFileBlocks will be released in shipped<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span> // method, so we here will also open new scanners and close old scanners in shipped method.<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span> // See HBASE-18055 for more details.<a name="line.1138"></a>
+<span class="sourceLineNo">1139</span> trySwitchToStreamRead();<a name="line.1139"></a>
+<span class="sourceLineNo">1140</span> }<a name="line.1140"></a>
+<span class="sourceLineNo">1141</span> }<a name="line.1141"></a>
+<span class="sourceLineNo">1142</span>}<a name="line.1142"></a>
+<span class="sourceLineNo">1143</span><a name="line.1143"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ede30993/devapidocs/src-html/org/apache/hadoop/hbase/util/CollectionBackedScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/CollectionBackedScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/CollectionBackedScanner.html
index 6d91b4d..c961ffa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/CollectionBackedScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/CollectionBackedScanner.html
@@ -124,19 +124,12 @@
<span class="sourceLineNo">116</span> return false;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @see org.apache.hadoop.hbase.regionserver.KeyValueScanner#getScannerOrder()<a name="line.120"></a>
-<span class="sourceLineNo">121</span> */<a name="line.121"></a>
-<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public long getScannerOrder() {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return 0;<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> @Override<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public void close() {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> // do nothing<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">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> @Override<a name="line.120"></a>
+<span class="sourceLineNo">121</span> public void close() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> // do nothing<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>