You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/12/04 08:26:57 UTC
[21/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 12/4/18 10:26 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/9ccae1ee/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html b/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
index 08b76e3..52a1647 100644
--- a/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
+++ b/xref-test/org/apache/omid/tso/TestPersistenceProcessorHandler.html
@@ -177,7 +177,7 @@
<a class="jxr_linenumber" name="167" href="#167">167</a>
<a class="jxr_linenumber" name="168" href="#168">168</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="169" href="#169">169</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="170" href="#170">170</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="170" href="#170">170</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="171" href="#171">171</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="172" href="#172">172</a> assertTrue(batch.isEmpty());
<a class="jxr_linenumber" name="173" href="#173">173</a>
@@ -188,14 +188,14 @@
<a class="jxr_linenumber" name="178" href="#178">178</a>
<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="180" href="#180">180</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="181" href="#181">181</a> batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="181" href="#181">181</a> batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="182" href="#182">182</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="183" href="#183">183</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="184" href="#184">184</a> persistenceHandler.onEvent(batchEvent);
<a class="jxr_linenumber" name="185" href="#185">185</a>
<a class="jxr_linenumber" name="186" href="#186">186</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="187" href="#187">187</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="188" href="#188">188</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="188" href="#188">188</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="189" href="#189">189</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="190" href="#190">190</a> assertEquals(batch.getNumEvents(), 1);
<a class="jxr_linenumber" name="191" href="#191">191</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -207,14 +207,14 @@
<a class="jxr_linenumber" name="197" href="#197">197</a>
<a class="jxr_linenumber" name="198" href="#198">198</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="199" href="#199">199</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="200" href="#200">200</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="200" href="#200">200</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="201" href="#201">201</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="202" href="#202">202</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="203" href="#203">203</a> persistenceHandler.onEvent(batchEvent);
<a class="jxr_linenumber" name="204" href="#204">204</a>
<a class="jxr_linenumber" name="205" href="#205">205</a> verify(persistenceHandler, times(1)).flush(eq(1));
<a class="jxr_linenumber" name="206" href="#206">206</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="207" href="#207">207</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="207" href="#207">207</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="208" href="#208">208</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="209" href="#209">209</a> assertEquals(batch.getNumEvents(), 1);
<a class="jxr_linenumber" name="210" href="#210">210</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -227,14 +227,14 @@
<a class="jxr_linenumber" name="217" href="#217">217</a>
<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="219" href="#219">219</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="220" href="#220">220</a> batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="220" href="#220">220</a> batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="221" href="#221">221</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="222" href="#222">222</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="223" href="#223">223</a> persistenceHandler.onEvent(batchEvent);
<a class="jxr_linenumber" name="224" href="#224">224</a>
<a class="jxr_linenumber" name="225" href="#225">225</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="226" href="#226">226</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="227" href="#227">227</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="227" href="#227">227</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="228" href="#228">228</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="229" href="#229">229</a> assertEquals(batch.getNumEvents(), 1);
<a class="jxr_linenumber" name="230" href="#230">230</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -246,7 +246,7 @@
<a class="jxr_linenumber" name="236" href="#236">236</a>
<a class="jxr_linenumber" name="237" href="#237">237</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="238" href="#238">238</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="239" href="#239">239</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="239" href="#239">239</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="240" href="#240">240</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="241" href="#241">241</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="242" href="#242">242</a>
@@ -255,7 +255,7 @@
<a class="jxr_linenumber" name="245" href="#245">245</a>
<a class="jxr_linenumber" name="246" href="#246">246</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="247" href="#247">247</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(batch);
-<a class="jxr_linenumber" name="248" href="#248">248</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="248" href="#248">248</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="249" href="#249">249</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="250" href="#250">250</a> assertEquals(batch.getNumEvents(), 0);
<a class="jxr_linenumber" name="251" href="#251">251</a>
@@ -266,8 +266,8 @@
<a class="jxr_linenumber" name="256" href="#256">256</a>
<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="258" href="#258">258</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="259" href="#259">259</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="260" href="#260">260</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="259" href="#259">259</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="260" href="#260">260</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="261" href="#261">261</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="262" href="#262">262</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="263" href="#263">263</a>
@@ -279,7 +279,7 @@
<a class="jxr_linenumber" name="269" href="#269">269</a>
<a class="jxr_linenumber" name="270" href="#270">270</a> verify(persistenceHandler, times(1)).flush(eq(1));
<a class="jxr_linenumber" name="271" href="#271">271</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="272" href="#272">272</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="272" href="#272">272</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="273" href="#273">273</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="274" href="#274">274</a> assertEquals(batch.getNumEvents(), 1);
<a class="jxr_linenumber" name="275" href="#275">275</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -295,8 +295,8 @@
<a class="jxr_linenumber" name="285" href="#285">285</a>
<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="287" href="#287">287</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="288" href="#288">288</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="289" href="#289">289</a> batch.addCommit(SECOND_ST, SECOND_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="288" href="#288">288</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="289" href="#289">289</a> batch.addCommit(SECOND_ST, SECOND_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="290" href="#290">290</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="291" href="#291">291</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="292" href="#292">292</a>
@@ -308,7 +308,7 @@
<a class="jxr_linenumber" name="298" href="#298">298</a>
<a class="jxr_linenumber" name="299" href="#299">299</a> verify(persistenceHandler, times(1)).flush(eq(1));
<a class="jxr_linenumber" name="300" href="#300">300</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="301" href="#301">301</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="301" href="#301">301</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="302" href="#302">302</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="303" href="#303">303</a> assertEquals(batch.getNumEvents(), 1);
<a class="jxr_linenumber" name="304" href="#304">304</a> assertEquals(batch.get(0).getStartTimestamp(), SECOND_ST);
@@ -321,8 +321,8 @@
<a class="jxr_linenumber" name="311" href="#311">311</a>
<a class="jxr_linenumber" name="312" href="#312">312</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="313" href="#313">313</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="314" href="#314">314</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="315" href="#315">315</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="314" href="#314">314</a> batch.addCommitRetry(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="315" href="#315">315</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="316" href="#316">316</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="317" href="#317">317</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="318" href="#318">318</a>
@@ -334,8 +334,8 @@
<a class="jxr_linenumber" name="324" href="#324">324</a>
<a class="jxr_linenumber" name="325" href="#325">325</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="326" href="#326">326</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="327" href="#327">327</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="328" href="#328">328</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="327" href="#327">327</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="328" href="#328">328</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="329" href="#329">329</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="330" href="#330">330</a> assertEquals(batch.getNumEvents(), 0);
<a class="jxr_linenumber" name="331" href="#331">331</a>
@@ -346,8 +346,8 @@
<a class="jxr_linenumber" name="336" href="#336">336</a>
<a class="jxr_linenumber" name="337" href="#337">337</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="338" href="#338">338</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="339" href="#339">339</a> batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="340" href="#340">340</a> batch.addAbort(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="339" href="#339">339</a> batch.addAbort(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="340" href="#340">340</a> batch.addAbort(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="341" href="#341">341</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="342" href="#342">342</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="343" href="#343">343</a>
@@ -359,7 +359,7 @@
<a class="jxr_linenumber" name="349" href="#349">349</a>
<a class="jxr_linenumber" name="350" href="#350">350</a> verify(persistenceHandler, times(1)).flush(eq(0));
<a class="jxr_linenumber" name="351" href="#351">351</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="352" href="#352">352</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="352" href="#352">352</a> verify(retryProcessor, never()).disambiguateRetryRequestHeuristically(anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="353" href="#353">353</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="354" href="#354">354</a> assertEquals(batch.getNumEvents(), 2);
<a class="jxr_linenumber" name="355" href="#355">355</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -374,12 +374,12 @@
<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="365" href="#365">365</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
<a class="jxr_linenumber" name="366" href="#366">366</a>
-<a class="jxr_linenumber" name="367" href="#367">367</a> batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="368" href="#368">368</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="369" href="#369">369</a> batch.addCommit(THIRD_ST, THIRD_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="370" href="#370">370</a> batch.addAbort(FOURTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="371" href="#371">371</a> batch.addCommit(FIFTH_ST, FIFTH_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="372" href="#372">372</a> batch.addCommitRetry(SIXTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="367" href="#367">367</a> batch.addTimestamp(FIRST_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="368" href="#368">368</a> batch.addCommitRetry(SECOND_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="369" href="#369">369</a> batch.addCommit(THIRD_ST, THIRD_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="370" href="#370">370</a> batch.addAbort(FOURTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="371" href="#371">371</a> batch.addCommit(FIFTH_ST, FIFTH_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="372" href="#372">372</a> batch.addCommitRetry(SIXTH_ST, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="373" href="#373">373</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="374" href="#374">374</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="375" href="#375">375</a>
@@ -391,7 +391,7 @@
<a class="jxr_linenumber" name="381" href="#381">381</a>
<a class="jxr_linenumber" name="382" href="#382">382</a> verify(persistenceHandler, times(1)).flush(2); <em class="jxr_comment">// 2 commits to flush</em>
<a class="jxr_linenumber" name="383" href="#383">383</a> verify(persistenceHandler, times(1)).filterAndDissambiguateClientRetries(eq(batch));
-<a class="jxr_linenumber" name="384" href="#384">384</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="384" href="#384">384</a> verify(retryProcessor, times(1)).disambiguateRetryRequestHeuristically(eq(SECOND_ST), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="385" href="#385">385</a> verify(replyProcessor, times(1)).manageResponsesBatch(eq(BATCH_SEQUENCE), eq(batch));
<a class="jxr_linenumber" name="386" href="#386">386</a> assertEquals(batch.getNumEvents(), 4);
<a class="jxr_linenumber" name="387" href="#387">387</a> assertEquals(batch.get(0).getStartTimestamp(), FIRST_ST);
@@ -418,7 +418,7 @@
<a class="jxr_linenumber" name="408" href="#408">408</a>
<a class="jxr_linenumber" name="409" href="#409">409</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="410" href="#410">410</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="411" href="#411">411</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="411" href="#411">411</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="412" href="#412">412</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="413" href="#413">413</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="414" href="#414">414</a>
@@ -460,7 +460,7 @@
<a class="jxr_linenumber" name="450" href="#450">450</a>
<a class="jxr_linenumber" name="451" href="#451">451</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="452" href="#452">452</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="453" href="#453">453</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="453" href="#453">453</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="454" href="#454">454</a> PersistBatchEvent batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="455" href="#455">455</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="456" href="#456">456</a>
@@ -495,7 +495,7 @@
<a class="jxr_linenumber" name="485" href="#485">485</a>
<a class="jxr_linenumber" name="486" href="#486">486</a> <em class="jxr_comment">// Prepare test batch</em>
<a class="jxr_linenumber" name="487" href="#487">487</a> batch = <strong class="jxr_keyword">new</strong> Batch(BATCH_ID, BATCH_SIZE);
-<a class="jxr_linenumber" name="488" href="#488">488</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="488" href="#488">488</a> batch.addCommit(FIRST_ST, FIRST_CT, <strong class="jxr_keyword">null</strong>, mock(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="489" href="#489">489</a> batchEvent = <strong class="jxr_keyword">new</strong> PersistBatchEvent();
<a class="jxr_linenumber" name="490" href="#490">490</a> PersistBatchEvent.makePersistBatch(batchEvent, BATCH_SEQUENCE, batch);
<a class="jxr_linenumber" name="491" href="#491">491</a>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/9ccae1ee/xref-test/org/apache/omid/tso/TestReplyProcessor.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestReplyProcessor.html b/xref-test/org/apache/omid/tso/TestReplyProcessor.html
index baf138c..d408be5 100644
--- a/xref-test/org/apache/omid/tso/TestReplyProcessor.html
+++ b/xref-test/org/apache/omid/tso/TestReplyProcessor.html
@@ -80,7 +80,7 @@
<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> Panicker panicker;
<a class="jxr_linenumber" name="71" href="#71">71</a>
<a class="jxr_linenumber" name="72" href="#72">72</a> @Mock
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> MonitoringContext monCtx;
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> MonitoringContextImpl monCtx;
<a class="jxr_linenumber" name="74" href="#74">74</a>
<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> MetricsRegistry metrics;
<a class="jxr_linenumber" name="76" href="#76">76</a>
@@ -257,11 +257,11 @@
<a class="jxr_linenumber" name="247" href="#247">247</a> inOrderReplyBatchEvents.verify(replyProcessor, times(1)).handleReplyBatchEvent(eq(thirdBatchEvent));
<a class="jxr_linenumber" name="248" href="#248">248</a>
<a class="jxr_linenumber" name="249" href="#249">249</a> InOrder inOrderReplies = inOrder(replyProcessor, replyProcessor, replyProcessor, replyProcessor, replyProcessor);
-<a class="jxr_linenumber" name="250" href="#250">250</a> inOrderReplies.verify(replyProcessor, times(1)).sendAbortResponse(eq(FIFTH_ST), any(Channel.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="251" href="#251">251</a> inOrderReplies.verify(replyProcessor, times(1)).sendTimestampResponse(eq(THIRD_ST), any(Channel.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="252" href="#252">252</a> inOrderReplies.verify(replyProcessor, times(1)).sendCommitResponse(eq(FOURTH_ST), eq(FOURTH_CT), any(Channel.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="253" href="#253">253</a> inOrderReplies.verify(replyProcessor, times(1)).sendTimestampResponse(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="254" href="#254">254</a> inOrderReplies.verify(replyProcessor, times(1)).sendCommitResponse(eq(SECOND_ST), eq(SECOND_CT), any(Channel.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="250" href="#250">250</a> inOrderReplies.verify(replyProcessor, times(1)).sendAbortResponse(eq(FIFTH_ST), any(Channel.<strong class="jxr_keyword">class</strong>), eq(monCtx));
+<a class="jxr_linenumber" name="251" href="#251">251</a> inOrderReplies.verify(replyProcessor, times(1)).sendTimestampResponse(eq(THIRD_ST), any(Channel.<strong class="jxr_keyword">class</strong>), eq(monCtx));
+<a class="jxr_linenumber" name="252" href="#252">252</a> inOrderReplies.verify(replyProcessor, times(1)).sendCommitResponse(eq(FOURTH_ST), eq(FOURTH_CT), any(Channel.<strong class="jxr_keyword">class</strong>), eq(monCtx));
+<a class="jxr_linenumber" name="253" href="#253">253</a> inOrderReplies.verify(replyProcessor, times(1)).sendTimestampResponse(eq(FIRST_ST), any(Channel.<strong class="jxr_keyword">class</strong>), eq(monCtx));
+<a class="jxr_linenumber" name="254" href="#254">254</a> inOrderReplies.verify(replyProcessor, times(1)).sendCommitResponse(eq(SECOND_ST), eq(SECOND_CT), any(Channel.<strong class="jxr_keyword">class</strong>), eq(monCtx));
<a class="jxr_linenumber" name="255" href="#255">255</a>
<a class="jxr_linenumber" name="256" href="#256">256</a> }
<a class="jxr_linenumber" name="257" href="#257">257</a>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/9ccae1ee/xref-test/org/apache/omid/tso/TestRequestProcessor.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestRequestProcessor.html b/xref-test/org/apache/omid/tso/TestRequestProcessor.html
index 0691cef..272939b 100644
--- a/xref-test/org/apache/omid/tso/TestRequestProcessor.html
+++ b/xref-test/org/apache/omid/tso/TestRequestProcessor.html
@@ -29,175 +29,195 @@
<a class="jxr_linenumber" name="19" href="#19">19</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> com.google.common.collect.Lists;
<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.MetricsRegistry;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.jboss.netty.channel.Channel;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.mockito.ArgumentCaptor;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="30" href="#30">30</a>
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="33" href="#33">33</a>
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.any;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anyLong;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.eq;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.timeout;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="42" href="#42">42</a>
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TestRequestProcessor.html">TestRequestProcessor</a> {
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestRequestProcessor.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> CONFLICT_MAP_SIZE = 1000;
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> CONFLICT_MAP_ASSOCIATIVITY = 32;
+<a class="jxr_linenumber" name="22" href="#22">22</a>
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.MetricsRegistry;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.AbstractTransactionManager;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.jboss.netty.channel.Channel;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.mockito.ArgumentCaptor;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="32" href="#32">32</a>
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.util.Collections;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="36" href="#36">36</a>
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.any;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anyLong;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.eq;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.timeout;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="45" href="#45">45</a>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TestRequestProcessor.html">TestRequestProcessor</a> {
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestRequestProcessor.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
-<a class="jxr_linenumber" name="51" href="#51">51</a>
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">private</strong> PersistenceProcessor persist;
-<a class="jxr_linenumber" name="53" href="#53">53</a>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> TSOStateManager stateManager;
-<a class="jxr_linenumber" name="55" href="#55">55</a>
-<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// Request processor under test</em>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> RequestProcessor requestProc;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> CONFLICT_MAP_SIZE = 1000;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> CONFLICT_MAP_ASSOCIATIVITY = 32;
+<a class="jxr_linenumber" name="52" href="#52">52</a>
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> PersistenceProcessor persist;
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> TSOStateManager stateManager;
<a class="jxr_linenumber" name="58" href="#58">58</a>
-<a class="jxr_linenumber" name="59" href="#59">59</a> @BeforeMethod
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> beforeMethod() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// Request processor under test</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> RequestProcessor requestProc;
<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_comment">// Build the required scaffolding for the test</em>
-<a class="jxr_linenumber" name="63" href="#63">63</a> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
-<a class="jxr_linenumber" name="64" href="#64">64</a>
-<a class="jxr_linenumber" name="65" href="#65">65</a> TimestampOracleImpl timestampOracle =
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">new</strong> TimestampOracleImpl(metrics, <strong class="jxr_keyword">new</strong> TimestampOracleImpl.InMemoryTimestampStorage(), <strong class="jxr_keyword">new</strong> MockPanicker());
-<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> stateManager = <strong class="jxr_keyword">new</strong> TSOStateManagerImpl(timestampOracle);
-<a class="jxr_linenumber" name="69" href="#69">69</a>
-<a class="jxr_linenumber" name="70" href="#70">70</a> persist = mock(PersistenceProcessor.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="71" href="#71">71</a> SettableFuture<Void> f = SettableFuture.create();
-<a class="jxr_linenumber" name="72" href="#72">72</a> f.set(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="73" href="#73">73</a> doReturn(f).when(persist).persistLowWatermark(any(Long.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> LowWatermarkWriter lowWatermarkWriter;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> TimestampOracleImpl timestampOracle;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> ReplyProcessor replyProcessor;
+<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="66" href="#66">66</a> @BeforeMethod
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> beforeMethod() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="68" href="#68">68</a>
+<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_comment">// Build the required scaffolding for the test</em>
+<a class="jxr_linenumber" name="70" href="#70">70</a> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
+<a class="jxr_linenumber" name="71" href="#71">71</a>
+<a class="jxr_linenumber" name="72" href="#72">72</a> TimestampOracleImpl timestampOracle =
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">new</strong> TimestampOracleImpl(metrics, <strong class="jxr_keyword">new</strong> TimestampOracleImpl.InMemoryTimestampStorage(), <strong class="jxr_keyword">new</strong> MockPanicker());
<a class="jxr_linenumber" name="74" href="#74">74</a>
-<a class="jxr_linenumber" name="75" href="#75">75</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="76" href="#76">76</a> config.setConflictMapSize(CONFLICT_MAP_SIZE);
-<a class="jxr_linenumber" name="77" href="#77">77</a>
-<a class="jxr_linenumber" name="78" href="#78">78</a> requestProc = <strong class="jxr_keyword">new</strong> RequestProcessorImpl(metrics, timestampOracle, persist, <strong class="jxr_keyword">new</strong> MockPanicker(), config);
-<a class="jxr_linenumber" name="79" href="#79">79</a>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <em class="jxr_comment">// Initialize the state for the experiment</em>
-<a class="jxr_linenumber" name="81" href="#81">81</a> stateManager.register(requestProc);
-<a class="jxr_linenumber" name="82" href="#82">82</a> stateManager.initialize();
-<a class="jxr_linenumber" name="83" href="#83">83</a>
-<a class="jxr_linenumber" name="84" href="#84">84</a> }
+<a class="jxr_linenumber" name="75" href="#75">75</a> stateManager = <strong class="jxr_keyword">new</strong> TSOStateManagerImpl(timestampOracle);
+<a class="jxr_linenumber" name="76" href="#76">76</a> lowWatermarkWriter = mock(LowWatermarkWriter.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="77" href="#77">77</a> persist = mock(PersistenceProcessor.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="78" href="#78">78</a> replyProcessor = mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="79" href="#79">79</a> SettableFuture<Void> f = SettableFuture.create();
+<a class="jxr_linenumber" name="80" href="#80">80</a> f.set(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="81" href="#81">81</a> doReturn(f).when(lowWatermarkWriter).persistLowWatermark(any(Long.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="84" href="#84">84</a> config.setConflictMapSize(CONFLICT_MAP_SIZE);
<a class="jxr_linenumber" name="85" href="#85">85</a>
-<a class="jxr_linenumber" name="86" href="#86">86</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestamp() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="86" href="#86">86</a> requestProc = <strong class="jxr_keyword">new</strong> RequestProcessorPersistCT(metrics, timestampOracle, persist, <strong class="jxr_keyword">new</strong> MockPanicker(),
+<a class="jxr_linenumber" name="87" href="#87">87</a> config, lowWatermarkWriter,replyProcessor);
<a class="jxr_linenumber" name="88" href="#88">88</a>
-<a class="jxr_linenumber" name="89" href="#89">89</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="90" href="#90">90</a> ArgumentCaptor<Long> firstTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="91" href="#91">91</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
-<a class="jxr_linenumber" name="92" href="#92">92</a> firstTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="93" href="#93">93</a>
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">long</strong> firstTS = firstTScapture.getValue();
-<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_comment">// verify that timestamps increase monotonically</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 100; i++) {
-<a class="jxr_linenumber" name="97" href="#97">97</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="98" href="#98">98</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(eq(firstTS++), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// Initialize the state for the experiment</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> stateManager.register(requestProc);
+<a class="jxr_linenumber" name="91" href="#91">91</a> stateManager.initialize();
+<a class="jxr_linenumber" name="92" href="#92">92</a>
+<a class="jxr_linenumber" name="93" href="#93">93</a> }
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestamp() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="97" href="#97">97</a>
+<a class="jxr_linenumber" name="98" href="#98">98</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="99" href="#99">99</a> ArgumentCaptor<Long> firstTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="100" href="#100">100</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
+<a class="jxr_linenumber" name="101" href="#101">101</a> firstTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="102" href="#102">102</a>
-<a class="jxr_linenumber" name="103" href="#103">103</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommit() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="107" href="#107">107</a> ArgumentCaptor<Long> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="108" href="#108">108</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
-<a class="jxr_linenumber" name="109" href="#109">109</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">long</strong> firstTS = TScapture.getValue();
-<a class="jxr_linenumber" name="111" href="#111">111</a>
-<a class="jxr_linenumber" name="112" href="#112">112</a> List<Long> writeSet = Lists.newArrayList(1L, 20L, 203L);
-<a class="jxr_linenumber" name="113" href="#113">113</a> requestProc.commitRequest(firstTS - 1, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="114" href="#114">114</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(firstTS - 1), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">long</strong> firstTS = firstTScapture.getValue();
+<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_comment">// verify that timestamps increase monotonically</em>
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 100; i++) {
+<a class="jxr_linenumber" name="106" href="#106">106</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="107" href="#107">107</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(eq(firstTS), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="108" href="#108">108</a> firstTS += AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="109" href="#109">109</a> }
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> }
+<a class="jxr_linenumber" name="112" href="#112">112</a>
+<a class="jxr_linenumber" name="113" href="#113">113</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommit() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="115" href="#115">115</a>
-<a class="jxr_linenumber" name="116" href="#116">116</a> requestProc.commitRequest(firstTS, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="117" href="#117">117</a> ArgumentCaptor<Long> commitTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> verify(persist, timeout(100).times(1)).addCommitToBatch(eq(firstTS), commitTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="120" href="#120">120</a> assertTrue(commitTScapture.getValue() > firstTS, <span class="jxr_string">"Commit TS must be greater than start TS"</span>);
+<a class="jxr_linenumber" name="116" href="#116">116</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="117" href="#117">117</a> ArgumentCaptor<Long> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="118" href="#118">118</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
+<a class="jxr_linenumber" name="119" href="#119">119</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">long</strong> firstTS = TScapture.getValue();
<a class="jxr_linenumber" name="121" href="#121">121</a>
-<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// test conflict</em>
-<a class="jxr_linenumber" name="123" href="#123">123</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="124" href="#124">124</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="125" href="#125">125</a> verify(persist, timeout(100).times(2)).addTimestampToBatch(
-<a class="jxr_linenumber" name="126" href="#126">126</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">long</strong> secondTS = TScapture.getValue();
+<a class="jxr_linenumber" name="122" href="#122">122</a> List<Long> writeSet = Lists.newArrayList(1L, 20L, 203L);
+<a class="jxr_linenumber" name="123" href="#123">123</a> requestProc.commitRequest(firstTS - AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="124" href="#124">124</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(firstTS - AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="125" href="#125">125</a>
+<a class="jxr_linenumber" name="126" href="#126">126</a> requestProc.commitRequest(firstTS, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="127" href="#127">127</a> ArgumentCaptor<Long> commitTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="128" href="#128">128</a>
-<a class="jxr_linenumber" name="129" href="#129">129</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="130" href="#130">130</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="131" href="#131">131</a> verify(persist, timeout(100).times(3)).addTimestampToBatch(
-<a class="jxr_linenumber" name="132" href="#132">132</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">long</strong> thirdTS = TScapture.getValue();
-<a class="jxr_linenumber" name="134" href="#134">134</a>
-<a class="jxr_linenumber" name="135" href="#135">135</a> requestProc.commitRequest(thirdTS, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="136" href="#136">136</a> verify(persist, timeout(100).times(1)).addCommitToBatch(eq(thirdTS), anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="137" href="#137">137</a> requestProc.commitRequest(secondTS, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="138" href="#138">138</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(secondTS), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="139" href="#139">139</a>
-<a class="jxr_linenumber" name="140" href="#140">140</a> }
-<a class="jxr_linenumber" name="141" href="#141">141</a>
-<a class="jxr_linenumber" name="142" href="#142">142</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitRequestAbortsWhenResettingRequestProcessorState() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="129" href="#129">129</a> verify(persist, timeout(100).times(1)).addCommitToBatch(eq(firstTS), commitTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="130" href="#130">130</a> assertTrue(commitTScapture.getValue() > firstTS, <span class="jxr_string">"Commit TS must be greater than start TS"</span>);
+<a class="jxr_linenumber" name="131" href="#131">131</a>
+<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_comment">// test conflict</em>
+<a class="jxr_linenumber" name="133" href="#133">133</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="134" href="#134">134</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> verify(persist, timeout(100).times(2)).addTimestampToBatch(
+<a class="jxr_linenumber" name="136" href="#136">136</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">long</strong> secondTS = TScapture.getValue();
+<a class="jxr_linenumber" name="138" href="#138">138</a>
+<a class="jxr_linenumber" name="139" href="#139">139</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="140" href="#140">140</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="141" href="#141">141</a> verify(persist, timeout(100).times(3)).addTimestampToBatch(
+<a class="jxr_linenumber" name="142" href="#142">142</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">long</strong> thirdTS = TScapture.getValue();
<a class="jxr_linenumber" name="144" href="#144">144</a>
-<a class="jxr_linenumber" name="145" href="#145">145</a> List<Long> writeSet = Collections.emptyList();
-<a class="jxr_linenumber" name="146" href="#146">146</a>
-<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// Start a transaction...</em>
-<a class="jxr_linenumber" name="148" href="#148">148</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="149" href="#149">149</a> ArgumentCaptor<Long> capturedTS = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="150" href="#150">150</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(capturedTS.capture(),
-<a class="jxr_linenumber" name="151" href="#151">151</a> any(Channel.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="152" href="#152">152</a> any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">long</strong> startTS = capturedTS.getValue();
+<a class="jxr_linenumber" name="145" href="#145">145</a> requestProc.commitRequest(thirdTS, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="146" href="#146">146</a> verify(persist, timeout(100).times(1)).addCommitToBatch(eq(thirdTS), anyLong(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="147" href="#147">147</a> requestProc.commitRequest(secondTS, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="148" href="#148">148</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(secondTS), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="149" href="#149">149</a>
+<a class="jxr_linenumber" name="150" href="#150">150</a> }
+<a class="jxr_linenumber" name="151" href="#151">151</a>
+<a class="jxr_linenumber" name="152" href="#152">152</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFence() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="154" href="#154">154</a>
-<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_comment">// ... simulate the reset of the RequestProcessor state (e.g. due to</em>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment">// a change in mastership) and...</em>
-<a class="jxr_linenumber" name="157" href="#157">157</a> stateManager.initialize();
-<a class="jxr_linenumber" name="158" href="#158">158</a>
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment">// ...check that the transaction is aborted when trying to commit</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> requestProc.commitRequest(startTS, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="161" href="#161">161</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(startTS), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="162" href="#162">162</a>
-<a class="jxr_linenumber" name="163" href="#163">163</a> }
+<a class="jxr_linenumber" name="155" href="#155">155</a> requestProc.fenceRequest(666L, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="156" href="#156">156</a> ArgumentCaptor<Long> firstTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="157" href="#157">157</a> verify(replyProcessor, timeout(100).times(1)).sendFenceResponse(eq(666L),
+<a class="jxr_linenumber" name="158" href="#158">158</a> firstTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> }
+<a class="jxr_linenumber" name="161" href="#161">161</a>
+<a class="jxr_linenumber" name="162" href="#162">162</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitRequestAbortsWhenResettingRequestProcessorState() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="164" href="#164">164</a>
-<a class="jxr_linenumber" name="165" href="#165">165</a> @Test(timeOut = 5_000)
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testLowWatermarkIsStoredOnlyWhenACacheElementIsEvicted() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="167" href="#167">167</a>
-<a class="jxr_linenumber" name="168" href="#168">168</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ANY_START_TS = 1;
-<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> FIRST_COMMIT_TS_EVICTED = 1L;
-<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NEXT_COMMIT_TS_THAT_SHOULD_BE_EVICTED = 2L;
-<a class="jxr_linenumber" name="171" href="#171">171</a>
-<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment">// Fill the cache to provoke a cache eviction</em>
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">long</strong> i = 0; i < CONFLICT_MAP_SIZE + CONFLICT_MAP_ASSOCIATIVITY; i++) {
-<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">long</strong> writeSetElementHash = i + 1; <em class="jxr_comment">// This is to match the assigned CT: K/V in cache = WS Element Hash/CT</em>
-<a class="jxr_linenumber" name="175" href="#175">175</a> List<Long> writeSet = Lists.newArrayList(writeSetElementHash);
-<a class="jxr_linenumber" name="176" href="#176">176</a> requestProc.commitRequest(ANY_START_TS, writeSet, false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="177" href="#177">177</a> }
+<a class="jxr_linenumber" name="165" href="#165">165</a> List<Long> writeSet = Collections.emptyList();
+<a class="jxr_linenumber" name="166" href="#166">166</a>
+<a class="jxr_linenumber" name="167" href="#167">167</a> <em class="jxr_comment">// Start a transaction...</em>
+<a class="jxr_linenumber" name="168" href="#168">168</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="169" href="#169">169</a> ArgumentCaptor<Long> capturedTS = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="170" href="#170">170</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(capturedTS.capture(),
+<a class="jxr_linenumber" name="171" href="#171">171</a> any(Channel.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="172" href="#172">172</a> any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">long</strong> startTS = capturedTS.getValue();
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_comment">// ... simulate the reset of the RequestProcessor state (e.g. due to</em>
+<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment">// a change in mastership) and...</em>
+<a class="jxr_linenumber" name="177" href="#177">177</a> stateManager.initialize();
<a class="jxr_linenumber" name="178" href="#178">178</a>
-<a class="jxr_linenumber" name="179" href="#179">179</a> Thread.currentThread().sleep(3000); <em class="jxr_comment">// Allow the Request processor to finish the request processing</em>
-<a class="jxr_linenumber" name="180" href="#180">180</a>
-<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment">// Check that first time its called is on init</em>
-<a class="jxr_linenumber" name="182" href="#182">182</a> verify(persist, timeout(100).times(1)).persistLowWatermark(eq(0L));
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// Then, check it is called when cache is full and the first element is evicted (should be a 1)</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> verify(persist, timeout(100).times(1)).persistLowWatermark(eq(FIRST_COMMIT_TS_EVICTED));
-<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment">// Finally it should never be called with the next element</em>
-<a class="jxr_linenumber" name="186" href="#186">186</a> verify(persist, timeout(100).never()).persistLowWatermark(eq(NEXT_COMMIT_TS_THAT_SHOULD_BE_EVICTED));
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// ...check that the transaction is aborted when trying to commit</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> requestProc.commitRequest(startTS, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="181" href="#181">181</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(startTS), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContextImpl.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="182" href="#182">182</a>
+<a class="jxr_linenumber" name="183" href="#183">183</a> }
+<a class="jxr_linenumber" name="184" href="#184">184</a>
+<a class="jxr_linenumber" name="185" href="#185">185</a> @Test(timeOut = 5_000)
+<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testLowWatermarkIsStoredOnlyWhenACacheElementIsEvicted() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="187" href="#187">187</a>
-<a class="jxr_linenumber" name="188" href="#188">188</a> }
-<a class="jxr_linenumber" name="189" href="#189">189</a>
-<a class="jxr_linenumber" name="190" href="#190">190</a> }
+<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ANY_START_TS = 1;
+<a class="jxr_linenumber" name="189" href="#189">189</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> FIRST_COMMIT_TS_EVICTED = AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NEXT_COMMIT_TS_THAT_SHOULD_BE_EVICTED = FIRST_COMMIT_TS_EVICTED + AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="191" href="#191">191</a>
+<a class="jxr_linenumber" name="192" href="#192">192</a> <em class="jxr_comment">// Fill the cache to provoke a cache eviction</em>
+<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">long</strong> i = 0; i < CONFLICT_MAP_SIZE + CONFLICT_MAP_ASSOCIATIVITY; i++) {
+<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">long</strong> writeSetElementHash = i + 1; <em class="jxr_comment">// This is to match the assigned CT: K/V in cache = WS Element Hash/CT</em>
+<a class="jxr_linenumber" name="195" href="#195">195</a> List<Long> writeSet = Lists.newArrayList(writeSetElementHash);
+<a class="jxr_linenumber" name="196" href="#196">196</a> requestProc.commitRequest(ANY_START_TS, writeSet, <strong class="jxr_keyword">new</strong> ArrayList<Long>(0), false, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContextImpl(metrics));
+<a class="jxr_linenumber" name="197" href="#197">197</a> }
+<a class="jxr_linenumber" name="198" href="#198">198</a>
+<a class="jxr_linenumber" name="199" href="#199">199</a> Thread.currentThread().sleep(3000); <em class="jxr_comment">// Allow the Request processor to finish the request processing</em>
+<a class="jxr_linenumber" name="200" href="#200">200</a>
+<a class="jxr_linenumber" name="201" href="#201">201</a> <em class="jxr_comment">// Check that first time its called is on init</em>
+<a class="jxr_linenumber" name="202" href="#202">202</a> verify(lowWatermarkWriter, timeout(100).times(1)).persistLowWatermark(eq(0L));
+<a class="jxr_linenumber" name="203" href="#203">203</a> <em class="jxr_comment">// Then, check it is called when cache is full and the first element is evicted (should be a AbstractTransactionManager.NUM_OF_CHECKPOINTS)</em>
+<a class="jxr_linenumber" name="204" href="#204">204</a> verify(lowWatermarkWriter, timeout(100).times(1)).persistLowWatermark(eq(FIRST_COMMIT_TS_EVICTED));
+<a class="jxr_linenumber" name="205" href="#205">205</a> <em class="jxr_comment">// Finally it should never be called with the next element</em>
+<a class="jxr_linenumber" name="206" href="#206">206</a> verify(lowWatermarkWriter, timeout(100).never()).persistLowWatermark(eq(NEXT_COMMIT_TS_THAT_SHOULD_BE_EVICTED));
+<a class="jxr_linenumber" name="207" href="#207">207</a>
+<a class="jxr_linenumber" name="208" href="#208">208</a> }
+<a class="jxr_linenumber" name="209" href="#209">209</a>
+<a class="jxr_linenumber" name="210" href="#210">210</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>