http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e60b829c/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html index 9c23193..831ba3f 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.Operator.html @@ -173,135 +173,116 @@ <span class="sourceLineNo">165</span> return filterListBase.transformCell(c);<a name="line.165"></a> <span class="sourceLineNo">166</span> }<a name="line.166"></a> <span class="sourceLineNo">167</span><a name="line.167"></a> -<span class="sourceLineNo">168</span> /**<a name="line.168"></a> -<span class="sourceLineNo">169</span> * Internal implementation of {@link #filterCell(Cell)}. Compared to the<a name="line.169"></a> -<span class="sourceLineNo">170</span> * {@link #filterCell(Cell)} method, this method accepts an additional parameter named<a name="line.170"></a> -<span class="sourceLineNo">171</span> * transformedCell. This parameter indicates the initial value of transformed cell before this<a name="line.171"></a> -<span class="sourceLineNo">172</span> * filter operation. <br/><a name="line.172"></a> -<span class="sourceLineNo">173</span> * For FilterList, we can consider a filter list as a node in a tree. sub-filters of the filter<a name="line.173"></a> -<span class="sourceLineNo">174</span> * list are children of the relative node. The logic of transforming cell of a filter list, well,<a name="line.174"></a> -<span class="sourceLineNo">175</span> * we can consider it as the process of post-order tree traverse. For a node , Before we traverse<a name="line.175"></a> -<span class="sourceLineNo">176</span> * the current child, we should set the traverse result (transformed cell) of previous node(s) as<a name="line.176"></a> -<span class="sourceLineNo">177</span> * the initial value. so the additional currentTransformedCell parameter is needed (HBASE-18879).<a name="line.177"></a> -<span class="sourceLineNo">178</span> * @param c The cell in question.<a name="line.178"></a> -<span class="sourceLineNo">179</span> * @param transformedCell The transformed cell of previous filter(s)<a name="line.179"></a> -<span class="sourceLineNo">180</span> * @return ReturnCode of this filter operation.<a name="line.180"></a> -<span class="sourceLineNo">181</span> * @throws IOException<a name="line.181"></a> +<span class="sourceLineNo">168</span> @Override<a name="line.168"></a> +<span class="sourceLineNo">169</span> @Deprecated<a name="line.169"></a> +<span class="sourceLineNo">170</span> public ReturnCode filterKeyValue(final Cell c) throws IOException {<a name="line.170"></a> +<span class="sourceLineNo">171</span> return filterCell(c);<a name="line.171"></a> +<span class="sourceLineNo">172</span> }<a name="line.172"></a> +<span class="sourceLineNo">173</span><a name="line.173"></a> +<span class="sourceLineNo">174</span> @Override<a name="line.174"></a> +<span class="sourceLineNo">175</span> public ReturnCode filterCell(final Cell c) throws IOException {<a name="line.175"></a> +<span class="sourceLineNo">176</span> return filterListBase.filterCell(c);<a name="line.176"></a> +<span class="sourceLineNo">177</span> }<a name="line.177"></a> +<span class="sourceLineNo">178</span><a name="line.178"></a> +<span class="sourceLineNo">179</span> /**<a name="line.179"></a> +<span class="sourceLineNo">180</span> * Filters that never filter by modifying the returned List of Cells can inherit this<a name="line.180"></a> +<span class="sourceLineNo">181</span> * implementation that does nothing. {@inheritDoc}<a name="line.181"></a> <span class="sourceLineNo">182</span> */<a name="line.182"></a> -<span class="sourceLineNo">183</span> ReturnCode internalFilterCell(Cell c, Cell transformedCell) throws IOException {<a name="line.183"></a> -<span class="sourceLineNo">184</span> return this.filterListBase.internalFilterCell(c, transformedCell);<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> @Override<a name="line.187"></a> -<span class="sourceLineNo">188</span> @Deprecated<a name="line.188"></a> -<span class="sourceLineNo">189</span> public ReturnCode filterKeyValue(final Cell c) throws IOException {<a name="line.189"></a> -<span class="sourceLineNo">190</span> return filterCell(c);<a name="line.190"></a> +<span class="sourceLineNo">183</span> @Override<a name="line.183"></a> +<span class="sourceLineNo">184</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.184"></a> +<span class="sourceLineNo">185</span> filterListBase.filterRowCells(cells);<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> @Override<a name="line.188"></a> +<span class="sourceLineNo">189</span> public boolean hasFilterRow() {<a name="line.189"></a> +<span class="sourceLineNo">190</span> return filterListBase.hasFilterRow();<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> @Override<a name="line.193"></a> -<span class="sourceLineNo">194</span> public ReturnCode filterCell(final Cell c) throws IOException {<a name="line.194"></a> -<span class="sourceLineNo">195</span> return filterListBase.filterCell(c);<a name="line.195"></a> +<span class="sourceLineNo">194</span> public boolean filterRow() throws IOException {<a name="line.194"></a> +<span class="sourceLineNo">195</span> return filterListBase.filterRow();<a name="line.195"></a> <span class="sourceLineNo">196</span> }<a name="line.196"></a> <span class="sourceLineNo">197</span><a name="line.197"></a> <span class="sourceLineNo">198</span> /**<a name="line.198"></a> -<span class="sourceLineNo">199</span> * Filters that never filter by modifying the returned List of Cells can inherit this<a name="line.199"></a> -<span class="sourceLineNo">200</span> * implementation that does nothing. {@inheritDoc}<a name="line.200"></a> -<span class="sourceLineNo">201</span> */<a name="line.201"></a> -<span class="sourceLineNo">202</span> @Override<a name="line.202"></a> -<span class="sourceLineNo">203</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.203"></a> -<span class="sourceLineNo">204</span> filterListBase.filterRowCells(cells);<a name="line.204"></a> -<span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span> @Override<a name="line.207"></a> -<span class="sourceLineNo">208</span> public boolean hasFilterRow() {<a name="line.208"></a> -<span class="sourceLineNo">209</span> return filterListBase.hasFilterRow();<a name="line.209"></a> -<span class="sourceLineNo">210</span> }<a name="line.210"></a> -<span class="sourceLineNo">211</span><a name="line.211"></a> -<span class="sourceLineNo">212</span> @Override<a name="line.212"></a> -<span class="sourceLineNo">213</span> public boolean filterRow() throws IOException {<a name="line.213"></a> -<span class="sourceLineNo">214</span> return filterListBase.filterRow();<a name="line.214"></a> -<span class="sourceLineNo">215</span> }<a name="line.215"></a> -<span class="sourceLineNo">216</span><a name="line.216"></a> -<span class="sourceLineNo">217</span> /**<a name="line.217"></a> -<span class="sourceLineNo">218</span> * @return The filter serialized using pb<a name="line.218"></a> -<span class="sourceLineNo">219</span> */<a name="line.219"></a> -<span class="sourceLineNo">220</span> public byte[] toByteArray() throws IOException {<a name="line.220"></a> -<span class="sourceLineNo">221</span> FilterProtos.FilterList.Builder builder = FilterProtos.FilterList.newBuilder();<a name="line.221"></a> -<span class="sourceLineNo">222</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.222"></a> -<span class="sourceLineNo">223</span> ArrayList<Filter> filters = filterListBase.getFilters();<a name="line.223"></a> -<span class="sourceLineNo">224</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.224"></a> -<span class="sourceLineNo">225</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.225"></a> -<span class="sourceLineNo">226</span> }<a name="line.226"></a> -<span class="sourceLineNo">227</span> return builder.build().toByteArray();<a name="line.227"></a> -<span class="sourceLineNo">228</span> }<a name="line.228"></a> -<span class="sourceLineNo">229</span><a name="line.229"></a> -<span class="sourceLineNo">230</span> /**<a name="line.230"></a> -<span class="sourceLineNo">231</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.231"></a> -<span class="sourceLineNo">232</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.232"></a> -<span class="sourceLineNo">233</span> * @throws DeserializationException<a name="line.233"></a> -<span class="sourceLineNo">234</span> * @see #toByteArray<a name="line.234"></a> -<span class="sourceLineNo">235</span> */<a name="line.235"></a> -<span class="sourceLineNo">236</span> public static FilterList parseFrom(final byte[] pbBytes) throws DeserializationException {<a name="line.236"></a> -<span class="sourceLineNo">237</span> FilterProtos.FilterList proto;<a name="line.237"></a> -<span class="sourceLineNo">238</span> try {<a name="line.238"></a> -<span class="sourceLineNo">239</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.239"></a> -<span class="sourceLineNo">240</span> } catch (InvalidProtocolBufferException e) {<a name="line.240"></a> -<span class="sourceLineNo">241</span> throw new DeserializationException(e);<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> List<Filter> rowFilters = new ArrayList<>(proto.getFiltersCount());<a name="line.244"></a> -<span class="sourceLineNo">245</span> try {<a name="line.245"></a> -<span class="sourceLineNo">246</span> List<FilterProtos.Filter> filtersList = proto.getFiltersList();<a name="line.246"></a> -<span class="sourceLineNo">247</span> for (int i = 0, n = filtersList.size(); i < n; i++) {<a name="line.247"></a> -<span class="sourceLineNo">248</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.248"></a> -<span class="sourceLineNo">249</span> }<a name="line.249"></a> -<span class="sourceLineNo">250</span> } catch (IOException ioe) {<a name="line.250"></a> -<span class="sourceLineNo">251</span> throw new DeserializationException(ioe);<a name="line.251"></a> -<span class="sourceLineNo">252</span> }<a name="line.252"></a> -<span class="sourceLineNo">253</span> return new FilterList(Operator.valueOf(proto.getOperator().name()), rowFilters);<a name="line.253"></a> +<span class="sourceLineNo">199</span> * @return The filter serialized using pb<a name="line.199"></a> +<span class="sourceLineNo">200</span> */<a name="line.200"></a> +<span class="sourceLineNo">201</span> public byte[] toByteArray() throws IOException {<a name="line.201"></a> +<span class="sourceLineNo">202</span> FilterProtos.FilterList.Builder builder = FilterProtos.FilterList.newBuilder();<a name="line.202"></a> +<span class="sourceLineNo">203</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.203"></a> +<span class="sourceLineNo">204</span> ArrayList<Filter> filters = filterListBase.getFilters();<a name="line.204"></a> +<span class="sourceLineNo">205</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.205"></a> +<span class="sourceLineNo">206</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.206"></a> +<span class="sourceLineNo">207</span> }<a name="line.207"></a> +<span class="sourceLineNo">208</span> return builder.build().toByteArray();<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> /**<a name="line.211"></a> +<span class="sourceLineNo">212</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.212"></a> +<span class="sourceLineNo">213</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.213"></a> +<span class="sourceLineNo">214</span> * @throws DeserializationException<a name="line.214"></a> +<span class="sourceLineNo">215</span> * @see #toByteArray<a name="line.215"></a> +<span class="sourceLineNo">216</span> */<a name="line.216"></a> +<span class="sourceLineNo">217</span> public static FilterList parseFrom(final byte[] pbBytes) throws DeserializationException {<a name="line.217"></a> +<span class="sourceLineNo">218</span> FilterProtos.FilterList proto;<a name="line.218"></a> +<span class="sourceLineNo">219</span> try {<a name="line.219"></a> +<span class="sourceLineNo">220</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.220"></a> +<span class="sourceLineNo">221</span> } catch (InvalidProtocolBufferException e) {<a name="line.221"></a> +<span class="sourceLineNo">222</span> throw new DeserializationException(e);<a name="line.222"></a> +<span class="sourceLineNo">223</span> }<a name="line.223"></a> +<span class="sourceLineNo">224</span><a name="line.224"></a> +<span class="sourceLineNo">225</span> List<Filter> rowFilters = new ArrayList<>(proto.getFiltersCount());<a name="line.225"></a> +<span class="sourceLineNo">226</span> try {<a name="line.226"></a> +<span class="sourceLineNo">227</span> List<FilterProtos.Filter> filtersList = proto.getFiltersList();<a name="line.227"></a> +<span class="sourceLineNo">228</span> for (int i = 0, n = filtersList.size(); i < n; i++) {<a name="line.228"></a> +<span class="sourceLineNo">229</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.229"></a> +<span class="sourceLineNo">230</span> }<a name="line.230"></a> +<span class="sourceLineNo">231</span> } catch (IOException ioe) {<a name="line.231"></a> +<span class="sourceLineNo">232</span> throw new DeserializationException(ioe);<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span> return new FilterList(Operator.valueOf(proto.getOperator().name()), rowFilters);<a name="line.234"></a> +<span class="sourceLineNo">235</span> }<a name="line.235"></a> +<span class="sourceLineNo">236</span><a name="line.236"></a> +<span class="sourceLineNo">237</span> /**<a name="line.237"></a> +<span class="sourceLineNo">238</span> * @param other<a name="line.238"></a> +<span class="sourceLineNo">239</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.239"></a> +<span class="sourceLineNo">240</span> * corresponding fields in other. Used for testing.<a name="line.240"></a> +<span class="sourceLineNo">241</span> */<a name="line.241"></a> +<span class="sourceLineNo">242</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> if (other == this) return true;<a name="line.243"></a> +<span class="sourceLineNo">244</span> if (!(other instanceof FilterList)) return false;<a name="line.244"></a> +<span class="sourceLineNo">245</span><a name="line.245"></a> +<span class="sourceLineNo">246</span> FilterList o = (FilterList) other;<a name="line.246"></a> +<span class="sourceLineNo">247</span> return this.getOperator().equals(o.getOperator())<a name="line.247"></a> +<span class="sourceLineNo">248</span> && ((this.getFilters() == o.getFilters()) || this.getFilters().equals(o.getFilters()));<a name="line.248"></a> +<span class="sourceLineNo">249</span> }<a name="line.249"></a> +<span class="sourceLineNo">250</span><a name="line.250"></a> +<span class="sourceLineNo">251</span> @Override<a name="line.251"></a> +<span class="sourceLineNo">252</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.252"></a> +<span class="sourceLineNo">253</span> return this.filterListBase.getNextCellHint(currentCell);<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> /**<a name="line.256"></a> -<span class="sourceLineNo">257</span> * @param other<a name="line.257"></a> -<span class="sourceLineNo">258</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.258"></a> -<span class="sourceLineNo">259</span> * corresponding fields in other. Used for testing.<a name="line.259"></a> -<span class="sourceLineNo">260</span> */<a name="line.260"></a> -<span class="sourceLineNo">261</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.261"></a> -<span class="sourceLineNo">262</span> if (other == this) return true;<a name="line.262"></a> -<span class="sourceLineNo">263</span> if (!(other instanceof FilterList)) return false;<a name="line.263"></a> -<span class="sourceLineNo">264</span><a name="line.264"></a> -<span class="sourceLineNo">265</span> FilterList o = (FilterList) other;<a name="line.265"></a> -<span class="sourceLineNo">266</span> return this.getOperator().equals(o.getOperator())<a name="line.266"></a> -<span class="sourceLineNo">267</span> && ((this.getFilters() == o.getFilters()) || this.getFilters().equals(o.getFilters()));<a name="line.267"></a> -<span class="sourceLineNo">268</span> }<a name="line.268"></a> -<span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> @Override<a name="line.270"></a> -<span class="sourceLineNo">271</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.271"></a> -<span class="sourceLineNo">272</span> return this.filterListBase.getNextCellHint(currentCell);<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> @Override<a name="line.275"></a> -<span class="sourceLineNo">276</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.276"></a> -<span class="sourceLineNo">277</span> return this.filterListBase.isFamilyEssential(name);<a name="line.277"></a> -<span class="sourceLineNo">278</span> }<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 void setReversed(boolean reversed) {<a name="line.281"></a> -<span class="sourceLineNo">282</span> this.reversed = reversed;<a name="line.282"></a> -<span class="sourceLineNo">283</span> this.filterListBase.setReversed(reversed);<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> @Override<a name="line.286"></a> -<span class="sourceLineNo">287</span> public boolean isReversed() {<a name="line.287"></a> -<span class="sourceLineNo">288</span> assert this.reversed == this.filterListBase.isReversed();<a name="line.288"></a> -<span class="sourceLineNo">289</span> return this.reversed;<a name="line.289"></a> -<span class="sourceLineNo">290</span> }<a name="line.290"></a> -<span class="sourceLineNo">291</span><a name="line.291"></a> -<span class="sourceLineNo">292</span> @Override<a name="line.292"></a> -<span class="sourceLineNo">293</span> public String toString() {<a name="line.293"></a> -<span class="sourceLineNo">294</span> return this.filterListBase.toString();<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">256</span> @Override<a name="line.256"></a> +<span class="sourceLineNo">257</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.257"></a> +<span class="sourceLineNo">258</span> return this.filterListBase.isFamilyEssential(name);<a name="line.258"></a> +<span class="sourceLineNo">259</span> }<a name="line.259"></a> +<span class="sourceLineNo">260</span><a name="line.260"></a> +<span class="sourceLineNo">261</span> @Override<a name="line.261"></a> +<span class="sourceLineNo">262</span> public void setReversed(boolean reversed) {<a name="line.262"></a> +<span class="sourceLineNo">263</span> this.reversed = reversed;<a name="line.263"></a> +<span class="sourceLineNo">264</span> this.filterListBase.setReversed(reversed);<a name="line.264"></a> +<span class="sourceLineNo">265</span> }<a name="line.265"></a> +<span class="sourceLineNo">266</span><a name="line.266"></a> +<span class="sourceLineNo">267</span> @Override<a name="line.267"></a> +<span class="sourceLineNo">268</span> public boolean isReversed() {<a name="line.268"></a> +<span class="sourceLineNo">269</span> assert this.reversed == this.filterListBase.isReversed();<a name="line.269"></a> +<span class="sourceLineNo">270</span> return this.reversed;<a name="line.270"></a> +<span class="sourceLineNo">271</span> }<a name="line.271"></a> +<span class="sourceLineNo">272</span><a name="line.272"></a> +<span class="sourceLineNo">273</span> @Override<a name="line.273"></a> +<span class="sourceLineNo">274</span> public String toString() {<a name="line.274"></a> +<span class="sourceLineNo">275</span> return this.filterListBase.toString();<a name="line.275"></a> +<span class="sourceLineNo">276</span> }<a name="line.276"></a> +<span class="sourceLineNo">277</span>}<a name="line.277"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e60b829c/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html index 9c23193..831ba3f 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/FilterList.html @@ -173,135 +173,116 @@ <span class="sourceLineNo">165</span> return filterListBase.transformCell(c);<a name="line.165"></a> <span class="sourceLineNo">166</span> }<a name="line.166"></a> <span class="sourceLineNo">167</span><a name="line.167"></a> -<span class="sourceLineNo">168</span> /**<a name="line.168"></a> -<span class="sourceLineNo">169</span> * Internal implementation of {@link #filterCell(Cell)}. Compared to the<a name="line.169"></a> -<span class="sourceLineNo">170</span> * {@link #filterCell(Cell)} method, this method accepts an additional parameter named<a name="line.170"></a> -<span class="sourceLineNo">171</span> * transformedCell. This parameter indicates the initial value of transformed cell before this<a name="line.171"></a> -<span class="sourceLineNo">172</span> * filter operation. <br/><a name="line.172"></a> -<span class="sourceLineNo">173</span> * For FilterList, we can consider a filter list as a node in a tree. sub-filters of the filter<a name="line.173"></a> -<span class="sourceLineNo">174</span> * list are children of the relative node. The logic of transforming cell of a filter list, well,<a name="line.174"></a> -<span class="sourceLineNo">175</span> * we can consider it as the process of post-order tree traverse. For a node , Before we traverse<a name="line.175"></a> -<span class="sourceLineNo">176</span> * the current child, we should set the traverse result (transformed cell) of previous node(s) as<a name="line.176"></a> -<span class="sourceLineNo">177</span> * the initial value. so the additional currentTransformedCell parameter is needed (HBASE-18879).<a name="line.177"></a> -<span class="sourceLineNo">178</span> * @param c The cell in question.<a name="line.178"></a> -<span class="sourceLineNo">179</span> * @param transformedCell The transformed cell of previous filter(s)<a name="line.179"></a> -<span class="sourceLineNo">180</span> * @return ReturnCode of this filter operation.<a name="line.180"></a> -<span class="sourceLineNo">181</span> * @throws IOException<a name="line.181"></a> +<span class="sourceLineNo">168</span> @Override<a name="line.168"></a> +<span class="sourceLineNo">169</span> @Deprecated<a name="line.169"></a> +<span class="sourceLineNo">170</span> public ReturnCode filterKeyValue(final Cell c) throws IOException {<a name="line.170"></a> +<span class="sourceLineNo">171</span> return filterCell(c);<a name="line.171"></a> +<span class="sourceLineNo">172</span> }<a name="line.172"></a> +<span class="sourceLineNo">173</span><a name="line.173"></a> +<span class="sourceLineNo">174</span> @Override<a name="line.174"></a> +<span class="sourceLineNo">175</span> public ReturnCode filterCell(final Cell c) throws IOException {<a name="line.175"></a> +<span class="sourceLineNo">176</span> return filterListBase.filterCell(c);<a name="line.176"></a> +<span class="sourceLineNo">177</span> }<a name="line.177"></a> +<span class="sourceLineNo">178</span><a name="line.178"></a> +<span class="sourceLineNo">179</span> /**<a name="line.179"></a> +<span class="sourceLineNo">180</span> * Filters that never filter by modifying the returned List of Cells can inherit this<a name="line.180"></a> +<span class="sourceLineNo">181</span> * implementation that does nothing. {@inheritDoc}<a name="line.181"></a> <span class="sourceLineNo">182</span> */<a name="line.182"></a> -<span class="sourceLineNo">183</span> ReturnCode internalFilterCell(Cell c, Cell transformedCell) throws IOException {<a name="line.183"></a> -<span class="sourceLineNo">184</span> return this.filterListBase.internalFilterCell(c, transformedCell);<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> @Override<a name="line.187"></a> -<span class="sourceLineNo">188</span> @Deprecated<a name="line.188"></a> -<span class="sourceLineNo">189</span> public ReturnCode filterKeyValue(final Cell c) throws IOException {<a name="line.189"></a> -<span class="sourceLineNo">190</span> return filterCell(c);<a name="line.190"></a> +<span class="sourceLineNo">183</span> @Override<a name="line.183"></a> +<span class="sourceLineNo">184</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.184"></a> +<span class="sourceLineNo">185</span> filterListBase.filterRowCells(cells);<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> @Override<a name="line.188"></a> +<span class="sourceLineNo">189</span> public boolean hasFilterRow() {<a name="line.189"></a> +<span class="sourceLineNo">190</span> return filterListBase.hasFilterRow();<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> @Override<a name="line.193"></a> -<span class="sourceLineNo">194</span> public ReturnCode filterCell(final Cell c) throws IOException {<a name="line.194"></a> -<span class="sourceLineNo">195</span> return filterListBase.filterCell(c);<a name="line.195"></a> +<span class="sourceLineNo">194</span> public boolean filterRow() throws IOException {<a name="line.194"></a> +<span class="sourceLineNo">195</span> return filterListBase.filterRow();<a name="line.195"></a> <span class="sourceLineNo">196</span> }<a name="line.196"></a> <span class="sourceLineNo">197</span><a name="line.197"></a> <span class="sourceLineNo">198</span> /**<a name="line.198"></a> -<span class="sourceLineNo">199</span> * Filters that never filter by modifying the returned List of Cells can inherit this<a name="line.199"></a> -<span class="sourceLineNo">200</span> * implementation that does nothing. {@inheritDoc}<a name="line.200"></a> -<span class="sourceLineNo">201</span> */<a name="line.201"></a> -<span class="sourceLineNo">202</span> @Override<a name="line.202"></a> -<span class="sourceLineNo">203</span> public void filterRowCells(List<Cell> cells) throws IOException {<a name="line.203"></a> -<span class="sourceLineNo">204</span> filterListBase.filterRowCells(cells);<a name="line.204"></a> -<span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span> @Override<a name="line.207"></a> -<span class="sourceLineNo">208</span> public boolean hasFilterRow() {<a name="line.208"></a> -<span class="sourceLineNo">209</span> return filterListBase.hasFilterRow();<a name="line.209"></a> -<span class="sourceLineNo">210</span> }<a name="line.210"></a> -<span class="sourceLineNo">211</span><a name="line.211"></a> -<span class="sourceLineNo">212</span> @Override<a name="line.212"></a> -<span class="sourceLineNo">213</span> public boolean filterRow() throws IOException {<a name="line.213"></a> -<span class="sourceLineNo">214</span> return filterListBase.filterRow();<a name="line.214"></a> -<span class="sourceLineNo">215</span> }<a name="line.215"></a> -<span class="sourceLineNo">216</span><a name="line.216"></a> -<span class="sourceLineNo">217</span> /**<a name="line.217"></a> -<span class="sourceLineNo">218</span> * @return The filter serialized using pb<a name="line.218"></a> -<span class="sourceLineNo">219</span> */<a name="line.219"></a> -<span class="sourceLineNo">220</span> public byte[] toByteArray() throws IOException {<a name="line.220"></a> -<span class="sourceLineNo">221</span> FilterProtos.FilterList.Builder builder = FilterProtos.FilterList.newBuilder();<a name="line.221"></a> -<span class="sourceLineNo">222</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.222"></a> -<span class="sourceLineNo">223</span> ArrayList<Filter> filters = filterListBase.getFilters();<a name="line.223"></a> -<span class="sourceLineNo">224</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.224"></a> -<span class="sourceLineNo">225</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.225"></a> -<span class="sourceLineNo">226</span> }<a name="line.226"></a> -<span class="sourceLineNo">227</span> return builder.build().toByteArray();<a name="line.227"></a> -<span class="sourceLineNo">228</span> }<a name="line.228"></a> -<span class="sourceLineNo">229</span><a name="line.229"></a> -<span class="sourceLineNo">230</span> /**<a name="line.230"></a> -<span class="sourceLineNo">231</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.231"></a> -<span class="sourceLineNo">232</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.232"></a> -<span class="sourceLineNo">233</span> * @throws DeserializationException<a name="line.233"></a> -<span class="sourceLineNo">234</span> * @see #toByteArray<a name="line.234"></a> -<span class="sourceLineNo">235</span> */<a name="line.235"></a> -<span class="sourceLineNo">236</span> public static FilterList parseFrom(final byte[] pbBytes) throws DeserializationException {<a name="line.236"></a> -<span class="sourceLineNo">237</span> FilterProtos.FilterList proto;<a name="line.237"></a> -<span class="sourceLineNo">238</span> try {<a name="line.238"></a> -<span class="sourceLineNo">239</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.239"></a> -<span class="sourceLineNo">240</span> } catch (InvalidProtocolBufferException e) {<a name="line.240"></a> -<span class="sourceLineNo">241</span> throw new DeserializationException(e);<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> List<Filter> rowFilters = new ArrayList<>(proto.getFiltersCount());<a name="line.244"></a> -<span class="sourceLineNo">245</span> try {<a name="line.245"></a> -<span class="sourceLineNo">246</span> List<FilterProtos.Filter> filtersList = proto.getFiltersList();<a name="line.246"></a> -<span class="sourceLineNo">247</span> for (int i = 0, n = filtersList.size(); i < n; i++) {<a name="line.247"></a> -<span class="sourceLineNo">248</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.248"></a> -<span class="sourceLineNo">249</span> }<a name="line.249"></a> -<span class="sourceLineNo">250</span> } catch (IOException ioe) {<a name="line.250"></a> -<span class="sourceLineNo">251</span> throw new DeserializationException(ioe);<a name="line.251"></a> -<span class="sourceLineNo">252</span> }<a name="line.252"></a> -<span class="sourceLineNo">253</span> return new FilterList(Operator.valueOf(proto.getOperator().name()), rowFilters);<a name="line.253"></a> +<span class="sourceLineNo">199</span> * @return The filter serialized using pb<a name="line.199"></a> +<span class="sourceLineNo">200</span> */<a name="line.200"></a> +<span class="sourceLineNo">201</span> public byte[] toByteArray() throws IOException {<a name="line.201"></a> +<span class="sourceLineNo">202</span> FilterProtos.FilterList.Builder builder = FilterProtos.FilterList.newBuilder();<a name="line.202"></a> +<span class="sourceLineNo">203</span> builder.setOperator(FilterProtos.FilterList.Operator.valueOf(operator.name()));<a name="line.203"></a> +<span class="sourceLineNo">204</span> ArrayList<Filter> filters = filterListBase.getFilters();<a name="line.204"></a> +<span class="sourceLineNo">205</span> for (int i = 0, n = filters.size(); i < n; i++) {<a name="line.205"></a> +<span class="sourceLineNo">206</span> builder.addFilters(ProtobufUtil.toFilter(filters.get(i)));<a name="line.206"></a> +<span class="sourceLineNo">207</span> }<a name="line.207"></a> +<span class="sourceLineNo">208</span> return builder.build().toByteArray();<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> /**<a name="line.211"></a> +<span class="sourceLineNo">212</span> * @param pbBytes A pb serialized {@link FilterList} instance<a name="line.212"></a> +<span class="sourceLineNo">213</span> * @return An instance of {@link FilterList} made from <code>bytes</code><a name="line.213"></a> +<span class="sourceLineNo">214</span> * @throws DeserializationException<a name="line.214"></a> +<span class="sourceLineNo">215</span> * @see #toByteArray<a name="line.215"></a> +<span class="sourceLineNo">216</span> */<a name="line.216"></a> +<span class="sourceLineNo">217</span> public static FilterList parseFrom(final byte[] pbBytes) throws DeserializationException {<a name="line.217"></a> +<span class="sourceLineNo">218</span> FilterProtos.FilterList proto;<a name="line.218"></a> +<span class="sourceLineNo">219</span> try {<a name="line.219"></a> +<span class="sourceLineNo">220</span> proto = FilterProtos.FilterList.parseFrom(pbBytes);<a name="line.220"></a> +<span class="sourceLineNo">221</span> } catch (InvalidProtocolBufferException e) {<a name="line.221"></a> +<span class="sourceLineNo">222</span> throw new DeserializationException(e);<a name="line.222"></a> +<span class="sourceLineNo">223</span> }<a name="line.223"></a> +<span class="sourceLineNo">224</span><a name="line.224"></a> +<span class="sourceLineNo">225</span> List<Filter> rowFilters = new ArrayList<>(proto.getFiltersCount());<a name="line.225"></a> +<span class="sourceLineNo">226</span> try {<a name="line.226"></a> +<span class="sourceLineNo">227</span> List<FilterProtos.Filter> filtersList = proto.getFiltersList();<a name="line.227"></a> +<span class="sourceLineNo">228</span> for (int i = 0, n = filtersList.size(); i < n; i++) {<a name="line.228"></a> +<span class="sourceLineNo">229</span> rowFilters.add(ProtobufUtil.toFilter(filtersList.get(i)));<a name="line.229"></a> +<span class="sourceLineNo">230</span> }<a name="line.230"></a> +<span class="sourceLineNo">231</span> } catch (IOException ioe) {<a name="line.231"></a> +<span class="sourceLineNo">232</span> throw new DeserializationException(ioe);<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span> return new FilterList(Operator.valueOf(proto.getOperator().name()), rowFilters);<a name="line.234"></a> +<span class="sourceLineNo">235</span> }<a name="line.235"></a> +<span class="sourceLineNo">236</span><a name="line.236"></a> +<span class="sourceLineNo">237</span> /**<a name="line.237"></a> +<span class="sourceLineNo">238</span> * @param other<a name="line.238"></a> +<span class="sourceLineNo">239</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.239"></a> +<span class="sourceLineNo">240</span> * corresponding fields in other. Used for testing.<a name="line.240"></a> +<span class="sourceLineNo">241</span> */<a name="line.241"></a> +<span class="sourceLineNo">242</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> if (other == this) return true;<a name="line.243"></a> +<span class="sourceLineNo">244</span> if (!(other instanceof FilterList)) return false;<a name="line.244"></a> +<span class="sourceLineNo">245</span><a name="line.245"></a> +<span class="sourceLineNo">246</span> FilterList o = (FilterList) other;<a name="line.246"></a> +<span class="sourceLineNo">247</span> return this.getOperator().equals(o.getOperator())<a name="line.247"></a> +<span class="sourceLineNo">248</span> && ((this.getFilters() == o.getFilters()) || this.getFilters().equals(o.getFilters()));<a name="line.248"></a> +<span class="sourceLineNo">249</span> }<a name="line.249"></a> +<span class="sourceLineNo">250</span><a name="line.250"></a> +<span class="sourceLineNo">251</span> @Override<a name="line.251"></a> +<span class="sourceLineNo">252</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.252"></a> +<span class="sourceLineNo">253</span> return this.filterListBase.getNextCellHint(currentCell);<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> /**<a name="line.256"></a> -<span class="sourceLineNo">257</span> * @param other<a name="line.257"></a> -<span class="sourceLineNo">258</span> * @return true if and only if the fields of the filter that are serialized are equal to the<a name="line.258"></a> -<span class="sourceLineNo">259</span> * corresponding fields in other. Used for testing.<a name="line.259"></a> -<span class="sourceLineNo">260</span> */<a name="line.260"></a> -<span class="sourceLineNo">261</span> boolean areSerializedFieldsEqual(Filter other) {<a name="line.261"></a> -<span class="sourceLineNo">262</span> if (other == this) return true;<a name="line.262"></a> -<span class="sourceLineNo">263</span> if (!(other instanceof FilterList)) return false;<a name="line.263"></a> -<span class="sourceLineNo">264</span><a name="line.264"></a> -<span class="sourceLineNo">265</span> FilterList o = (FilterList) other;<a name="line.265"></a> -<span class="sourceLineNo">266</span> return this.getOperator().equals(o.getOperator())<a name="line.266"></a> -<span class="sourceLineNo">267</span> && ((this.getFilters() == o.getFilters()) || this.getFilters().equals(o.getFilters()));<a name="line.267"></a> -<span class="sourceLineNo">268</span> }<a name="line.268"></a> -<span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> @Override<a name="line.270"></a> -<span class="sourceLineNo">271</span> public Cell getNextCellHint(Cell currentCell) throws IOException {<a name="line.271"></a> -<span class="sourceLineNo">272</span> return this.filterListBase.getNextCellHint(currentCell);<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> @Override<a name="line.275"></a> -<span class="sourceLineNo">276</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.276"></a> -<span class="sourceLineNo">277</span> return this.filterListBase.isFamilyEssential(name);<a name="line.277"></a> -<span class="sourceLineNo">278</span> }<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 void setReversed(boolean reversed) {<a name="line.281"></a> -<span class="sourceLineNo">282</span> this.reversed = reversed;<a name="line.282"></a> -<span class="sourceLineNo">283</span> this.filterListBase.setReversed(reversed);<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> @Override<a name="line.286"></a> -<span class="sourceLineNo">287</span> public boolean isReversed() {<a name="line.287"></a> -<span class="sourceLineNo">288</span> assert this.reversed == this.filterListBase.isReversed();<a name="line.288"></a> -<span class="sourceLineNo">289</span> return this.reversed;<a name="line.289"></a> -<span class="sourceLineNo">290</span> }<a name="line.290"></a> -<span class="sourceLineNo">291</span><a name="line.291"></a> -<span class="sourceLineNo">292</span> @Override<a name="line.292"></a> -<span class="sourceLineNo">293</span> public String toString() {<a name="line.293"></a> -<span class="sourceLineNo">294</span> return this.filterListBase.toString();<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">256</span> @Override<a name="line.256"></a> +<span class="sourceLineNo">257</span> public boolean isFamilyEssential(byte[] name) throws IOException {<a name="line.257"></a> +<span class="sourceLineNo">258</span> return this.filterListBase.isFamilyEssential(name);<a name="line.258"></a> +<span class="sourceLineNo">259</span> }<a name="line.259"></a> +<span class="sourceLineNo">260</span><a name="line.260"></a> +<span class="sourceLineNo">261</span> @Override<a name="line.261"></a> +<span class="sourceLineNo">262</span> public void setReversed(boolean reversed) {<a name="line.262"></a> +<span class="sourceLineNo">263</span> this.reversed = reversed;<a name="line.263"></a> +<span class="sourceLineNo">264</span> this.filterListBase.setReversed(reversed);<a name="line.264"></a> +<span class="sourceLineNo">265</span> }<a name="line.265"></a> +<span class="sourceLineNo">266</span><a name="line.266"></a> +<span class="sourceLineNo">267</span> @Override<a name="line.267"></a> +<span class="sourceLineNo">268</span> public boolean isReversed() {<a name="line.268"></a> +<span class="sourceLineNo">269</span> assert this.reversed == this.filterListBase.isReversed();<a name="line.269"></a> +<span class="sourceLineNo">270</span> return this.reversed;<a name="line.270"></a> +<span class="sourceLineNo">271</span> }<a name="line.271"></a> +<span class="sourceLineNo">272</span><a name="line.272"></a> +<span class="sourceLineNo">273</span> @Override<a name="line.273"></a> +<span class="sourceLineNo">274</span> public String toString() {<a name="line.274"></a> +<span class="sourceLineNo">275</span> return this.filterListBase.toString();<a name="line.275"></a> +<span class="sourceLineNo">276</span> }<a name="line.276"></a> +<span class="sourceLineNo">277</span>}<a name="line.277"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e60b829c/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 3895bd2..cc75bee 100644 --- a/book.html +++ b/book.html @@ -35449,7 +35449,7 @@ The server will return cellblocks compressed using this same compressor as long <div id="footer"> <div id="footer-text"> Version 3.0.0-SNAPSHOT<br> -Last updated 2017-11-16 14:29:37 UTC +Last updated 2017-11-17 14:35:07 UTC </div> </div> </body> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e60b829c/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index aedaf82..0dd9c12 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20171116" /> + <meta name="Date-Revision-yyyymmdd" content="20171117" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -311,7 +311,7 @@ under the License. --> <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-11-16</li> + <li id="publishDate" class="pull-right">Last Published: 2017-11-17</li> </p> </div>
