You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/09/26 09:18:29 UTC
[29/50] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 9/26/18 12:17 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/ff061775/xref-test/org/apache/omid/transaction/TestTxMgrFailover.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTxMgrFailover.html b/xref-test/org/apache/omid/transaction/TestTxMgrFailover.html
index 239ba59..19d29dd 100644
--- a/xref-test/org/apache/omid/transaction/TestTxMgrFailover.html
+++ b/xref-test/org/apache/omid/transaction/TestTxMgrFailover.html
@@ -27,44 +27,44 @@
<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.transaction;
<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> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNull;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
-<a class="jxr_linenumber" name="24" href="#24">24</a>
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="26" href="#26">26</a>
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> javax.annotation.Nullable;
-<a class="jxr_linenumber" name="28" href="#28">28</a>
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.Cell;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CellUtil;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.InMemoryCommitTable;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.Transaction.Status;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.ProgrammableTSOServer;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.TSOClient;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeClass;
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="48" href="#48">48</a>
-<a class="jxr_linenumber" name="49" href="#49">49</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTxMgrFailover.html">TestTxMgrFailover</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTxMgrFailover.<strong class="jxr_keyword">class</strong>);
-<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> TSO_SERVER_PORT = 3333;
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TSO_SERVER_HOST = <span class="jxr_string">"localhost"</span>;
-<a class="jxr_linenumber" name="56" href="#56">56</a>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> TX1_ST = 1L;
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.Cell;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CellUtil;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HTable;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.InMemoryCommitTable;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.Transaction.Status;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.ProgrammableTSOServer;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.TSOClient;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeClass;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="39" href="#39">39</a>
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> javax.annotation.Nullable;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="42" href="#42">42</a>
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNull;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTxMgrFailover.html">TestTxMgrFailover</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
+<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTxMgrFailover.<strong class="jxr_keyword">class</strong>);
+<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> TSO_SERVER_PORT = 3333;
+<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TSO_SERVER_HOST = <span class="jxr_string">"localhost"</span>;
+<a class="jxr_linenumber" name="55" href="#55">55</a>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> TX1_ST = 1L;
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> TX1_CT = 2L;
<a class="jxr_linenumber" name="58" href="#58">58</a>
<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier = Bytes.toBytes(<span class="jxr_string">"test-qual"</span>);
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
@@ -113,14 +113,14 @@
<a class="jxr_linenumber" name="103" href="#103">103</a> tso.queueResponse(<strong class="jxr_keyword">new</strong> ProgrammableTSOServer.TimestampResponse(TX1_ST));
<a class="jxr_linenumber" name="104" href="#104">104</a> tso.queueResponse(<strong class="jxr_keyword">new</strong> ProgrammableTSOServer.AbortResponse(TX1_ST));
<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
<a class="jxr_linenumber" name="107" href="#107">107</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
<a class="jxr_linenumber" name="108" href="#108">108</a> assertEquals(tx1.getStartTimestamp(), TX1_ST);
<a class="jxr_linenumber" name="109" href="#109">109</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="110" href="#110">110</a> put.addColumn(TEST_FAMILY.getBytes(), qualifier, data1);
+<a class="jxr_linenumber" name="110" href="#110">110</a> put.add(TEST_FAMILY.getBytes(), qualifier, data1);
<a class="jxr_linenumber" name="111" href="#111">111</a> txTable.put(tx1, put);
-<a class="jxr_linenumber" name="112" href="#112">112</a> assertEquals(hBaseUtils.countRows(txTable.getHTable()), 1, <span class="jxr_string">"Rows should be 1!"</span>);
-<a class="jxr_linenumber" name="113" href="#113">113</a> checkOperationSuccessOnCell(txTable.getHTable(), KeyValue.Type.Put, data1, TEST_TABLE.getBytes(), row1, TEST_FAMILY.getBytes(),
+<a class="jxr_linenumber" name="112" href="#112">112</a> assertEquals(hBaseUtils.countRows(<strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE)), 1, <span class="jxr_string">"Rows should be 1!"</span>);
+<a class="jxr_linenumber" name="113" href="#113">113</a> checkOperationSuccessOnCell(KeyValue.Type.Put, data1, TEST_TABLE.getBytes(), row1, TEST_FAMILY.getBytes(),
<a class="jxr_linenumber" name="114" href="#114">114</a> qualifier);
<a class="jxr_linenumber" name="115" href="#115">115</a>
<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">try</strong> {
@@ -135,7 +135,7 @@
<a class="jxr_linenumber" name="125" href="#125">125</a> assertEquals(tx1.getStatus(), Status.ROLLEDBACK);
<a class="jxr_linenumber" name="126" href="#126">126</a> assertEquals(tx1.getCommitTimestamp(), 0);
<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// Check the cleanup process did its job and the committed data is NOT there</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a> checkOperationSuccessOnCell(txTable.getHTable(), KeyValue.Type.Delete, <strong class="jxr_keyword">null</strong>, TEST_TABLE.getBytes(), row1, TEST_FAMILY.getBytes(),
+<a class="jxr_linenumber" name="128" href="#128">128</a> checkOperationSuccessOnCell(KeyValue.Type.Delete, <strong class="jxr_keyword">null</strong>, TEST_TABLE.getBytes(), row1, TEST_FAMILY.getBytes(),
<a class="jxr_linenumber" name="129" href="#129">129</a> qualifier);
<a class="jxr_linenumber" name="130" href="#130">130</a> }
<a class="jxr_linenumber" name="131" href="#131">131</a>
@@ -145,46 +145,45 @@
<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_comment">// Helper methods</em>
<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_comment">// ----------------------------------------------------------------------------------------------------------------</em>
<a class="jxr_linenumber" name="137" href="#137">137</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkOperationSuccessOnCell(Table table,
-<a class="jxr_linenumber" name="139" href="#139">139</a> KeyValue.Type targetOp,
-<a class="jxr_linenumber" name="140" href="#140">140</a> @Nullable byte[] expectedValue,
-<a class="jxr_linenumber" name="141" href="#141">141</a> byte[] tableName,
-<a class="jxr_linenumber" name="142" href="#142">142</a> byte[] row,
-<a class="jxr_linenumber" name="143" href="#143">143</a> byte[] fam,
-<a class="jxr_linenumber" name="144" href="#144">144</a> byte[] col) {
-<a class="jxr_linenumber" name="145" href="#145">145</a>
-<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="147" href="#147">147</a> Get get = <strong class="jxr_keyword">new</strong> Get(row).setMaxVersions(1);
-<a class="jxr_linenumber" name="148" href="#148">148</a> Result result = table.get(get);
-<a class="jxr_linenumber" name="149" href="#149">149</a> Cell latestCell = result.getColumnLatestCell(fam, col);
-<a class="jxr_linenumber" name="150" href="#150">150</a>
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">switch</strong> (targetOp) {
-<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">case</strong> Put:
-<a class="jxr_linenumber" name="153" href="#153">153</a> assertEquals(latestCell.getTypeByte(), targetOp.getCode());
-<a class="jxr_linenumber" name="154" href="#154">154</a> assertEquals(CellUtil.cloneValue(latestCell), expectedValue);
-<a class="jxr_linenumber" name="155" href="#155">155</a> LOG.trace(<span class="jxr_string">"Value for "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="156" href="#156">156</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam) + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="157" href="#157">157</a> + Bytes.toString(col) + <span class="jxr_string">"=>"</span> + Bytes.toString(CellUtil.cloneValue(latestCell))
-<a class="jxr_linenumber" name="158" href="#158">158</a> + <span class="jxr_string">" ("</span> + Bytes.toString(expectedValue) + <span class="jxr_string">" expected)"</span>);
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">case</strong> Delete:
-<a class="jxr_linenumber" name="161" href="#161">161</a> LOG.trace(<span class="jxr_string">"Value for "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="162" href="#162">162</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam)
-<a class="jxr_linenumber" name="163" href="#163">163</a> + Bytes.toString(col) + <span class="jxr_string">" deleted"</span>);
-<a class="jxr_linenumber" name="164" href="#164">164</a> assertNull(latestCell);
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">default</strong>:
-<a class="jxr_linenumber" name="167" href="#167">167</a> fail();
-<a class="jxr_linenumber" name="168" href="#168">168</a> }
-<a class="jxr_linenumber" name="169" href="#169">169</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a class="jxr_linenumber" name="170" href="#170">170</a> LOG.error(<span class="jxr_string">"Error reading row "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
-<a class="jxr_linenumber" name="171" href="#171">171</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam)
-<a class="jxr_linenumber" name="172" href="#172">172</a> + Bytes.toString(col), e);
-<a class="jxr_linenumber" name="173" href="#173">173</a> fail();
-<a class="jxr_linenumber" name="174" href="#174">174</a> }
-<a class="jxr_linenumber" name="175" href="#175">175</a> }
-<a class="jxr_linenumber" name="176" href="#176">176</a>
-<a class="jxr_linenumber" name="177" href="#177">177</a> }
+<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkOperationSuccessOnCell(KeyValue.Type targetOp,
+<a class="jxr_linenumber" name="139" href="#139">139</a> @Nullable byte[] expectedValue,
+<a class="jxr_linenumber" name="140" href="#140">140</a> byte[] tableName,
+<a class="jxr_linenumber" name="141" href="#141">141</a> byte[] row,
+<a class="jxr_linenumber" name="142" href="#142">142</a> byte[] fam,
+<a class="jxr_linenumber" name="143" href="#143">143</a> byte[] col) {
+<a class="jxr_linenumber" name="144" href="#144">144</a>
+<a class="jxr_linenumber" name="145" href="#145">145</a> <strong class="jxr_keyword">try</strong> (HTable table = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, tableName)) {
+<a class="jxr_linenumber" name="146" href="#146">146</a> Get get = <strong class="jxr_keyword">new</strong> Get(row).setMaxVersions(1);
+<a class="jxr_linenumber" name="147" href="#147">147</a> Result result = table.get(get);
+<a class="jxr_linenumber" name="148" href="#148">148</a> Cell latestCell = result.getColumnLatestCell(fam, col);
+<a class="jxr_linenumber" name="149" href="#149">149</a>
+<a class="jxr_linenumber" name="150" href="#150">150</a> <strong class="jxr_keyword">switch</strong> (targetOp) {
+<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">case</strong> Put:
+<a class="jxr_linenumber" name="152" href="#152">152</a> assertEquals(latestCell.getTypeByte(), targetOp.getCode());
+<a class="jxr_linenumber" name="153" href="#153">153</a> assertEquals(CellUtil.cloneValue(latestCell), expectedValue);
+<a class="jxr_linenumber" name="154" href="#154">154</a> LOG.trace(<span class="jxr_string">"Value for "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="155" href="#155">155</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam) + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="156" href="#156">156</a> + Bytes.toString(col) + <span class="jxr_string">"=>"</span> + Bytes.toString(CellUtil.cloneValue(latestCell))
+<a class="jxr_linenumber" name="157" href="#157">157</a> + <span class="jxr_string">" ("</span> + Bytes.toString(expectedValue) + <span class="jxr_string">" expected)"</span>);
+<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">case</strong> Delete:
+<a class="jxr_linenumber" name="160" href="#160">160</a> LOG.trace(<span class="jxr_string">"Value for "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="161" href="#161">161</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam)
+<a class="jxr_linenumber" name="162" href="#162">162</a> + Bytes.toString(col) + <span class="jxr_string">" deleted"</span>);
+<a class="jxr_linenumber" name="163" href="#163">163</a> assertNull(latestCell);
+<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">default</strong>:
+<a class="jxr_linenumber" name="166" href="#166">166</a> fail();
+<a class="jxr_linenumber" name="167" href="#167">167</a> }
+<a class="jxr_linenumber" name="168" href="#168">168</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
+<a class="jxr_linenumber" name="169" href="#169">169</a> LOG.error(<span class="jxr_string">"Error reading row "</span> + Bytes.toString(tableName) + <span class="jxr_string">":"</span>
+<a class="jxr_linenumber" name="170" href="#170">170</a> + Bytes.toString(row) + <span class="jxr_string">":"</span> + Bytes.toString(fam)
+<a class="jxr_linenumber" name="171" href="#171">171</a> + Bytes.toString(col), e);
+<a class="jxr_linenumber" name="172" href="#172">172</a> fail();
+<a class="jxr_linenumber" name="173" href="#173">173</a> }
+<a class="jxr_linenumber" name="174" href="#174">174</a> }
+<a class="jxr_linenumber" name="175" href="#175">175</a>
+<a class="jxr_linenumber" name="176" href="#176">176</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/ff061775/xref-test/org/apache/omid/transaction/TestUpdateScan.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestUpdateScan.html b/xref-test/org/apache/omid/transaction/TestUpdateScan.html
index cfbf9ce..8c8d87a 100644
--- a/xref-test/org/apache/omid/transaction/TestUpdateScan.html
+++ b/xref-test/org/apache/omid/transaction/TestUpdateScan.html
@@ -27,25 +27,25 @@
<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.transaction;
<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> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="22" href="#22">22</a>
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.BinaryPrefixComparator;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.CompareFilter;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.FilterList;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.RowFilter;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.WhileMatchFilter;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.testng.Assert;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.BinaryPrefixComparator;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.CompareFilter;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.FilterList;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.RowFilter;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.WhileMatchFilter;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.testng.Assert;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="36" href="#36">36</a>
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
<a class="jxr_linenumber" name="39" href="#39">39</a>
<a class="jxr_linenumber" name="40" href="#40">40</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestUpdateScan.html">TestUpdateScan</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -58,13 +58,13 @@
<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGet(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="50" href="#50">50</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="51" href="#51">51</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="51" href="#51">51</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="52" href="#52">52</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">int</strong>[] lInts = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < lInts.length; i++) {
<a class="jxr_linenumber" name="55" href="#55">55</a> byte[] data = Bytes.toBytes(lInts[i]);
<a class="jxr_linenumber" name="56" href="#56">56</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="57" href="#57">57</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="57" href="#57">57</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
<a class="jxr_linenumber" name="58" href="#58">58</a> table.put(t, put);
<a class="jxr_linenumber" name="59" href="#59">59</a> }
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">int</strong> startKeyValue = lInts[3];
@@ -115,15 +115,15 @@
<a class="jxr_linenumber" name="105" href="#105">105</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScan(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
<a class="jxr_linenumber" name="109" href="#109">109</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="110" href="#110">110</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">int</strong>[] lInts = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> lInt : lInts) {
<a class="jxr_linenumber" name="113" href="#113">113</a> byte[] data = Bytes.toBytes(lInt);
<a class="jxr_linenumber" name="114" href="#114">114</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="115" href="#115">115</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
-<a class="jxr_linenumber" name="116" href="#116">116</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2), data);
+<a class="jxr_linenumber" name="115" href="#115">115</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="116" href="#116">116</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2), data);
<a class="jxr_linenumber" name="117" href="#117">117</a> table.put(t, put);
<a class="jxr_linenumber" name="118" href="#118">118</a> }
<a class="jxr_linenumber" name="119" href="#119">119</a>
@@ -164,13 +164,13 @@
<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="156" href="#156">156</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="157" href="#157">157</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="157" href="#157">157</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="158" href="#158">158</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">int</strong>[] lIntsA = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsA : lIntsA) {
<a class="jxr_linenumber" name="161" href="#161">161</a> byte[] data = Bytes.toBytes(aLIntsA);
<a class="jxr_linenumber" name="162" href="#162">162</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="163" href="#163">163</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="163" href="#163">163</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
<a class="jxr_linenumber" name="164" href="#164">164</a> table.put(t, put);
<a class="jxr_linenumber" name="165" href="#165">165</a> }
<a class="jxr_linenumber" name="166" href="#166">166</a> tm.commit(t);
@@ -180,7 +180,7 @@
<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsB : lIntsB) {
<a class="jxr_linenumber" name="171" href="#171">171</a> byte[] data = Bytes.toBytes(aLIntsB);
<a class="jxr_linenumber" name="172" href="#172">172</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="173" href="#173">173</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="173" href="#173">173</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
<a class="jxr_linenumber" name="174" href="#174">174</a> table.put(tu, put);
<a class="jxr_linenumber" name="175" href="#175">175</a> }
<a class="jxr_linenumber" name="176" href="#176">176</a>
@@ -189,7 +189,7 @@
<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsC : lIntsC) {
<a class="jxr_linenumber" name="180" href="#180">180</a> byte[] data = Bytes.toBytes(aLIntsC);
<a class="jxr_linenumber" name="181" href="#181">181</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="182" href="#182">182</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="182" href="#182">182</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
<a class="jxr_linenumber" name="183" href="#183">183</a> table.put(t, put);
<a class="jxr_linenumber" name="184" href="#184">184</a> }
<a class="jxr_linenumber" name="185" href="#185">185</a> tm.commit(t);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/ff061775/xref-test/org/apache/omid/transaction/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/package-frame.html b/xref-test/org/apache/omid/transaction/package-frame.html
index 5b1d031..8c90716 100644
--- a/xref-test/org/apache/omid/transaction/package-frame.html
+++ b/xref-test/org/apache/omid/transaction/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.2.11-SNAPSHOT Reference Package org.apache.omid.transaction</title>
+ <title>Omid 0.9.0.0 Reference Package org.apache.omid.transaction</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -25,9 +25,6 @@
<a href="TSOForHBaseCompactorTestModule.html" target="classFrame">TSOForHBaseCompactorTestModule</a>
</li>
<li>
- <a href="TSOForSnapshotFilterTestModule.html" target="classFrame">TSOForSnapshotFilterTestModule</a>
- </li>
- <li>
<a href="TestAsynchronousPostCommitter.html" target="classFrame">TestAsynchronousPostCommitter</a>
</li>
<li>
@@ -43,9 +40,6 @@
<a href="TestCellUtils.html" target="classFrame">TestCellUtils</a>
</li>
<li>
- <a href="TestCheckpoint.html" target="classFrame">TestCheckpoint</a>
- </li>
- <li>
<a href="TestColumnIterator.html" target="classFrame">TestColumnIterator</a>
</li>
<li>
@@ -76,9 +70,6 @@
<a href="TestHBaseTransactionManager.html" target="classFrame">TestHBaseTransactionManager</a>
</li>
<li>
- <a href="TestMarkPutAsCommitted.html" target="classFrame">TestMarkPutAsCommitted</a>
- </li>
- <li>
<a href="TestMultiplePut.html" target="classFrame">TestMultiplePut</a>
</li>
<li>
@@ -91,9 +82,6 @@
<a href="TestSingleColumnFamily.html" target="classFrame">TestSingleColumnFamily</a>
</li>
<li>
- <a href="TestSnapshotFilter.html" target="classFrame">TestSnapshotFilter</a>
- </li>
- <li>
<a href="TestTSOModule.html" target="classFrame">TestTSOModule</a>
</li>
<li>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/ff061775/xref-test/org/apache/omid/transaction/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/package-summary.html b/xref-test/org/apache/omid/transaction/package-summary.html
index 21ec263..b262e00 100644
--- a/xref-test/org/apache/omid/transaction/package-summary.html
+++ b/xref-test/org/apache/omid/transaction/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.2.11-SNAPSHOT Reference Package org.apache.omid.transaction</title>
+ <title>Omid 0.9.0.0 Reference Package org.apache.omid.transaction</title>
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
</head>
<body>
@@ -52,11 +52,6 @@
</tr>
<tr>
<td>
- <a href="TSOForSnapshotFilterTestModule.html" target="classFrame">TSOForSnapshotFilterTestModule</a>
- </td>
- </tr>
- <tr>
- <td>
<a href="TestAsynchronousPostCommitter.html" target="classFrame">TestAsynchronousPostCommitter</a>
</td>
</tr>
@@ -82,11 +77,6 @@
</tr>
<tr>
<td>
- <a href="TestCheckpoint.html" target="classFrame">TestCheckpoint</a>
- </td>
- </tr>
- <tr>
- <td>
<a href="TestColumnIterator.html" target="classFrame">TestColumnIterator</a>
</td>
</tr>
@@ -137,11 +127,6 @@
</tr>
<tr>
<td>
- <a href="TestMarkPutAsCommitted.html" target="classFrame">TestMarkPutAsCommitted</a>
- </td>
- </tr>
- <tr>
- <td>
<a href="TestMultiplePut.html" target="classFrame">TestMultiplePut</a>
</td>
</tr>
@@ -162,11 +147,6 @@
</tr>
<tr>
<td>
- <a href="TestSnapshotFilter.html" target="classFrame">TestSnapshotFilter</a>
- </td>
- </tr>
- <tr>
- <td>
<a href="TestTSOModule.html" target="classFrame">TestTSOModule</a>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/ff061775/xref-test/org/apache/omid/tso/TSOMockModule.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TSOMockModule.html b/xref-test/org/apache/omid/tso/TSOMockModule.html
index 4cc6b4f..004ac59 100644
--- a/xref-test/org/apache/omid/tso/TSOMockModule.html
+++ b/xref-test/org/apache/omid/tso/TSOMockModule.html
@@ -36,72 +36,67 @@
<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.MetricsRegistry;
<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.omid.timestamp.storage.TimestampStorage;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServerConfig.TIMESTAMP_TYPE;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TimestampOracleImpl.InMemoryTimestampStorage;
-<a class="jxr_linenumber" name="31" href="#31">31</a>
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> javax.inject.Named;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> javax.inject.Singleton;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.net.SocketException;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.net.UnknownHostException;
-<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.tso.TSOServer.TSO_HOST_AND_PORT_KEY;
-<a class="jxr_linenumber" name="38" href="#38">38</a>
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a> <strong class="jxr_keyword">extends</strong> AbstractModule {
-<a class="jxr_linenumber" name="40" href="#40">40</a>
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> TSOServerConfig config;
-<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> <a href="../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(TSOServerConfig config) {
-<a class="jxr_linenumber" name="44" href="#44">44</a> Preconditions.checkArgument(config.getNumConcurrentCTWriters() >= 2, <span class="jxr_string">"# of Commit Table writers must be >= 2"</span>);
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">this</strong>.config = config;
-<a class="jxr_linenumber" name="46" href="#46">46</a> }
-<a class="jxr_linenumber" name="47" href="#47">47</a>
-<a class="jxr_linenumber" name="48" href="#48">48</a> @Override
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> configure() {
-<a class="jxr_linenumber" name="50" href="#50">50</a>
-<a class="jxr_linenumber" name="51" href="#51">51</a> bind(TSOChannelHandler.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="52" href="#52">52</a> bind(TSOStateManager.<strong class="jxr_keyword">class</strong>).to(TSOStateManagerImpl.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="53" href="#53">53</a> bind(CommitTable.<strong class="jxr_keyword">class</strong>).to(InMemoryCommitTable.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="54" href="#54">54</a> bind(TimestampStorage.<strong class="jxr_keyword">class</strong>).to(InMemoryTimestampStorage.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">if</strong> (config.getTimestampTypeEnum() == TIMESTAMP_TYPE.WORLD_TIME) {
-<a class="jxr_linenumber" name="56" href="#56">56</a> bind(TimestampOracle.<strong class="jxr_keyword">class</strong>).to(WorldClockOracleImpl.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="57" href="#57">57</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="58" href="#58">58</a> bind(TimestampOracle.<strong class="jxr_keyword">class</strong>).to(PausableTimestampOracle.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="59" href="#59">59</a> }
-<a class="jxr_linenumber" name="60" href="#60">60</a> bind(Panicker.<strong class="jxr_keyword">class</strong>).to(MockPanicker.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> install(<strong class="jxr_keyword">new</strong> BatchPoolModule(config));
-<a class="jxr_linenumber" name="63" href="#63">63</a> install(config.getLeaseModule());
-<a class="jxr_linenumber" name="64" href="#64">64</a> install(<strong class="jxr_keyword">new</strong> DisruptorModule(config));
-<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TimestampOracleImpl.InMemoryTimestampStorage;
+<a class="jxr_linenumber" name="30" href="#30">30</a>
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> javax.inject.Named;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> javax.inject.Singleton;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> java.net.SocketException;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.net.UnknownHostException;
+<a class="jxr_linenumber" name="35" href="#35">35</a>
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.tso.TSOServer.TSO_HOST_AND_PORT_KEY;
+<a class="jxr_linenumber" name="37" href="#37">37</a>
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a> <strong class="jxr_keyword">extends</strong> AbstractModule {
+<a class="jxr_linenumber" name="39" href="#39">39</a>
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> TSOServerConfig config;
+<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> <a href="../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(TSOServerConfig config) {
+<a class="jxr_linenumber" name="43" href="#43">43</a> Preconditions.checkArgument(config.getNumConcurrentCTWriters() >= 2, <span class="jxr_string">"# of Commit Table writers must be >= 2"</span>);
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">this</strong>.config = config;
+<a class="jxr_linenumber" name="45" href="#45">45</a> }
+<a class="jxr_linenumber" name="46" href="#46">46</a>
+<a class="jxr_linenumber" name="47" href="#47">47</a> @Override
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> configure() {
+<a class="jxr_linenumber" name="49" href="#49">49</a>
+<a class="jxr_linenumber" name="50" href="#50">50</a> bind(TSOChannelHandler.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="51" href="#51">51</a> bind(TSOStateManager.<strong class="jxr_keyword">class</strong>).to(TSOStateManagerImpl.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="52" href="#52">52</a> bind(CommitTable.<strong class="jxr_keyword">class</strong>).to(InMemoryCommitTable.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="53" href="#53">53</a> bind(TimestampStorage.<strong class="jxr_keyword">class</strong>).to(InMemoryTimestampStorage.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="54" href="#54">54</a> bind(TimestampOracle.<strong class="jxr_keyword">class</strong>).to(PausableTimestampOracle.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="55" href="#55">55</a> bind(Panicker.<strong class="jxr_keyword">class</strong>).to(MockPanicker.<strong class="jxr_keyword">class</strong>).in(Singleton.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> install(<strong class="jxr_keyword">new</strong> BatchPoolModule(config));
+<a class="jxr_linenumber" name="58" href="#58">58</a> install(config.getLeaseModule());
+<a class="jxr_linenumber" name="59" href="#59">59</a> install(<strong class="jxr_keyword">new</strong> DisruptorModule(config));
+<a class="jxr_linenumber" name="60" href="#60">60</a>
+<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> @Provides
+<a class="jxr_linenumber" name="64" href="#64">64</a> TSOServerConfig provideTSOServerConfig() {
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">return</strong> config;
<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> @Provides
-<a class="jxr_linenumber" name="69" href="#69">69</a> TSOServerConfig provideTSOServerConfig() {
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">return</strong> config;
-<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> @Provides
-<a class="jxr_linenumber" name="74" href="#74">74</a> @Singleton
-<a class="jxr_linenumber" name="75" href="#75">75</a> MetricsRegistry provideMetricsRegistry() {
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> NullMetricsProvider();
-<a class="jxr_linenumber" name="77" href="#77">77</a> }
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> @Provides
-<a class="jxr_linenumber" name="80" href="#80">80</a> @Named(TSO_HOST_AND_PORT_KEY)
-<a class="jxr_linenumber" name="81" href="#81">81</a> String provideTSOHostAndPort() <strong class="jxr_keyword">throws</strong> SocketException, UnknownHostException {
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">return</strong> NetworkInterfaceUtils.getTSOHostAndPort(config);
-<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> @Provides
-<a class="jxr_linenumber" name="86" href="#86">86</a> PersistenceProcessorHandler[] getPersistenceProcessorHandler(Provider<PersistenceProcessorHandler> provider) {
-<a class="jxr_linenumber" name="87" href="#87">87</a> PersistenceProcessorHandler[] persistenceProcessorHandlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < persistenceProcessorHandlers.length; i++) {
-<a class="jxr_linenumber" name="89" href="#89">89</a> persistenceProcessorHandlers[i] = provider.get();
-<a class="jxr_linenumber" name="90" href="#90">90</a> }
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">return</strong> persistenceProcessorHandlers;
-<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="69" href="#69">69</a> @Singleton
+<a class="jxr_linenumber" name="70" href="#70">70</a> MetricsRegistry provideMetricsRegistry() {
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> NullMetricsProvider();
+<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> @Provides
+<a class="jxr_linenumber" name="75" href="#75">75</a> @Named(TSO_HOST_AND_PORT_KEY)
+<a class="jxr_linenumber" name="76" href="#76">76</a> String provideTSOHostAndPort() <strong class="jxr_keyword">throws</strong> SocketException, UnknownHostException {
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">return</strong> NetworkInterfaceUtils.getTSOHostAndPort(config);
+<a class="jxr_linenumber" name="78" href="#78">78</a> }
+<a class="jxr_linenumber" name="79" href="#79">79</a>
+<a class="jxr_linenumber" name="80" href="#80">80</a> @Provides
+<a class="jxr_linenumber" name="81" href="#81">81</a> PersistenceProcessorHandler[] getPersistenceProcessorHandler(Provider<PersistenceProcessorHandler> provider) {
+<a class="jxr_linenumber" name="82" href="#82">82</a> PersistenceProcessorHandler[] persistenceProcessorHandlers = <strong class="jxr_keyword">new</strong> PersistenceProcessorHandler[config.getNumConcurrentCTWriters()];
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < persistenceProcessorHandlers.length; i++) {
+<a class="jxr_linenumber" name="84" href="#84">84</a> persistenceProcessorHandlers[i] = provider.get();
+<a class="jxr_linenumber" name="85" href="#85">85</a> }
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong> persistenceProcessorHandlers;
+<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> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>