http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html index e5afc32..32c4a50 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultiRowRangeFilter.html @@ -124,309 +124,309 @@ <span class="sourceLineNo">116</span> } else {<a name="line.116"></a> <span class="sourceLineNo">117</span> if (range.contains(rowArr, offset, length)) {<a name="line.117"></a> <span class="sourceLineNo">118</span> currentReturnCode = ReturnCode.INCLUDE;<a name="line.118"></a> -<span class="sourceLineNo">119</span> } else currentReturnCode = ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.119"></a> -<span class="sourceLineNo">120</span> }<a name="line.120"></a> -<span class="sourceLineNo">121</span> } else {<a name="line.121"></a> -<span class="sourceLineNo">122</span> currentReturnCode = ReturnCode.INCLUDE;<a name="line.122"></a> -<span class="sourceLineNo">123</span> }<a name="line.123"></a> -<span class="sourceLineNo">124</span> return false;<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 ReturnCode filterKeyValue(Cell ignored) {<a name="line.128"></a> -<span class="sourceLineNo">129</span> return currentReturnCode;<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> @Override<a name="line.132"></a> -<span class="sourceLineNo">133</span> public Cell getNextCellHint(Cell currentKV) {<a name="line.133"></a> -<span class="sourceLineNo">134</span> // skip to the next range's start row<a name="line.134"></a> -<span class="sourceLineNo">135</span> return CellUtil.createFirstOnRow(range.startRow, 0,<a name="line.135"></a> -<span class="sourceLineNo">136</span> (short) range.startRow.length);<a name="line.136"></a> -<span class="sourceLineNo">137</span> }<a name="line.137"></a> -<span class="sourceLineNo">138</span><a name="line.138"></a> -<span class="sourceLineNo">139</span> /**<a name="line.139"></a> -<span class="sourceLineNo">140</span> * @return The filter serialized using pb<a name="line.140"></a> -<span class="sourceLineNo">141</span> */<a name="line.141"></a> -<span class="sourceLineNo">142</span> public byte[] toByteArray() {<a name="line.142"></a> -<span class="sourceLineNo">143</span> FilterProtos.MultiRowRangeFilter.Builder builder = FilterProtos.MultiRowRangeFilter<a name="line.143"></a> -<span class="sourceLineNo">144</span> .newBuilder();<a name="line.144"></a> -<span class="sourceLineNo">145</span> for (RowRange range : rangeList) {<a name="line.145"></a> -<span class="sourceLineNo">146</span> if (range != null) {<a name="line.146"></a> -<span class="sourceLineNo">147</span> FilterProtos.RowRange.Builder rangebuilder = FilterProtos.RowRange.newBuilder();<a name="line.147"></a> -<span class="sourceLineNo">148</span> if (range.startRow != null)<a name="line.148"></a> -<span class="sourceLineNo">149</span> rangebuilder.setStartRow(UnsafeByteOperations.unsafeWrap(range.startRow));<a name="line.149"></a> -<span class="sourceLineNo">150</span> rangebuilder.setStartRowInclusive(range.startRowInclusive);<a name="line.150"></a> -<span class="sourceLineNo">151</span> if (range.stopRow != null)<a name="line.151"></a> -<span class="sourceLineNo">152</span> rangebuilder.setStopRow(UnsafeByteOperations.unsafeWrap(range.stopRow));<a name="line.152"></a> -<span class="sourceLineNo">153</span> rangebuilder.setStopRowInclusive(range.stopRowInclusive);<a name="line.153"></a> -<span class="sourceLineNo">154</span> range.isScan = Bytes.equals(range.startRow, range.stopRow) ? 1 : 0;<a name="line.154"></a> -<span class="sourceLineNo">155</span> builder.addRowRangeList(rangebuilder.build());<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> return builder.build().toByteArray();<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> * @param pbBytes A pb serialized instance<a name="line.162"></a> -<span class="sourceLineNo">163</span> * @return An instance of MultiRowRangeFilter<a name="line.163"></a> -<span class="sourceLineNo">164</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.164"></a> -<span class="sourceLineNo">165</span> */<a name="line.165"></a> -<span class="sourceLineNo">166</span> public static MultiRowRangeFilter parseFrom(final byte[] pbBytes)<a name="line.166"></a> -<span class="sourceLineNo">167</span> throws DeserializationException {<a name="line.167"></a> -<span class="sourceLineNo">168</span> FilterProtos.MultiRowRangeFilter proto;<a name="line.168"></a> -<span class="sourceLineNo">169</span> try {<a name="line.169"></a> -<span class="sourceLineNo">170</span> proto = FilterProtos.MultiRowRangeFilter.parseFrom(pbBytes);<a name="line.170"></a> -<span class="sourceLineNo">171</span> } catch (InvalidProtocolBufferException e) {<a name="line.171"></a> -<span class="sourceLineNo">172</span> throw new DeserializationException(e);<a name="line.172"></a> -<span class="sourceLineNo">173</span> }<a name="line.173"></a> -<span class="sourceLineNo">174</span> int length = proto.getRowRangeListCount();<a name="line.174"></a> -<span class="sourceLineNo">175</span> List<FilterProtos.RowRange> rangeProtos = proto.getRowRangeListList();<a name="line.175"></a> -<span class="sourceLineNo">176</span> List<RowRange> rangeList = new ArrayList<RowRange>(length);<a name="line.176"></a> -<span class="sourceLineNo">177</span> for (FilterProtos.RowRange rangeProto : rangeProtos) {<a name="line.177"></a> -<span class="sourceLineNo">178</span> RowRange range = new RowRange(rangeProto.hasStartRow() ? rangeProto.getStartRow()<a name="line.178"></a> -<span class="sourceLineNo">179</span> .toByteArray() : null, rangeProto.getStartRowInclusive(), rangeProto.hasStopRow() ?<a name="line.179"></a> -<span class="sourceLineNo">180</span> rangeProto.getStopRow().toByteArray() : null, rangeProto.getStopRowInclusive());<a name="line.180"></a> -<span class="sourceLineNo">181</span> rangeList.add(range);<a name="line.181"></a> -<span class="sourceLineNo">182</span> }<a name="line.182"></a> -<span class="sourceLineNo">183</span> return new MultiRowRangeFilter(rangeList);<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 o the filter to compare<a name="line.187"></a> -<span class="sourceLineNo">188</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.188"></a> -<span class="sourceLineNo">189</span> * corresponding fields in other. Used for testing.<a name="line.189"></a> -<span class="sourceLineNo">190</span> */<a name="line.190"></a> -<span class="sourceLineNo">191</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.191"></a> -<span class="sourceLineNo">192</span> if (o == this)<a name="line.192"></a> -<span class="sourceLineNo">193</span> return true;<a name="line.193"></a> -<span class="sourceLineNo">194</span> if (!(o instanceof MultiRowRangeFilter))<a name="line.194"></a> -<span class="sourceLineNo">195</span> return false;<a name="line.195"></a> -<span class="sourceLineNo">196</span><a name="line.196"></a> -<span class="sourceLineNo">197</span> MultiRowRangeFilter other = (MultiRowRangeFilter) o;<a name="line.197"></a> -<span class="sourceLineNo">198</span> if (this.rangeList.size() != other.rangeList.size())<a name="line.198"></a> -<span class="sourceLineNo">199</span> return false;<a name="line.199"></a> -<span class="sourceLineNo">200</span> for (int i = 0; i < rangeList.size(); ++i) {<a name="line.200"></a> -<span class="sourceLineNo">201</span> RowRange thisRange = this.rangeList.get(i);<a name="line.201"></a> -<span class="sourceLineNo">202</span> RowRange otherRange = other.rangeList.get(i);<a name="line.202"></a> -<span class="sourceLineNo">203</span> if (!(Bytes.equals(thisRange.startRow, otherRange.startRow) && Bytes.equals(<a name="line.203"></a> -<span class="sourceLineNo">204</span> thisRange.stopRow, otherRange.stopRow) && (thisRange.startRowInclusive ==<a name="line.204"></a> -<span class="sourceLineNo">205</span> otherRange.startRowInclusive) && (thisRange.stopRowInclusive ==<a name="line.205"></a> -<span class="sourceLineNo">206</span> otherRange.stopRowInclusive))) {<a name="line.206"></a> -<span class="sourceLineNo">207</span> return false;<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> return true;<a name="line.210"></a> -<span class="sourceLineNo">211</span> }<a name="line.211"></a> -<span class="sourceLineNo">212</span><a name="line.212"></a> -<span class="sourceLineNo">213</span> /**<a name="line.213"></a> -<span class="sourceLineNo">214</span> * calculate the position where the row key in the ranges list.<a name="line.214"></a> -<span class="sourceLineNo">215</span> *<a name="line.215"></a> -<span class="sourceLineNo">216</span> * @param rowKey the row key to calculate<a name="line.216"></a> -<span class="sourceLineNo">217</span> * @return index the position of the row key<a name="line.217"></a> -<span class="sourceLineNo">218</span> */<a name="line.218"></a> -<span class="sourceLineNo">219</span> private int getNextRangeIndex(byte[] rowKey) {<a name="line.219"></a> -<span class="sourceLineNo">220</span> RowRange temp = new RowRange(rowKey, true, null, true);<a name="line.220"></a> -<span class="sourceLineNo">221</span> int index = Collections.binarySearch(rangeList, temp);<a name="line.221"></a> -<span class="sourceLineNo">222</span> if (index < 0) {<a name="line.222"></a> -<span class="sourceLineNo">223</span> int insertionPosition = -index - 1;<a name="line.223"></a> -<span class="sourceLineNo">224</span> // check if the row key in the range before the insertion position<a name="line.224"></a> -<span class="sourceLineNo">225</span> if (insertionPosition != 0 && rangeList.get(insertionPosition - 1).contains(rowKey)) {<a name="line.225"></a> -<span class="sourceLineNo">226</span> return insertionPosition - 1;<a name="line.226"></a> -<span class="sourceLineNo">227</span> }<a name="line.227"></a> -<span class="sourceLineNo">228</span> // check if the row key is before the first range<a name="line.228"></a> -<span class="sourceLineNo">229</span> if (insertionPosition == 0 && !rangeList.get(insertionPosition).contains(rowKey)) {<a name="line.229"></a> -<span class="sourceLineNo">230</span> return ROW_BEFORE_FIRST_RANGE;<a name="line.230"></a> -<span class="sourceLineNo">231</span> }<a name="line.231"></a> -<span class="sourceLineNo">232</span> if (!initialized) {<a name="line.232"></a> -<span class="sourceLineNo">233</span> initialized = true;<a name="line.233"></a> -<span class="sourceLineNo">234</span> }<a name="line.234"></a> -<span class="sourceLineNo">235</span> return insertionPosition;<a name="line.235"></a> -<span class="sourceLineNo">236</span> }<a name="line.236"></a> -<span class="sourceLineNo">237</span> // the row key equals one of the start keys, and the the range exclude the start key<a name="line.237"></a> -<span class="sourceLineNo">238</span> if(rangeList.get(index).startRowInclusive == false) {<a name="line.238"></a> -<span class="sourceLineNo">239</span> EXCLUSIVE = true;<a name="line.239"></a> -<span class="sourceLineNo">240</span> }<a name="line.240"></a> -<span class="sourceLineNo">241</span> return index;<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> * sort the ranges and if the ranges with overlap, then merge them.<a name="line.245"></a> -<span class="sourceLineNo">246</span> *<a name="line.246"></a> -<span class="sourceLineNo">247</span> * @param ranges the list of ranges to sort and merge.<a name="line.247"></a> -<span class="sourceLineNo">248</span> * @return the ranges after sort and merge.<a name="line.248"></a> -<span class="sourceLineNo">249</span> */<a name="line.249"></a> -<span class="sourceLineNo">250</span> public static List<RowRange> sortAndMerge(List<RowRange> ranges) {<a name="line.250"></a> -<span class="sourceLineNo">251</span> if (ranges.isEmpty()) {<a name="line.251"></a> -<span class="sourceLineNo">252</span> throw new IllegalArgumentException("No ranges found.");<a name="line.252"></a> -<span class="sourceLineNo">253</span> }<a name="line.253"></a> -<span class="sourceLineNo">254</span> List<RowRange> invalidRanges = new ArrayList<RowRange>();<a name="line.254"></a> -<span class="sourceLineNo">255</span> List<RowRange> newRanges = new ArrayList<RowRange>(ranges.size());<a name="line.255"></a> -<span class="sourceLineNo">256</span> Collections.sort(ranges);<a name="line.256"></a> -<span class="sourceLineNo">257</span> if(ranges.get(0).isValid()) {<a name="line.257"></a> -<span class="sourceLineNo">258</span> if (ranges.size() == 1) {<a name="line.258"></a> -<span class="sourceLineNo">259</span> newRanges.add(ranges.get(0));<a name="line.259"></a> -<span class="sourceLineNo">260</span> }<a name="line.260"></a> -<span class="sourceLineNo">261</span> } else {<a name="line.261"></a> -<span class="sourceLineNo">262</span> invalidRanges.add(ranges.get(0));<a name="line.262"></a> -<span class="sourceLineNo">263</span> }<a name="line.263"></a> -<span class="sourceLineNo">264</span><a name="line.264"></a> -<span class="sourceLineNo">265</span> byte[] lastStartRow = ranges.get(0).startRow;<a name="line.265"></a> -<span class="sourceLineNo">266</span> boolean lastStartRowInclusive = ranges.get(0).startRowInclusive;<a name="line.266"></a> -<span class="sourceLineNo">267</span> byte[] lastStopRow = ranges.get(0).stopRow;<a name="line.267"></a> -<span class="sourceLineNo">268</span> boolean lastStopRowInclusive = ranges.get(0).stopRowInclusive;<a name="line.268"></a> -<span class="sourceLineNo">269</span> int i = 1;<a name="line.269"></a> -<span class="sourceLineNo">270</span> for (; i < ranges.size(); i++) {<a name="line.270"></a> -<span class="sourceLineNo">271</span> RowRange range = ranges.get(i);<a name="line.271"></a> -<span class="sourceLineNo">272</span> if (!range.isValid()) {<a name="line.272"></a> -<span class="sourceLineNo">273</span> invalidRanges.add(range);<a name="line.273"></a> -<span class="sourceLineNo">274</span> }<a name="line.274"></a> -<span class="sourceLineNo">275</span> if(Bytes.equals(lastStopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.276"></a> -<span class="sourceLineNo">277</span> lastStopRowInclusive));<a name="line.277"></a> -<span class="sourceLineNo">278</span> break;<a name="line.278"></a> -<span class="sourceLineNo">279</span> }<a name="line.279"></a> -<span class="sourceLineNo">280</span> // with overlap in the ranges<a name="line.280"></a> -<span class="sourceLineNo">281</span> if ((Bytes.compareTo(lastStopRow, range.startRow) > 0) ||<a name="line.281"></a> -<span class="sourceLineNo">282</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 && !(lastStopRowInclusive == false &&<a name="line.282"></a> -<span class="sourceLineNo">283</span> range.isStartRowInclusive() == false))) {<a name="line.283"></a> -<span class="sourceLineNo">284</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, range.stopRow,<a name="line.285"></a> -<span class="sourceLineNo">286</span> range.stopRowInclusive));<a name="line.286"></a> -<span class="sourceLineNo">287</span> break;<a name="line.287"></a> -<span class="sourceLineNo">288</span> }<a name="line.288"></a> -<span class="sourceLineNo">289</span> // if first range contains second range, ignore the second range<a name="line.289"></a> -<span class="sourceLineNo">290</span> if (Bytes.compareTo(lastStopRow, range.stopRow) >= 0) {<a name="line.290"></a> -<span class="sourceLineNo">291</span> if((Bytes.compareTo(lastStopRow, range.stopRow) == 0)) {<a name="line.291"></a> -<span class="sourceLineNo">292</span> if(lastStopRowInclusive == true || range.stopRowInclusive == true) {<a name="line.292"></a> -<span class="sourceLineNo">293</span> lastStopRowInclusive = true;<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> if ((i + 1) == ranges.size()) {<a name="line.296"></a> -<span class="sourceLineNo">297</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.297"></a> -<span class="sourceLineNo">298</span> lastStopRowInclusive));<a name="line.298"></a> -<span class="sourceLineNo">299</span> }<a name="line.299"></a> -<span class="sourceLineNo">300</span> } else {<a name="line.300"></a> -<span class="sourceLineNo">301</span> lastStopRow = range.stopRow;<a name="line.301"></a> -<span class="sourceLineNo">302</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.302"></a> -<span class="sourceLineNo">303</span> if ((i + 1) < ranges.size()) {<a name="line.303"></a> -<span class="sourceLineNo">304</span> i++;<a name="line.304"></a> -<span class="sourceLineNo">305</span> range = ranges.get(i);<a name="line.305"></a> -<span class="sourceLineNo">306</span> if (!range.isValid()) {<a name="line.306"></a> -<span class="sourceLineNo">307</span> invalidRanges.add(range);<a name="line.307"></a> -<span class="sourceLineNo">308</span> }<a name="line.308"></a> -<span class="sourceLineNo">309</span> } else {<a name="line.309"></a> -<span class="sourceLineNo">310</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.310"></a> -<span class="sourceLineNo">311</span> lastStopRowInclusive));<a name="line.311"></a> -<span class="sourceLineNo">312</span> break;<a name="line.312"></a> -<span class="sourceLineNo">313</span> }<a name="line.313"></a> -<span class="sourceLineNo">314</span> while ((Bytes.compareTo(lastStopRow, range.startRow) > 0) ||<a name="line.314"></a> -<span class="sourceLineNo">315</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 &&<a name="line.315"></a> -<span class="sourceLineNo">316</span> (lastStopRowInclusive == true || range.startRowInclusive==true))) {<a name="line.316"></a> -<span class="sourceLineNo">317</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.317"></a> -<span class="sourceLineNo">318</span> break;<a name="line.318"></a> -<span class="sourceLineNo">319</span> }<a name="line.319"></a> -<span class="sourceLineNo">320</span> // if this first range contain second range, ignore the second range<a name="line.320"></a> -<span class="sourceLineNo">321</span> if (Bytes.compareTo(lastStopRow, range.stopRow) >= 0) {<a name="line.321"></a> -<span class="sourceLineNo">322</span> if(lastStopRowInclusive == true || range.stopRowInclusive == true) {<a name="line.322"></a> -<span class="sourceLineNo">323</span> lastStopRowInclusive = true;<a name="line.323"></a> -<span class="sourceLineNo">324</span> }<a name="line.324"></a> -<span class="sourceLineNo">325</span> i++;<a name="line.325"></a> -<span class="sourceLineNo">326</span> if (i < ranges.size()) {<a name="line.326"></a> -<span class="sourceLineNo">327</span> range = ranges.get(i);<a name="line.327"></a> -<span class="sourceLineNo">328</span> if (!range.isValid()) {<a name="line.328"></a> -<span class="sourceLineNo">329</span> invalidRanges.add(range);<a name="line.329"></a> -<span class="sourceLineNo">330</span> }<a name="line.330"></a> -<span class="sourceLineNo">331</span> } else {<a name="line.331"></a> -<span class="sourceLineNo">332</span> break;<a name="line.332"></a> -<span class="sourceLineNo">333</span> }<a name="line.333"></a> -<span class="sourceLineNo">334</span> } else {<a name="line.334"></a> -<span class="sourceLineNo">335</span> lastStopRow = range.stopRow;<a name="line.335"></a> -<span class="sourceLineNo">336</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.336"></a> -<span class="sourceLineNo">337</span> i++;<a name="line.337"></a> -<span class="sourceLineNo">338</span> if (i < ranges.size()) {<a name="line.338"></a> -<span class="sourceLineNo">339</span> range = ranges.get(i);<a name="line.339"></a> -<span class="sourceLineNo">340</span> if (!range.isValid()) {<a name="line.340"></a> -<span class="sourceLineNo">341</span> invalidRanges.add(range);<a name="line.341"></a> -<span class="sourceLineNo">342</span> }<a name="line.342"></a> -<span class="sourceLineNo">343</span> } else {<a name="line.343"></a> -<span class="sourceLineNo">344</span> break;<a name="line.344"></a> -<span class="sourceLineNo">345</span> }<a name="line.345"></a> -<span class="sourceLineNo">346</span> }<a name="line.346"></a> -<span class="sourceLineNo">347</span> }<a name="line.347"></a> -<span class="sourceLineNo">348</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.348"></a> -<span class="sourceLineNo">349</span> if((Bytes.compareTo(lastStopRow, range.startRow) < 0) ||<a name="line.349"></a> -<span class="sourceLineNo">350</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 &&<a name="line.350"></a> -<span class="sourceLineNo">351</span> lastStopRowInclusive == false && range.startRowInclusive == false)) {<a name="line.351"></a> -<span class="sourceLineNo">352</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.352"></a> -<span class="sourceLineNo">353</span> lastStopRowInclusive));<a name="line.353"></a> -<span class="sourceLineNo">354</span> newRanges.add(range);<a name="line.354"></a> -<span class="sourceLineNo">355</span> } else {<a name="line.355"></a> -<span class="sourceLineNo">356</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, range.stopRow,<a name="line.356"></a> -<span class="sourceLineNo">357</span> range.stopRowInclusive));<a name="line.357"></a> -<span class="sourceLineNo">358</span> break;<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> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.361"></a> -<span class="sourceLineNo">362</span> lastStopRowInclusive));<a name="line.362"></a> -<span class="sourceLineNo">363</span> if ((i + 1) == ranges.size()) {<a name="line.363"></a> -<span class="sourceLineNo">364</span> newRanges.add(range);<a name="line.364"></a> -<span class="sourceLineNo">365</span> }<a name="line.365"></a> -<span class="sourceLineNo">366</span> lastStartRow = range.startRow;<a name="line.366"></a> -<span class="sourceLineNo">367</span> lastStartRowInclusive = range.startRowInclusive;<a name="line.367"></a> -<span class="sourceLineNo">368</span> lastStopRow = range.stopRow;<a name="line.368"></a> -<span class="sourceLineNo">369</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.369"></a> -<span class="sourceLineNo">370</span> }<a name="line.370"></a> -<span class="sourceLineNo">371</span> } else {<a name="line.371"></a> -<span class="sourceLineNo">372</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.372"></a> -<span class="sourceLineNo">373</span> lastStopRowInclusive));<a name="line.373"></a> -<span class="sourceLineNo">374</span> if ((i + 1) == ranges.size()) {<a name="line.374"></a> -<span class="sourceLineNo">375</span> newRanges.add(range);<a name="line.375"></a> -<span class="sourceLineNo">376</span> }<a name="line.376"></a> -<span class="sourceLineNo">377</span> lastStartRow = range.startRow;<a name="line.377"></a> -<span class="sourceLineNo">378</span> lastStartRowInclusive = range.startRowInclusive;<a name="line.378"></a> -<span class="sourceLineNo">379</span> lastStopRow = range.stopRow;<a name="line.379"></a> -<span class="sourceLineNo">380</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.380"></a> -<span class="sourceLineNo">381</span> }<a name="line.381"></a> -<span class="sourceLineNo">382</span> }<a name="line.382"></a> -<span class="sourceLineNo">383</span> // check the remaining ranges<a name="line.383"></a> -<span class="sourceLineNo">384</span> for(int j=i; j < ranges.size(); j++) {<a name="line.384"></a> -<span class="sourceLineNo">385</span> if(!ranges.get(j).isValid()) {<a name="line.385"></a> -<span class="sourceLineNo">386</span> invalidRanges.add(ranges.get(j));<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> -<span class="sourceLineNo">389</span> // if invalid range exists, throw the exception<a name="line.389"></a> -<span class="sourceLineNo">390</span> if (invalidRanges.size() != 0) {<a name="line.390"></a> -<span class="sourceLineNo">391</span> throwExceptionForInvalidRanges(invalidRanges, true);<a name="line.391"></a> -<span class="sourceLineNo">392</span> }<a name="line.392"></a> -<span class="sourceLineNo">393</span> // If no valid ranges found, throw the exception<a name="line.393"></a> -<span class="sourceLineNo">394</span> if(newRanges.isEmpty()) {<a name="line.394"></a> -<span class="sourceLineNo">395</span> throw new IllegalArgumentException("No valid ranges found.");<a name="line.395"></a> -<span class="sourceLineNo">396</span> }<a name="line.396"></a> -<span class="sourceLineNo">397</span> return newRanges;<a name="line.397"></a> -<span class="sourceLineNo">398</span> }<a name="line.398"></a> -<span class="sourceLineNo">399</span><a name="line.399"></a> -<span class="sourceLineNo">400</span> private static void throwExceptionForInvalidRanges(List<RowRange> invalidRanges,<a name="line.400"></a> -<span class="sourceLineNo">401</span> boolean details) {<a name="line.401"></a> -<span class="sourceLineNo">402</span> StringBuilder sb = new StringBuilder();<a name="line.402"></a> -<span class="sourceLineNo">403</span> sb.append(invalidRanges.size()).append(" invaild ranges.\n");<a name="line.403"></a> -<span class="sourceLineNo">404</span> if (details) {<a name="line.404"></a> -<span class="sourceLineNo">405</span> for (RowRange range : invalidRanges) {<a name="line.405"></a> -<span class="sourceLineNo">406</span> sb.append(<a name="line.406"></a> -<span class="sourceLineNo">407</span> "Invalid range: start row => " + Bytes.toString(range.startRow) + ", stop row => "<a name="line.407"></a> -<span class="sourceLineNo">408</span> + Bytes.toString(range.stopRow)).append('\n');<a name="line.408"></a> -<span class="sourceLineNo">409</span> }<a name="line.409"></a> -<span class="sourceLineNo">410</span> }<a name="line.410"></a> -<span class="sourceLineNo">411</span> throw new IllegalArgumentException(sb.toString());<a name="line.411"></a> -<span class="sourceLineNo">412</span> }<a name="line.412"></a> -<span class="sourceLineNo">413</span><a name="line.413"></a> -<span class="sourceLineNo">414</span> @InterfaceAudience.Public<a name="line.414"></a> -<span class="sourceLineNo">415</span> @InterfaceStability.Evolving<a name="line.415"></a> -<span class="sourceLineNo">416</span> public static class RowRange implements Comparable<RowRange> {<a name="line.416"></a> -<span class="sourceLineNo">417</span> private byte[] startRow;<a name="line.417"></a> -<span class="sourceLineNo">418</span> private boolean startRowInclusive = true;<a name="line.418"></a> -<span class="sourceLineNo">419</span> private byte[] stopRow;<a name="line.419"></a> -<span class="sourceLineNo">420</span> private boolean stopRowInclusive = false;<a name="line.420"></a> -<span class="sourceLineNo">421</span> private int isScan = 0;<a name="line.421"></a> +<span class="sourceLineNo">119</span> } else {<a name="line.119"></a> +<span class="sourceLineNo">120</span> currentReturnCode = ReturnCode.SEEK_NEXT_USING_HINT;<a name="line.120"></a> +<span class="sourceLineNo">121</span> }<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<a name="line.122"></a> +<span class="sourceLineNo">123</span> } else {<a name="line.123"></a> +<span class="sourceLineNo">124</span> currentReturnCode = ReturnCode.INCLUDE;<a name="line.124"></a> +<span class="sourceLineNo">125</span> }<a name="line.125"></a> +<span class="sourceLineNo">126</span> return false;<a name="line.126"></a> +<span class="sourceLineNo">127</span> }<a name="line.127"></a> +<span class="sourceLineNo">128</span><a name="line.128"></a> +<span class="sourceLineNo">129</span> @Override<a name="line.129"></a> +<span class="sourceLineNo">130</span> public ReturnCode filterKeyValue(Cell ignored) {<a name="line.130"></a> +<span class="sourceLineNo">131</span> return currentReturnCode;<a name="line.131"></a> +<span class="sourceLineNo">132</span> }<a name="line.132"></a> +<span class="sourceLineNo">133</span><a name="line.133"></a> +<span class="sourceLineNo">134</span> @Override<a name="line.134"></a> +<span class="sourceLineNo">135</span> public Cell getNextCellHint(Cell currentKV) {<a name="line.135"></a> +<span class="sourceLineNo">136</span> // skip to the next range's start row<a name="line.136"></a> +<span class="sourceLineNo">137</span> return CellUtil.createFirstOnRow(range.startRow, 0,<a name="line.137"></a> +<span class="sourceLineNo">138</span> (short) range.startRow.length);<a name="line.138"></a> +<span class="sourceLineNo">139</span> }<a name="line.139"></a> +<span class="sourceLineNo">140</span><a name="line.140"></a> +<span class="sourceLineNo">141</span> /**<a name="line.141"></a> +<span class="sourceLineNo">142</span> * @return The filter serialized using pb<a name="line.142"></a> +<span class="sourceLineNo">143</span> */<a name="line.143"></a> +<span class="sourceLineNo">144</span> public byte[] toByteArray() {<a name="line.144"></a> +<span class="sourceLineNo">145</span> FilterProtos.MultiRowRangeFilter.Builder builder = FilterProtos.MultiRowRangeFilter<a name="line.145"></a> +<span class="sourceLineNo">146</span> .newBuilder();<a name="line.146"></a> +<span class="sourceLineNo">147</span> for (RowRange range : rangeList) {<a name="line.147"></a> +<span class="sourceLineNo">148</span> if (range != null) {<a name="line.148"></a> +<span class="sourceLineNo">149</span> FilterProtos.RowRange.Builder rangebuilder = FilterProtos.RowRange.newBuilder();<a name="line.149"></a> +<span class="sourceLineNo">150</span> if (range.startRow != null)<a name="line.150"></a> +<span class="sourceLineNo">151</span> rangebuilder.setStartRow(UnsafeByteOperations.unsafeWrap(range.startRow));<a name="line.151"></a> +<span class="sourceLineNo">152</span> rangebuilder.setStartRowInclusive(range.startRowInclusive);<a name="line.152"></a> +<span class="sourceLineNo">153</span> if (range.stopRow != null)<a name="line.153"></a> +<span class="sourceLineNo">154</span> rangebuilder.setStopRow(UnsafeByteOperations.unsafeWrap(range.stopRow));<a name="line.154"></a> +<span class="sourceLineNo">155</span> rangebuilder.setStopRowInclusive(range.stopRowInclusive);<a name="line.155"></a> +<span class="sourceLineNo">156</span> builder.addRowRangeList(rangebuilder.build());<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> return builder.build().toByteArray();<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> /**<a name="line.162"></a> +<span class="sourceLineNo">163</span> * @param pbBytes A pb serialized instance<a name="line.163"></a> +<span class="sourceLineNo">164</span> * @return An instance of MultiRowRangeFilter<a name="line.164"></a> +<span class="sourceLineNo">165</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.165"></a> +<span class="sourceLineNo">166</span> */<a name="line.166"></a> +<span class="sourceLineNo">167</span> public static MultiRowRangeFilter parseFrom(final byte[] pbBytes)<a name="line.167"></a> +<span class="sourceLineNo">168</span> throws DeserializationException {<a name="line.168"></a> +<span class="sourceLineNo">169</span> FilterProtos.MultiRowRangeFilter proto;<a name="line.169"></a> +<span class="sourceLineNo">170</span> try {<a name="line.170"></a> +<span class="sourceLineNo">171</span> proto = FilterProtos.MultiRowRangeFilter.parseFrom(pbBytes);<a name="line.171"></a> +<span class="sourceLineNo">172</span> } catch (InvalidProtocolBufferException e) {<a name="line.172"></a> +<span class="sourceLineNo">173</span> throw new DeserializationException(e);<a name="line.173"></a> +<span class="sourceLineNo">174</span> }<a name="line.174"></a> +<span class="sourceLineNo">175</span> int length = proto.getRowRangeListCount();<a name="line.175"></a> +<span class="sourceLineNo">176</span> List<FilterProtos.RowRange> rangeProtos = proto.getRowRangeListList();<a name="line.176"></a> +<span class="sourceLineNo">177</span> List<RowRange> rangeList = new ArrayList<>(length);<a name="line.177"></a> +<span class="sourceLineNo">178</span> for (FilterProtos.RowRange rangeProto : rangeProtos) {<a name="line.178"></a> +<span class="sourceLineNo">179</span> RowRange range = new RowRange(rangeProto.hasStartRow() ? rangeProto.getStartRow()<a name="line.179"></a> +<span class="sourceLineNo">180</span> .toByteArray() : null, rangeProto.getStartRowInclusive(), rangeProto.hasStopRow() ?<a name="line.180"></a> +<span class="sourceLineNo">181</span> rangeProto.getStopRow().toByteArray() : null, rangeProto.getStopRowInclusive());<a name="line.181"></a> +<span class="sourceLineNo">182</span> rangeList.add(range);<a name="line.182"></a> +<span class="sourceLineNo">183</span> }<a name="line.183"></a> +<span class="sourceLineNo">184</span> return new MultiRowRangeFilter(rangeList);<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> /**<a name="line.187"></a> +<span class="sourceLineNo">188</span> * @param o the filter to compare<a name="line.188"></a> +<span class="sourceLineNo">189</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.189"></a> +<span class="sourceLineNo">190</span> * corresponding fields in other. Used for testing.<a name="line.190"></a> +<span class="sourceLineNo">191</span> */<a name="line.191"></a> +<span class="sourceLineNo">192</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.192"></a> +<span class="sourceLineNo">193</span> if (o == this)<a name="line.193"></a> +<span class="sourceLineNo">194</span> return true;<a name="line.194"></a> +<span class="sourceLineNo">195</span> if (!(o instanceof MultiRowRangeFilter))<a name="line.195"></a> +<span class="sourceLineNo">196</span> return false;<a name="line.196"></a> +<span class="sourceLineNo">197</span><a name="line.197"></a> +<span class="sourceLineNo">198</span> MultiRowRangeFilter other = (MultiRowRangeFilter) o;<a name="line.198"></a> +<span class="sourceLineNo">199</span> if (this.rangeList.size() != other.rangeList.size())<a name="line.199"></a> +<span class="sourceLineNo">200</span> return false;<a name="line.200"></a> +<span class="sourceLineNo">201</span> for (int i = 0; i < rangeList.size(); ++i) {<a name="line.201"></a> +<span class="sourceLineNo">202</span> RowRange thisRange = this.rangeList.get(i);<a name="line.202"></a> +<span class="sourceLineNo">203</span> RowRange otherRange = other.rangeList.get(i);<a name="line.203"></a> +<span class="sourceLineNo">204</span> if (!(Bytes.equals(thisRange.startRow, otherRange.startRow) && Bytes.equals(<a name="line.204"></a> +<span class="sourceLineNo">205</span> thisRange.stopRow, otherRange.stopRow) && (thisRange.startRowInclusive ==<a name="line.205"></a> +<span class="sourceLineNo">206</span> otherRange.startRowInclusive) && (thisRange.stopRowInclusive ==<a name="line.206"></a> +<span class="sourceLineNo">207</span> otherRange.stopRowInclusive))) {<a name="line.207"></a> +<span class="sourceLineNo">208</span> return false;<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> return true;<a name="line.211"></a> +<span class="sourceLineNo">212</span> }<a name="line.212"></a> +<span class="sourceLineNo">213</span><a name="line.213"></a> +<span class="sourceLineNo">214</span> /**<a name="line.214"></a> +<span class="sourceLineNo">215</span> * calculate the position where the row key in the ranges list.<a name="line.215"></a> +<span class="sourceLineNo">216</span> *<a name="line.216"></a> +<span class="sourceLineNo">217</span> * @param rowKey the row key to calculate<a name="line.217"></a> +<span class="sourceLineNo">218</span> * @return index the position of the row key<a name="line.218"></a> +<span class="sourceLineNo">219</span> */<a name="line.219"></a> +<span class="sourceLineNo">220</span> private int getNextRangeIndex(byte[] rowKey) {<a name="line.220"></a> +<span class="sourceLineNo">221</span> RowRange temp = new RowRange(rowKey, true, null, true);<a name="line.221"></a> +<span class="sourceLineNo">222</span> int index = Collections.binarySearch(rangeList, temp);<a name="line.222"></a> +<span class="sourceLineNo">223</span> if (index < 0) {<a name="line.223"></a> +<span class="sourceLineNo">224</span> int insertionPosition = -index - 1;<a name="line.224"></a> +<span class="sourceLineNo">225</span> // check if the row key in the range before the insertion position<a name="line.225"></a> +<span class="sourceLineNo">226</span> if (insertionPosition != 0 && rangeList.get(insertionPosition - 1).contains(rowKey)) {<a name="line.226"></a> +<span class="sourceLineNo">227</span> return insertionPosition - 1;<a name="line.227"></a> +<span class="sourceLineNo">228</span> }<a name="line.228"></a> +<span class="sourceLineNo">229</span> // check if the row key is before the first range<a name="line.229"></a> +<span class="sourceLineNo">230</span> if (insertionPosition == 0 && !rangeList.get(insertionPosition).contains(rowKey)) {<a name="line.230"></a> +<span class="sourceLineNo">231</span> return ROW_BEFORE_FIRST_RANGE;<a name="line.231"></a> +<span class="sourceLineNo">232</span> }<a name="line.232"></a> +<span class="sourceLineNo">233</span> if (!initialized) {<a name="line.233"></a> +<span class="sourceLineNo">234</span> initialized = true;<a name="line.234"></a> +<span class="sourceLineNo">235</span> }<a name="line.235"></a> +<span class="sourceLineNo">236</span> return insertionPosition;<a name="line.236"></a> +<span class="sourceLineNo">237</span> }<a name="line.237"></a> +<span class="sourceLineNo">238</span> // the row key equals one of the start keys, and the the range exclude the start key<a name="line.238"></a> +<span class="sourceLineNo">239</span> if(rangeList.get(index).startRowInclusive == false) {<a name="line.239"></a> +<span class="sourceLineNo">240</span> EXCLUSIVE = true;<a name="line.240"></a> +<span class="sourceLineNo">241</span> }<a name="line.241"></a> +<span class="sourceLineNo">242</span> return index;<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> * sort the ranges and if the ranges with overlap, then merge them.<a name="line.246"></a> +<span class="sourceLineNo">247</span> *<a name="line.247"></a> +<span class="sourceLineNo">248</span> * @param ranges the list of ranges to sort and merge.<a name="line.248"></a> +<span class="sourceLineNo">249</span> * @return the ranges after sort and merge.<a name="line.249"></a> +<span class="sourceLineNo">250</span> */<a name="line.250"></a> +<span class="sourceLineNo">251</span> public static List<RowRange> sortAndMerge(List<RowRange> ranges) {<a name="line.251"></a> +<span class="sourceLineNo">252</span> if (ranges.isEmpty()) {<a name="line.252"></a> +<span class="sourceLineNo">253</span> throw new IllegalArgumentException("No ranges found.");<a name="line.253"></a> +<span class="sourceLineNo">254</span> }<a name="line.254"></a> +<span class="sourceLineNo">255</span> List<RowRange> invalidRanges = new ArrayList<>();<a name="line.255"></a> +<span class="sourceLineNo">256</span> List<RowRange> newRanges = new ArrayList<>(ranges.size());<a name="line.256"></a> +<span class="sourceLineNo">257</span> Collections.sort(ranges);<a name="line.257"></a> +<span class="sourceLineNo">258</span> if(ranges.get(0).isValid()) {<a name="line.258"></a> +<span class="sourceLineNo">259</span> if (ranges.size() == 1) {<a name="line.259"></a> +<span class="sourceLineNo">260</span> newRanges.add(ranges.get(0));<a name="line.260"></a> +<span class="sourceLineNo">261</span> }<a name="line.261"></a> +<span class="sourceLineNo">262</span> } else {<a name="line.262"></a> +<span class="sourceLineNo">263</span> invalidRanges.add(ranges.get(0));<a name="line.263"></a> +<span class="sourceLineNo">264</span> }<a name="line.264"></a> +<span class="sourceLineNo">265</span><a name="line.265"></a> +<span class="sourceLineNo">266</span> byte[] lastStartRow = ranges.get(0).startRow;<a name="line.266"></a> +<span class="sourceLineNo">267</span> boolean lastStartRowInclusive = ranges.get(0).startRowInclusive;<a name="line.267"></a> +<span class="sourceLineNo">268</span> byte[] lastStopRow = ranges.get(0).stopRow;<a name="line.268"></a> +<span class="sourceLineNo">269</span> boolean lastStopRowInclusive = ranges.get(0).stopRowInclusive;<a name="line.269"></a> +<span class="sourceLineNo">270</span> int i = 1;<a name="line.270"></a> +<span class="sourceLineNo">271</span> for (; i < ranges.size(); i++) {<a name="line.271"></a> +<span class="sourceLineNo">272</span> RowRange range = ranges.get(i);<a name="line.272"></a> +<span class="sourceLineNo">273</span> if (!range.isValid()) {<a name="line.273"></a> +<span class="sourceLineNo">274</span> invalidRanges.add(range);<a name="line.274"></a> +<span class="sourceLineNo">275</span> }<a name="line.275"></a> +<span class="sourceLineNo">276</span> if(Bytes.equals(lastStopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.276"></a> +<span class="sourceLineNo">277</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.277"></a> +<span class="sourceLineNo">278</span> lastStopRowInclusive));<a name="line.278"></a> +<span class="sourceLineNo">279</span> break;<a name="line.279"></a> +<span class="sourceLineNo">280</span> }<a name="line.280"></a> +<span class="sourceLineNo">281</span> // with overlap in the ranges<a name="line.281"></a> +<span class="sourceLineNo">282</span> if ((Bytes.compareTo(lastStopRow, range.startRow) > 0) ||<a name="line.282"></a> +<span class="sourceLineNo">283</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 && !(lastStopRowInclusive == false &&<a name="line.283"></a> +<span class="sourceLineNo">284</span> range.isStartRowInclusive() == false))) {<a name="line.284"></a> +<span class="sourceLineNo">285</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.285"></a> +<span class="sourceLineNo">286</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, range.stopRow,<a name="line.286"></a> +<span class="sourceLineNo">287</span> range.stopRowInclusive));<a name="line.287"></a> +<span class="sourceLineNo">288</span> break;<a name="line.288"></a> +<span class="sourceLineNo">289</span> }<a name="line.289"></a> +<span class="sourceLineNo">290</span> // if first range contains second range, ignore the second range<a name="line.290"></a> +<span class="sourceLineNo">291</span> if (Bytes.compareTo(lastStopRow, range.stopRow) >= 0) {<a name="line.291"></a> +<span class="sourceLineNo">292</span> if((Bytes.compareTo(lastStopRow, range.stopRow) == 0)) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> if(lastStopRowInclusive == true || range.stopRowInclusive == true) {<a name="line.293"></a> +<span class="sourceLineNo">294</span> lastStopRowInclusive = true;<a name="line.294"></a> +<span class="sourceLineNo">295</span> }<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span> if ((i + 1) == ranges.size()) {<a name="line.297"></a> +<span class="sourceLineNo">298</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.298"></a> +<span class="sourceLineNo">299</span> lastStopRowInclusive));<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span> } else {<a name="line.301"></a> +<span class="sourceLineNo">302</span> lastStopRow = range.stopRow;<a name="line.302"></a> +<span class="sourceLineNo">303</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.303"></a> +<span class="sourceLineNo">304</span> if ((i + 1) < ranges.size()) {<a name="line.304"></a> +<span class="sourceLineNo">305</span> i++;<a name="line.305"></a> +<span class="sourceLineNo">306</span> range = ranges.get(i);<a name="line.306"></a> +<span class="sourceLineNo">307</span> if (!range.isValid()) {<a name="line.307"></a> +<span class="sourceLineNo">308</span> invalidRanges.add(range);<a name="line.308"></a> +<span class="sourceLineNo">309</span> }<a name="line.309"></a> +<span class="sourceLineNo">310</span> } else {<a name="line.310"></a> +<span class="sourceLineNo">311</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.311"></a> +<span class="sourceLineNo">312</span> lastStopRowInclusive));<a name="line.312"></a> +<span class="sourceLineNo">313</span> break;<a name="line.313"></a> +<span class="sourceLineNo">314</span> }<a name="line.314"></a> +<span class="sourceLineNo">315</span> while ((Bytes.compareTo(lastStopRow, range.startRow) > 0) ||<a name="line.315"></a> +<span class="sourceLineNo">316</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 &&<a name="line.316"></a> +<span class="sourceLineNo">317</span> (lastStopRowInclusive == true || range.startRowInclusive==true))) {<a name="line.317"></a> +<span class="sourceLineNo">318</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.318"></a> +<span class="sourceLineNo">319</span> break;<a name="line.319"></a> +<span class="sourceLineNo">320</span> }<a name="line.320"></a> +<span class="sourceLineNo">321</span> // if this first range contain second range, ignore the second range<a name="line.321"></a> +<span class="sourceLineNo">322</span> if (Bytes.compareTo(lastStopRow, range.stopRow) >= 0) {<a name="line.322"></a> +<span class="sourceLineNo">323</span> if(lastStopRowInclusive == true || range.stopRowInclusive == true) {<a name="line.323"></a> +<span class="sourceLineNo">324</span> lastStopRowInclusive = true;<a name="line.324"></a> +<span class="sourceLineNo">325</span> }<a name="line.325"></a> +<span class="sourceLineNo">326</span> i++;<a name="line.326"></a> +<span class="sourceLineNo">327</span> if (i < ranges.size()) {<a name="line.327"></a> +<span class="sourceLineNo">328</span> range = ranges.get(i);<a name="line.328"></a> +<span class="sourceLineNo">329</span> if (!range.isValid()) {<a name="line.329"></a> +<span class="sourceLineNo">330</span> invalidRanges.add(range);<a name="line.330"></a> +<span class="sourceLineNo">331</span> }<a name="line.331"></a> +<span class="sourceLineNo">332</span> } else {<a name="line.332"></a> +<span class="sourceLineNo">333</span> break;<a name="line.333"></a> +<span class="sourceLineNo">334</span> }<a name="line.334"></a> +<span class="sourceLineNo">335</span> } else {<a name="line.335"></a> +<span class="sourceLineNo">336</span> lastStopRow = range.stopRow;<a name="line.336"></a> +<span class="sourceLineNo">337</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.337"></a> +<span class="sourceLineNo">338</span> i++;<a name="line.338"></a> +<span class="sourceLineNo">339</span> if (i < ranges.size()) {<a name="line.339"></a> +<span class="sourceLineNo">340</span> range = ranges.get(i);<a name="line.340"></a> +<span class="sourceLineNo">341</span> if (!range.isValid()) {<a name="line.341"></a> +<span class="sourceLineNo">342</span> invalidRanges.add(range);<a name="line.342"></a> +<span class="sourceLineNo">343</span> }<a name="line.343"></a> +<span class="sourceLineNo">344</span> } else {<a name="line.344"></a> +<span class="sourceLineNo">345</span> break;<a name="line.345"></a> +<span class="sourceLineNo">346</span> }<a name="line.346"></a> +<span class="sourceLineNo">347</span> }<a name="line.347"></a> +<span class="sourceLineNo">348</span> }<a name="line.348"></a> +<span class="sourceLineNo">349</span> if(Bytes.equals(range.stopRow, HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.349"></a> +<span class="sourceLineNo">350</span> if((Bytes.compareTo(lastStopRow, range.startRow) < 0) ||<a name="line.350"></a> +<span class="sourceLineNo">351</span> (Bytes.compareTo(lastStopRow, range.startRow) == 0 &&<a name="line.351"></a> +<span class="sourceLineNo">352</span> lastStopRowInclusive == false && range.startRowInclusive == false)) {<a name="line.352"></a> +<span class="sourceLineNo">353</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.353"></a> +<span class="sourceLineNo">354</span> lastStopRowInclusive));<a name="line.354"></a> +<span class="sourceLineNo">355</span> newRanges.add(range);<a name="line.355"></a> +<span class="sourceLineNo">356</span> } else {<a name="line.356"></a> +<span class="sourceLineNo">357</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, range.stopRow,<a name="line.357"></a> +<span class="sourceLineNo">358</span> range.stopRowInclusive));<a name="line.358"></a> +<span class="sourceLineNo">359</span> break;<a name="line.359"></a> +<span class="sourceLineNo">360</span> }<a name="line.360"></a> +<span class="sourceLineNo">361</span> }<a name="line.361"></a> +<span class="sourceLineNo">362</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.362"></a> +<span class="sourceLineNo">363</span> lastStopRowInclusive));<a name="line.363"></a> +<span class="sourceLineNo">364</span> if ((i + 1) == ranges.size()) {<a name="line.364"></a> +<span class="sourceLineNo">365</span> newRanges.add(range);<a name="line.365"></a> +<span class="sourceLineNo">366</span> }<a name="line.366"></a> +<span class="sourceLineNo">367</span> lastStartRow = range.startRow;<a name="line.367"></a> +<span class="sourceLineNo">368</span> lastStartRowInclusive = range.startRowInclusive;<a name="line.368"></a> +<span class="sourceLineNo">369</span> lastStopRow = range.stopRow;<a name="line.369"></a> +<span class="sourceLineNo">370</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.370"></a> +<span class="sourceLineNo">371</span> }<a name="line.371"></a> +<span class="sourceLineNo">372</span> } else {<a name="line.372"></a> +<span class="sourceLineNo">373</span> newRanges.add(new RowRange(lastStartRow, lastStartRowInclusive, lastStopRow,<a name="line.373"></a> +<span class="sourceLineNo">374</span> lastStopRowInclusive));<a name="line.374"></a> +<span class="sourceLineNo">375</span> if ((i + 1) == ranges.size()) {<a name="line.375"></a> +<span class="sourceLineNo">376</span> newRanges.add(range);<a name="line.376"></a> +<span class="sourceLineNo">377</span> }<a name="line.377"></a> +<span class="sourceLineNo">378</span> lastStartRow = range.startRow;<a name="line.378"></a> +<span class="sourceLineNo">379</span> lastStartRowInclusive = range.startRowInclusive;<a name="line.379"></a> +<span class="sourceLineNo">380</span> lastStopRow = range.stopRow;<a name="line.380"></a> +<span class="sourceLineNo">381</span> lastStopRowInclusive = range.stopRowInclusive;<a name="line.381"></a> +<span class="sourceLineNo">382</span> }<a name="line.382"></a> +<span class="sourceLineNo">383</span> }<a name="line.383"></a> +<span class="sourceLineNo">384</span> // check the remaining ranges<a name="line.384"></a> +<span class="sourceLineNo">385</span> for(int j=i; j < ranges.size(); j++) {<a name="line.385"></a> +<span class="sourceLineNo">386</span> if(!ranges.get(j).isValid()) {<a name="line.386"></a> +<span class="sourceLineNo">387</span> invalidRanges.add(ranges.get(j));<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> // if invalid range exists, throw the exception<a name="line.390"></a> +<span class="sourceLineNo">391</span> if (invalidRanges.size() != 0) {<a name="line.391"></a> +<span class="sourceLineNo">392</span> throwExceptionForInvalidRanges(invalidRanges, true);<a name="line.392"></a> +<span class="sourceLineNo">393</span> }<a name="line.393"></a> +<span class="sourceLineNo">394</span> // If no valid ranges found, throw the exception<a name="line.394"></a> +<span class="sourceLineNo">395</span> if(newRanges.isEmpty()) {<a name="line.395"></a> +<span class="sourceLineNo">396</span> throw new IllegalArgumentException("No valid ranges found.");<a name="line.396"></a> +<span class="sourceLineNo">397</span> }<a name="line.397"></a> +<span class="sourceLineNo">398</span> return newRanges;<a name="line.398"></a> +<span class="sourceLineNo">399</span> }<a name="line.399"></a> +<span class="sourceLineNo">400</span><a name="line.400"></a> +<span class="sourceLineNo">401</span> private static void throwExceptionForInvalidRanges(List<RowRange> invalidRanges,<a name="line.401"></a> +<span class="sourceLineNo">402</span> boolean details) {<a name="line.402"></a> +<span class="sourceLineNo">403</span> StringBuilder sb = new StringBuilder();<a name="line.403"></a> +<span class="sourceLineNo">404</span> sb.append(invalidRanges.size()).append(" invaild ranges.\n");<a name="line.404"></a> +<span class="sourceLineNo">405</span> if (details) {<a name="line.405"></a> +<span class="sourceLineNo">406</span> for (RowRange range : invalidRanges) {<a name="line.406"></a> +<span class="sourceLineNo">407</span> sb.append(<a name="line.407"></a> +<span class="sourceLineNo">408</span> "Invalid range: start row => " + Bytes.toString(range.startRow) + ", stop row => "<a name="line.408"></a> +<span class="sourceLineNo">409</span> + Bytes.toString(range.stopRow)).append('\n');<a name="line.409"></a> +<span class="sourceLineNo">410</span> }<a name="line.410"></a> +<span class="sourceLineNo">411</span> }<a name="line.411"></a> +<span class="sourceLineNo">412</span> throw new IllegalArgumentException(sb.toString());<a name="line.412"></a> +<span class="sourceLineNo">413</span> }<a name="line.413"></a> +<span class="sourceLineNo">414</span><a name="line.414"></a> +<span class="sourceLineNo">415</span> @InterfaceAudience.Public<a name="line.415"></a> +<span class="sourceLineNo">416</span> @InterfaceStability.Evolving<a name="line.416"></a> +<span class="sourceLineNo">417</span> public static class RowRange implements Comparable<RowRange> {<a name="line.417"></a> +<span class="sourceLineNo">418</span> private byte[] startRow;<a name="line.418"></a> +<span class="sourceLineNo">419</span> private boolean startRowInclusive = true;<a name="line.419"></a> +<span class="sourceLineNo">420</span> private byte[] stopRow;<a name="line.420"></a> +<span class="sourceLineNo">421</span> private boolean stopRowInclusive = false;<a name="line.421"></a> <span class="sourceLineNo">422</span><a name="line.422"></a> <span class="sourceLineNo">423</span> public RowRange() {<a name="line.423"></a> <span class="sourceLineNo">424</span> }<a name="line.424"></a> @@ -449,74 +449,73 @@ <span class="sourceLineNo">441</span> this.startRowInclusive = startRowInclusive;<a name="line.441"></a> <span class="sourceLineNo">442</span> this.stopRow = (stopRow == null) ? HConstants.EMPTY_BYTE_ARRAY :stopRow;<a name="line.442"></a> <span class="sourceLineNo">443</span> this.stopRowInclusive = stopRowInclusive;<a name="line.443"></a> -<span class="sourceLineNo">444</span> isScan = Bytes.equals(startRow, stopRow) ? 1 : 0;<a name="line.444"></a> -<span class="sourceLineNo">445</span> }<a name="line.445"></a> -<span class="sourceLineNo">446</span><a name="line.446"></a> -<span class="sourceLineNo">447</span> public byte[] getStartRow() {<a name="line.447"></a> -<span class="sourceLineNo">448</span> return startRow;<a name="line.448"></a> -<span class="sourceLineNo">449</span> }<a name="line.449"></a> -<span class="sourceLineNo">450</span><a name="line.450"></a> -<span class="sourceLineNo">451</span> public byte[] getStopRow() {<a name="line.451"></a> -<span class="sourceLineNo">452</span> return stopRow;<a name="line.452"></a> -<span class="sourceLineNo">453</span> }<a name="line.453"></a> -<span class="sourceLineNo">454</span><a name="line.454"></a> -<span class="sourceLineNo">455</span> /**<a name="line.455"></a> -<span class="sourceLineNo">456</span> * @return if start row is inclusive.<a name="line.456"></a> -<span class="sourceLineNo">457</span> */<a name="line.457"></a> -<span class="sourceLineNo">458</span> public boolean isStartRowInclusive() {<a name="line.458"></a> -<span class="sourceLineNo">459</span> return startRowInclusive;<a name="line.459"></a> -<span class="sourceLineNo">460</span> }<a name="line.460"></a> -<span class="sourceLineNo">461</span><a name="line.461"></a> -<span class="sourceLineNo">462</span> /**<a name="line.462"></a> -<span class="sourceLineNo">463</span> * @return if stop row is inclusive.<a name="line.463"></a> -<span class="sourceLineNo">464</span> */<a name="line.464"></a> -<span class="sourceLineNo">465</span> public boolean isStopRowInclusive() {<a name="line.465"></a> -<span class="sourceLineNo">466</span> return stopRowInclusive;<a name="line.466"></a> -<span class="sourceLineNo">467</span> }<a name="line.467"></a> -<span class="sourceLineNo">468</span><a name="line.468"></a> -<span class="sourceLineNo">469</span> public boolean contains(byte[] row) {<a name="line.469"></a> -<span class="sourceLineNo">470</span> return contains(row, 0, row.length);<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span><a name="line.472"></a> -<span class="sourceLineNo">473</span> public boolean contains(byte[] buffer, int offset, int length) {<a name="line.473"></a> -<span class="sourceLineNo">474</span> if(startRowInclusive) {<a name="line.474"></a> -<span class="sourceLineNo">475</span> if(stopRowInclusive) {<a name="line.475"></a> -<span class="sourceLineNo">476</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) >= 0<a name="line.476"></a> -<span class="sourceLineNo">477</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.477"></a> -<span class="sourceLineNo">478</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) <= isScan);<a name="line.478"></a> -<span class="sourceLineNo">479</span> } else {<a name="line.479"></a> -<span class="sourceLineNo">480</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) >= 0<a name="line.480"></a> -<span class="sourceLineNo">481</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.481"></a> -<span class="sourceLineNo">482</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) < isScan);<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span> } else {<a name="line.484"></a> -<span class="sourceLineNo">485</span> if(stopRowInclusive) {<a name="line.485"></a> -<span class="sourceLineNo">486</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) > 0<a name="line.486"></a> -<span class="sourceLineNo">487</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.487"></a> -<span class="sourceLineNo">488</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) <= isScan);<a name="line.488"></a> -<span class="sourceLineNo">489</span> } else {<a name="line.489"></a> -<span class="sourceLineNo">490</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) > 0<a name="line.490"></a> -<span class="sourceLineNo">491</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.491"></a> -<span class="sourceLineNo">492</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) < isScan);<a name="line.492"></a> -<span class="sourceLineNo">493</span> }<a name="line.493"></a> -<span class="sourceLineNo">494</span> }<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span><a name="line.496"></a> -<span class="sourceLineNo">497</span> @Override<a name="line.497"></a> -<span class="sourceLineNo">498</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.498"></a> -<span class="sourceLineNo">499</span> justification="This compareTo is not of this Object, but of referenced RowRange")<a name="line.499"></a> -<span class="sourceLineNo">500</span> public int compareTo(RowRange other) {<a name="line.500"></a> -<span class="sourceLineNo">501</span> return Bytes.compareTo(this.startRow, other.startRow);<a name="line.501"></a> -<span class="sourceLineNo">502</span> }<a name="line.502"></a> -<span class="sourceLineNo">503</span><a name="line.503"></a> -<span class="sourceLineNo">504</span> public boolean isValid() {<a name="line.504"></a> -<span class="sourceLineNo">505</span> return Bytes.equals(startRow, HConstants.EMPTY_BYTE_ARRAY)<a name="line.505"></a> -<span class="sourceLineNo">506</span> || Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY)<a name="line.506"></a> -<span class="sourceLineNo">507</span> || Bytes.compareTo(startRow, stopRow) < 0<a name="line.507"></a> -<span class="sourceLineNo">508</span> || (Bytes.compareTo(startRow, stopRow) == 0 && stopRowInclusive == true);<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span> }<a name="line.510"></a> -<span class="sourceLineNo">511</span>}<a name="line.511"></a> +<span class="sourceLineNo">444</span> }<a name="line.444"></a> +<span class="sourceLineNo">445</span><a name="line.445"></a> +<span class="sourceLineNo">446</span> public byte[] getStartRow() {<a name="line.446"></a> +<span class="sourceLineNo">447</span> return startRow;<a name="line.447"></a> +<span class="sourceLineNo">448</span> }<a name="line.448"></a> +<span class="sourceLineNo">449</span><a name="line.449"></a> +<span class="sourceLineNo">450</span> public byte[] getStopRow() {<a name="line.450"></a> +<span class="sourceLineNo">451</span> return stopRow;<a name="line.451"></a> +<span class="sourceLineNo">452</span> }<a name="line.452"></a> +<span class="sourceLineNo">453</span><a name="line.453"></a> +<span class="sourceLineNo">454</span> /**<a name="line.454"></a> +<span class="sourceLineNo">455</span> * @return if start row is inclusive.<a name="line.455"></a> +<span class="sourceLineNo">456</span> */<a name="line.456"></a> +<span class="sourceLineNo">457</span> public boolean isStartRowInclusive() {<a name="line.457"></a> +<span class="sourceLineNo">458</span> return startRowInclusive;<a name="line.458"></a> +<span class="sourceLineNo">459</span> }<a name="line.459"></a> +<span class="sourceLineNo">460</span><a name="line.460"></a> +<span class="sourceLineNo">461</span> /**<a name="line.461"></a> +<span class="sourceLineNo">462</span> * @return if stop row is inclusive.<a name="line.462"></a> +<span class="sourceLineNo">463</span> */<a name="line.463"></a> +<span class="sourceLineNo">464</span> public boolean isStopRowInclusive() {<a name="line.464"></a> +<span class="sourceLineNo">465</span> return stopRowInclusive;<a name="line.465"></a> +<span class="sourceLineNo">466</span> }<a name="line.466"></a> +<span class="sourceLineNo">467</span><a name="line.467"></a> +<span class="sourceLineNo">468</span> public boolean contains(byte[] row) {<a name="line.468"></a> +<span class="sourceLineNo">469</span> return contains(row, 0, row.length);<a name="line.469"></a> +<span class="sourceLineNo">470</span> }<a name="line.470"></a> +<span class="sourceLineNo">471</span><a name="line.471"></a> +<span class="sourceLineNo">472</span> public boolean contains(byte[] buffer, int offset, int length) {<a name="line.472"></a> +<span class="sourceLineNo">473</span> if(startRowInclusive) {<a name="line.473"></a> +<span class="sourceLineNo">474</span> if(stopRowInclusive) {<a name="line.474"></a> +<span class="sourceLineNo">475</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) >= 0<a name="line.475"></a> +<span class="sourceLineNo">476</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.476"></a> +<span class="sourceLineNo">477</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) <= 0);<a name="line.477"></a> +<span class="sourceLineNo">478</span> } else {<a name="line.478"></a> +<span class="sourceLineNo">479</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) >= 0<a name="line.479"></a> +<span class="sourceLineNo">480</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.480"></a> +<span class="sourceLineNo">481</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) < 0);<a name="line.481"></a> +<span class="sourceLineNo">482</span> }<a name="line.482"></a> +<span class="sourceLineNo">483</span> } else {<a name="line.483"></a> +<span class="sourceLineNo">484</span> if(stopRowInclusive) {<a name="line.484"></a> +<span class="sourceLineNo">485</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) > 0<a name="line.485"></a> +<span class="sourceLineNo">486</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.486"></a> +<span class="sourceLineNo">487</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) <= 0);<a name="line.487"></a> +<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> +<span class="sourceLineNo">489</span> return Bytes.compareTo(buffer, offset, length, startRow, 0, startRow.length) > 0<a name="line.489"></a> +<span class="sourceLineNo">490</span> && (Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY) ||<a name="line.490"></a> +<span class="sourceLineNo">491</span> Bytes.compareTo(buffer, offset, length, stopRow, 0, stopRow.length) < 0);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.497"></a> +<span class="sourceLineNo">498</span> justification="This compareTo is not of this Object, but of referenced RowRange")<a name="line.498"></a> +<span class="sourceLineNo">499</span> public int compareTo(RowRange other) {<a name="line.499"></a> +<span class="sourceLineNo">500</span> return Bytes.compareTo(this.startRow, other.startRow);<a name="line.500"></a> +<span class="sourceLineNo">501</span> }<a name="line.501"></a> +<span class="sourceLineNo">502</span><a name="line.502"></a> +<span class="sourceLineNo">503</span> public boolean isValid() {<a name="line.503"></a> +<span class="sourceLineNo">504</span> return Bytes.equals(startRow, HConstants.EMPTY_BYTE_ARRAY)<a name="line.504"></a> +<span class="sourceLineNo">505</span> || Bytes.equals(stopRow, HConstants.EMPTY_BYTE_ARRAY)<a name="line.505"></a> +<span class="sourceLineNo">506</span> || Bytes.compareTo(startRow, stopRow) < 0<a name="line.506"></a> +<span class="sourceLineNo">507</span> || (Bytes.compareTo(startRow, stopRow) == 0 && stopRowInclusive == true);<a name="line.507"></a> +<span class="sourceLineNo">508</span> }<a name="line.508"></a> +<span class="sourceLineNo">509</span> }<a name="line.509"></a> +<span class="sourceLineNo">510</span>}<a name="line.510"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html index 4cb4490..31c3043 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.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> public TreeSet<byte []> createTreeSet() {<a name="line.166"></a> -<span class="sourceLineNo">167</span> return new TreeSet<byte []>(new Comparator<Object>() {<a name="line.167"></a> +<span class="sourceLineNo">167</span> return new TreeSet<>(new Comparator<Object>() {<a name="line.167"></a> <span class="sourceLineNo">168</span> @Override<a name="line.168"></a> <span class="sourceLineNo">169</span> public int compare (Object o1, Object o2) {<a name="line.169"></a> <span class="sourceLineNo">170</span> if (o1 == null || o2 == null)<a name="line.170"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html index 834129e..0bf5f12 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html @@ -64,7 +64,7 @@ <span class="sourceLineNo">056</span><a name="line.56"></a> <span class="sourceLineNo">057</span> static {<a name="line.57"></a> <span class="sourceLineNo">058</span> // Registers all the filter supported by the Filter Language<a name="line.58"></a> -<span class="sourceLineNo">059</span> filterHashMap = new HashMap<String, String>();<a name="line.59"></a> +<span class="sourceLineNo">059</span> filterHashMap = new HashMap<>();<a name="line.59"></a> <span class="sourceLineNo">060</span> filterHashMap.put("KeyOnlyFilter", ParseConstants.FILTER_PACKAGE + "." +<a name="line.60"></a> <span class="sourceLineNo">061</span> "KeyOnlyFilter");<a name="line.61"></a> <span class="sourceLineNo">062</span> filterHashMap.put("FirstKeyOnlyFilter", ParseConstants.FILTER_PACKAGE + "." +<a name="line.62"></a> @@ -103,7 +103,7 @@ <span class="sourceLineNo">095</span> "DependentColumnFilter");<a name="line.95"></a> <span class="sourceLineNo">096</span><a name="line.96"></a> <span class="sourceLineNo">097</span> // Creates the operatorPrecedenceHashMap<a name="line.97"></a> -<span class="sourceLineNo">098</span> operatorPrecedenceHashMap = new HashMap<ByteBuffer, Integer>();<a name="line.98"></a> +<span class="sourceLineNo">098</span> operatorPrecedenceHashMap = new HashMap<>();<a name="line.98"></a> <span class="sourceLineNo">099</span> operatorPrecedenceHashMap.put(ParseConstants.SKIP_BUFFER, 1);<a name="line.99"></a> <span class="sourceLineNo">100</span> operatorPrecedenceHashMap.put(ParseConstants.WHILE_BUFFER, 1);<a name="line.100"></a> <span class="sourceLineNo">101</span> operatorPrecedenceHashMap.put(ParseConstants.AND_BUFFER, 2);<a name="line.101"></a> @@ -130,9 +130,9 @@ <span class="sourceLineNo">122</span> public Filter parseFilterString (byte [] filterStringAsByteArray)<a name="line.122"></a> <span class="sourceLineNo">123</span> throws CharacterCodingException {<a name="line.123"></a> <span class="sourceLineNo">124</span> // stack for the operators and parenthesis<a name="line.124"></a> -<span class="sourceLineNo">125</span> Stack <ByteBuffer> operatorStack = new Stack<ByteBuffer>();<a name="line.125"></a> +<span class="sourceLineNo">125</span> Stack <ByteBuffer> operatorStack = new Stack<>();<a name="line.125"></a> <span class="sourceLineNo">126</span> // stack for the filter objects<a name="line.126"></a> -<span class="sourceLineNo">127</span> Stack <Filter> filterStack = new Stack<Filter>();<a name="line.127"></a> +<span class="sourceLineNo">127</span> Stack <Filter> filterStack = new Stack<>();<a name="line.127"></a> <span class="sourceLineNo">128</span><a name="line.128"></a> <span class="sourceLineNo">129</span> Filter filter = null;<a name="line.129"></a> <span class="sourceLineNo">130</span> for (int i=0; i<filterStringAsByteArray.length; i++) {<a name="line.130"></a> @@ -317,7 +317,7 @@ <span class="sourceLineNo">309</span><a name="line.309"></a> <span class="sourceLineNo">310</span> int argumentStartIndex = 0;<a name="line.310"></a> <span class="sourceLineNo">311</span> int argumentEndIndex = 0;<a name="line.311"></a> -<span class="sourceLineNo">312</span> ArrayList<byte []> filterArguments = new ArrayList<byte []>();<a name="line.312"></a> +<span class="sourceLineNo">312</span> ArrayList<byte []> filterArguments = new ArrayList<>();<a name="line.312"></a> <span class="sourceLineNo">313</span><a name="line.313"></a> <span class="sourceLineNo">314</span> for (int i = argumentListStartIndex + 1; i<filterStringAsByteArray.length; i++) {<a name="line.314"></a> <span class="sourceLineNo">315</span><a name="line.315"></a> @@ -401,7 +401,7 @@ <span class="sourceLineNo">393</span> if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) {<a name="line.393"></a> <span class="sourceLineNo">394</span> // The top of the stack is an OR<a name="line.394"></a> <span class="sourceLineNo">395</span> try {<a name="line.395"></a> -<span class="sourceLineNo">396</span> ArrayList<Filter> listOfFilters = new ArrayList<Filter>();<a name="line.396"></a> +<span class="sourceLineNo">396</span> ArrayList<Filter> listOfFilters = new ArrayList<>();<a name="line.396"></a> <span class="sourceLineNo">397</span> while (!operatorStack.empty() && operatorStack.peek().equals(ParseConstants.OR_BUFFER)) {<a name="line.397"></a> <span class="sourceLineNo">398</span> Filter filter = filterStack.pop();<a name="line.398"></a> <span class="sourceLineNo">399</span> listOfFilters.add(0, filter);<a name="line.399"></a> @@ -418,7 +418,7 @@ <span class="sourceLineNo">410</span> } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) {<a name="line.410"></a> <span class="sourceLineNo">411</span> // The top of the stack is an AND<a name="line.411"></a> <span class="sourceLineNo">412</span> try {<a name="line.412"></a> -<span class="sourceLineNo">413</span> ArrayList<Filter> listOfFilters = new ArrayList<Filter>();<a name="line.413"></a> +<span class="sourceLineNo">413</span> ArrayList<Filter> listOfFilters = new ArrayList<>();<a name="line.413"></a> <span class="sourceLineNo">414</span> while (!operatorStack.empty() && operatorStack.peek().equals(ParseConstants.AND_BUFFER)) {<a name="line.414"></a> <span class="sourceLineNo">415</span> Filter filter = filterStack.pop();<a name="line.415"></a> <span class="sourceLineNo">416</span> listOfFilters.add(0, filter);<a name="line.416"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/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 fa99228..1c1be8f 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html @@ -85,7 +85,7 @@ <span class="sourceLineNo">077</span> Preconditions.checkArgument(timestamp >= 0, "must be positive %s", timestamp);<a name="line.77"></a> <span class="sourceLineNo">078</span> }<a name="line.78"></a> <span class="sourceLineNo">079</span> this.canHint = canHint;<a name="line.79"></a> -<span class="sourceLineNo">080</span> this.timestamps = new TreeSet<Long>(timestamps);<a name="line.80"></a> +<span class="sourceLineNo">080</span> this.timestamps = new TreeSet<>(timestamps);<a name="line.80"></a> <span class="sourceLineNo">081</span> init();<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> @@ -93,7 +93,7 @@ <span class="sourceLineNo">085</span> * @return the list of timestamps<a name="line.85"></a> <span class="sourceLineNo">086</span> */<a name="line.86"></a> <span class="sourceLineNo">087</span> public List<Long> getTimestamps() {<a name="line.87"></a> -<span class="sourceLineNo">088</span> List<Long> list = new ArrayList<Long>(timestamps.size());<a name="line.88"></a> +<span class="sourceLineNo">088</span> List<Long> list = new ArrayList<>(timestamps.size());<a name="line.88"></a> <span class="sourceLineNo">089</span> list.addAll(timestamps);<a name="line.89"></a> <span class="sourceLineNo">090</span> return list;<a name="line.90"></a> <span class="sourceLineNo">091</span> }<a name="line.91"></a> @@ -165,7 +165,7 @@ <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> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.159"></a> -<span class="sourceLineNo">160</span> ArrayList<Long> timestamps = new ArrayList<Long>(filterArguments.size());<a name="line.160"></a> +<span class="sourceLineNo">160</span> ArrayList<Long> timestamps = new ArrayList<>(filterArguments.size());<a name="line.160"></a> <span class="sourceLineNo">161</span> for (int i = 0; i<filterArguments.size(); i++) {<a name="line.161"></a> <span class="sourceLineNo">162</span> long timestamp = ParseFilter.convertByteArrayToLong(filterArguments.get(i));<a name="line.162"></a> <span class="sourceLineNo">163</span> timestamps.add(timestamp);<a name="line.163"></a>