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/06/17 21:21:21 UTC
[46/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 6/17/16 2:20 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTable.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTable.html b/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTable.html
index 56283b8..b17d32c 100644
--- a/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTable.html
+++ b/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTable.html
@@ -8,43 +8,43 @@
<body>
<div id="overview"><a href="../../../../../../../target/site/testapidocs/org/apache/omid/committable/hbase/TestHBaseCommitTable.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.committable.hbase;
<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.base.Optional;
<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.ListenableFuture;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Client;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.CommitTimestamp;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Writer;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.hbase.HBaseCommitTable.HBaseClient;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.conf.Configuration;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseConfiguration;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HColumnDescriptor;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MiniHBaseCluster;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HBaseAdmin;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.coprocessor.AggregationClient;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.coprocessor.LongColumnInterpreter;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.conf.Configuration;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseConfiguration;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HColumnDescriptor;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MiniHBaseCluster;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HBaseAdmin;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.coprocessor.AggregationClient;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.coprocessor.LongColumnInterpreter;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Client;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.CommitTimestamp;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Writer;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.hbase.HBaseCommitTable.HBaseClient;
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.testng.Assert;
@@ -57,9 +57,9 @@
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.ExecutionException;
<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.Future;
<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.AssertJUnit.assertEquals;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.AssertJUnit.assertFalse;
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.AssertJUnit.assertTrue;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
<a class="jxr_linenumber" name="53" href="#53">53</a>
<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/omid/committable/hbase/TestHBaseCommitTable.html">TestHBaseCommitTable</a> {
<a class="jxr_linenumber" name="55" href="#55">55</a>
@@ -149,14 +149,14 @@
<a class="jxr_linenumber" name="139" href="#139">139</a> Client client = commitTable.getClient();
<a class="jxr_linenumber" name="140" href="#140">140</a>
<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment">// Test that the first time the table is empty</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> assertEquals(<span class="jxr_string">"Rows should be 0!"</span>, 0, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="142" href="#142">142</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 0, <span class="jxr_string">"Rows should be 0!"</span>);
<a class="jxr_linenumber" name="143" href="#143">143</a>
<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_comment">// Test the successful creation of 1000 txs in the table</em>
<a class="jxr_linenumber" name="145" href="#145">145</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 1000; i++) {
<a class="jxr_linenumber" name="146" href="#146">146</a> writer.addCommittedTransaction(i, i + 1);
<a class="jxr_linenumber" name="147" href="#147">147</a> }
<a class="jxr_linenumber" name="148" href="#148">148</a> writer.flush();
-<a class="jxr_linenumber" name="149" href="#149">149</a> assertEquals(<span class="jxr_string">"Rows should be 1000!"</span>, 1000, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="149" href="#149">149</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 1000, <span class="jxr_string">"Rows should be 1000!"</span>);
<a class="jxr_linenumber" name="150" href="#150">150</a>
<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment">// Test the we get the right commit timestamps for each previously inserted tx</em>
<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">long</strong> i = 0; i < 1000; i++) {
@@ -164,9 +164,9 @@
<a class="jxr_linenumber" name="154" href="#154">154</a> assertTrue(commitTimestamp.isPresent());
<a class="jxr_linenumber" name="155" href="#155">155</a> assertTrue(commitTimestamp.get().isValid());
<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">long</strong> ct = commitTimestamp.get().getValue();
-<a class="jxr_linenumber" name="157" href="#157">157</a> assertEquals(<span class="jxr_string">"Commit timestamp should be "</span> + (i + 1), (i + 1), ct);
+<a class="jxr_linenumber" name="157" href="#157">157</a> assertEquals(ct, (i + 1), <span class="jxr_string">"Commit timestamp should be "</span> + (i + 1));
<a class="jxr_linenumber" name="158" href="#158">158</a> }
-<a class="jxr_linenumber" name="159" href="#159">159</a> assertEquals(<span class="jxr_string">"Rows should be 1000!"</span>, 1000, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="159" href="#159">159</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 1000, <span class="jxr_string">"Rows should be 1000!"</span>);
<a class="jxr_linenumber" name="160" href="#160">160</a>
<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_comment">// Test the successful deletion of the 1000 txs</em>
<a class="jxr_linenumber" name="162" href="#162">162</a> Future<Void> f;
@@ -174,31 +174,31 @@
<a class="jxr_linenumber" name="164" href="#164">164</a> f = client.completeTransaction(i);
<a class="jxr_linenumber" name="165" href="#165">165</a> f.get();
<a class="jxr_linenumber" name="166" href="#166">166</a> }
-<a class="jxr_linenumber" name="167" href="#167">167</a> assertEquals(<span class="jxr_string">"Rows should be 0!"</span>, 0, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="167" href="#167">167</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 0, <span class="jxr_string">"Rows should be 0!"</span>);
<a class="jxr_linenumber" name="168" href="#168">168</a>
<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment">// Test we don't get a commit timestamp for a non-existent transaction id in the table</em>
<a class="jxr_linenumber" name="170" href="#170">170</a> Optional<CommitTimestamp> commitTimestamp = client.getCommitTimestamp(0).get();
-<a class="jxr_linenumber" name="171" href="#171">171</a> assertFalse(<span class="jxr_string">"Commit timestamp should not be present"</span>, commitTimestamp.isPresent());
+<a class="jxr_linenumber" name="171" href="#171">171</a> assertFalse(commitTimestamp.isPresent(), <span class="jxr_string">"Commit timestamp should not be present"</span>);
<a class="jxr_linenumber" name="172" href="#172">172</a>
<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment">// Test that the first time, the low watermark family in table is empty</em>
-<a class="jxr_linenumber" name="174" href="#174">174</a> assertEquals(<span class="jxr_string">"Rows should be 0!"</span>, 0, rowCount(TABLE_NAME, lowWatermarkFamily));
+<a class="jxr_linenumber" name="174" href="#174">174</a> assertEquals(rowCount(TABLE_NAME, lowWatermarkFamily), 0, <span class="jxr_string">"Rows should be 0!"</span>);
<a class="jxr_linenumber" name="175" href="#175">175</a>
<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment">// Test the unsuccessful read of the low watermark the first time</em>
<a class="jxr_linenumber" name="177" href="#177">177</a> ListenableFuture<Long> lowWatermarkFuture = client.readLowWatermark();
-<a class="jxr_linenumber" name="178" href="#178">178</a> assertEquals(<span class="jxr_string">"Low watermark should be 0"</span>, Long.valueOf(0), lowWatermarkFuture.get());
+<a class="jxr_linenumber" name="178" href="#178">178</a> assertEquals(lowWatermarkFuture.get(), Long.valueOf(0), <span class="jxr_string">"Low watermark should be 0"</span>);
<a class="jxr_linenumber" name="179" href="#179">179</a>
<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_comment">// Test the successful update of the low watermark</em>
<a class="jxr_linenumber" name="181" href="#181">181</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> lowWatermark = 0; lowWatermark < 1000; lowWatermark++) {
<a class="jxr_linenumber" name="182" href="#182">182</a> writer.updateLowWatermark(lowWatermark);
<a class="jxr_linenumber" name="183" href="#183">183</a> }
<a class="jxr_linenumber" name="184" href="#184">184</a> writer.flush();
-<a class="jxr_linenumber" name="185" href="#185">185</a> assertEquals(<span class="jxr_string">"Should there be only one row!"</span>, 1, rowCount(TABLE_NAME, lowWatermarkFamily));
+<a class="jxr_linenumber" name="185" href="#185">185</a> assertEquals(rowCount(TABLE_NAME, lowWatermarkFamily), 1, <span class="jxr_string">"Should there be only one row!"</span>);
<a class="jxr_linenumber" name="186" href="#186">186</a>
<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// Test the successful read of the low watermark</em>
<a class="jxr_linenumber" name="188" href="#188">188</a> lowWatermarkFuture = client.readLowWatermark();
<a class="jxr_linenumber" name="189" href="#189">189</a> <strong class="jxr_keyword">long</strong> lowWatermark = lowWatermarkFuture.get();
-<a class="jxr_linenumber" name="190" href="#190">190</a> assertEquals(<span class="jxr_string">"Low watermark should be 999"</span>, 999, lowWatermark);
-<a class="jxr_linenumber" name="191" href="#191">191</a> assertEquals(<span class="jxr_string">"Should there be only one row!"</span>, 1, rowCount(TABLE_NAME, lowWatermarkFamily));
+<a class="jxr_linenumber" name="190" href="#190">190</a> assertEquals(lowWatermark, 999, <span class="jxr_string">"Low watermark should be 999"</span>);
+<a class="jxr_linenumber" name="191" href="#191">191</a> assertEquals(rowCount(TABLE_NAME, lowWatermarkFamily), 1, <span class="jxr_string">"Should there be only one row!"</span>);
<a class="jxr_linenumber" name="192" href="#192">192</a>
<a class="jxr_linenumber" name="193" href="#193">193</a> }
<a class="jxr_linenumber" name="194" href="#194">194</a>
@@ -220,7 +220,7 @@
<a class="jxr_linenumber" name="210" href="#210">210</a> Client client = commitTable.getClient();
<a class="jxr_linenumber" name="211" href="#211">211</a>
<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment">// Test that initially the table is empty</em>
-<a class="jxr_linenumber" name="213" href="#213">213</a> assertEquals(<span class="jxr_string">"Rows should be 0!"</span>, 0, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="213" href="#213">213</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 0, <span class="jxr_string">"Rows should be 0!"</span>);
<a class="jxr_linenumber" name="214" href="#214">214</a>
<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_comment">// Test that a transaction can be added properly to the commit table</em>
<a class="jxr_linenumber" name="216" href="#216">216</a> writer.addCommittedTransaction(TX1_ST, TX1_CT);
@@ -229,28 +229,28 @@
<a class="jxr_linenumber" name="219" href="#219">219</a> assertTrue(commitTimestamp.isPresent());
<a class="jxr_linenumber" name="220" href="#220">220</a> assertTrue(commitTimestamp.get().isValid());
<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">long</strong> ct = commitTimestamp.get().getValue();
-<a class="jxr_linenumber" name="222" href="#222">222</a> assertEquals(<span class="jxr_string">"Commit timestamp should be "</span> + TX1_CT, TX1_CT, ct);
+<a class="jxr_linenumber" name="222" href="#222">222</a> assertEquals(ct, TX1_CT, <span class="jxr_string">"Commit timestamp should be "</span> + TX1_CT);
<a class="jxr_linenumber" name="223" href="#223">223</a>
<a class="jxr_linenumber" name="224" href="#224">224</a> <em class="jxr_comment">// Test that a committed transaction cannot be invalidated and</em>
<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_comment">// preserves its commit timestamp after that</em>
<a class="jxr_linenumber" name="226" href="#226">226</a> <strong class="jxr_keyword">boolean</strong> wasInvalidated = client.tryInvalidateTransaction(TX1_ST).get();
-<a class="jxr_linenumber" name="227" href="#227">227</a> assertFalse(<span class="jxr_string">"Transaction should not be invalidated"</span>, wasInvalidated);
+<a class="jxr_linenumber" name="227" href="#227">227</a> assertFalse(wasInvalidated, <span class="jxr_string">"Transaction should not be invalidated"</span>);
<a class="jxr_linenumber" name="228" href="#228">228</a>
<a class="jxr_linenumber" name="229" href="#229">229</a> commitTimestamp = client.getCommitTimestamp(TX1_ST).get();
<a class="jxr_linenumber" name="230" href="#230">230</a> assertTrue(commitTimestamp.isPresent());
<a class="jxr_linenumber" name="231" href="#231">231</a> assertTrue(commitTimestamp.get().isValid());
<a class="jxr_linenumber" name="232" href="#232">232</a> ct = commitTimestamp.get().getValue();
-<a class="jxr_linenumber" name="233" href="#233">233</a> assertEquals(<span class="jxr_string">"Commit timestamp should be "</span> + TX1_CT, TX1_CT, ct);
+<a class="jxr_linenumber" name="233" href="#233">233</a> assertEquals(ct, TX1_CT, <span class="jxr_string">"Commit timestamp should be "</span> + TX1_CT);
<a class="jxr_linenumber" name="234" href="#234">234</a>
<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment">// Test that a non-committed transaction can be invalidated...</em>
<a class="jxr_linenumber" name="236" href="#236">236</a> wasInvalidated = client.tryInvalidateTransaction(TX2_ST).get();
-<a class="jxr_linenumber" name="237" href="#237">237</a> assertTrue(<span class="jxr_string">"Transaction should be invalidated"</span>, wasInvalidated);
+<a class="jxr_linenumber" name="237" href="#237">237</a> assertTrue(wasInvalidated, <span class="jxr_string">"Transaction should be invalidated"</span>);
<a class="jxr_linenumber" name="238" href="#238">238</a> commitTimestamp = client.getCommitTimestamp(TX2_ST).get();
<a class="jxr_linenumber" name="239" href="#239">239</a> assertTrue(commitTimestamp.isPresent());
<a class="jxr_linenumber" name="240" href="#240">240</a> assertFalse(commitTimestamp.get().isValid());
<a class="jxr_linenumber" name="241" href="#241">241</a> ct = commitTimestamp.get().getValue();
-<a class="jxr_linenumber" name="242" href="#242">242</a> assertEquals(<span class="jxr_string">"Commit timestamp should be "</span> + CommitTable.INVALID_TRANSACTION_MARKER,
-<a class="jxr_linenumber" name="243" href="#243">243</a> CommitTable.INVALID_TRANSACTION_MARKER, ct);
+<a class="jxr_linenumber" name="242" href="#242">242</a> assertEquals(ct, CommitTable.INVALID_TRANSACTION_MARKER,
+<a class="jxr_linenumber" name="243" href="#243">243</a> <span class="jxr_string">"Commit timestamp should be "</span> + CommitTable.INVALID_TRANSACTION_MARKER);
<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment">// ...and that if it has been already invalidated, it remains</em>
<a class="jxr_linenumber" name="245" href="#245">245</a> <em class="jxr_comment">// invalidated when someone tries to commit it</em>
<a class="jxr_linenumber" name="246" href="#246">246</a> writer.addCommittedTransaction(TX2_ST, TX2_CT);
@@ -259,12 +259,12 @@
<a class="jxr_linenumber" name="249" href="#249">249</a> assertTrue(commitTimestamp.isPresent());
<a class="jxr_linenumber" name="250" href="#250">250</a> assertFalse(commitTimestamp.get().isValid());
<a class="jxr_linenumber" name="251" href="#251">251</a> ct = commitTimestamp.get().getValue();
-<a class="jxr_linenumber" name="252" href="#252">252</a> assertEquals(<span class="jxr_string">"Commit timestamp should be "</span> + CommitTable.INVALID_TRANSACTION_MARKER,
-<a class="jxr_linenumber" name="253" href="#253">253</a> CommitTable.INVALID_TRANSACTION_MARKER, ct);
+<a class="jxr_linenumber" name="252" href="#252">252</a> assertEquals(ct, CommitTable.INVALID_TRANSACTION_MARKER,
+<a class="jxr_linenumber" name="253" href="#253">253</a> <span class="jxr_string">"Commit timestamp should be "</span> + CommitTable.INVALID_TRANSACTION_MARKER);
<a class="jxr_linenumber" name="254" href="#254">254</a>
<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_comment">// Test that at the end of the test, the commit table contains 2</em>
<a class="jxr_linenumber" name="256" href="#256">256</a> <em class="jxr_comment">// elements, which correspond to the two rows added in the test</em>
-<a class="jxr_linenumber" name="257" href="#257">257</a> assertEquals(<span class="jxr_string">"Rows should be 2!"</span>, 2, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="257" href="#257">257</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 2, <span class="jxr_string">"Rows should be 2!"</span>);
<a class="jxr_linenumber" name="258" href="#258">258</a>
<a class="jxr_linenumber" name="259" href="#259">259</a> }
<a class="jxr_linenumber" name="260" href="#260">260</a>
@@ -284,7 +284,7 @@
<a class="jxr_linenumber" name="274" href="#274">274</a>
<a class="jxr_linenumber" name="275" href="#275">275</a> <em class="jxr_comment">// Completing first transaction should be fine</em>
<a class="jxr_linenumber" name="276" href="#276">276</a> client.completeTransaction(0).get();
-<a class="jxr_linenumber" name="277" href="#277">277</a> assertEquals(<span class="jxr_string">"Rows should be 999!"</span>, 999, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="277" href="#277">277</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 999, <span class="jxr_string">"Rows should be 999!"</span>);
<a class="jxr_linenumber" name="278" href="#278">278</a>
<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">// When closing, removing a transaction should throw an EE with an IOException</em>
<a class="jxr_linenumber" name="280" href="#280">280</a> client.close();
@@ -294,8 +294,8 @@
<a class="jxr_linenumber" name="284" href="#284">284</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException e) {
<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">// Expected</em>
<a class="jxr_linenumber" name="286" href="#286">286</a> }
-<a class="jxr_linenumber" name="287" href="#287">287</a> assertEquals(<span class="jxr_string">"Delete queue size should be 0!"</span>, 0, client.deleteQueue.size());
-<a class="jxr_linenumber" name="288" href="#288">288</a> assertEquals(<span class="jxr_string">"Rows should be 999!"</span>, 999, rowCount(TABLE_NAME, commitTableFamily));
+<a class="jxr_linenumber" name="287" href="#287">287</a> assertEquals(client.deleteQueue.size(), 0, <span class="jxr_string">"Delete queue size should be 0!"</span>);
+<a class="jxr_linenumber" name="288" href="#288">288</a> assertEquals(rowCount(TABLE_NAME, commitTableFamily), 999, <span class="jxr_string">"Rows should be 999!"</span>);
<a class="jxr_linenumber" name="289" href="#289">289</a>
<a class="jxr_linenumber" name="290" href="#290">290</a> }
<a class="jxr_linenumber" name="291" href="#291">291</a>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html b/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html
index 5ca0cef..58f49b5 100644
--- a/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html
+++ b/xref-test/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html
@@ -8,23 +8,23 @@
<body>
<div id="overview"><a href="../../../../../../../target/site/testapidocs/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.committable.hbase;
<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> org.apache.omid.committable.hbase.KeyGeneratorImplementations.BadRandomKeyGenerator;
@@ -40,7 +40,7 @@
<a class="jxr_linenumber" name="30" href="#30">30</a>
<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/omid/committable/hbase/TestHBaseCommitTableKey.html">TestHBaseCommitTableKey</a> {
<a class="jxr_linenumber" name="32" href="#32">32</a>
-<a class="jxr_linenumber" name="33" href="#33">33</a> @Test
+<a class="jxr_linenumber" name="33" href="#33">33</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEncodeDecode() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="35" href="#35">35</a> testKeyGen(<strong class="jxr_keyword">new</strong> BucketKeyGenerator());
<a class="jxr_linenumber" name="36" href="#36">36</a> testKeyGen(<strong class="jxr_keyword">new</strong> BadRandomKeyGenerator());
@@ -48,7 +48,7 @@
<a class="jxr_linenumber" name="38" href="#38">38</a> testKeyGen(<strong class="jxr_keyword">new</strong> SeqKeyGenerator());
<a class="jxr_linenumber" name="39" href="#39">39</a> }
<a class="jxr_linenumber" name="40" href="#40">40</a>
-<a class="jxr_linenumber" name="41" href="#41">41</a> @Test(enabled = false)
+<a class="jxr_linenumber" name="41" href="#41">41</a> @Test(enabled = false, timeOut = 10_000)
<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> testKeyGen(KeyGenerator keyGen) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="43" href="#43">43</a> assertEquals(keyGen.keyToStartTimestamp(keyGen.startTimestampToKey(0)), 0, <span class="jxr_string">"Should match"</span>);
<a class="jxr_linenumber" name="44" href="#44">44</a> assertEquals(keyGen.keyToStartTimestamp(keyGen.startTimestampToKey(1)), 1, <span class="jxr_string">"Should match"</span>);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/hbase/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/hbase/package-frame.html b/xref-test/org/apache/omid/committable/hbase/package-frame.html
index 7f6f610..0ce53e2 100644
--- a/xref-test/org/apache/omid/committable/hbase/package-frame.html
+++ b/xref-test/org/apache/omid/committable/hbase/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.committable.hbase</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.committable.hbase</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/hbase/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/hbase/package-summary.html b/xref-test/org/apache/omid/committable/hbase/package-summary.html
index e0d4759..b816f5c 100644
--- a/xref-test/org/apache/omid/committable/hbase/package-summary.html
+++ b/xref-test/org/apache/omid/committable/hbase/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.committable.hbase</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.committable.hbase</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/package-frame.html b/xref-test/org/apache/omid/committable/package-frame.html
index e6c825d..e3f5dba 100644
--- a/xref-test/org/apache/omid/committable/package-frame.html
+++ b/xref-test/org/apache/omid/committable/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.committable</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.committable</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/committable/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/committable/package-summary.html b/xref-test/org/apache/omid/committable/package-summary.html
index e4216a1..3a29cad 100644
--- a/xref-test/org/apache/omid/committable/package-summary.html
+++ b/xref-test/org/apache/omid/committable/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.committable</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.committable</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/package-frame.html b/xref-test/org/apache/omid/package-frame.html
index ce00597..0e0cb50 100644
--- a/xref-test/org/apache/omid/package-frame.html
+++ b/xref-test/org/apache/omid/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid</title>
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/package-summary.html b/xref-test/org/apache/omid/package-summary.html
index 60a7d2c..011d7f6 100644
--- a/xref-test/org/apache/omid/package-summary.html
+++ b/xref-test/org/apache/omid/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid</title>
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html b/xref-test/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html
index 594ae6b..3e1240c 100644
--- a/xref-test/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html
+++ b/xref-test/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html
@@ -8,23 +8,23 @@
<body>
<div id="overview"><a href="../../../../../../../target/site/testapidocs/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.timestamp.storage;
<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> org.apache.hadoop.conf.Configuration;
@@ -46,104 +46,106 @@
<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> java.io.IOException;
<a class="jxr_linenumber" name="38" href="#38">38</a>
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.*;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.AssertJUnit.assertEquals;
-<a class="jxr_linenumber" name="41" href="#41">41</a>
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.html">TestHBaseTimestampStorage</a> {
-<a class="jxr_linenumber" name="43" href="#43">43</a>
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestHBaseTimestampStorage.<strong class="jxr_keyword">class</strong>);
-<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> TableName TABLE_NAME = TableName.valueOf(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
-<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> HBaseTestingUtility testutil;
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> MiniHBaseCluster hbasecluster;
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Configuration hbaseConf;
-<a class="jxr_linenumber" name="51" href="#51">51</a>
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_CF_NAME;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME;
+<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.assertEquals;
+<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/timestamp/storage/TestHBaseTimestampStorage.html">TestHBaseTimestampStorage</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(TestHBaseTimestampStorage.<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> TableName TABLE_NAME = TableName.valueOf(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> HBaseTestingUtility testutil;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> MiniHBaseCluster hbasecluster;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Configuration hbaseConf;
<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> @BeforeClass
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setUpClass() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_comment">// HBase setup</em>
-<a class="jxr_linenumber" name="56" href="#56">56</a> hbaseConf = HBaseConfiguration.create();
-<a class="jxr_linenumber" name="57" href="#57">57</a>
-<a class="jxr_linenumber" name="58" href="#58">58</a> LOG.info(<span class="jxr_string">"Create hbase"</span>);
-<a class="jxr_linenumber" name="59" href="#59">59</a> testutil = <strong class="jxr_keyword">new</strong> HBaseTestingUtility(hbaseConf);
-<a class="jxr_linenumber" name="60" href="#60">60</a> hbasecluster = testutil.startMiniCluster(1);
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> }
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> @AfterClass
-<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> tearDownClass() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">if</strong> (hbasecluster != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="67" href="#67">67</a> testutil.shutdownMiniCluster();
-<a class="jxr_linenumber" name="68" href="#68">68</a> }
-<a class="jxr_linenumber" name="69" href="#69">69</a> }
-<a class="jxr_linenumber" name="70" href="#70">70</a>
-<a class="jxr_linenumber" name="71" href="#71">71</a> @BeforeMethod
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="73" href="#73">73</a> HBaseAdmin admin = testutil.getHBaseAdmin();
-<a class="jxr_linenumber" name="74" href="#74">74</a>
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME)) {
-<a class="jxr_linenumber" name="76" href="#76">76</a> HTableDescriptor desc = <strong class="jxr_keyword">new</strong> HTableDescriptor(TABLE_NAME);
-<a class="jxr_linenumber" name="77" href="#77">77</a> HColumnDescriptor datafam = <strong class="jxr_keyword">new</strong> HColumnDescriptor(DEFAULT_TIMESTAMP_STORAGE_CF_NAME);
-<a class="jxr_linenumber" name="78" href="#78">78</a> datafam.setMaxVersions(Integer.MAX_VALUE);
-<a class="jxr_linenumber" name="79" href="#79">79</a> desc.addFamily(datafam);
-<a class="jxr_linenumber" name="80" href="#80">80</a>
-<a class="jxr_linenumber" name="81" href="#81">81</a> admin.createTable(desc);
-<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> <strong class="jxr_keyword">if</strong> (admin.isTableDisabled(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME)) {
-<a class="jxr_linenumber" name="85" href="#85">85</a> admin.enableTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
-<a class="jxr_linenumber" name="86" href="#86">86</a> }
-<a class="jxr_linenumber" name="87" href="#87">87</a> HTableDescriptor[] tables = admin.listTables();
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">for</strong> (HTableDescriptor t : tables) {
-<a class="jxr_linenumber" name="89" href="#89">89</a> LOG.info(t.getNameAsString());
-<a class="jxr_linenumber" name="90" href="#90">90</a> }
-<a class="jxr_linenumber" name="91" href="#91">91</a> }
-<a class="jxr_linenumber" name="92" href="#92">92</a>
-<a class="jxr_linenumber" name="93" href="#93">93</a> @AfterMethod
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() {
-<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="96" href="#96">96</a> LOG.info(<span class="jxr_string">"tearing Down"</span>);
-<a class="jxr_linenumber" name="97" href="#97">97</a> HBaseAdmin admin = testutil.getHBaseAdmin();
-<a class="jxr_linenumber" name="98" href="#98">98</a> admin.disableTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
-<a class="jxr_linenumber" name="99" href="#99">99</a> admin.deleteTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
-<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="102" href="#102">102</a> LOG.error(<span class="jxr_string">"Error tearing down"</span>, e);
-<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>
-<a class="jxr_linenumber" name="106" href="#106">106</a> @Test
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHBaseTimestampStorage() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="108" href="#108">108</a>
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> INITIAL_TS_VALUE = 0;
-<a class="jxr_linenumber" name="110" href="#110">110</a> HBaseTimestampStorageConfig config = <strong class="jxr_keyword">new</strong> HBaseTimestampStorageConfig();
-<a class="jxr_linenumber" name="111" href="#111">111</a> HBaseTimestampStorage tsStorage = <strong class="jxr_keyword">new</strong> HBaseTimestampStorage(hbaseConf, config);
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_comment">// Test that the first time we get the timestamp is the initial value</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> assertEquals(<span class="jxr_string">"Initial value should be "</span> + INITIAL_TS_VALUE, INITIAL_TS_VALUE, tsStorage.getMaxTimestamp());
-<a class="jxr_linenumber" name="115" href="#115">115</a>
-<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_comment">// Test that updating the timestamp succeeds when passing the initial value as the previous one</em>
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">long</strong> newTimestamp = 1;
-<a class="jxr_linenumber" name="118" href="#118">118</a> tsStorage.updateMaxTimestamp(INITIAL_TS_VALUE, newTimestamp);
-<a class="jxr_linenumber" name="119" href="#119">119</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_comment">// Test setting a new timestamp fails (exception is thrown) when passing a wrong previous max timestamp</em>
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">long</strong> wrongTimestamp = 20;
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="123" href="#123">123</a> tsStorage.updateMaxTimestamp(wrongTimestamp, newTimestamp);
-<a class="jxr_linenumber" name="124" href="#124">124</a> Assert.fail(<span class="jxr_string">"Shouldn't update"</span>);
-<a class="jxr_linenumber" name="125" href="#125">125</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// Correct behavior</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> }
-<a class="jxr_linenumber" name="128" href="#128">128</a> assertEquals(<span class="jxr_string">"Value should be still "</span> + newTimestamp, newTimestamp, tsStorage.getMaxTimestamp());
-<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment">// Test we can set a new timestamp when passing the right previous max timestamp</em>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">long</strong> veryNewTimestamp = 40;
-<a class="jxr_linenumber" name="132" href="#132">132</a> tsStorage.updateMaxTimestamp(newTimestamp, veryNewTimestamp);
-<a class="jxr_linenumber" name="133" href="#133">133</a> assertEquals(<span class="jxr_string">"Value should be "</span> + veryNewTimestamp, veryNewTimestamp, tsStorage.getMaxTimestamp());
-<a class="jxr_linenumber" name="134" href="#134">134</a> }
+<a class="jxr_linenumber" name="53" href="#53">53</a>
+<a class="jxr_linenumber" name="54" href="#54">54</a> @BeforeClass
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setUpClass() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// HBase setup</em>
+<a class="jxr_linenumber" name="57" href="#57">57</a> hbaseConf = HBaseConfiguration.create();
+<a class="jxr_linenumber" name="58" href="#58">58</a>
+<a class="jxr_linenumber" name="59" href="#59">59</a> LOG.info(<span class="jxr_string">"Create hbase"</span>);
+<a class="jxr_linenumber" name="60" href="#60">60</a> testutil = <strong class="jxr_keyword">new</strong> HBaseTestingUtility(hbaseConf);
+<a class="jxr_linenumber" name="61" href="#61">61</a> hbasecluster = testutil.startMiniCluster(1);
+<a class="jxr_linenumber" name="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> }
+<a class="jxr_linenumber" name="64" href="#64">64</a>
+<a class="jxr_linenumber" name="65" href="#65">65</a> @AfterClass
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> tearDownClass() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">if</strong> (hbasecluster != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="68" href="#68">68</a> testutil.shutdownMiniCluster();
+<a class="jxr_linenumber" name="69" href="#69">69</a> }
+<a class="jxr_linenumber" name="70" href="#70">70</a> }
+<a class="jxr_linenumber" name="71" href="#71">71</a>
+<a class="jxr_linenumber" name="72" href="#72">72</a> @BeforeMethod
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="74" href="#74">74</a> HBaseAdmin admin = testutil.getHBaseAdmin();
+<a class="jxr_linenumber" name="75" href="#75">75</a>
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME)) {
+<a class="jxr_linenumber" name="77" href="#77">77</a> HTableDescriptor desc = <strong class="jxr_keyword">new</strong> HTableDescriptor(TABLE_NAME);
+<a class="jxr_linenumber" name="78" href="#78">78</a> HColumnDescriptor datafam = <strong class="jxr_keyword">new</strong> HColumnDescriptor(DEFAULT_TIMESTAMP_STORAGE_CF_NAME);
+<a class="jxr_linenumber" name="79" href="#79">79</a> datafam.setMaxVersions(Integer.MAX_VALUE);
+<a class="jxr_linenumber" name="80" href="#80">80</a> desc.addFamily(datafam);
+<a class="jxr_linenumber" name="81" href="#81">81</a>
+<a class="jxr_linenumber" name="82" href="#82">82</a> admin.createTable(desc);
+<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> <strong class="jxr_keyword">if</strong> (admin.isTableDisabled(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME)) {
+<a class="jxr_linenumber" name="86" href="#86">86</a> admin.enableTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
+<a class="jxr_linenumber" name="87" href="#87">87</a> }
+<a class="jxr_linenumber" name="88" href="#88">88</a> HTableDescriptor[] tables = admin.listTables();
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">for</strong> (HTableDescriptor t : tables) {
+<a class="jxr_linenumber" name="90" href="#90">90</a> LOG.info(t.getNameAsString());
+<a class="jxr_linenumber" name="91" href="#91">91</a> }
+<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> @AfterMethod
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() {
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="97" href="#97">97</a> LOG.info(<span class="jxr_string">"tearing Down"</span>);
+<a class="jxr_linenumber" name="98" href="#98">98</a> HBaseAdmin admin = testutil.getHBaseAdmin();
+<a class="jxr_linenumber" name="99" href="#99">99</a> admin.disableTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
+<a class="jxr_linenumber" name="100" href="#100">100</a> admin.deleteTable(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME);
+<a class="jxr_linenumber" name="101" href="#101">101</a>
+<a class="jxr_linenumber" name="102" href="#102">102</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="103" href="#103">103</a> LOG.error(<span class="jxr_string">"Error tearing down"</span>, e);
+<a class="jxr_linenumber" name="104" href="#104">104</a> }
+<a class="jxr_linenumber" name="105" href="#105">105</a> }
+<a class="jxr_linenumber" name="106" href="#106">106</a>
+<a class="jxr_linenumber" name="107" href="#107">107</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHBaseTimestampStorage() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="109" href="#109">109</a>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> INITIAL_TS_VALUE = 0;
+<a class="jxr_linenumber" name="111" href="#111">111</a> HBaseTimestampStorageConfig config = <strong class="jxr_keyword">new</strong> HBaseTimestampStorageConfig();
+<a class="jxr_linenumber" name="112" href="#112">112</a> HBaseTimestampStorage tsStorage = <strong class="jxr_keyword">new</strong> HBaseTimestampStorage(hbaseConf, config);
+<a class="jxr_linenumber" name="113" href="#113">113</a>
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// Test that the first time we get the timestamp is the initial value</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> assertEquals(tsStorage.getMaxTimestamp(), INITIAL_TS_VALUE, <span class="jxr_string">"Initial value should be "</span> + INITIAL_TS_VALUE);
+<a class="jxr_linenumber" name="116" href="#116">116</a>
+<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment">// Test that updating the timestamp succeeds when passing the initial value as the previous one</em>
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">long</strong> newTimestamp = 1;
+<a class="jxr_linenumber" name="119" href="#119">119</a> tsStorage.updateMaxTimestamp(INITIAL_TS_VALUE, newTimestamp);
+<a class="jxr_linenumber" name="120" href="#120">120</a>
+<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_comment">// Test setting a new timestamp fails (exception is thrown) when passing a wrong previous max timestamp</em>
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">long</strong> wrongTimestamp = 20;
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="124" href="#124">124</a> tsStorage.updateMaxTimestamp(wrongTimestamp, newTimestamp);
+<a class="jxr_linenumber" name="125" href="#125">125</a> Assert.fail(<span class="jxr_string">"Shouldn't update"</span>);
+<a class="jxr_linenumber" name="126" href="#126">126</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// Correct behavior</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> }
+<a class="jxr_linenumber" name="129" href="#129">129</a> assertEquals(tsStorage.getMaxTimestamp(), newTimestamp, <span class="jxr_string">"Value should be still "</span> + newTimestamp);
+<a class="jxr_linenumber" name="130" href="#130">130</a>
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// Test we can set a new timestamp when passing the right previous max timestamp</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">long</strong> veryNewTimestamp = 40;
+<a class="jxr_linenumber" name="133" href="#133">133</a> tsStorage.updateMaxTimestamp(newTimestamp, veryNewTimestamp);
+<a class="jxr_linenumber" name="134" href="#134">134</a> assertEquals(tsStorage.getMaxTimestamp(), veryNewTimestamp, <span class="jxr_string">"Value should be "</span> + veryNewTimestamp);
<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> }
+<a class="jxr_linenumber" name="136" href="#136">136</a> }
+<a class="jxr_linenumber" name="137" href="#137">137</a>
+<a class="jxr_linenumber" name="138" href="#138">138</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/3a40a657/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html b/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
index 957ca68..8c81606 100644
--- a/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
+++ b/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
@@ -8,23 +8,23 @@
<body>
<div id="overview"><a href="../../../../../../../target/site/testapidocs/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.timestamp.storage;
<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> org.apache.curator.RetryPolicy;
@@ -99,11 +99,11 @@
<a class="jxr_linenumber" name="89" href="#89">89</a>
<a class="jxr_linenumber" name="90" href="#90">90</a> LOG.info(<span class="jxr_string">"Creating Internal Zookeeper Client connected to {}"</span>, ZK_CLUSTER);
<a class="jxr_linenumber" name="91" href="#91">91</a> storageInternalZKClient = Mockito.spy(CuratorFrameworkFactory.builder()
-<a class="jxr_linenumber" name="92" href="#92">92</a> .namespace(<span class="jxr_string">"omid"</span>)
-<a class="jxr_linenumber" name="93" href="#93">93</a> .connectString(ZK_CLUSTER)
-<a class="jxr_linenumber" name="94" href="#94">94</a> .retryPolicy(retryPolicy)
-<a class="jxr_linenumber" name="95" href="#95">95</a> .connectionTimeoutMs(10) <em class="jxr_comment">// Low timeout for tests</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> .build());
+<a class="jxr_linenumber" name="92" href="#92">92</a> .namespace(<span class="jxr_string">"omid"</span>)
+<a class="jxr_linenumber" name="93" href="#93">93</a> .connectString(ZK_CLUSTER)
+<a class="jxr_linenumber" name="94" href="#94">94</a> .retryPolicy(retryPolicy)
+<a class="jxr_linenumber" name="95" href="#95">95</a> .connectionTimeoutMs(10) <em class="jxr_comment">// Low timeout for tests</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> .build());
<a class="jxr_linenumber" name="97" href="#97">97</a> storageInternalZKClient.start();
<a class="jxr_linenumber" name="98" href="#98">98</a> storageInternalZKClient.blockUntilConnected();
<a class="jxr_linenumber" name="99" href="#99">99</a>
@@ -127,7 +127,7 @@
<a class="jxr_linenumber" name="117" href="#117">117</a>
<a class="jxr_linenumber" name="118" href="#118">118</a> }
<a class="jxr_linenumber" name="119" href="#119">119</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a> @Test
+<a class="jxr_linenumber" name="120" href="#120">120</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBasicFunctionality() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="122" href="#122">122</a>
<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// Check ZNode for timestamp exists (storage instantiation should create it)</em>
@@ -197,7 +197,7 @@
<a class="jxr_linenumber" name="187" href="#187">187</a> assertEquals(zNodeStats.getVersion(), ITERATION_COUNT);
<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> @Test
+<a class="jxr_linenumber" name="190" href="#190">190</a> @Test(timeOut = 20_000)
<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testZkClientWhenZKIsDownAndRestarts() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="192" href="#192">192</a>
<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment">// Iterate updating the timestamp and check the final value</em>
@@ -227,7 +227,7 @@
<a class="jxr_linenumber" name="217" href="#217">217</a>
<a class="jxr_linenumber" name="218" href="#218">218</a> }
<a class="jxr_linenumber" name="219" href="#219">219</a>
-<a class="jxr_linenumber" name="220" href="#220">220</a> @Test
+<a class="jxr_linenumber" name="220" href="#220">220</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testZkClientLosingSession() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="222" href="#222">222</a>
<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// Cut the session in the server through the client</em>
@@ -248,7 +248,8 @@
<a class="jxr_linenumber" name="238" href="#238">238</a> assertEquals(storage.getMaxTimestamp(), 1_000_000 * ITERATION_COUNT);
<a class="jxr_linenumber" name="239" href="#239">239</a>
<a class="jxr_linenumber" name="240" href="#240">240</a> }
-<a class="jxr_linenumber" name="241" href="#241">241</a> }
+<a class="jxr_linenumber" name="241" href="#241">241</a>
+<a class="jxr_linenumber" name="242" href="#242">242</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/3a40a657/xref-test/org/apache/omid/timestamp/storage/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/package-frame.html b/xref-test/org/apache/omid/timestamp/storage/package-frame.html
index ac7bd27..1ef4528 100644
--- a/xref-test/org/apache/omid/timestamp/storage/package-frame.html
+++ b/xref-test/org/apache/omid/timestamp/storage/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/xref-test/org/apache/omid/timestamp/storage/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/package-summary.html b/xref-test/org/apache/omid/timestamp/storage/package-summary.html
index fac0a6e..0c4037c 100644
--- a/xref-test/org/apache/omid/timestamp/storage/package-summary.html
+++ b/xref-test/org/apache/omid/timestamp/storage/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.1.38-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
+ <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>