You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/08/31 14:47:34 UTC
[04/51] [partial] hbase-site git commit: Published site at
7c1fad4992a169a35b4457e6f4afcb30d04406e9.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/74f60271/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.CompatStateSerializer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.CompatStateSerializer.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.CompatStateSerializer.html
index 1a491f3..76e3c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.CompatStateSerializer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.CompatStateSerializer.html
@@ -213,122 +213,130 @@
<span class="sourceLineNo">205</span> if (proc.hasLock()) {<a name="line.205"></a>
<span class="sourceLineNo">206</span> builder.setLocked(true);<a name="line.206"></a>
<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return builder.build();<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> * Helper to convert the protobuf procedure.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Used by ProcedureStore implementations.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * (e.g. className, procId, parentId, ...).<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * We can split in 'data' and 'state', and the store<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * may take advantage of it by storing the data only on insert().<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // Procedure from class name<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> // set fields<a name="line.224"></a>
-<span class="sourceLineNo">225</span> proc.setProcId(proto.getProcId());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> proc.setState(proto.getState());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.227"></a>
-<span class="sourceLineNo">228</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (proto.hasParentId()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> proc.setParentProcId(proto.getParentId());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (proc.isBypass()) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> builder.setBypass(true);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return builder.build();<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> /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * Helper to convert the protobuf procedure.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * Used by ProcedureStore implementations.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> *<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * (e.g. className, procId, parentId, ...).<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * We can split in 'data' and 'state', and the store<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * may take advantage of it by storing the data only on insert().<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Procedure from class name<a name="line.225"></a>
+<span class="sourceLineNo">226</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // set fields<a name="line.228"></a>
+<span class="sourceLineNo">229</span> proc.setProcId(proto.getProcId());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> proc.setState(proto.getState());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.232"></a>
<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> if (proto.hasOwner()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> proc.setOwner(proto.getOwner());<a name="line.235"></a>
+<span class="sourceLineNo">234</span> if (proto.hasParentId()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> proc.setParentProcId(proto.getParentId());<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> if (proto.hasTimeout()) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> proc.setTimeout(proto.getTimeout());<a name="line.239"></a>
+<span class="sourceLineNo">238</span> if (proto.hasOwner()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> proc.setOwner(proto.getOwner());<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (proto.getStackIdCount() > 0) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.243"></a>
+<span class="sourceLineNo">242</span> if (proto.hasTimeout()) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> proc.setTimeout(proto.getTimeout());<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> if (proto.hasException()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.247"></a>
-<span class="sourceLineNo">248</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.248"></a>
-<span class="sourceLineNo">249</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.249"></a>
-<span class="sourceLineNo">250</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (proto.hasResult()) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> proc.setResult(proto.getResult().toByteArray());<a name="line.254"></a>
+<span class="sourceLineNo">246</span> if (proto.getStackIdCount() > 0) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (proto.hasException()) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.251"></a>
+<span class="sourceLineNo">252</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.252"></a>
+<span class="sourceLineNo">253</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.253"></a>
+<span class="sourceLineNo">254</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<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> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<a name="line.258"></a>
+<span class="sourceLineNo">257</span> if (proto.hasResult()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> proc.setResult(proto.getResult().toByteArray());<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> if (proto.getLocked()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> proc.lockedWhenLoading();<a name="line.262"></a>
+<span class="sourceLineNo">261</span> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<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> ProcedureStateSerializer serializer = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (proto.getStateMessageCount() > 0) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else if (proto.hasStateData()) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializer = new CompatStateSerializer(inputStream);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (serializer != null) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> proc.deserializeStateData(serializer);<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>
-<span class="sourceLineNo">278</span> return proc;<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> // ==========================================================================<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // convert from LockedResource object<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // ==========================================================================<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LockedResourceType resourceType) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LockedResource lockedResource) throws IOException<a name="line.295"></a>
-<span class="sourceLineNo">296</span> {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.297"></a>
-<span class="sourceLineNo">298</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> builder<a name="line.300"></a>
-<span class="sourceLineNo">301</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.301"></a>
-<span class="sourceLineNo">302</span> .setResourceName(lockedResource.getResourceName())<a name="line.302"></a>
-<span class="sourceLineNo">303</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.308"></a>
-<span class="sourceLineNo">309</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">265</span> if (proto.getLocked()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> proc.lockedWhenLoading();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (proto.getBypass()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> proc.bypass();<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> ProcedureStateSerializer serializer = null;<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (proto.getStateMessageCount() > 0) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> } else if (proto.hasStateData()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> serializer = new CompatStateSerializer(inputStream);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (serializer != null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> proc.deserializeStateData(serializer);<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> return proc;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> // ==========================================================================<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // convert from LockedResource object<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // ==========================================================================<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LockedResourceType resourceType) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LockedResource lockedResource) throws IOException<a name="line.303"></a>
+<span class="sourceLineNo">304</span> {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.305"></a>
+<span class="sourceLineNo">306</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> builder<a name="line.308"></a>
+<span class="sourceLineNo">309</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.309"></a>
+<span class="sourceLineNo">310</span> .setResourceName(lockedResource.getResourceName())<a name="line.310"></a>
+<span class="sourceLineNo">311</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.311"></a>
<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.313"></a>
+<span class="sourceLineNo">313</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.313"></a>
<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.316"></a>
-<span class="sourceLineNo">317</span> convertToProtoProcedure(waitingProcedure);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.318"></a>
+<span class="sourceLineNo">315</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.316"></a>
+<span class="sourceLineNo">317</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.318"></a>
<span class="sourceLineNo">319</span> }<a name="line.319"></a>
<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> return builder.build();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>}<a name="line.323"></a>
+<span class="sourceLineNo">321</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.324"></a>
+<span class="sourceLineNo">325</span> convertToProtoProcedure(waitingProcedure);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> return builder.build();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>}<a name="line.331"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/74f60271/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.StateSerializer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.StateSerializer.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.StateSerializer.html
index 1a491f3..76e3c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.StateSerializer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.StateSerializer.html
@@ -213,122 +213,130 @@
<span class="sourceLineNo">205</span> if (proc.hasLock()) {<a name="line.205"></a>
<span class="sourceLineNo">206</span> builder.setLocked(true);<a name="line.206"></a>
<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return builder.build();<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> * Helper to convert the protobuf procedure.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Used by ProcedureStore implementations.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * (e.g. className, procId, parentId, ...).<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * We can split in 'data' and 'state', and the store<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * may take advantage of it by storing the data only on insert().<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // Procedure from class name<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> // set fields<a name="line.224"></a>
-<span class="sourceLineNo">225</span> proc.setProcId(proto.getProcId());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> proc.setState(proto.getState());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.227"></a>
-<span class="sourceLineNo">228</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (proto.hasParentId()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> proc.setParentProcId(proto.getParentId());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (proc.isBypass()) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> builder.setBypass(true);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return builder.build();<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> /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * Helper to convert the protobuf procedure.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * Used by ProcedureStore implementations.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> *<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * (e.g. className, procId, parentId, ...).<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * We can split in 'data' and 'state', and the store<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * may take advantage of it by storing the data only on insert().<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Procedure from class name<a name="line.225"></a>
+<span class="sourceLineNo">226</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // set fields<a name="line.228"></a>
+<span class="sourceLineNo">229</span> proc.setProcId(proto.getProcId());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> proc.setState(proto.getState());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.232"></a>
<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> if (proto.hasOwner()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> proc.setOwner(proto.getOwner());<a name="line.235"></a>
+<span class="sourceLineNo">234</span> if (proto.hasParentId()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> proc.setParentProcId(proto.getParentId());<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> if (proto.hasTimeout()) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> proc.setTimeout(proto.getTimeout());<a name="line.239"></a>
+<span class="sourceLineNo">238</span> if (proto.hasOwner()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> proc.setOwner(proto.getOwner());<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (proto.getStackIdCount() > 0) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.243"></a>
+<span class="sourceLineNo">242</span> if (proto.hasTimeout()) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> proc.setTimeout(proto.getTimeout());<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> if (proto.hasException()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.247"></a>
-<span class="sourceLineNo">248</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.248"></a>
-<span class="sourceLineNo">249</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.249"></a>
-<span class="sourceLineNo">250</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (proto.hasResult()) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> proc.setResult(proto.getResult().toByteArray());<a name="line.254"></a>
+<span class="sourceLineNo">246</span> if (proto.getStackIdCount() > 0) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (proto.hasException()) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.251"></a>
+<span class="sourceLineNo">252</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.252"></a>
+<span class="sourceLineNo">253</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.253"></a>
+<span class="sourceLineNo">254</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<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> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<a name="line.258"></a>
+<span class="sourceLineNo">257</span> if (proto.hasResult()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> proc.setResult(proto.getResult().toByteArray());<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> if (proto.getLocked()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> proc.lockedWhenLoading();<a name="line.262"></a>
+<span class="sourceLineNo">261</span> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<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> ProcedureStateSerializer serializer = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (proto.getStateMessageCount() > 0) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else if (proto.hasStateData()) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializer = new CompatStateSerializer(inputStream);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (serializer != null) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> proc.deserializeStateData(serializer);<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>
-<span class="sourceLineNo">278</span> return proc;<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> // ==========================================================================<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // convert from LockedResource object<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // ==========================================================================<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LockedResourceType resourceType) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LockedResource lockedResource) throws IOException<a name="line.295"></a>
-<span class="sourceLineNo">296</span> {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.297"></a>
-<span class="sourceLineNo">298</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> builder<a name="line.300"></a>
-<span class="sourceLineNo">301</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.301"></a>
-<span class="sourceLineNo">302</span> .setResourceName(lockedResource.getResourceName())<a name="line.302"></a>
-<span class="sourceLineNo">303</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.308"></a>
-<span class="sourceLineNo">309</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">265</span> if (proto.getLocked()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> proc.lockedWhenLoading();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (proto.getBypass()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> proc.bypass();<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> ProcedureStateSerializer serializer = null;<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (proto.getStateMessageCount() > 0) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> } else if (proto.hasStateData()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> serializer = new CompatStateSerializer(inputStream);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (serializer != null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> proc.deserializeStateData(serializer);<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> return proc;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> // ==========================================================================<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // convert from LockedResource object<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // ==========================================================================<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LockedResourceType resourceType) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LockedResource lockedResource) throws IOException<a name="line.303"></a>
+<span class="sourceLineNo">304</span> {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.305"></a>
+<span class="sourceLineNo">306</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> builder<a name="line.308"></a>
+<span class="sourceLineNo">309</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.309"></a>
+<span class="sourceLineNo">310</span> .setResourceName(lockedResource.getResourceName())<a name="line.310"></a>
+<span class="sourceLineNo">311</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.311"></a>
<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.313"></a>
+<span class="sourceLineNo">313</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.313"></a>
<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.316"></a>
-<span class="sourceLineNo">317</span> convertToProtoProcedure(waitingProcedure);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.318"></a>
+<span class="sourceLineNo">315</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.316"></a>
+<span class="sourceLineNo">317</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.318"></a>
<span class="sourceLineNo">319</span> }<a name="line.319"></a>
<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> return builder.build();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>}<a name="line.323"></a>
+<span class="sourceLineNo">321</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.324"></a>
+<span class="sourceLineNo">325</span> convertToProtoProcedure(waitingProcedure);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> return builder.build();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>}<a name="line.331"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/74f60271/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.html
index 1a491f3..76e3c88 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureUtil.html
@@ -213,122 +213,130 @@
<span class="sourceLineNo">205</span> if (proc.hasLock()) {<a name="line.205"></a>
<span class="sourceLineNo">206</span> builder.setLocked(true);<a name="line.206"></a>
<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return builder.build();<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> * Helper to convert the protobuf procedure.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Used by ProcedureStore implementations.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> *<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * (e.g. className, procId, parentId, ...).<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * We can split in 'data' and 'state', and the store<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * may take advantage of it by storing the data only on insert().<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // Procedure from class name<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> // set fields<a name="line.224"></a>
-<span class="sourceLineNo">225</span> proc.setProcId(proto.getProcId());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> proc.setState(proto.getState());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.227"></a>
-<span class="sourceLineNo">228</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (proto.hasParentId()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> proc.setParentProcId(proto.getParentId());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (proc.isBypass()) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> builder.setBypass(true);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> return builder.build();<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> /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span> * Helper to convert the protobuf procedure.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * Used by ProcedureStore implementations.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> *<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * TODO: OPTIMIZATION: some of the field never change during the execution<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * (e.g. className, procId, parentId, ...).<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * We can split in 'data' and 'state', and the store<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * may take advantage of it by storing the data only on insert().<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> public static Procedure convertToProcedure(final ProcedureProtos.Procedure proto) throws IOException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Procedure from class name<a name="line.225"></a>
+<span class="sourceLineNo">226</span> final Procedure proc = newProcedure(proto.getClassName());<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // set fields<a name="line.228"></a>
+<span class="sourceLineNo">229</span> proc.setProcId(proto.getProcId());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> proc.setState(proto.getState());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> proc.setSubmittedTime(proto.getSubmittedTime());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> proc.setLastUpdate(proto.getLastUpdate());<a name="line.232"></a>
<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> if (proto.hasOwner()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> proc.setOwner(proto.getOwner());<a name="line.235"></a>
+<span class="sourceLineNo">234</span> if (proto.hasParentId()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> proc.setParentProcId(proto.getParentId());<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> if (proto.hasTimeout()) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> proc.setTimeout(proto.getTimeout());<a name="line.239"></a>
+<span class="sourceLineNo">238</span> if (proto.hasOwner()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> proc.setOwner(proto.getOwner());<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (proto.getStackIdCount() > 0) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.243"></a>
+<span class="sourceLineNo">242</span> if (proto.hasTimeout()) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> proc.setTimeout(proto.getTimeout());<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> if (proto.hasException()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.247"></a>
-<span class="sourceLineNo">248</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.248"></a>
-<span class="sourceLineNo">249</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.249"></a>
-<span class="sourceLineNo">250</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (proto.hasResult()) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> proc.setResult(proto.getResult().toByteArray());<a name="line.254"></a>
+<span class="sourceLineNo">246</span> if (proto.getStackIdCount() > 0) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> proc.setStackIndexes(proto.getStackIdList());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (proto.hasException()) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> assert proc.getState() == ProcedureProtos.ProcedureState.FAILED ||<a name="line.251"></a>
+<span class="sourceLineNo">252</span> proc.getState() == ProcedureProtos.ProcedureState.ROLLEDBACK :<a name="line.252"></a>
+<span class="sourceLineNo">253</span> "The procedure must be failed (waiting to rollback) or rolledback";<a name="line.253"></a>
+<span class="sourceLineNo">254</span> proc.setFailure(RemoteProcedureException.fromProto(proto.getException()));<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> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<a name="line.258"></a>
+<span class="sourceLineNo">257</span> if (proto.hasResult()) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> proc.setResult(proto.getResult().toByteArray());<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> if (proto.getLocked()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> proc.lockedWhenLoading();<a name="line.262"></a>
+<span class="sourceLineNo">261</span> if (proto.getNonce() != HConstants.NO_NONCE) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> proc.setNonceKey(new NonceKey(proto.getNonceGroup(), proto.getNonce()));<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> ProcedureStateSerializer serializer = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (proto.getStateMessageCount() > 0) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else if (proto.hasStateData()) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> serializer = new CompatStateSerializer(inputStream);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (serializer != null) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> proc.deserializeStateData(serializer);<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>
-<span class="sourceLineNo">278</span> return proc;<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> // ==========================================================================<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // convert from LockedResource object<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // ==========================================================================<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LockedResourceType resourceType) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LockedResource lockedResource) throws IOException<a name="line.295"></a>
-<span class="sourceLineNo">296</span> {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.297"></a>
-<span class="sourceLineNo">298</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> builder<a name="line.300"></a>
-<span class="sourceLineNo">301</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.301"></a>
-<span class="sourceLineNo">302</span> .setResourceName(lockedResource.getResourceName())<a name="line.302"></a>
-<span class="sourceLineNo">303</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.308"></a>
-<span class="sourceLineNo">309</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">265</span> if (proto.getLocked()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> proc.lockedWhenLoading();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (proto.getBypass()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> proc.bypass();<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> ProcedureStateSerializer serializer = null;<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (proto.getStateMessageCount() > 0) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> serializer = new StateSerializer(proto.toBuilder());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> } else if (proto.hasStateData()) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> InputStream inputStream = proto.getStateData().newInput();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> serializer = new CompatStateSerializer(inputStream);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (serializer != null) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> proc.deserializeStateData(serializer);<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> return proc;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> // ==========================================================================<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // convert from LockedResource object<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // ==========================================================================<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> public static LockServiceProtos.LockedResourceType convertToProtoResourceType(<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LockedResourceType resourceType) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return LockServiceProtos.LockedResourceType.valueOf(resourceType.name());<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> public static LockServiceProtos.LockType convertToProtoLockType(LockType lockType) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return LockServiceProtos.LockType.valueOf(lockType.name());<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public static LockServiceProtos.LockedResource convertToProtoLockedResource(<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LockedResource lockedResource) throws IOException<a name="line.303"></a>
+<span class="sourceLineNo">304</span> {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> LockServiceProtos.LockedResource.Builder builder =<a name="line.305"></a>
+<span class="sourceLineNo">306</span> LockServiceProtos.LockedResource.newBuilder();<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> builder<a name="line.308"></a>
+<span class="sourceLineNo">309</span> .setResourceType(convertToProtoResourceType(lockedResource.getResourceType()))<a name="line.309"></a>
+<span class="sourceLineNo">310</span> .setResourceName(lockedResource.getResourceName())<a name="line.310"></a>
+<span class="sourceLineNo">311</span> .setLockType(convertToProtoLockType(lockedResource.getLockType()));<a name="line.311"></a>
<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.313"></a>
+<span class="sourceLineNo">313</span> Procedure<?> exclusiveLockOwnerProcedure = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.313"></a>
<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.316"></a>
-<span class="sourceLineNo">317</span> convertToProtoProcedure(waitingProcedure);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.318"></a>
+<span class="sourceLineNo">315</span> if (exclusiveLockOwnerProcedure != null) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> ProcedureProtos.Procedure exclusiveLockOwnerProcedureProto =<a name="line.316"></a>
+<span class="sourceLineNo">317</span> convertToProtoProcedure(exclusiveLockOwnerProcedure);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> builder.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureProto);<a name="line.318"></a>
<span class="sourceLineNo">319</span> }<a name="line.319"></a>
<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> return builder.build();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>}<a name="line.323"></a>
+<span class="sourceLineNo">321</span> builder.setSharedLockCount(lockedResource.getSharedLockCount());<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> for (Procedure<?> waitingProcedure : lockedResource.getWaitingProcedures()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> ProcedureProtos.Procedure waitingProcedureProto =<a name="line.324"></a>
+<span class="sourceLineNo">325</span> convertToProtoProcedure(waitingProcedure);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> builder.addWaitingProcedures(waitingProcedureProto);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> return builder.build();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>}<a name="line.331"></a>