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/20 07:52:32 UTC
[41/48] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 9/20/18 10:51 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/581871ee/xref-test/org/apache/omid/transaction/TestAsynchronousPostCommitter.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestAsynchronousPostCommitter.html b/xref-test/org/apache/omid/transaction/TestAsynchronousPostCommitter.html
index 2794aba..efab50c 100644
--- a/xref-test/org/apache/omid/transaction/TestAsynchronousPostCommitter.html
+++ b/xref-test/org/apache/omid/transaction/TestAsynchronousPostCommitter.html
@@ -27,50 +27,50 @@
<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.Matchers.any;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doAnswer;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.times;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNotNull;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="29" href="#29">29</a>
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.CountDownLatch;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.Executors;
-<a class="jxr_linenumber" name="32" href="#32">32</a>
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<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.committable.CommitTable;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.mockito.invocation.InvocationOnMock;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.mockito.stubbing.Answer;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Optional;
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.ListenableFuture;
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.ListeningExecutorService;
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.MoreExecutors;
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.ThreadFactoryBuilder;
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<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/transaction/TestAsynchronousPostCommitter.html">TestAsynchronousPostCommitter</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<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> Logger LOG = LoggerFactory.getLogger(TestAsynchronousPostCommitter.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="57" href="#57">57</a>
-<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
+<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> com.google.common.util.concurrent.ListeningExecutorService;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.MoreExecutors;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.ThreadFactoryBuilder;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<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.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.mockito.invocation.InvocationOnMock;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.mockito.stubbing.Answer;
+<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.ITestContext;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<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> java.util.concurrent.CountDownLatch;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.Executors;
+<a class="jxr_linenumber" name="41" href="#41">41</a>
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.any;
+<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.doAnswer;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.times;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNotNull;
+<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.assertTrue;
+<a class="jxr_linenumber" name="51" href="#51">51</a>
+<a class="jxr_linenumber" name="52" href="#52">52</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestAsynchronousPostCommitter.html">TestAsynchronousPostCommitter</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestAsynchronousPostCommitter.<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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] nonExistentFamily = Bytes.toBytes(<span class="jxr_string">"non-existent"</span>);
<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>
<a class="jxr_linenumber" name="61" href="#61">61</a> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"test-is-committed1"</span>);
<a class="jxr_linenumber" name="62" href="#62">62</a> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"test-is-committed2"</span>);
-<a class="jxr_linenumber" name="63" href="#63">63</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a>
<a class="jxr_linenumber" name="64" href="#64">64</a> @Test(timeOut = 30_000)
<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPostCommitActionsAreCalledAsynchronously(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="66" href="#66">66</a>
@@ -117,16 +117,16 @@
<a class="jxr_linenumber" name="107" href="#107">107</a> }
<a class="jxr_linenumber" name="108" href="#108">108</a> }).when(syncPostCommitter).removeCommitTableEntry(any(AbstractTransaction.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
<a class="jxr_linenumber" name="111" href="#111">111</a>
<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_comment">// Execute tx with async post commit actions</em>
<a class="jxr_linenumber" name="113" href="#113">113</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="114" href="#114">114</a>
<a class="jxr_linenumber" name="115" href="#115">115</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="116" href="#116">116</a> put1.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
+<a class="jxr_linenumber" name="116" href="#116">116</a> put1.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
<a class="jxr_linenumber" name="117" href="#117">117</a> txTable.put(tx1, put1);
<a class="jxr_linenumber" name="118" href="#118">118</a> Put put2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="119" href="#119">119</a> put2.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
+<a class="jxr_linenumber" name="119" href="#119">119</a> put2.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
<a class="jxr_linenumber" name="120" href="#120">120</a> txTable.put(tx1, put2);
<a class="jxr_linenumber" name="121" href="#121">121</a>
<a class="jxr_linenumber" name="122" href="#122">122</a> tm.commit(tx1);
@@ -224,16 +224,16 @@
<a class="jxr_linenumber" name="214" href="#214">214</a> }).when(syncPostCommitter).removeCommitTableEntry(any(AbstractTransaction.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="215" href="#215">215</a>
<a class="jxr_linenumber" name="216" href="#216">216</a>
-<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
<a class="jxr_linenumber" name="218" href="#218">218</a>
<a class="jxr_linenumber" name="219" href="#219">219</a> <em class="jxr_comment">// Execute tx with async post commit actions</em>
<a class="jxr_linenumber" name="220" href="#220">220</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="221" href="#221">221</a>
<a class="jxr_linenumber" name="222" href="#222">222</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="223" href="#223">223</a> put1.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
+<a class="jxr_linenumber" name="223" href="#223">223</a> put1.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
<a class="jxr_linenumber" name="224" href="#224">224</a> txTable.put(tx1, put1);
<a class="jxr_linenumber" name="225" href="#225">225</a> Put put2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="226" href="#226">226</a> put2.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
+<a class="jxr_linenumber" name="226" href="#226">226</a> put2.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
<a class="jxr_linenumber" name="227" href="#227">227</a> txTable.put(tx1, put2);
<a class="jxr_linenumber" name="228" href="#228">228</a>
<a class="jxr_linenumber" name="229" href="#229">229</a> tm.commit(tx1);
@@ -293,16 +293,16 @@
<a class="jxr_linenumber" name="283" href="#283">283</a> }).when(syncPostCommitter).removeCommitTableEntry(any(AbstractTransaction.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="284" href="#284">284</a>
<a class="jxr_linenumber" name="285" href="#285">285</a>
-<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
<a class="jxr_linenumber" name="287" href="#287">287</a>
<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_comment">// Execute tx with async post commit actions</em>
<a class="jxr_linenumber" name="289" href="#289">289</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="290" href="#290">290</a>
<a class="jxr_linenumber" name="291" href="#291">291</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="292" href="#292">292</a> put1.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
+<a class="jxr_linenumber" name="292" href="#292">292</a> put1.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hey!"</span>));
<a class="jxr_linenumber" name="293" href="#293">293</a> txTable.put(tx1, put1);
<a class="jxr_linenumber" name="294" href="#294">294</a> Put put2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="295" href="#295">295</a> put2.addColumn(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
+<a class="jxr_linenumber" name="295" href="#295">295</a> put2.add(family, qualifier, Bytes.toBytes(<span class="jxr_string">"hou!"</span>));
<a class="jxr_linenumber" name="296" href="#296">296</a> txTable.put(tx1, put2);
<a class="jxr_linenumber" name="297" href="#297">297</a>
<a class="jxr_linenumber" name="298" href="#298">298</a> tm.commit(tx1);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/581871ee/xref-test/org/apache/omid/transaction/TestAutoFlush.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestAutoFlush.html b/xref-test/org/apache/omid/transaction/TestAutoFlush.html
index 8102cad..c8c7961 100644
--- a/xref-test/org/apache/omid/transaction/TestAutoFlush.html
+++ b/xref-test/org/apache/omid/transaction/TestAutoFlush.html
@@ -27,14 +27,14 @@
<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>
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="27" href="#27">27</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.util.Bytes;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<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> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
<a class="jxr_linenumber" name="28" href="#28">28</a>
<a class="jxr_linenumber" name="29" href="#29">29</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestAutoFlush.html">TestAutoFlush</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -47,14 +47,14 @@
<a class="jxr_linenumber" name="37" href="#37">37</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"col1"</span>);
<a class="jxr_linenumber" name="38" href="#38">38</a> byte[] data = Bytes.toBytes(<span class="jxr_string">"data"</span>);
<a class="jxr_linenumber" name="39" href="#39">39</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="41" href="#41">41</a>
<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_comment">// Turn off autoflush</em>
<a class="jxr_linenumber" name="43" href="#43">43</a> table.setAutoFlush(false);
<a class="jxr_linenumber" name="44" href="#44">44</a>
<a class="jxr_linenumber" name="45" href="#45">45</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="46" href="#46">46</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="47" href="#47">47</a> put.addColumn(family, col, data);
+<a class="jxr_linenumber" name="47" href="#47">47</a> put.add(family, col, data);
<a class="jxr_linenumber" name="48" href="#48">48</a> table.put(t, put);
<a class="jxr_linenumber" name="49" href="#49">49</a>
<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_comment">// Data shouldn't be in DB yet</em>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/581871ee/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html b/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
index 088eed1..9692d9e 100644
--- a/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
+++ b/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
@@ -27,27 +27,27 @@
<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.slf4j.LoggerFactory.getLogger;
-<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> <strong class="jxr_keyword">import</strong> java.util.Arrays;
-<a class="jxr_linenumber" name="27" href="#27">27</a>
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.CompareFilter;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.Filter;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
-<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.slf4j.Logger;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
-<a class="jxr_linenumber" name="40" href="#40">40</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.Delete;
+<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.CompareFilter;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.Filter;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="33" href="#33">33</a>
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<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.slf4j.LoggerFactory.getLogger;
+<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.assertEquals;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNull;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
<a class="jxr_linenumber" name="41" href="#41">41</a>
<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_javadoccomment"> * These tests try to analyze the transactional anomalies described by P. Baillis et al. in</em>
@@ -99,7 +99,7 @@
<a class="jxr_linenumber" name="89" href="#89">89</a>
<a class="jxr_linenumber" name="90" href="#90">90</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="91" href="#91">91</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="92" href="#92">92</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="92" href="#92">92</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="93" href="#93">93</a>
<a class="jxr_linenumber" name="94" href="#94">94</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="95" href="#95">95</a> Transaction tx2 = tm.begin();
@@ -113,7 +113,7 @@
<a class="jxr_linenumber" name="103" href="#103">103</a>
<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_comment">// 2) insert into test (id, value) values(3, 30); -- T2</em>
<a class="jxr_linenumber" name="105" href="#105">105</a> Put newRow = <strong class="jxr_keyword">new</strong> Put(rowId3);
-<a class="jxr_linenumber" name="106" href="#106">106</a> newRow.addColumn(famName, colName, dataValue3);
+<a class="jxr_linenumber" name="106" href="#106">106</a> newRow.add(famName, colName, dataValue3);
<a class="jxr_linenumber" name="107" href="#107">107</a> txTable.put(tx2, newRow);
<a class="jxr_linenumber" name="108" href="#108">108</a>
<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 3) Commit TX 2</em>
@@ -139,7 +139,7 @@
<a class="jxr_linenumber" name="129" href="#129">129</a>
<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="131" href="#131">131</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="132" href="#132">132</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="132" href="#132">132</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="133" href="#133">133</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="134" href="#134">134</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="135" href="#135">135</a>
@@ -153,7 +153,7 @@
<a class="jxr_linenumber" name="143" href="#143">143</a> Put row = <strong class="jxr_keyword">new</strong> Put(updateRes.getRow());
<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">int</strong> val = Bytes.toInt(updateRes.getValue(famName, colName));
<a class="jxr_linenumber" name="145" href="#145">145</a> LOG.info(<span class="jxr_string">"Updating row id {} with value {}"</span>, Bytes.toString(updateRes.getRow()), val);
-<a class="jxr_linenumber" name="146" href="#146">146</a> row.addColumn(famName, colName, Bytes.toBytes(val + 10));
+<a class="jxr_linenumber" name="146" href="#146">146</a> row.add(famName, colName, Bytes.toBytes(val + 10));
<a class="jxr_linenumber" name="147" href="#147">147</a> txTable.put(tx1, row);
<a class="jxr_linenumber" name="148" href="#148">148</a> updateRes = tx1Scanner.next();
<a class="jxr_linenumber" name="149" href="#149">149</a> count++;
@@ -208,7 +208,7 @@
<a class="jxr_linenumber" name="198" href="#198">198</a>
<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="200" href="#200">200</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="201" href="#201">201</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="201" href="#201">201</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="202" href="#202">202</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="203" href="#203">203</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="204" href="#204">204</a>
@@ -247,12 +247,12 @@
<a class="jxr_linenumber" name="237" href="#237">237</a>
<a class="jxr_linenumber" name="238" href="#238">238</a> <em class="jxr_comment">// 3) update test set value = 11 where id = 1; -- T1</em>
<a class="jxr_linenumber" name="239" href="#239">239</a> Put updateRow1Tx1 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="240" href="#240">240</a> updateRow1Tx1.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
+<a class="jxr_linenumber" name="240" href="#240">240</a> updateRow1Tx1.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
<a class="jxr_linenumber" name="241" href="#241">241</a> txTable.put(tx1, updateRow1Tx1);
<a class="jxr_linenumber" name="242" href="#242">242</a>
<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment">// 4) update test set value = 11 where id = 1; -- T2</em>
<a class="jxr_linenumber" name="244" href="#244">244</a> Put updateRow1Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="245" href="#245">245</a> updateRow1Tx2.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
+<a class="jxr_linenumber" name="245" href="#245">245</a> updateRow1Tx2.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
<a class="jxr_linenumber" name="246" href="#246">246</a> txTable.put(tx2, updateRow1Tx2);
<a class="jxr_linenumber" name="247" href="#247">247</a>
<a class="jxr_linenumber" name="248" href="#248">248</a> <em class="jxr_comment">// 5) commit -- T1</em>
@@ -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">// 0) Start transactions</em>
<a class="jxr_linenumber" name="276" href="#276">276</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="277" href="#277">277</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="277" href="#277">277</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="278" href="#278">278</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="279" href="#279">279</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="280" href="#280">280</a>
@@ -339,12 +339,12 @@
<a class="jxr_linenumber" name="329" href="#329">329</a>
<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">// 4) update test set value = 12 where id = 1; -- T2</em>
<a class="jxr_linenumber" name="331" href="#331">331</a> Put updateRow1Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="332" href="#332">332</a> updateRow1Tx2.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"12"</span>));
+<a class="jxr_linenumber" name="332" href="#332">332</a> updateRow1Tx2.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"12"</span>));
<a class="jxr_linenumber" name="333" href="#333">333</a> txTable.put(tx1, updateRow1Tx2);
<a class="jxr_linenumber" name="334" href="#334">334</a>
<a class="jxr_linenumber" name="335" href="#335">335</a> <em class="jxr_comment">// 5) update test set value = 18 where id = 1; -- T2</em>
<a class="jxr_linenumber" name="336" href="#336">336</a> Put updateRow2Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId2);
-<a class="jxr_linenumber" name="337" href="#337">337</a> updateRow2Tx2.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"18"</span>));
+<a class="jxr_linenumber" name="337" href="#337">337</a> updateRow2Tx2.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"18"</span>));
<a class="jxr_linenumber" name="338" href="#338">338</a> txTable.put(tx2, updateRow2Tx2);
<a class="jxr_linenumber" name="339" href="#339">339</a>
<a class="jxr_linenumber" name="340" href="#340">340</a> <em class="jxr_comment">// 6) commit -- T2</em>
@@ -384,7 +384,7 @@
<a class="jxr_linenumber" name="374" href="#374">374</a>
<a class="jxr_linenumber" name="375" href="#375">375</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="376" href="#376">376</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="377" href="#377">377</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="377" href="#377">377</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="378" href="#378">378</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="379" href="#379">379</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="380" href="#380">380</a>
@@ -397,9 +397,9 @@
<a class="jxr_linenumber" name="387" href="#387">387</a> <em class="jxr_comment">// 3) update test set value = 12 where id = 1; -- T2</em>
<a class="jxr_linenumber" name="388" href="#388">388</a> <em class="jxr_comment">// 4) update test set value = 18 where id = 2; -- T2</em>
<a class="jxr_linenumber" name="389" href="#389">389</a> Put updateRow1Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="390" href="#390">390</a> updateRow1Tx2.addColumn(famName, colName, Bytes.toBytes(12));
+<a class="jxr_linenumber" name="390" href="#390">390</a> updateRow1Tx2.add(famName, colName, Bytes.toBytes(12));
<a class="jxr_linenumber" name="391" href="#391">391</a> Put updateRow2Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId2);
-<a class="jxr_linenumber" name="392" href="#392">392</a> updateRow2Tx2.addColumn(famName, colName, Bytes.toBytes(18));
+<a class="jxr_linenumber" name="392" href="#392">392</a> updateRow2Tx2.add(famName, colName, Bytes.toBytes(18));
<a class="jxr_linenumber" name="393" href="#393">393</a> txTable.put(tx2, Arrays.asList(updateRow1Tx2, updateRow2Tx2));
<a class="jxr_linenumber" name="394" href="#394">394</a>
<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_comment">// 5) commit; -- T2</em>
@@ -445,7 +445,7 @@
<a class="jxr_linenumber" name="435" href="#435">435</a>
<a class="jxr_linenumber" name="436" href="#436">436</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="437" href="#437">437</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="438" href="#438">438</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="438" href="#438">438</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="439" href="#439">439</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="440" href="#440">440</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="441" href="#441">441</a>
@@ -502,12 +502,12 @@
<a class="jxr_linenumber" name="492" href="#492">492</a>
<a class="jxr_linenumber" name="493" href="#493">493</a> <em class="jxr_comment">// 3) update test set value = 11 where id = 1; -- T1</em>
<a class="jxr_linenumber" name="494" href="#494">494</a> Put updateRow1Tx1 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="495" href="#495">495</a> updateRow1Tx1.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
+<a class="jxr_linenumber" name="495" href="#495">495</a> updateRow1Tx1.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"11"</span>));
<a class="jxr_linenumber" name="496" href="#496">496</a> txTable.put(tx1, updateRow1Tx1);
<a class="jxr_linenumber" name="497" href="#497">497</a>
<a class="jxr_linenumber" name="498" href="#498">498</a> <em class="jxr_comment">// 4) update test set value = 21 where id = 2; -- T2</em>
<a class="jxr_linenumber" name="499" href="#499">499</a> Put updateRow2Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId2);
-<a class="jxr_linenumber" name="500" href="#500">500</a> updateRow2Tx2.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"21"</span>));
+<a class="jxr_linenumber" name="500" href="#500">500</a> updateRow2Tx2.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"21"</span>));
<a class="jxr_linenumber" name="501" href="#501">501</a> txTable.put(tx2, updateRow2Tx2);
<a class="jxr_linenumber" name="502" href="#502">502</a>
<a class="jxr_linenumber" name="503" href="#503">503</a> <em class="jxr_comment">// 5) commit; -- T1</em>
@@ -533,7 +533,7 @@
<a class="jxr_linenumber" name="523" href="#523">523</a>
<a class="jxr_linenumber" name="524" href="#524">524</a> <em class="jxr_comment">// 0) Start transactions</em>
<a class="jxr_linenumber" name="525" href="#525">525</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="526" href="#526">526</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="526" href="#526">526</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="527" href="#527">527</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="528" href="#528">528</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="529" href="#529">529</a>
@@ -552,12 +552,12 @@
<a class="jxr_linenumber" name="542" href="#542">542</a>
<a class="jxr_linenumber" name="543" href="#543">543</a> <em class="jxr_comment">// 3) insert into test (id, value) values(3, 30); -- T1</em>
<a class="jxr_linenumber" name="544" href="#544">544</a> Put insertRow3Tx1 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="545" href="#545">545</a> insertRow3Tx1.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"30"</span>));
+<a class="jxr_linenumber" name="545" href="#545">545</a> insertRow3Tx1.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"30"</span>));
<a class="jxr_linenumber" name="546" href="#546">546</a> txTable.put(tx1, insertRow3Tx1);
<a class="jxr_linenumber" name="547" href="#547">547</a>
<a class="jxr_linenumber" name="548" href="#548">548</a> <em class="jxr_comment">// 4) insert into test (id, value) values(4, 42); -- T2</em>
<a class="jxr_linenumber" name="549" href="#549">549</a> Put updateRow4Tx2 = <strong class="jxr_keyword">new</strong> Put(rowId2);
-<a class="jxr_linenumber" name="550" href="#550">550</a> updateRow4Tx2.addColumn(famName, colName, Bytes.toBytes(<span class="jxr_string">"42"</span>));
+<a class="jxr_linenumber" name="550" href="#550">550</a> updateRow4Tx2.add(famName, colName, Bytes.toBytes(<span class="jxr_string">"42"</span>));
<a class="jxr_linenumber" name="551" href="#551">551</a> txTable.put(tx2, updateRow4Tx2);
<a class="jxr_linenumber" name="552" href="#552">552</a>
<a class="jxr_linenumber" name="553" href="#553">553</a> <em class="jxr_comment">// 5) commit; -- T1</em>
@@ -580,14 +580,14 @@
<a class="jxr_linenumber" name="570" href="#570">570</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> loadBaseDataOnTestTable(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="571" href="#571">571</a>
<a class="jxr_linenumber" name="572" href="#572">572</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="573" href="#573">573</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="573" href="#573">573</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="574" href="#574">574</a>
<a class="jxr_linenumber" name="575" href="#575">575</a> Transaction initializationTx = tm.begin();
<a class="jxr_linenumber" name="576" href="#576">576</a> Put row1 = <strong class="jxr_keyword">new</strong> Put(rowId1);
-<a class="jxr_linenumber" name="577" href="#577">577</a> row1.addColumn(famName, colName, dataValue1);
+<a class="jxr_linenumber" name="577" href="#577">577</a> row1.add(famName, colName, dataValue1);
<a class="jxr_linenumber" name="578" href="#578">578</a> txTable.put(initializationTx, row1);
<a class="jxr_linenumber" name="579" href="#579">579</a> Put row2 = <strong class="jxr_keyword">new</strong> Put(rowId2);
-<a class="jxr_linenumber" name="580" href="#580">580</a> row2.addColumn(famName, colName, dataValue2);
+<a class="jxr_linenumber" name="580" href="#580">580</a> row2.add(famName, colName, dataValue2);
<a class="jxr_linenumber" name="581" href="#581">581</a> txTable.put(initializationTx, row2);
<a class="jxr_linenumber" name="582" href="#582">582</a>
<a class="jxr_linenumber" name="583" href="#583">583</a> tm.commit(initializationTx);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/581871ee/xref-test/org/apache/omid/transaction/TestBasicTransaction.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestBasicTransaction.html b/xref-test/org/apache/omid/transaction/TestBasicTransaction.html
index 5702ac7..dd9abd8 100644
--- a/xref-test/org/apache/omid/transaction/TestBasicTransaction.html
+++ b/xref-test/org/apache/omid/transaction/TestBasicTransaction.html
@@ -27,20 +27,20 @@
<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.junit.Assert.fail;
-<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.assertTrue;
-<a class="jxr_linenumber" name="23" href="#23">23</a>
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<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.client.ResultScanner;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="33" href="#33">33</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.util.Bytes;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="30" href="#30">30</a>
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.fail;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
<a class="jxr_linenumber" name="34" href="#34">34</a>
<a class="jxr_linenumber" name="35" href="#35">35</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestBasicTransaction.html">TestBasicTransaction</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestampsOfTwoRowsInstertedAfterCommitOfSingleTransactionAreEquals(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="43" href="#43">43</a>
<a class="jxr_linenumber" name="44" href="#44">44</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="45" href="#45">45</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="45" href="#45">45</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="46" href="#46">46</a>
<a class="jxr_linenumber" name="47" href="#47">47</a> byte[] rowName1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
<a class="jxr_linenumber" name="48" href="#48">48</a> byte[] rowName2 = Bytes.toBytes(<span class="jxr_string">"row2"</span>);
@@ -64,10 +64,10 @@
<a class="jxr_linenumber" name="54" href="#54">54</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="55" href="#55">55</a>
<a class="jxr_linenumber" name="56" href="#56">56</a> Put row1 = <strong class="jxr_keyword">new</strong> Put(rowName1);
-<a class="jxr_linenumber" name="57" href="#57">57</a> row1.addColumn(famName1, colName1, dataValue1);
+<a class="jxr_linenumber" name="57" href="#57">57</a> row1.add(famName1, colName1, dataValue1);
<a class="jxr_linenumber" name="58" href="#58">58</a> tt.put(tx1, row1);
<a class="jxr_linenumber" name="59" href="#59">59</a> Put row2 = <strong class="jxr_keyword">new</strong> Put(rowName2);
-<a class="jxr_linenumber" name="60" href="#60">60</a> row2.addColumn(famName1, colName1, dataValue2);
+<a class="jxr_linenumber" name="60" href="#60">60</a> row2.add(famName1, colName1, dataValue2);
<a class="jxr_linenumber" name="61" href="#61">61</a> tt.put(tx1, row2);
<a class="jxr_linenumber" name="62" href="#62">62</a>
<a class="jxr_linenumber" name="63" href="#63">63</a> tm.commit(tx1);
@@ -98,7 +98,7 @@
<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="89" href="#89">89</a>
<a class="jxr_linenumber" name="90" href="#90">90</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="91" href="#91">91</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="91" href="#91">91</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="92" href="#92">92</a>
<a class="jxr_linenumber" name="93" href="#93">93</a> byte[] rowName1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
<a class="jxr_linenumber" name="94" href="#94">94</a> byte[] rowName2 = Bytes.toBytes(<span class="jxr_string">"row2"</span>);
@@ -113,10 +113,10 @@
<a class="jxr_linenumber" name="103" href="#103">103</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="104" href="#104">104</a>
<a class="jxr_linenumber" name="105" href="#105">105</a> Put row1 = <strong class="jxr_keyword">new</strong> Put(rowName1);
-<a class="jxr_linenumber" name="106" href="#106">106</a> row1.addColumn(famName1, colName1, dataValue1);
+<a class="jxr_linenumber" name="106" href="#106">106</a> row1.add(famName1, colName1, dataValue1);
<a class="jxr_linenumber" name="107" href="#107">107</a> tt.put(tx1, row1);
<a class="jxr_linenumber" name="108" href="#108">108</a> Put row2 = <strong class="jxr_keyword">new</strong> Put(rowName2);
-<a class="jxr_linenumber" name="109" href="#109">109</a> row2.addColumn(famName1, colName1, dataValue2);
+<a class="jxr_linenumber" name="109" href="#109">109</a> row2.add(famName1, colName1, dataValue2);
<a class="jxr_linenumber" name="110" href="#110">110</a> tt.put(tx1, row2);
<a class="jxr_linenumber" name="111" href="#111">111</a>
<a class="jxr_linenumber" name="112" href="#112">112</a> tm.commit(tx1);
@@ -124,10 +124,10 @@
<a class="jxr_linenumber" name="114" href="#114">114</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="115" href="#115">115</a>
<a class="jxr_linenumber" name="116" href="#116">116</a> row1 = <strong class="jxr_keyword">new</strong> Put(rowName1);
-<a class="jxr_linenumber" name="117" href="#117">117</a> row1.addColumn(famName1, colName1, dataValue3);
+<a class="jxr_linenumber" name="117" href="#117">117</a> row1.add(famName1, colName1, dataValue3);
<a class="jxr_linenumber" name="118" href="#118">118</a> tt.put(tx2, row1);
<a class="jxr_linenumber" name="119" href="#119">119</a> row2 = <strong class="jxr_keyword">new</strong> Put(rowName2);
-<a class="jxr_linenumber" name="120" href="#120">120</a> row2.addColumn(famName1, colName1, dataValue4);
+<a class="jxr_linenumber" name="120" href="#120">120</a> row2.add(famName1, colName1, dataValue4);
<a class="jxr_linenumber" name="121" href="#121">121</a> tt.put(tx2, row2);
<a class="jxr_linenumber" name="122" href="#122">122</a>
<a class="jxr_linenumber" name="123" href="#123">123</a> tm.commit(tx2);
@@ -165,7 +165,7 @@
<a class="jxr_linenumber" name="155" href="#155">155</a>
<a class="jxr_linenumber" name="156" href="#156">156</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="158" href="#158">158</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="159" href="#159">159</a>
<a class="jxr_linenumber" name="160" href="#160">160</a> Transaction t1 = tm.begin();
<a class="jxr_linenumber" name="161" href="#161">161</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
@@ -177,14 +177,14 @@
<a class="jxr_linenumber" name="167" href="#167">167</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
<a class="jxr_linenumber" name="168" href="#168">168</a>
<a class="jxr_linenumber" name="169" href="#169">169</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="170" href="#170">170</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="170" href="#170">170</a> p.add(fam, col, data1);
<a class="jxr_linenumber" name="171" href="#171">171</a> tt.put(t1, p);
<a class="jxr_linenumber" name="172" href="#172">172</a> tm.commit(t1);
<a class="jxr_linenumber" name="173" href="#173">173</a>
<a class="jxr_linenumber" name="174" href="#174">174</a> Transaction tread = tm.begin();
<a class="jxr_linenumber" name="175" href="#175">175</a> Transaction t2 = tm.begin();
<a class="jxr_linenumber" name="176" href="#176">176</a> p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="177" href="#177">177</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="177" href="#177">177</a> p.add(fam, col, data2);
<a class="jxr_linenumber" name="178" href="#178">178</a> tt.put(t2, p);
<a class="jxr_linenumber" name="179" href="#179">179</a> tm.commit(t2);
<a class="jxr_linenumber" name="180" href="#180">180</a>
@@ -202,7 +202,7 @@
<a class="jxr_linenumber" name="192" href="#192">192</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestManyVersions(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="193" href="#193">193</a>
<a class="jxr_linenumber" name="194" href="#194">194</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="195" href="#195">195</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="195" href="#195">195</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="196" href="#196">196</a>
<a class="jxr_linenumber" name="197" href="#197">197</a> Transaction t1 = tm.begin();
<a class="jxr_linenumber" name="198" href="#198">198</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
@@ -214,14 +214,14 @@
<a class="jxr_linenumber" name="204" href="#204">204</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
<a class="jxr_linenumber" name="205" href="#205">205</a>
<a class="jxr_linenumber" name="206" href="#206">206</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="207" href="#207">207</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="207" href="#207">207</a> p.add(fam, col, data1);
<a class="jxr_linenumber" name="208" href="#208">208</a> tt.put(t1, p);
<a class="jxr_linenumber" name="209" href="#209">209</a> tm.commit(t1);
<a class="jxr_linenumber" name="210" href="#210">210</a>
<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 5; ++i) {
<a class="jxr_linenumber" name="212" href="#212">212</a> Transaction t2 = tm.begin();
<a class="jxr_linenumber" name="213" href="#213">213</a> p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="214" href="#214">214</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="214" href="#214">214</a> p.add(fam, col, data2);
<a class="jxr_linenumber" name="215" href="#215">215</a> tt.put(t2, p);
<a class="jxr_linenumber" name="216" href="#216">216</a> }
<a class="jxr_linenumber" name="217" href="#217">217</a> Transaction tread = tm.begin();
@@ -241,7 +241,7 @@
<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestInterleave(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="232" href="#232">232</a>
<a class="jxr_linenumber" name="233" href="#233">233</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="234" href="#234">234</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="234" href="#234">234</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="235" href="#235">235</a>
<a class="jxr_linenumber" name="236" href="#236">236</a> Transaction t1 = tm.begin();
<a class="jxr_linenumber" name="237" href="#237">237</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
@@ -253,13 +253,13 @@
<a class="jxr_linenumber" name="243" href="#243">243</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
<a class="jxr_linenumber" name="244" href="#244">244</a>
<a class="jxr_linenumber" name="245" href="#245">245</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="246" href="#246">246</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="246" href="#246">246</a> p.add(fam, col, data1);
<a class="jxr_linenumber" name="247" href="#247">247</a> tt.put(t1, p);
<a class="jxr_linenumber" name="248" href="#248">248</a> tm.commit(t1);
<a class="jxr_linenumber" name="249" href="#249">249</a>
<a class="jxr_linenumber" name="250" href="#250">250</a> Transaction t2 = tm.begin();
<a class="jxr_linenumber" name="251" href="#251">251</a> p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="252" href="#252">252</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="252" href="#252">252</a> p.add(fam, col, data2);
<a class="jxr_linenumber" name="253" href="#253">253</a> tt.put(t2, p);
<a class="jxr_linenumber" name="254" href="#254">254</a>
<a class="jxr_linenumber" name="255" href="#255">255</a> Transaction tread = tm.begin();
@@ -288,7 +288,7 @@
<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInterleavedScanReturnsTheRightSnapshotResults(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="279" href="#279">279</a>
<a class="jxr_linenumber" name="280" href="#280">280</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="281" href="#281">281</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="281" href="#281">281</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="282" href="#282">282</a>
<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">// Basic data-scaffolding for test</em>
<a class="jxr_linenumber" name="284" href="#284">284</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
@@ -306,7 +306,7 @@
<a class="jxr_linenumber" name="296" href="#296">296</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"row-to-scan"</span> + i);
<a class="jxr_linenumber" name="297" href="#297">297</a>
<a class="jxr_linenumber" name="298" href="#298">298</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="299" href="#299">299</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="299" href="#299">299</a> p.add(fam, col, data1);
<a class="jxr_linenumber" name="300" href="#300">300</a> txTable.put(tx1, p);
<a class="jxr_linenumber" name="301" href="#301">301</a> }
<a class="jxr_linenumber" name="302" href="#302">302</a> tm.commit(tx1);
@@ -315,7 +315,7 @@
<a class="jxr_linenumber" name="305" href="#305">305</a> <em class="jxr_comment">// that scans the table, gets the proper snapshot with the stuff written by Tx1</em>
<a class="jxr_linenumber" name="306" href="#306">306</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="307" href="#307">307</a> Put p = <strong class="jxr_keyword">new</strong> Put(randomRow);
-<a class="jxr_linenumber" name="308" href="#308">308</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="308" href="#308">308</a> p.add(fam, col, data2);
<a class="jxr_linenumber" name="309" href="#309">309</a> txTable.put(tx2, p);
<a class="jxr_linenumber" name="310" href="#310">310</a>
<a class="jxr_linenumber" name="311" href="#311">311</a> Transaction scanTx = tm.begin(); <em class="jxr_comment">// This is the concurrent transactional scanner</em>
@@ -372,7 +372,7 @@
<a class="jxr_linenumber" name="362" href="#362">362</a> <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="363" href="#363">363</a>
<a class="jxr_linenumber" name="364" href="#364">364</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="365" href="#365">365</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="365" href="#365">365</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
<a class="jxr_linenumber" name="366" href="#366">366</a>
<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">// Basic data-scaffolding for test</em>
<a class="jxr_linenumber" name="368" href="#368">368</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
@@ -390,7 +390,7 @@
<a class="jxr_linenumber" name="380" href="#380">380</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"row-to-scan"</span> + i);
<a class="jxr_linenumber" name="381" href="#381">381</a>
<a class="jxr_linenumber" name="382" href="#382">382</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="383" href="#383">383</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="383" href="#383">383</a> p.add(fam, col, data1);
<a class="jxr_linenumber" name="384" href="#384">384</a> txTable.put(tx1, p);
<a class="jxr_linenumber" name="385" href="#385">385</a> }
<a class="jxr_linenumber" name="386" href="#386">386</a> tm.commit(tx1);
@@ -399,7 +399,7 @@
<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_comment">// right snapshot with the new value in the random row just written by Tx2</em>
<a class="jxr_linenumber" name="390" href="#390">390</a> Transaction tx2 = tm.begin();
<a class="jxr_linenumber" name="391" href="#391">391</a> Put p = <strong class="jxr_keyword">new</strong> Put(randomRow);
-<a class="jxr_linenumber" name="392" href="#392">392</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="392" href="#392">392</a> p.add(fam, col, data2);
<a class="jxr_linenumber" name="393" href="#393">393</a> txTable.put(tx2, p);
<a class="jxr_linenumber" name="394" href="#394">394</a>
<a class="jxr_linenumber" name="395" href="#395">395</a> <strong class="jxr_keyword">int</strong> modifiedRows = 0;
@@ -447,44 +447,7 @@
<a class="jxr_linenumber" name="437" href="#437">437</a>
<a class="jxr_linenumber" name="438" href="#438">438</a> }
<a class="jxr_linenumber" name="439" href="#439">439</a>
-<a class="jxr_linenumber" name="440" href="#440">440</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="441" href="#441">441</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAutoCommit(ITestContext context)
-<a class="jxr_linenumber" name="442" href="#442">442</a> <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="443" href="#443">443</a>
-<a class="jxr_linenumber" name="444" href="#444">444</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="445" href="#445">445</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
-<a class="jxr_linenumber" name="446" href="#446">446</a>
-<a class="jxr_linenumber" name="447" href="#447">447</a> byte[] rowName1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
-<a class="jxr_linenumber" name="448" href="#448">448</a> byte[] famName1 = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="449" href="#449">449</a> byte[] colName1 = Bytes.toBytes(<span class="jxr_string">"col1"</span>);
-<a class="jxr_linenumber" name="450" href="#450">450</a> byte[] dataValue1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="451" href="#451">451</a>
-<a class="jxr_linenumber" name="452" href="#452">452</a> Transaction tx1 = tm.begin();
-<a class="jxr_linenumber" name="453" href="#453">453</a>
-<a class="jxr_linenumber" name="454" href="#454">454</a> Put row1 = <strong class="jxr_keyword">new</strong> Put(rowName1);
-<a class="jxr_linenumber" name="455" href="#455">455</a> row1.addColumn(famName1, colName1, dataValue1);
-<a class="jxr_linenumber" name="456" href="#456">456</a> tt.put(tx1, row1);
-<a class="jxr_linenumber" name="457" href="#457">457</a>
-<a class="jxr_linenumber" name="458" href="#458">458</a> Transaction tx2 = tm.begin();
-<a class="jxr_linenumber" name="459" href="#459">459</a>
-<a class="jxr_linenumber" name="460" href="#460">460</a> Transaction tx3 = tm.begin();
-<a class="jxr_linenumber" name="461" href="#461">461</a>
-<a class="jxr_linenumber" name="462" href="#462">462</a> Get g = <strong class="jxr_keyword">new</strong> Get(rowName1).setMaxVersions();
-<a class="jxr_linenumber" name="463" href="#463">463</a> g.addColumn(famName1, colName1);
-<a class="jxr_linenumber" name="464" href="#464">464</a> Result r = tt.get(tx3, g);
-<a class="jxr_linenumber" name="465" href="#465">465</a> assertEquals(r.size(), 0, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="466" href="#466">466</a>
-<a class="jxr_linenumber" name="467" href="#467">467</a> row1 = <strong class="jxr_keyword">new</strong> Put(rowName1);
-<a class="jxr_linenumber" name="468" href="#468">468</a> row1.addColumn(famName1, colName1, dataValue1);
-<a class="jxr_linenumber" name="469" href="#469">469</a> tt.put(tx2, row1, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="470" href="#470">470</a>
-<a class="jxr_linenumber" name="471" href="#471">471</a> r = tt.get(tx3, g);
-<a class="jxr_linenumber" name="472" href="#472">472</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="473" href="#473">473</a>
-<a class="jxr_linenumber" name="474" href="#474">474</a> tt.close();
-<a class="jxr_linenumber" name="475" href="#475">475</a> }
-<a class="jxr_linenumber" name="476" href="#476">476</a>
-<a class="jxr_linenumber" name="477" href="#477">477</a> }
+<a class="jxr_linenumber" name="440" href="#440">440</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>