You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/07/01 22:49:45 UTC
[16/23] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 7/1/16 3:49 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TestLongCache.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestLongCache.html b/xref-test/org/apache/omid/tso/TestLongCache.html
index f65c21c..83f1f58 100644
--- a/xref-test/org/apache/omid/tso/TestLongCache.html
+++ b/xref-test/org/apache/omid/tso/TestLongCache.html
@@ -46,7 +46,7 @@
<a class="jxr_linenumber" name="36" href="#36">36</a>
<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">private</strong> Random random = <strong class="jxr_keyword">new</strong> Random(System.currentTimeMillis());
<a class="jxr_linenumber" name="38" href="#38">38</a>
-<a class="jxr_linenumber" name="39" href="#39">39</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="39" href="#39">39</a> @Test
<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAddAndGetElems() {
<a class="jxr_linenumber" name="41" href="#41">41</a>
<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_comment">// Cache configuration</em>
@@ -75,7 +75,7 @@
<a class="jxr_linenumber" name="65" href="#65">65</a>
<a class="jxr_linenumber" name="66" href="#66">66</a> }
<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="68" href="#68">68</a> @Test(timeOut = 10000)
<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEntriesAge() {
<a class="jxr_linenumber" name="70" href="#70">70</a>
<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> entries = 1000;
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TestPanicker.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestPanicker.html b/xref-test/org/apache/omid/tso/TestPanicker.html
index 0407d34..1fcd07f 100644
--- a/xref-test/org/apache/omid/tso/TestPanicker.html
+++ b/xref-test/org/apache/omid/tso/TestPanicker.html
@@ -74,7 +74,7 @@
<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_comment">// Note this test has been moved and refactored to TestTimestampOracle because</em>
<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// it tests the behaviour of the TimestampOracle.</em>
<a class="jxr_linenumber" name="66" href="#66">66</a> <em class="jxr_comment">// Please, remove me in a future commit</em>
-<a class="jxr_linenumber" name="67" href="#67">67</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="67" href="#67">67</a> @Test
<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestampOraclePanic() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="69" href="#69">69</a>
<a class="jxr_linenumber" name="70" href="#70">70</a> TimestampStorage storage = spy(<strong class="jxr_keyword">new</strong> TimestampOracleImpl.InMemoryTimestampStorage());
@@ -87,123 +87,127 @@
<a class="jxr_linenumber" name="77" href="#77">77</a> Thread allocThread = <strong class="jxr_keyword">new</strong> Thread(<span class="jxr_string">"AllocThread"</span>) {
<a class="jxr_linenumber" name="78" href="#78">78</a> @Override
<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="81" href="#81">81</a> tso.next();
-<a class="jxr_linenumber" name="82" href="#82">82</a> }
-<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="85" href="#85">85</a> allocThread.start();
-<a class="jxr_linenumber" name="86" href="#86">86</a>
-<a class="jxr_linenumber" name="87" href="#87">87</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="88" href="#88">88</a>
-<a class="jxr_linenumber" name="89" href="#89">89</a> }
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="82" href="#82">82</a> tso.next();
+<a class="jxr_linenumber" name="83" href="#83">83</a> }
+<a class="jxr_linenumber" name="84" href="#84">84</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) {
+<a class="jxr_linenumber" name="85" href="#85">85</a> LOG.error(<span class="jxr_string">"Shouldn't occur"</span>);
+<a class="jxr_linenumber" name="86" href="#86">86</a> }
+<a class="jxr_linenumber" name="87" href="#87">87</a> }
+<a class="jxr_linenumber" name="88" href="#88">88</a> };
+<a class="jxr_linenumber" name="89" href="#89">89</a> allocThread.start();
<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_comment">// Note this test has been moved and refactored to TestPersistenceProcessor because</em>
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// it tests the behaviour of the PersistenceProcessor.</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// Please, remove me in a future commit</em>
-<a class="jxr_linenumber" name="94" href="#94">94</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitTablePanic() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="96" href="#96">96</a>
-<a class="jxr_linenumber" name="97" href="#97">97</a> Panicker panicker = spy(<strong class="jxr_keyword">new</strong> MockPanicker());
-<a class="jxr_linenumber" name="98" href="#98">98</a>
-<a class="jxr_linenumber" name="99" href="#99">99</a> doThrow(<strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"Unable to write@TestPanicker"</span>)).when(mockWriter).flush();
+<a class="jxr_linenumber" name="91" href="#91">91</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<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> <em class="jxr_comment">// Note this test has been moved and refactored to TestPersistenceProcessor because</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_comment">// it tests the behaviour of the PersistenceProcessor.</em>
+<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">// Please, remove me in a future commit</em>
+<a class="jxr_linenumber" name="98" href="#98">98</a> @Test
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitTablePanic() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">final</strong> CommitTable.Client mockClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="102" href="#102">102</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> CommitTable() {
-<a class="jxr_linenumber" name="103" href="#103">103</a> @Override
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> Writer getWriter() {
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">return</strong> mockWriter;
-<a class="jxr_linenumber" name="106" href="#106">106</a> }
-<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> @Override
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">public</strong> Client getClient() {
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">return</strong> mockClient;
-<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>
-<a class="jxr_linenumber" name="114" href="#114">114</a> LeaseManager leaseManager = mock(LeaseManager.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="115" href="#115">115</a> doReturn(<strong class="jxr_keyword">true</strong>).when(leaseManager).stillInLeasePeriod();
-<a class="jxr_linenumber" name="116" href="#116">116</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="117" href="#117">117</a> ObjectPool<Batch> batchPool = <strong class="jxr_keyword">new</strong> BatchPoolModule(config).getBatchPool();
-<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> PersistenceProcessorHandler[] handlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < config.getNumConcurrentCTWriters(); i++) {
-<a class="jxr_linenumber" name="121" href="#121">121</a> handlers[i] = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
-<a class="jxr_linenumber" name="122" href="#122">122</a> <span class="jxr_string">"localhost:1234"</span>,
-<a class="jxr_linenumber" name="123" href="#123">123</a> leaseManager,
-<a class="jxr_linenumber" name="124" href="#124">124</a> commitTable,
-<a class="jxr_linenumber" name="125" href="#125">125</a> mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="126" href="#126">126</a> mock(RetryProcessor.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="127" href="#127">127</a> panicker);
-<a class="jxr_linenumber" name="128" href="#128">128</a> }
-<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> PersistenceProcessor proc = <strong class="jxr_keyword">new</strong> PersistenceProcessorImpl(config,
-<a class="jxr_linenumber" name="131" href="#131">131</a> commitTable,
-<a class="jxr_linenumber" name="132" href="#132">132</a> batchPool,
-<a class="jxr_linenumber" name="133" href="#133">133</a> panicker,
-<a class="jxr_linenumber" name="134" href="#134">134</a> handlers,
-<a class="jxr_linenumber" name="135" href="#135">135</a> metrics);
-<a class="jxr_linenumber" name="136" href="#136">136</a>
-<a class="jxr_linenumber" name="137" href="#137">137</a> proc.addCommitToBatch(1, 2, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="138" href="#138">138</a>
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">new</strong> RequestProcessorImpl(metrics, mock(TimestampOracle.<strong class="jxr_keyword">class</strong>), proc, panicker, mock(TSOServerConfig.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="101" href="#101">101</a> Panicker panicker = spy(<strong class="jxr_keyword">new</strong> MockPanicker());
+<a class="jxr_linenumber" name="102" href="#102">102</a>
+<a class="jxr_linenumber" name="103" href="#103">103</a> doThrow(<strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"Unable to write@TestPanicker"</span>)).when(mockWriter).flush();
+<a class="jxr_linenumber" name="104" href="#104">104</a>
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">final</strong> CommitTable.Client mockClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="106" href="#106">106</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> CommitTable() {
+<a class="jxr_linenumber" name="107" href="#107">107</a> @Override
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">public</strong> Writer getWriter() {
+<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">return</strong> mockWriter;
+<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> @Override
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">public</strong> Client getClient() {
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">return</strong> mockClient;
+<a class="jxr_linenumber" name="115" href="#115">115</a> }
+<a class="jxr_linenumber" name="116" href="#116">116</a> };
+<a class="jxr_linenumber" name="117" href="#117">117</a>
+<a class="jxr_linenumber" name="118" href="#118">118</a> LeaseManager leaseManager = mock(LeaseManager.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="119" href="#119">119</a> doReturn(<strong class="jxr_keyword">true</strong>).when(leaseManager).stillInLeasePeriod();
+<a class="jxr_linenumber" name="120" href="#120">120</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="121" href="#121">121</a> ObjectPool<Batch> batchPool = <strong class="jxr_keyword">new</strong> BatchPoolModule(config).getBatchPool();
+<a class="jxr_linenumber" name="122" href="#122">122</a>
+<a class="jxr_linenumber" name="123" href="#123">123</a> PersistenceProcessorHandler[] handlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < config.getNumConcurrentCTWriters(); i++) {
+<a class="jxr_linenumber" name="125" href="#125">125</a> handlers[i] = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
+<a class="jxr_linenumber" name="126" href="#126">126</a> <span class="jxr_string">"localhost:1234"</span>,
+<a class="jxr_linenumber" name="127" href="#127">127</a> leaseManager,
+<a class="jxr_linenumber" name="128" href="#128">128</a> commitTable,
+<a class="jxr_linenumber" name="129" href="#129">129</a> mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="130" href="#130">130</a> mock(RetryProcessor.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="131" href="#131">131</a> panicker);
+<a class="jxr_linenumber" name="132" href="#132">132</a> }
+<a class="jxr_linenumber" name="133" href="#133">133</a>
+<a class="jxr_linenumber" name="134" href="#134">134</a> PersistenceProcessor proc = <strong class="jxr_keyword">new</strong> PersistenceProcessorImpl(config,
+<a class="jxr_linenumber" name="135" href="#135">135</a> commitTable,
+<a class="jxr_linenumber" name="136" href="#136">136</a> batchPool,
+<a class="jxr_linenumber" name="137" href="#137">137</a> panicker,
+<a class="jxr_linenumber" name="138" href="#138">138</a> handlers,
+<a class="jxr_linenumber" name="139" href="#139">139</a> metrics);
<a class="jxr_linenumber" name="140" href="#140">140</a>
-<a class="jxr_linenumber" name="141" href="#141">141</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="141" href="#141">141</a> proc.addCommitToBatch(1, 2, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
<a class="jxr_linenumber" name="142" href="#142">142</a>
-<a class="jxr_linenumber" name="143" href="#143">143</a> }
+<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">new</strong> RequestProcessorImpl(metrics, mock(TimestampOracle.<strong class="jxr_keyword">class</strong>), proc, panicker, mock(TSOServerConfig.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="144" href="#144">144</a>
-<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// Note this test has been moved and refactored to TestPersistenceProcessor because</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// it tests the behaviour of the PersistenceProcessor.</em>
-<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// Please, remove me in a future commit</em>
-<a class="jxr_linenumber" name="148" href="#148">148</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRuntimeExceptionTakesDownDaemon() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="150" href="#150">150</a>
-<a class="jxr_linenumber" name="151" href="#151">151</a> Panicker panicker = spy(<strong class="jxr_keyword">new</strong> MockPanicker());
-<a class="jxr_linenumber" name="152" href="#152">152</a>
-<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">final</strong> CommitTable.Writer mockWriter = mock(CommitTable.Writer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="154" href="#154">154</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"Kaboom!"</span>)).when(mockWriter).addCommittedTransaction(anyLong(), anyLong());
-<a class="jxr_linenumber" name="155" href="#155">155</a>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">final</strong> CommitTable.Client mockClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="157" href="#157">157</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> CommitTable() {
-<a class="jxr_linenumber" name="158" href="#158">158</a> @Override
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">public</strong> Writer getWriter() {
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">return</strong> mockWriter;
-<a class="jxr_linenumber" name="161" href="#161">161</a> }
-<a class="jxr_linenumber" name="162" href="#162">162</a>
-<a class="jxr_linenumber" name="163" href="#163">163</a> @Override
-<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">public</strong> Client getClient() {
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">return</strong> mockClient;
-<a class="jxr_linenumber" name="166" href="#166">166</a> }
-<a class="jxr_linenumber" name="167" href="#167">167</a> };
-<a class="jxr_linenumber" name="168" href="#168">168</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="169" href="#169">169</a> ObjectPool<Batch> batchPool = <strong class="jxr_keyword">new</strong> BatchPoolModule(config).getBatchPool();
-<a class="jxr_linenumber" name="170" href="#170">170</a>
-<a class="jxr_linenumber" name="171" href="#171">171</a> PersistenceProcessorHandler[] handlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < config.getNumConcurrentCTWriters(); i++) {
-<a class="jxr_linenumber" name="173" href="#173">173</a> handlers[i] = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
-<a class="jxr_linenumber" name="174" href="#174">174</a> <span class="jxr_string">"localhost:1234"</span>,
-<a class="jxr_linenumber" name="175" href="#175">175</a> mock(LeaseManager.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="176" href="#176">176</a> commitTable,
-<a class="jxr_linenumber" name="177" href="#177">177</a> mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="178" href="#178">178</a> mock(RetryProcessor.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="179" href="#179">179</a> panicker);
-<a class="jxr_linenumber" name="180" href="#180">180</a> }
-<a class="jxr_linenumber" name="181" href="#181">181</a>
-<a class="jxr_linenumber" name="182" href="#182">182</a> PersistenceProcessor proc = <strong class="jxr_keyword">new</strong> PersistenceProcessorImpl(config,
-<a class="jxr_linenumber" name="183" href="#183">183</a> commitTable,
-<a class="jxr_linenumber" name="184" href="#184">184</a> batchPool,
-<a class="jxr_linenumber" name="185" href="#185">185</a> panicker,
-<a class="jxr_linenumber" name="186" href="#186">186</a> handlers,
-<a class="jxr_linenumber" name="187" href="#187">187</a> metrics);
-<a class="jxr_linenumber" name="188" href="#188">188</a> proc.addCommitToBatch(1, 2, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
-<a class="jxr_linenumber" name="189" href="#189">189</a>
-<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">new</strong> RequestProcessorImpl(metrics, mock(TimestampOracle.<strong class="jxr_keyword">class</strong>), proc, panicker, mock(TSOServerConfig.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="191" href="#191">191</a>
-<a class="jxr_linenumber" name="192" href="#192">192</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="145" href="#145">145</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> }
+<a class="jxr_linenumber" name="148" href="#148">148</a>
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment">// Note this test has been moved and refactored to TestPersistenceProcessor because</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_comment">// it tests the behaviour of the PersistenceProcessor.</em>
+<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment">// Please, remove me in a future commit</em>
+<a class="jxr_linenumber" name="152" href="#152">152</a> @Test
+<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRuntimeExceptionTakesDownDaemon() <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> Panicker panicker = spy(<strong class="jxr_keyword">new</strong> MockPanicker());
+<a class="jxr_linenumber" name="156" href="#156">156</a>
+<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">final</strong> CommitTable.Writer mockWriter = mock(CommitTable.Writer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="158" href="#158">158</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"Kaboom!"</span>)).when(mockWriter).addCommittedTransaction(anyLong(), anyLong());
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">final</strong> CommitTable.Client mockClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="161" href="#161">161</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> CommitTable() {
+<a class="jxr_linenumber" name="162" href="#162">162</a> @Override
+<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> Writer getWriter() {
+<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">return</strong> mockWriter;
+<a class="jxr_linenumber" name="165" href="#165">165</a> }
+<a class="jxr_linenumber" name="166" href="#166">166</a>
+<a class="jxr_linenumber" name="167" href="#167">167</a> @Override
+<a class="jxr_linenumber" name="168" href="#168">168</a> <strong class="jxr_keyword">public</strong> Client getClient() {
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">return</strong> mockClient;
+<a class="jxr_linenumber" name="170" href="#170">170</a> }
+<a class="jxr_linenumber" name="171" href="#171">171</a> };
+<a class="jxr_linenumber" name="172" href="#172">172</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="173" href="#173">173</a> ObjectPool<Batch> batchPool = <strong class="jxr_keyword">new</strong> BatchPoolModule(config).getBatchPool();
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> PersistenceProcessorHandler[] handlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < config.getNumConcurrentCTWriters(); i++) {
+<a class="jxr_linenumber" name="177" href="#177">177</a> handlers[i] = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler(metrics,
+<a class="jxr_linenumber" name="178" href="#178">178</a> <span class="jxr_string">"localhost:1234"</span>,
+<a class="jxr_linenumber" name="179" href="#179">179</a> mock(LeaseManager.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="180" href="#180">180</a> commitTable,
+<a class="jxr_linenumber" name="181" href="#181">181</a> mock(ReplyProcessor.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="182" href="#182">182</a> mock(RetryProcessor.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="183" href="#183">183</a> panicker);
+<a class="jxr_linenumber" name="184" href="#184">184</a> }
+<a class="jxr_linenumber" name="185" href="#185">185</a>
+<a class="jxr_linenumber" name="186" href="#186">186</a> PersistenceProcessor proc = <strong class="jxr_keyword">new</strong> PersistenceProcessorImpl(config,
+<a class="jxr_linenumber" name="187" href="#187">187</a> commitTable,
+<a class="jxr_linenumber" name="188" href="#188">188</a> batchPool,
+<a class="jxr_linenumber" name="189" href="#189">189</a> panicker,
+<a class="jxr_linenumber" name="190" href="#190">190</a> handlers,
+<a class="jxr_linenumber" name="191" href="#191">191</a> metrics);
+<a class="jxr_linenumber" name="192" href="#192">192</a> proc.addCommitToBatch(1, 2, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
<a class="jxr_linenumber" name="193" href="#193">193</a>
-<a class="jxr_linenumber" name="194" href="#194">194</a> }
+<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">new</strong> RequestProcessorImpl(metrics, mock(TimestampOracle.<strong class="jxr_keyword">class</strong>), proc, panicker, mock(TSOServerConfig.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="195" href="#195">195</a>
-<a class="jxr_linenumber" name="196" href="#196">196</a> }
+<a class="jxr_linenumber" name="196" href="#196">196</a> verify(panicker, timeout(1000).atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<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>
+<a class="jxr_linenumber" name="200" href="#200">200</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/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..af442b1 100644
--- a/xref-test/org/apache/omid/tso/TestRequestProcessor.html
+++ b/xref-test/org/apache/omid/tso/TestRequestProcessor.html
@@ -42,162 +42,163 @@
<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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anyBoolean;
+<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.anyLong;
+<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.eq;
+<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.doReturn;
+<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.mock;
+<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.timeout;
+<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.verify;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="43" href="#43">43</a>
+<a class="jxr_linenumber" name="44" href="#44">44</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="45" href="#45">45</a>
+<a class="jxr_linenumber" name="46" href="#46">46</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="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> <strong class="jxr_keyword">int</strong> CONFLICT_MAP_SIZE = 1000;
+<a class="jxr_linenumber" name="49" href="#49">49</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="50" href="#50">50</a>
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
+<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> PersistenceProcessor persist;
+<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> TSOStateManager stateManager;
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Request processor under test</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> RequestProcessor requestProc;
+<a class="jxr_linenumber" name="59" href="#59">59</a>
+<a class="jxr_linenumber" name="60" href="#60">60</a> @BeforeMethod
+<a class="jxr_linenumber" name="61" href="#61">61</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="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <em class="jxr_comment">// Build the required scaffolding for the test</em>
+<a class="jxr_linenumber" name="64" href="#64">64</a> MetricsRegistry metrics = <strong class="jxr_keyword">new</strong> NullMetricsProvider();
+<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="66" href="#66">66</a> TimestampOracleImpl timestampOracle =
+<a class="jxr_linenumber" name="67" href="#67">67</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="68" href="#68">68</a>
+<a class="jxr_linenumber" name="69" href="#69">69</a> stateManager = <strong class="jxr_keyword">new</strong> TSOStateManagerImpl(timestampOracle);
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> persist = mock(PersistenceProcessor.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="72" href="#72">72</a> SettableFuture<Void> f = SettableFuture.create();
+<a class="jxr_linenumber" name="73" href="#73">73</a> f.set(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="74" href="#74">74</a> doReturn(f).when(persist).persistLowWatermark(any(Long.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="75" href="#75">75</a>
+<a class="jxr_linenumber" name="76" href="#76">76</a> TSOServerConfig config = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="77" href="#77">77</a> config.setMaxItems(CONFLICT_MAP_SIZE);
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</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="80" href="#80">80</a>
+<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_comment">// Initialize the state for the experiment</em>
+<a class="jxr_linenumber" name="82" href="#82">82</a> stateManager.register(requestProc);
+<a class="jxr_linenumber" name="83" href="#83">83</a> stateManager.initialize();
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> }
+<a class="jxr_linenumber" name="86" href="#86">86</a>
+<a class="jxr_linenumber" name="87" href="#87">87</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="88" href="#88">88</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="89" href="#89">89</a>
+<a class="jxr_linenumber" name="90" href="#90">90</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="91" href="#91">91</a> ArgumentCaptor<Long> firstTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="92" href="#92">92</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
+<a class="jxr_linenumber" name="93" href="#93">93</a> firstTScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">long</strong> firstTS = firstTScapture.getValue();
+<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_comment">// verify that timestamps increase monotonically</em>
+<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 100; i++) {
+<a class="jxr_linenumber" name="98" href="#98">98</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="99" href="#99">99</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="100" href="#100">100</a> }
+<a class="jxr_linenumber" name="101" href="#101">101</a>
+<a class="jxr_linenumber" name="102" href="#102">102</a> }
+<a class="jxr_linenumber" name="103" href="#103">103</a>
+<a class="jxr_linenumber" name="104" href="#104">104</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="105" href="#105">105</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="106" href="#106">106</a>
+<a class="jxr_linenumber" name="107" href="#107">107</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="108" href="#108">108</a> ArgumentCaptor<Long> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="109" href="#109">109</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(
+<a class="jxr_linenumber" name="110" href="#110">110</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">long</strong> firstTS = TScapture.getValue();
+<a class="jxr_linenumber" name="112" href="#112">112</a>
+<a class="jxr_linenumber" name="113" href="#113">113</a> List<Long> writeSet = Lists.newArrayList(1L, 20L, 203L);
+<a class="jxr_linenumber" name="114" href="#114">114</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="115" href="#115">115</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(firstTS - 1), anyBoolean(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="116" href="#116">116</a>
+<a class="jxr_linenumber" name="117" href="#117">117</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="118" href="#118">118</a> ArgumentCaptor<Long> commitTScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="119" href="#119">119</a>
+<a class="jxr_linenumber" name="120" href="#120">120</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="121" href="#121">121</a> assertTrue(commitTScapture.getValue() > firstTS, <span class="jxr_string">"Commit TS must be greater than start TS"</span>);
+<a class="jxr_linenumber" name="122" href="#122">122</a>
+<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// test conflict</em>
+<a class="jxr_linenumber" name="124" href="#124">124</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="125" href="#125">125</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="126" href="#126">126</a> verify(persist, timeout(100).times(2)).addTimestampToBatch(
+<a class="jxr_linenumber" name="127" href="#127">127</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">long</strong> secondTS = TScapture.getValue();
+<a class="jxr_linenumber" name="129" href="#129">129</a>
+<a class="jxr_linenumber" name="130" href="#130">130</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="131" href="#131">131</a> TScapture = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="132" href="#132">132</a> verify(persist, timeout(100).times(3)).addTimestampToBatch(
+<a class="jxr_linenumber" name="133" href="#133">133</a> TScapture.capture(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">long</strong> thirdTS = TScapture.getValue();
+<a class="jxr_linenumber" name="135" href="#135">135</a>
+<a class="jxr_linenumber" name="136" href="#136">136</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="137" href="#137">137</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="138" href="#138">138</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="139" href="#139">139</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(secondTS), anyBoolean(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<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>
+<a class="jxr_linenumber" name="143" href="#143">143</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="144" href="#144">144</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="145" href="#145">145</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a> List<Long> writeSet = Collections.emptyList();
+<a class="jxr_linenumber" name="147" href="#147">147</a>
+<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_comment">// Start a transaction...</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a> requestProc.timestampRequest(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> MonitoringContext(metrics));
+<a class="jxr_linenumber" name="150" href="#150">150</a> ArgumentCaptor<Long> capturedTS = ArgumentCaptor.forClass(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="151" href="#151">151</a> verify(persist, timeout(100).times(1)).addTimestampToBatch(capturedTS.capture(),
+<a class="jxr_linenumber" name="152" href="#152">152</a> any(Channel.<strong class="jxr_keyword">class</strong>),
+<a class="jxr_linenumber" name="153" href="#153">153</a> any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">long</strong> startTS = capturedTS.getValue();
+<a class="jxr_linenumber" name="155" href="#155">155</a>
+<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment">// ... simulate the reset of the RequestProcessor state (e.g. due to</em>
+<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_comment">// a change in mastership) and...</em>
+<a class="jxr_linenumber" name="158" href="#158">158</a> stateManager.initialize();
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_comment">// ...check that the transaction is aborted when trying to commit</em>
+<a class="jxr_linenumber" name="161" href="#161">161</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="162" href="#162">162</a> verify(persist, timeout(100).times(1)).addAbortToBatch(eq(startTS), anyBoolean(), any(Channel.<strong class="jxr_keyword">class</strong>), any(MonitoringContext.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="163" href="#163">163</a>
+<a class="jxr_linenumber" name="164" href="#164">164</a> }
+<a class="jxr_linenumber" name="165" href="#165">165</a>
+<a class="jxr_linenumber" name="166" href="#166">166</a> @Test(timeOut = 5_000)
+<a class="jxr_linenumber" name="167" href="#167">167</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="168" href="#168">168</a>
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ANY_START_TS = 1;
+<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> FIRST_COMMIT_TS_EVICTED = 1L;
+<a class="jxr_linenumber" name="171" href="#171">171</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="172" href="#172">172</a>
+<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment">// Fill the cache to provoke a cache eviction</em>
+<a class="jxr_linenumber" name="174" href="#174">174</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="175" href="#175">175</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="176" href="#176">176</a> List<Long> writeSet = Lists.newArrayList(writeSetElementHash);
+<a class="jxr_linenumber" name="177" href="#177">177</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="178" href="#178">178</a> }
+<a class="jxr_linenumber" name="179" href="#179">179</a>
+<a class="jxr_linenumber" name="180" href="#180">180</a> Thread.currentThread().sleep(3000); <em class="jxr_comment">// Allow the Request processor to finish the request processing</em>
+<a class="jxr_linenumber" name="181" href="#181">181</a>
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// Check that first time its called is on init</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> verify(persist, timeout(100).times(1)).persistLowWatermark(eq(0L));
+<a class="jxr_linenumber" name="184" href="#184">184</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="185" href="#185">185</a> verify(persist, timeout(100).times(1)).persistLowWatermark(eq(FIRST_COMMIT_TS_EVICTED));
+<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment">// Finally it should never be called with the next element</em>
+<a class="jxr_linenumber" name="187" href="#187">187</a> verify(persist, timeout(100).never()).persistLowWatermark(eq(NEXT_COMMIT_TS_THAT_SHOULD_BE_EVICTED));
+<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="191" href="#191">191</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TestTSOStateManager.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestTSOStateManager.html b/xref-test/org/apache/omid/tso/TestTSOStateManager.html
index 508ff06..77f8dd0 100644
--- a/xref-test/org/apache/omid/tso/TestTSOStateManager.html
+++ b/xref-test/org/apache/omid/tso/TestTSOStateManager.html
@@ -60,7 +60,7 @@
<a class="jxr_linenumber" name="50" href="#50">50</a> when(timestampOracle.getLast()).thenReturn(INITIAL_STATE_VALUE);
<a class="jxr_linenumber" name="51" href="#51">51</a> }
<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="53" href="#53">53</a> @Test
<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTSOServerStateInitialization() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="55" href="#55">55</a>
<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// Reset the state and check we get the initial state values</em>
@@ -81,7 +81,7 @@
<a class="jxr_linenumber" name="71" href="#71">71</a>
<a class="jxr_linenumber" name="72" href="#72">72</a> }
<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="74" href="#74">74</a> @Test
<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testObserverRegistrationAndDeregistrationForStateChanges() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="76" href="#76">76</a>
<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_comment">// Register observer 1 for receiving state changes</em>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TestTimestampOracle.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestTimestampOracle.html b/xref-test/org/apache/omid/tso/TestTimestampOracle.html
index 57b5464..789805c 100644
--- a/xref-test/org/apache/omid/tso/TestTimestampOracle.html
+++ b/xref-test/org/apache/omid/tso/TestTimestampOracle.html
@@ -107,20 +107,24 @@
<a class="jxr_linenumber" name="97" href="#97">97</a> Thread allocThread = <strong class="jxr_keyword">new</strong> Thread(<span class="jxr_string">"AllocThread"</span>) {
<a class="jxr_linenumber" name="98" href="#98">98</a> @Override
<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="101" href="#101">101</a> timestampOracle.next();
-<a class="jxr_linenumber" name="102" href="#102">102</a> }
-<a class="jxr_linenumber" name="103" href="#103">103</a> }
-<a class="jxr_linenumber" name="104" href="#104">104</a> };
-<a class="jxr_linenumber" name="105" href="#105">105</a> allocThread.start();
-<a class="jxr_linenumber" name="106" href="#106">106</a>
-<a class="jxr_linenumber" name="107" href="#107">107</a> updateMaxTimestampMethodCalled.await();
-<a class="jxr_linenumber" name="108" href="#108">108</a>
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// Verify that it has blown up</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> verify(panicker, atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="111" href="#111">111</a> }
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="102" href="#102">102</a> timestampOracle.next();
+<a class="jxr_linenumber" name="103" href="#103">103</a> }
+<a class="jxr_linenumber" name="104" href="#104">104</a> } <strong class="jxr_keyword">catch</strong> (IOException ioe) {
+<a class="jxr_linenumber" name="105" href="#105">105</a> LOG.error(<span class="jxr_string">"Shouldn't occur"</span>);
+<a class="jxr_linenumber" name="106" href="#106">106</a> }
+<a class="jxr_linenumber" name="107" href="#107">107</a> }
+<a class="jxr_linenumber" name="108" href="#108">108</a> };
+<a class="jxr_linenumber" name="109" href="#109">109</a> allocThread.start();
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> updateMaxTimestampMethodCalled.await();
<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> }
+<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_comment">// Verify that it has blown up</em>
+<a class="jxr_linenumber" name="114" href="#114">114</a> verify(panicker, atLeastOnce()).panic(anyString(), any(Throwable.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="115" href="#115">115</a> }
+<a class="jxr_linenumber" name="116" href="#116">116</a>
+<a class="jxr_linenumber" name="117" href="#117">117</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html b/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
index e9ef446..595b920 100644
--- a/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
+++ b/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
@@ -76,7 +76,7 @@
<a class="jxr_linenumber" name="66" href="#66">66</a> tsoServerPortForTest = TestUtils.getFreeLocalPort();
<a class="jxr_linenumber" name="67" href="#67">67</a>
<a class="jxr_linenumber" name="68" href="#68">68</a> TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="69" href="#69">69</a> tsoConfig.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="69" href="#69">69</a> tsoConfig.setMaxItems(1000);
<a class="jxr_linenumber" name="70" href="#70">70</a> tsoConfig.setPort(tsoServerPortForTest);
<a class="jxr_linenumber" name="71" href="#71">71</a> Module tsoServerMockModule = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(tsoConfig);
<a class="jxr_linenumber" name="72" href="#72">72</a> Injector injector = Guice.createInjector(tsoServerMockModule);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html b/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
index 3846e24..d64c0a9 100644
--- a/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
+++ b/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
@@ -44,7 +44,7 @@
<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c1 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xdeadbeefL);
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c2 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(-0xfeedcafeL);
<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="37" href="#37">37</a> @Test(timeOut = 10000)
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConflicts() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="39" href="#39">39</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
<a class="jxr_linenumber" name="40" href="#40">40</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());
@@ -62,7 +62,7 @@
<a class="jxr_linenumber" name="52" href="#52">52</a> }
<a class="jxr_linenumber" name="53" href="#53">53</a> }
<a class="jxr_linenumber" name="54" href="#54">54</a>
-<a class="jxr_linenumber" name="55" href="#55">55</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="55" href="#55">55</a> @Test(timeOut = 10000)
<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testWatermarkUpdate() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="57" href="#57">57</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
<a class="jxr_linenumber" name="58" href="#58">58</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());