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:48:20 UTC
[35/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 9/20/18 10:47 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/6826ad03/xref-test/org/apache/omid/transaction/TestHBaseTransactionManager.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestHBaseTransactionManager.html b/xref-test/org/apache/omid/transaction/TestHBaseTransactionManager.html
index 58f473a..e0dc63c 100644
--- a/xref-test/org/apache/omid/transaction/TestHBaseTransactionManager.html
+++ b/xref-test/org/apache/omid/transaction/TestHBaseTransactionManager.html
@@ -27,23 +27,23 @@
<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> org.apache.omid.tso.client.TSOClient;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<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> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anyLong;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anySetOf;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.timeout;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.times;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<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.anyLong;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anySetOf;
+<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.doReturn;
+<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.spy;
+<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.timeout;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.times;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.verify;
+<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> <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> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<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.apache.omid.tso.client.TSOClient;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
<a class="jxr_linenumber" name="37" href="#37">37</a>
<a class="jxr_linenumber" name="38" href="#38">38</a> <em class="jxr_comment">// TODO These tests should be adapted to a future test for AbstractTransactionManager as they should be DB independent</em>
<a class="jxr_linenumber" name="39" href="#39">39</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
@@ -62,7 +62,7 @@
<a class="jxr_linenumber" name="52" href="#52">52</a>
<a class="jxr_linenumber" name="53" href="#53">53</a> TSOClient tsoClient = spy(getClient(context));
<a class="jxr_linenumber" name="54" href="#54">54</a>
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">long</strong> fakeEpoch = tsoClient.getNewStartTimestamp().get() + FAKE_EPOCH_INCREMENT;
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">long</strong> fakeEpoch = tsoClient.getNewStartTimestamp().get() + (FAKE_EPOCH_INCREMENT * AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN);
<a class="jxr_linenumber" name="56" href="#56">56</a>
<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Modify the epoch before testing the begin method</em>
<a class="jxr_linenumber" name="58" href="#58">58</a> doReturn(fakeEpoch).when(tsoClient).getEpoch();
@@ -84,16 +84,16 @@
<a class="jxr_linenumber" name="74" href="#74">74</a> TSOClient tsoClient = spy(getClient(context));
<a class="jxr_linenumber" name="75" href="#75">75</a> TransactionManager tm = newTransactionManager(context, tsoClient);
<a class="jxr_linenumber" name="76" href="#76">76</a>
-<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
<a class="jxr_linenumber" name="78" href="#78">78</a>
<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_comment">// Add initial data in a transactional context</em>
<a class="jxr_linenumber" name="80" href="#80">80</a> Transaction tx1 = tm.begin();
<a class="jxr_linenumber" name="81" href="#81">81</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="82" href="#82">82</a> put.add(testFamily, qualifier, data1);
+<a class="jxr_linenumber" name="82" href="#82">82</a> put.addColumn(testFamily, qualifier, data1);
<a class="jxr_linenumber" name="83" href="#83">83</a> txTable.put(tx1, put);
<a class="jxr_linenumber" name="84" href="#84">84</a> tm.commit(tx1);
<a class="jxr_linenumber" name="85" href="#85">85</a>
-<a class="jxr_linenumber" name="86" href="#86">86</a> verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="86" href="#86">86</a> verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="87" href="#87">87</a>
<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// Create a read-only tx and verify that commit has not been invoked again in the TSOClient</em>
<a class="jxr_linenumber" name="89" href="#89">89</a> AbstractTransaction readOnlyTx = (AbstractTransaction) tm.begin();
@@ -103,7 +103,7 @@
<a class="jxr_linenumber" name="93" href="#93">93</a> assertTrue(readOnlyTx.getWriteSet().isEmpty());
<a class="jxr_linenumber" name="94" href="#94">94</a> tm.commit(readOnlyTx);
<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="96" href="#96">96</a> verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals(readOnlyTx.getStatus(), Transaction.Status.COMMITTED_RO);
<a class="jxr_linenumber" name="98" href="#98">98</a> }
<a class="jxr_linenumber" name="99" href="#99">99</a>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/6826ad03/xref-test/org/apache/omid/transaction/TestMarkPutAsCommitted.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestMarkPutAsCommitted.html b/xref-test/org/apache/omid/transaction/TestMarkPutAsCommitted.html
new file mode 100644
index 0000000..151b0b4
--- /dev/null
+++ b/xref-test/org/apache/omid/transaction/TestMarkPutAsCommitted.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>TestMarkPutAsCommitted xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+</head>
+<body>
+<div id="overview"><a href="../../../../../../target/site/testapidocs/org/apache/omid/transaction/TestMarkPutAsCommitted.html">View Javadoc</a></div><pre>
+
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
+<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.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.apache.omid.transaction.CellUtils.hasCell;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.transaction.CellUtils.hasShadowCell;
+<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> java.util.Arrays;
+<a class="jxr_linenumber" name="25" href="#25">25</a>
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<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="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/TestMarkPutAsCommitted.html">TestMarkPutAsCommitted</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
+<a class="jxr_linenumber" name="37" href="#37">37</a>
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestMarkPutAsCommitted.<strong class="jxr_keyword">class</strong>);
+<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">static</strong> <strong class="jxr_keyword">final</strong> String TEST_FAMILY = <span class="jxr_string">"data"</span>;
+<a class="jxr_linenumber" name="41" href="#41">41</a>
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-sc"</span>);
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier = Bytes.toBytes(<span class="jxr_string">"testdata-1"</span>);
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> @Test(timeOut = 60_000)
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellsExistanceInAutocommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="50" href="#50">50</a>
+<a class="jxr_linenumber" name="51" href="#51">51</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="52" href="#52">52</a>
+<a class="jxr_linenumber" name="53" href="#53">53</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Test shadow cells are created properly</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="59" href="#59">59</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="60" href="#60">60</a>
+<a class="jxr_linenumber" name="61" href="#61">61</a> put = TTable.markPutAsCommitted(put, t1.getWriteTimestamp(), t1.getWriteTimestamp());
+<a class="jxr_linenumber" name="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> table.getHTable().put(put);
+<a class="jxr_linenumber" name="64" href="#64">64</a>
+<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// After markPutAsCommitted test that both cell and shadow cell are there</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> assertTrue(hasCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="67" href="#67">67</a> <span class="jxr_string">"Cell should be there"</span>);
+<a class="jxr_linenumber" name="68" href="#68">68</a> assertTrue(hasShadowCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="69" href="#69">69</a> <span class="jxr_string">"Shadow cell should be there"</span>);
+<a class="jxr_linenumber" name="70" href="#70">70</a> }
+<a class="jxr_linenumber" name="71" href="#71">71</a>
+<a class="jxr_linenumber" name="72" href="#72">72</a> @Test(timeOut = 60_000)
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadAfterAutocommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="74" href="#74">74</a>
+<a class="jxr_linenumber" name="75" href="#75">75</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="76" href="#76">76</a>
+<a class="jxr_linenumber" name="77" href="#77">77</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="80" href="#80">80</a>
+<a class="jxr_linenumber" name="81" href="#81">81</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="82" href="#82">82</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="83" href="#83">83</a>
+<a class="jxr_linenumber" name="84" href="#84">84</a> table.put(t1, put);
+<a class="jxr_linenumber" name="85" href="#85">85</a>
+<a class="jxr_linenumber" name="86" href="#86">86</a> tm.commit(t1);
+<a class="jxr_linenumber" name="87" href="#87">87</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// After commit test that both cell and shadow cell are there</em>
+<a class="jxr_linenumber" name="89" href="#89">89</a> assertTrue(hasCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="90" href="#90">90</a> <span class="jxr_string">"Cell should be there"</span>);
+<a class="jxr_linenumber" name="91" href="#91">91</a> assertTrue(hasShadowCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="92" href="#92">92</a> <span class="jxr_string">"Shadow cell should be there"</span>);
+<a class="jxr_linenumber" name="93" href="#93">93</a>
+<a class="jxr_linenumber" name="94" href="#94">94</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="95" href="#95">95</a> Get get = <strong class="jxr_keyword">new</strong> Get(row);
+<a class="jxr_linenumber" name="96" href="#96">96</a> get.addColumn(family, qualifier);
+<a class="jxr_linenumber" name="97" href="#97">97</a>
+<a class="jxr_linenumber" name="98" href="#98">98</a> Result getResult = table.get(t2, get);
+<a class="jxr_linenumber" name="99" href="#99">99</a> assertTrue(Arrays.equals(data1, getResult.getValue(family, qualifier)), <span class="jxr_string">"Values should be the same"</span>);
+<a class="jxr_linenumber" name="100" href="#100">100</a>
+<a class="jxr_linenumber" name="101" href="#101">101</a>
+<a class="jxr_linenumber" name="102" href="#102">102</a> HBaseTransaction t3 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="103" href="#103">103</a>
+<a class="jxr_linenumber" name="104" href="#104">104</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="105" href="#105">105</a> put1.addColumn(family, qualifier, data2);
+<a class="jxr_linenumber" name="106" href="#106">106</a>
+<a class="jxr_linenumber" name="107" href="#107">107</a> put1 = TTable.markPutAsCommitted(put1, t3.getWriteTimestamp(), t3.getWriteTimestamp());
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> table.getHTable().put(put1);
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// After markPutAsCommitted test that both cell and shadow cell are there</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> assertTrue(hasCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="113" href="#113">113</a> <span class="jxr_string">"Cell should be there"</span>);
+<a class="jxr_linenumber" name="114" href="#114">114</a> assertTrue(hasShadowCell(row, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="115" href="#115">115</a> <span class="jxr_string">"Shadow cell should be there"</span>);
+<a class="jxr_linenumber" name="116" href="#116">116</a>
+<a class="jxr_linenumber" name="117" href="#117">117</a> Transaction t4 = tm.begin();
+<a class="jxr_linenumber" name="118" href="#118">118</a>
+<a class="jxr_linenumber" name="119" href="#119">119</a> getResult = table.get(t4, get);
+<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_comment">//Test that t4 reads t3's write even though t3 was not committed </em>
+<a class="jxr_linenumber" name="121" href="#121">121</a> assertTrue(Arrays.equals(data2, getResult.getValue(family, qualifier)), <span class="jxr_string">"Values should be the same"</span>);
+<a class="jxr_linenumber" name="122" href="#122">122</a> }
+<a class="jxr_linenumber" name="123" href="#123">123</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/6826ad03/xref-test/org/apache/omid/transaction/TestMultiplePut.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestMultiplePut.html b/xref-test/org/apache/omid/transaction/TestMultiplePut.html
index adbe467..15f2a7c 100644
--- a/xref-test/org/apache/omid/transaction/TestMultiplePut.html
+++ b/xref-test/org/apache/omid/transaction/TestMultiplePut.html
@@ -27,121 +27,120 @@
<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> 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.slf4j.Logger;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<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="28" href="#28">28</a>
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<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.assertTrue;
+<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.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> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestMultiplePut.html">TestMultiplePut</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
<a class="jxr_linenumber" name="33" href="#33">33</a>
<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestMultiplePut.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="35" href="#35">35</a>
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] testTable = Bytes.toBytes(TEST_TABLE);
-<a class="jxr_linenumber" name="37" href="#37">37</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="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] col1 = Bytes.toBytes(<span class="jxr_string">"col1"</span>);
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] col2 = Bytes.toBytes(<span class="jxr_string">"col2"</span>);
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"testData"</span>);
-<a class="jxr_linenumber" name="41" href="#41">41</a>
-<a class="jxr_linenumber" name="42" href="#42">42</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultiPutInTwoDifferentColsOfSameRowAreInTheTableAfterCommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="48" href="#48">48</a>
-<a class="jxr_linenumber" name="49" href="#49">49</a> Transaction tx = tm.begin();
-<a class="jxr_linenumber" name="50" href="#50">50</a>
-<a class="jxr_linenumber" name="51" href="#51">51</a> byte[] rowToAdd = Bytes.toBytes(1000);
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
-<a class="jxr_linenumber" name="54" href="#54">54</a> put1.add(family, col1, data);
-<a class="jxr_linenumber" name="55" href="#55">55</a> txTable.put(tx, put1);
-<a class="jxr_linenumber" name="56" href="#56">56</a>
-<a class="jxr_linenumber" name="57" href="#57">57</a> Put put2 = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
-<a class="jxr_linenumber" name="58" href="#58">58</a> put2.add(family, col2, data);
-<a class="jxr_linenumber" name="59" href="#59">59</a> txTable.put(tx, put2);
-<a class="jxr_linenumber" name="60" href="#60">60</a>
-<a class="jxr_linenumber" name="61" href="#61">61</a> tm.commit(tx);
-<a class="jxr_linenumber" name="62" href="#62">62</a>
-<a class="jxr_linenumber" name="63" href="#63">63</a> assertTrue(verifyValue(testTable, rowToAdd, family, col1, data), <span class="jxr_string">"Invalid value in table"</span>);
-<a class="jxr_linenumber" name="64" href="#64">64</a> assertTrue(verifyValue(testTable, rowToAdd, family, col2, data), <span class="jxr_string">"Invalid value in table"</span>);
-<a class="jxr_linenumber" name="65" href="#65">65</a> }
-<a class="jxr_linenumber" name="66" href="#66">66</a>
-<a class="jxr_linenumber" name="67" href="#67">67</a> }
-<a class="jxr_linenumber" name="68" href="#68">68</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testManyManyPutsInDifferentRowsAreInTheTableAfterCommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="71" href="#71">71</a>
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ROWS_TO_ADD = 50;
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="75" href="#75">75</a>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="77" href="#77">77</a>
-<a class="jxr_linenumber" name="78" href="#78">78</a> Transaction tx = tm.begin();
-<a class="jxr_linenumber" name="79" href="#79">79</a>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i <= NUM_ROWS_TO_ADD; i++) {
-<a class="jxr_linenumber" name="81" href="#81">81</a> byte[] rowToAdd = Bytes.toBytes(i);
-<a class="jxr_linenumber" name="82" href="#82">82</a> byte[] dataForRowCol = Bytes.toBytes(<span class="jxr_string">"testData"</span> + i);
-<a class="jxr_linenumber" name="83" href="#83">83</a> Put put = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
-<a class="jxr_linenumber" name="84" href="#84">84</a> put.add(family, col1, dataForRowCol);
-<a class="jxr_linenumber" name="85" href="#85">85</a> txTable.put(tx, put);
-<a class="jxr_linenumber" name="86" href="#86">86</a> }
-<a class="jxr_linenumber" name="87" href="#87">87</a>
-<a class="jxr_linenumber" name="88" href="#88">88</a> tm.commit(tx);
-<a class="jxr_linenumber" name="89" href="#89">89</a>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <em class="jxr_comment">// Check some of the added values are there in the table</em>
-<a class="jxr_linenumber" name="91" href="#91">91</a> byte[] rowToCheck = Bytes.toBytes(0);
-<a class="jxr_linenumber" name="92" href="#92">92</a> byte[] dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + 0);
-<a class="jxr_linenumber" name="93" href="#93">93</a> assertTrue(verifyValue(testTable, rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
-<a class="jxr_linenumber" name="94" href="#94">94</a> rowToCheck = Bytes.toBytes(NUM_ROWS_TO_ADD / 2);
-<a class="jxr_linenumber" name="95" href="#95">95</a> dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + (NUM_ROWS_TO_ADD / 2));
-<a class="jxr_linenumber" name="96" href="#96">96</a> assertTrue(verifyValue(testTable, rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
-<a class="jxr_linenumber" name="97" href="#97">97</a> rowToCheck = Bytes.toBytes(NUM_ROWS_TO_ADD);
-<a class="jxr_linenumber" name="98" href="#98">98</a> dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + NUM_ROWS_TO_ADD);
-<a class="jxr_linenumber" name="99" href="#99">99</a> assertTrue(verifyValue(testTable, rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
-<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
-<a class="jxr_linenumber" name="102" href="#102">102</a> }
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetFromNonExistentRowAfterMultiplePutsReturnsNoResult(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="106" href="#106">106</a>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ROWS_TO_ADD = 10;
-<a class="jxr_linenumber" name="108" href="#108">108</a>
-<a class="jxr_linenumber" name="109" href="#109">109</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="110" href="#110">110</a>
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> Transaction tx = tm.begin();
-<a class="jxr_linenumber" name="114" href="#114">114</a>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ROWS_TO_ADD; i++) {
-<a class="jxr_linenumber" name="116" href="#116">116</a> byte[] rowToAdd = Bytes.toBytes(i);
-<a class="jxr_linenumber" name="117" href="#117">117</a> Put put = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
-<a class="jxr_linenumber" name="118" href="#118">118</a> put.add(family, col1, Bytes.toBytes(<span class="jxr_string">"testData"</span> + i));
-<a class="jxr_linenumber" name="119" href="#119">119</a> txTable.put(tx, put);
-<a class="jxr_linenumber" name="120" href="#120">120</a> }
-<a class="jxr_linenumber" name="121" href="#121">121</a>
-<a class="jxr_linenumber" name="122" href="#122">122</a> byte[] nonExistentRow = Bytes.toBytes(NUM_ROWS_TO_ADD + 5);
-<a class="jxr_linenumber" name="123" href="#123">123</a> Get get = <strong class="jxr_keyword">new</strong> Get(nonExistentRow);
-<a class="jxr_linenumber" name="124" href="#124">124</a> Result result = txTable.get(tx, get);
-<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> assertTrue(result.isEmpty(), <span class="jxr_string">"Found a row that should not exist"</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a>
-<a class="jxr_linenumber" name="128" href="#128">128</a> tm.commit(tx);
-<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> }
-<a class="jxr_linenumber" name="131" href="#131">131</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a> }
-<a class="jxr_linenumber" name="133" href="#133">133</a>
-<a class="jxr_linenumber" name="134" href="#134">134</a> }
+<a class="jxr_linenumber" name="36" href="#36">36</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="37" href="#37">37</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] col1 = Bytes.toBytes(<span class="jxr_string">"col1"</span>);
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] col2 = Bytes.toBytes(<span class="jxr_string">"col2"</span>);
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"testData"</span>);
+<a class="jxr_linenumber" name="40" href="#40">40</a>
+<a class="jxr_linenumber" name="41" href="#41">41</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultiPutInTwoDifferentColsOfSameRowAreInTheTableAfterCommit(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>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> Transaction tx = tm.begin();
+<a class="jxr_linenumber" name="49" href="#49">49</a>
+<a class="jxr_linenumber" name="50" href="#50">50</a> byte[] rowToAdd = Bytes.toBytes(1000);
+<a class="jxr_linenumber" name="51" href="#51">51</a>
+<a class="jxr_linenumber" name="52" href="#52">52</a> Put put1 = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
+<a class="jxr_linenumber" name="53" href="#53">53</a> put1.addColumn(family, col1, data);
+<a class="jxr_linenumber" name="54" href="#54">54</a> txTable.put(tx, put1);
+<a class="jxr_linenumber" name="55" href="#55">55</a>
+<a class="jxr_linenumber" name="56" href="#56">56</a> Put put2 = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
+<a class="jxr_linenumber" name="57" href="#57">57</a> put2.addColumn(family, col2, data);
+<a class="jxr_linenumber" name="58" href="#58">58</a> txTable.put(tx, put2);
+<a class="jxr_linenumber" name="59" href="#59">59</a>
+<a class="jxr_linenumber" name="60" href="#60">60</a> tm.commit(tx);
+<a class="jxr_linenumber" name="61" href="#61">61</a>
+<a class="jxr_linenumber" name="62" href="#62">62</a> assertTrue(verifyValue(txTable.getHTable(), rowToAdd, family, col1, data), <span class="jxr_string">"Invalid value in table"</span>);
+<a class="jxr_linenumber" name="63" href="#63">63</a> assertTrue(verifyValue(txTable.getHTable(), rowToAdd, family, col2, data), <span class="jxr_string">"Invalid value in table"</span>);
+<a class="jxr_linenumber" name="64" href="#64">64</a> }
+<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="66" href="#66">66</a> }
+<a class="jxr_linenumber" name="67" href="#67">67</a>
+<a class="jxr_linenumber" name="68" href="#68">68</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testManyManyPutsInDifferentRowsAreInTheTableAfterCommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ROWS_TO_ADD = 50;
+<a class="jxr_linenumber" name="72" href="#72">72</a>
+<a class="jxr_linenumber" name="73" href="#73">73</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="74" href="#74">74</a>
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="76" href="#76">76</a>
+<a class="jxr_linenumber" name="77" href="#77">77</a> Transaction tx = tm.begin();
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i <= NUM_ROWS_TO_ADD; i++) {
+<a class="jxr_linenumber" name="80" href="#80">80</a> byte[] rowToAdd = Bytes.toBytes(i);
+<a class="jxr_linenumber" name="81" href="#81">81</a> byte[] dataForRowCol = Bytes.toBytes(<span class="jxr_string">"testData"</span> + i);
+<a class="jxr_linenumber" name="82" href="#82">82</a> Put put = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
+<a class="jxr_linenumber" name="83" href="#83">83</a> put.addColumn(family, col1, dataForRowCol);
+<a class="jxr_linenumber" name="84" href="#84">84</a> txTable.put(tx, put);
+<a class="jxr_linenumber" name="85" href="#85">85</a> }
+<a class="jxr_linenumber" name="86" href="#86">86</a>
+<a class="jxr_linenumber" name="87" href="#87">87</a> tm.commit(tx);
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// Check some of the added values are there in the table</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> byte[] rowToCheck = Bytes.toBytes(0);
+<a class="jxr_linenumber" name="91" href="#91">91</a> byte[] dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + 0);
+<a class="jxr_linenumber" name="92" href="#92">92</a> assertTrue(verifyValue(txTable.getHTable(), rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
+<a class="jxr_linenumber" name="93" href="#93">93</a> rowToCheck = Bytes.toBytes(NUM_ROWS_TO_ADD / 2);
+<a class="jxr_linenumber" name="94" href="#94">94</a> dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + (NUM_ROWS_TO_ADD / 2));
+<a class="jxr_linenumber" name="95" href="#95">95</a> assertTrue(verifyValue(txTable.getHTable(), rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
+<a class="jxr_linenumber" name="96" href="#96">96</a> rowToCheck = Bytes.toBytes(NUM_ROWS_TO_ADD);
+<a class="jxr_linenumber" name="97" href="#97">97</a> dataToCheck = Bytes.toBytes(<span class="jxr_string">"testData"</span> + NUM_ROWS_TO_ADD);
+<a class="jxr_linenumber" name="98" href="#98">98</a> assertTrue(verifyValue(txTable.getHTable(), rowToCheck, family, col1, dataToCheck), <span class="jxr_string">"Invalid value in table"</span>);
+<a class="jxr_linenumber" name="99" href="#99">99</a>
+<a class="jxr_linenumber" name="100" href="#100">100</a> }
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a>
+<a class="jxr_linenumber" name="103" href="#103">103</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetFromNonExistentRowAfterMultiplePutsReturnsNoResult(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="105" href="#105">105</a>
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_ROWS_TO_ADD = 10;
+<a class="jxr_linenumber" name="107" href="#107">107</a>
+<a class="jxr_linenumber" name="108" href="#108">108</a> TransactionManager tm = newTransactionManager(context);
+<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="111" href="#111">111</a>
+<a class="jxr_linenumber" name="112" href="#112">112</a> Transaction tx = tm.begin();
+<a class="jxr_linenumber" name="113" href="#113">113</a>
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < NUM_ROWS_TO_ADD; i++) {
+<a class="jxr_linenumber" name="115" href="#115">115</a> byte[] rowToAdd = Bytes.toBytes(i);
+<a class="jxr_linenumber" name="116" href="#116">116</a> Put put = <strong class="jxr_keyword">new</strong> Put(rowToAdd);
+<a class="jxr_linenumber" name="117" href="#117">117</a> put.addColumn(family, col1, Bytes.toBytes(<span class="jxr_string">"testData"</span> + i));
+<a class="jxr_linenumber" name="118" href="#118">118</a> txTable.put(tx, put);
+<a class="jxr_linenumber" name="119" href="#119">119</a> }
+<a class="jxr_linenumber" name="120" href="#120">120</a>
+<a class="jxr_linenumber" name="121" href="#121">121</a> byte[] nonExistentRow = Bytes.toBytes(NUM_ROWS_TO_ADD + 5);
+<a class="jxr_linenumber" name="122" href="#122">122</a> Get get = <strong class="jxr_keyword">new</strong> Get(nonExistentRow);
+<a class="jxr_linenumber" name="123" href="#123">123</a> Result result = txTable.get(tx, get);
+<a class="jxr_linenumber" name="124" href="#124">124</a>
+<a class="jxr_linenumber" name="125" href="#125">125</a> assertTrue(result.isEmpty(), <span class="jxr_string">"Found a row that should not exist"</span>);
+<a class="jxr_linenumber" name="126" href="#126">126</a>
+<a class="jxr_linenumber" name="127" href="#127">127</a> tm.commit(tx);
+<a class="jxr_linenumber" name="128" href="#128">128</a>
+<a class="jxr_linenumber" name="129" href="#129">129</a> }
+<a class="jxr_linenumber" name="130" href="#130">130</a>
+<a class="jxr_linenumber" name="131" href="#131">131</a> }
+<a class="jxr_linenumber" name="132" href="#132">132</a>
+<a class="jxr_linenumber" name="133" href="#133">133</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/6826ad03/xref-test/org/apache/omid/transaction/TestReadPath.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestReadPath.html b/xref-test/org/apache/omid/transaction/TestReadPath.html
index ab3049b..3d920fb 100644
--- a/xref-test/org/apache/omid/transaction/TestReadPath.html
+++ b/xref-test/org/apache/omid/transaction/TestReadPath.html
@@ -27,22 +27,22 @@
<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> 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.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="28" href="#28">28</a>
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> java.util.Arrays;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> java.util.List;
-<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> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertNotNull;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<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.assertFalse;
+<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.assertNotNull;
+<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> java.util.ArrayList;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> java.util.List;
+<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.Cell;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CellUtil;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<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.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> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<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/transaction/TestReadPath.html">TestReadPath</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -56,14 +56,14 @@
<a class="jxr_linenumber" name="46" href="#46">46</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadInterleaved(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="48" href="#48">48</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="49" href="#49">49</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="49" href="#49">49</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="50" href="#50">50</a>
<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_comment">// Put some data on the DB</em>
<a class="jxr_linenumber" name="52" href="#52">52</a> Transaction t1 = tm.begin();
<a class="jxr_linenumber" name="53" href="#53">53</a> Transaction t2 = tm.begin();
<a class="jxr_linenumber" name="54" href="#54">54</a>
<a class="jxr_linenumber" name="55" href="#55">55</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="56" href="#56">56</a> put.add(family, col, data);
+<a class="jxr_linenumber" name="56" href="#56">56</a> put.addColumn(family, col, data);
<a class="jxr_linenumber" name="57" href="#57">57</a> table.put(t1, put);
<a class="jxr_linenumber" name="58" href="#58">58</a> tm.commit(t1);
<a class="jxr_linenumber" name="59" href="#59">59</a>
@@ -75,12 +75,12 @@
<a class="jxr_linenumber" name="65" href="#65">65</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadWithSeveralUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="67" href="#67">67</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="68" href="#68">68</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="68" href="#68">68</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="69" href="#69">69</a>
<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_comment">// Put some data on the DB</em>
<a class="jxr_linenumber" name="71" href="#71">71</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="72" href="#72">72</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="73" href="#73">73</a> put.add(family, col, data);
+<a class="jxr_linenumber" name="73" href="#73">73</a> put.addColumn(family, col, data);
<a class="jxr_linenumber" name="74" href="#74">74</a> table.put(t, put);
<a class="jxr_linenumber" name="75" href="#75">75</a> tm.commit(t);
<a class="jxr_linenumber" name="76" href="#76">76</a> List<Transaction> running = <strong class="jxr_keyword">new</strong> ArrayList<>();
@@ -89,7 +89,7 @@
<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 10; ++i) {
<a class="jxr_linenumber" name="80" href="#80">80</a> t = tm.begin();
<a class="jxr_linenumber" name="81" href="#81">81</a> put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="82" href="#82">82</a> put.add(family, col, uncommitted);
+<a class="jxr_linenumber" name="82" href="#82">82</a> put.addColumn(family, col, uncommitted);
<a class="jxr_linenumber" name="83" href="#83">83</a> table.put(t, put);
<a class="jxr_linenumber" name="84" href="#84">84</a> running.add(t);
<a class="jxr_linenumber" name="85" href="#85">85</a> }