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:15 UTC
[30/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/TestTransactionConflict.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
index 4a11a91..aae38d5 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
@@ -27,290 +27,500 @@
<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.HColumnDescriptor;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
-<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.HBaseAdmin;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="35" href="#35">35</a>
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<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.fail;
-<a class="jxr_linenumber" name="39" href="#39">39</a>
-<a class="jxr_linenumber" name="40" href="#40">40</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTransactionConflict.html">TestTransactionConflict</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<a class="jxr_linenumber" name="42" href="#42">42</a>
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionConflict.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
+<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.HColumnDescriptor;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Admin;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Connection;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ConnectionFactory;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.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.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<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="41" href="#41">41</a>
+<a class="jxr_linenumber" name="42" href="#42">42</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTransactionConflict.html">TestTransactionConflict</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="47" href="#47">47</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="48" href="#48">48</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="51" href="#51">51</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="54" href="#54">54</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
-<a class="jxr_linenumber" name="55" href="#55">55</a>
-<a class="jxr_linenumber" name="56" href="#56">56</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
-<a class="jxr_linenumber" name="57" href="#57">57</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="58" href="#58">58</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
-<a class="jxr_linenumber" name="59" href="#59">59</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="60" href="#60">60</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="63" href="#63">63</a> p.add(fam, col, data1);
-<a class="jxr_linenumber" name="64" href="#64">64</a> tt.put(t1, p);
-<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="67" href="#67">67</a> p2.add(fam, col, data2);
-<a class="jxr_linenumber" name="68" href="#68">68</a> tt.put(t2, p2);
-<a class="jxr_linenumber" name="69" href="#69">69</a>
-<a class="jxr_linenumber" name="70" href="#70">70</a> tm.commit(t2);
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionConflict.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="46" href="#46">46</a>
+<a class="jxr_linenumber" name="47" href="#47">47</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="49" href="#49">49</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="50" href="#50">50</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="51" href="#51">51</a>
+<a class="jxr_linenumber" name="52" href="#52">52</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="53" href="#53">53</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="56" href="#56">56</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="57" href="#57">57</a>
+<a class="jxr_linenumber" name="58" href="#58">58</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="59" href="#59">59</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="60" href="#60">60</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="61" href="#61">61</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="62" href="#62">62</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="63" href="#63">63</a>
+<a class="jxr_linenumber" name="64" href="#64">64</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="65" href="#65">65</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="66" href="#66">66</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="67" href="#67">67</a>
+<a class="jxr_linenumber" name="68" href="#68">68</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="69" href="#69">69</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="70" href="#70">70</a> tt.put(t2, p2);
<a class="jxr_linenumber" name="71" href="#71">71</a>
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="73" href="#73">73</a> tm.commit(t1);
-<a class="jxr_linenumber" name="74" href="#74">74</a> fail(<span class="jxr_string">"Transaction should not commit successfully"</span>);
-<a class="jxr_linenumber" name="75" href="#75">75</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="76" href="#76">76</a> }
-<a class="jxr_linenumber" name="77" href="#77">77</a> }
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestMultiTableConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="81" href="#81">81</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="82" href="#82">82</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="83" href="#83">83</a> String table2 = TEST_TABLE + 2;
-<a class="jxr_linenumber" name="84" href="#84">84</a> TableName table2Name = TableName.valueOf(table2);
-<a class="jxr_linenumber" name="85" href="#85">85</a>
-<a class="jxr_linenumber" name="86" href="#86">86</a> HBaseAdmin admin = <strong class="jxr_keyword">new</strong> HBaseAdmin(hbaseConf);
+<a class="jxr_linenumber" name="72" href="#72">72</a> tm.commit(t2);
+<a class="jxr_linenumber" name="73" href="#73">73</a>
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="75" href="#75">75</a> tm.commit(t1);
+<a class="jxr_linenumber" name="76" href="#76">76</a> fail(<span class="jxr_string">"Transaction should not commit successfully"</span>);
+<a class="jxr_linenumber" name="77" href="#77">77</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="78" href="#78">78</a> }
+<a class="jxr_linenumber" name="79" href="#79">79</a> }
+<a class="jxr_linenumber" name="80" href="#80">80</a>
+<a class="jxr_linenumber" name="81" href="#81">81</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestMultiTableConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="83" href="#83">83</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="84" href="#84">84</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="85" href="#85">85</a> String table2 = TEST_TABLE + 2;
+<a class="jxr_linenumber" name="86" href="#86">86</a> TableName table2Name = TableName.valueOf(table2);
<a class="jxr_linenumber" name="87" href="#87">87</a>
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(table2)) {
-<a class="jxr_linenumber" name="89" href="#89">89</a> HTableDescriptor desc = <strong class="jxr_keyword">new</strong> HTableDescriptor(table2Name);
-<a class="jxr_linenumber" name="90" href="#90">90</a> HColumnDescriptor datafam = <strong class="jxr_keyword">new</strong> HColumnDescriptor(TEST_FAMILY);
-<a class="jxr_linenumber" name="91" href="#91">91</a> datafam.setMaxVersions(Integer.MAX_VALUE);
-<a class="jxr_linenumber" name="92" href="#92">92</a> desc.addFamily(datafam);
-<a class="jxr_linenumber" name="93" href="#93">93</a>
-<a class="jxr_linenumber" name="94" href="#94">94</a> admin.createTable(desc);
-<a class="jxr_linenumber" name="95" href="#95">95</a> }
-<a class="jxr_linenumber" name="96" href="#96">96</a>
-<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">if</strong> (admin.isTableDisabled(table2)) {
-<a class="jxr_linenumber" name="98" href="#98">98</a> admin.enableTable(table2);
-<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a> admin.close();
-<a class="jxr_linenumber" name="101" href="#101">101</a>
-<a class="jxr_linenumber" name="102" href="#102">102</a> TTable tt2 = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, table2);
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="105" href="#105">105</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="106" href="#106">106</a>
-<a class="jxr_linenumber" name="107" href="#107">107</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="108" href="#108">108</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
-<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
-<a class="jxr_linenumber" name="111" href="#111">111</a> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"test-simple2"</span>);
-<a class="jxr_linenumber" name="112" href="#112">112</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="113" href="#113">113</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
-<a class="jxr_linenumber" name="114" href="#114">114</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="115" href="#115">115</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
-<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="118" href="#118">118</a> p.add(fam, col, data1);
-<a class="jxr_linenumber" name="119" href="#119">119</a> tt.put(t1, p);
-<a class="jxr_linenumber" name="120" href="#120">120</a> tt2.put(t1, p);
-<a class="jxr_linenumber" name="121" href="#121">121</a>
-<a class="jxr_linenumber" name="122" href="#122">122</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="123" href="#123">123</a> p2.add(fam, col, data2);
-<a class="jxr_linenumber" name="124" href="#124">124</a> tt.put(t2, p2);
-<a class="jxr_linenumber" name="125" href="#125">125</a> p2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="126" href="#126">126</a> p2.add(fam, col, data2);
-<a class="jxr_linenumber" name="127" href="#127">127</a> tt2.put(t2, p2);
-<a class="jxr_linenumber" name="128" href="#128">128</a>
-<a class="jxr_linenumber" name="129" href="#129">129</a> tm.commit(t2);
-<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="133" href="#133">133</a> tm.commit(t1);
-<a class="jxr_linenumber" name="134" href="#134">134</a> fail(<span class="jxr_string">"Transaction commited successfully"</span>);
-<a class="jxr_linenumber" name="135" href="#135">135</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="136" href="#136">136</a> aborted = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="137" href="#137">137</a> }
-<a class="jxr_linenumber" name="138" href="#138">138</a> assertTrue(aborted, <span class="jxr_string">"Transaction didn't raise exception"</span>);
-<a class="jxr_linenumber" name="139" href="#139">139</a>
-<a class="jxr_linenumber" name="140" href="#140">140</a> ResultScanner rs = tt2.getHTable().getScanner(fam, col);
-<a class="jxr_linenumber" name="141" href="#141">141</a>
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="143" href="#143">143</a> Result r;
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">while</strong> ((r = rs.next()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="145" href="#145">145</a> count += r.size();
-<a class="jxr_linenumber" name="146" href="#146">146</a> }
-<a class="jxr_linenumber" name="147" href="#147">147</a> assertEquals(count, 1, <span class="jxr_string">"Should have cell"</span>);
-<a class="jxr_linenumber" name="148" href="#148">148</a> }
-<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestCleanupAfterConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="152" href="#152">152</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="153" href="#153">153</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="154" href="#154">154</a>
-<a class="jxr_linenumber" name="155" href="#155">155</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="156" href="#156">156</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="159" href="#159">159</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
-<a class="jxr_linenumber" name="160" href="#160">160</a>
-<a class="jxr_linenumber" name="161" href="#161">161</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
-<a class="jxr_linenumber" name="162" href="#162">162</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="163" href="#163">163</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
-<a class="jxr_linenumber" name="164" href="#164">164</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="165" href="#165">165</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
-<a class="jxr_linenumber" name="166" href="#166">166</a>
-<a class="jxr_linenumber" name="167" href="#167">167</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="168" href="#168">168</a> p.add(fam, col, data1);
-<a class="jxr_linenumber" name="169" href="#169">169</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">try</strong> (Connection conn = ConnectionFactory.createConnection(hbaseConf);
+<a class="jxr_linenumber" name="89" href="#89">89</a> Admin admin = conn.getAdmin()) {
+<a class="jxr_linenumber" name="90" href="#90">90</a> TableName htable2 = TableName.valueOf(table2);
+<a class="jxr_linenumber" name="91" href="#91">91</a>
+<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(htable2)) {
+<a class="jxr_linenumber" name="93" href="#93">93</a> HTableDescriptor desc = <strong class="jxr_keyword">new</strong> HTableDescriptor(table2Name);
+<a class="jxr_linenumber" name="94" href="#94">94</a> HColumnDescriptor datafam = <strong class="jxr_keyword">new</strong> HColumnDescriptor(TEST_FAMILY);
+<a class="jxr_linenumber" name="95" href="#95">95</a> datafam.setMaxVersions(Integer.MAX_VALUE);
+<a class="jxr_linenumber" name="96" href="#96">96</a> desc.addFamily(datafam);
+<a class="jxr_linenumber" name="97" href="#97">97</a>
+<a class="jxr_linenumber" name="98" href="#98">98</a> admin.createTable(desc);
+<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> <strong class="jxr_keyword">if</strong> (admin.isTableDisabled(htable2)) {
+<a class="jxr_linenumber" name="102" href="#102">102</a> admin.enableTable(htable2);
+<a class="jxr_linenumber" name="103" href="#103">103</a> }
+<a class="jxr_linenumber" name="104" href="#104">104</a> }
+<a class="jxr_linenumber" name="105" href="#105">105</a>
+<a class="jxr_linenumber" name="106" href="#106">106</a> TTable tt2 = <strong class="jxr_keyword">new</strong> TTable(connection, table2);
+<a class="jxr_linenumber" name="107" href="#107">107</a>
+<a class="jxr_linenumber" name="108" href="#108">108</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="109" href="#109">109</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="112" href="#112">112</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="113" href="#113">113</a>
+<a class="jxr_linenumber" name="114" href="#114">114</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="115" href="#115">115</a> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"test-simple2"</span>);
+<a class="jxr_linenumber" name="116" href="#116">116</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="117" href="#117">117</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="118" href="#118">118</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="119" href="#119">119</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="120" href="#120">120</a>
+<a class="jxr_linenumber" name="121" href="#121">121</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="122" href="#122">122</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="123" href="#123">123</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="124" href="#124">124</a> tt2.put(t1, p);
+<a class="jxr_linenumber" name="125" href="#125">125</a>
+<a class="jxr_linenumber" name="126" href="#126">126</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="127" href="#127">127</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="128" href="#128">128</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="129" href="#129">129</a> p2 = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="130" href="#130">130</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="131" href="#131">131</a> tt2.put(t2, p2);
+<a class="jxr_linenumber" name="132" href="#132">132</a>
+<a class="jxr_linenumber" name="133" href="#133">133</a> tm.commit(t2);
+<a class="jxr_linenumber" name="134" href="#134">134</a>
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
+<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="137" href="#137">137</a> tm.commit(t1);
+<a class="jxr_linenumber" name="138" href="#138">138</a> fail(<span class="jxr_string">"Transaction commited successfully"</span>);
+<a class="jxr_linenumber" name="139" href="#139">139</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="140" href="#140">140</a> aborted = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="141" href="#141">141</a> }
+<a class="jxr_linenumber" name="142" href="#142">142</a> assertTrue(aborted, <span class="jxr_string">"Transaction didn't raise exception"</span>);
+<a class="jxr_linenumber" name="143" href="#143">143</a>
+<a class="jxr_linenumber" name="144" href="#144">144</a> ResultScanner rs = tt2.getHTable().getScanner(fam, col);
+<a class="jxr_linenumber" name="145" href="#145">145</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="147" href="#147">147</a> Result r;
+<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">while</strong> ((r = rs.next()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="149" href="#149">149</a> count += r.size();
+<a class="jxr_linenumber" name="150" href="#150">150</a> }
+<a class="jxr_linenumber" name="151" href="#151">151</a> assertEquals(count, 1, <span class="jxr_string">"Should have cell"</span>);
+<a class="jxr_linenumber" name="152" href="#152">152</a> }
+<a class="jxr_linenumber" name="153" href="#153">153</a>
+<a class="jxr_linenumber" name="154" href="#154">154</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestCleanupAfterConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="156" href="#156">156</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="157" href="#157">157</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="158" href="#158">158</a>
+<a class="jxr_linenumber" name="159" href="#159">159</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="160" href="#160">160</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="161" href="#161">161</a>
+<a class="jxr_linenumber" name="162" href="#162">162</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="163" href="#163">163</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="164" href="#164">164</a>
+<a class="jxr_linenumber" name="165" href="#165">165</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="166" href="#166">166</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="167" href="#167">167</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="168" href="#168">168</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="169" href="#169">169</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
<a class="jxr_linenumber" name="170" href="#170">170</a>
-<a class="jxr_linenumber" name="171" href="#171">171</a> Get g = <strong class="jxr_keyword">new</strong> Get(row).setMaxVersions();
-<a class="jxr_linenumber" name="172" href="#172">172</a> g.addColumn(fam, col);
-<a class="jxr_linenumber" name="173" href="#173">173</a> Result r = tt.getHTable().get(g);
-<a class="jxr_linenumber" name="174" href="#174">174</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="175" href="#175">175</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
-<a class="jxr_linenumber" name="176" href="#176">176</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
-<a class="jxr_linenumber" name="177" href="#177">177</a>
-<a class="jxr_linenumber" name="178" href="#178">178</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="179" href="#179">179</a> p2.add(fam, col, data2);
-<a class="jxr_linenumber" name="180" href="#180">180</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="171" href="#171">171</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="172" href="#172">172</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="173" href="#173">173</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> Get g = <strong class="jxr_keyword">new</strong> Get(row).setMaxVersions();
+<a class="jxr_linenumber" name="176" href="#176">176</a> g.addColumn(fam, col);
+<a class="jxr_linenumber" name="177" href="#177">177</a> Result r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="178" href="#178">178</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="179" href="#179">179</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="180" href="#180">180</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
<a class="jxr_linenumber" name="181" href="#181">181</a>
-<a class="jxr_linenumber" name="182" href="#182">182</a> r = tt.getHTable().get(g);
-<a class="jxr_linenumber" name="183" href="#183">183</a> assertEquals(r.size(), 2, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="184" href="#184">184</a> r = tt.get(t2, g);
-<a class="jxr_linenumber" name="185" href="#185">185</a> assertEquals(r.size(),1, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="186" href="#186">186</a> assertTrue(Bytes.equals(data2, r.getValue(fam, col)),
-<a class="jxr_linenumber" name="187" href="#187">187</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
-<a class="jxr_linenumber" name="188" href="#188">188</a>
-<a class="jxr_linenumber" name="189" href="#189">189</a> tm.commit(t1);
-<a class="jxr_linenumber" name="190" href="#190">190</a>
-<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
-<a class="jxr_linenumber" name="192" href="#192">192</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="193" href="#193">193</a> tm.commit(t2);
-<a class="jxr_linenumber" name="194" href="#194">194</a> fail(<span class="jxr_string">"Transaction commited successfully"</span>);
-<a class="jxr_linenumber" name="195" href="#195">195</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="196" href="#196">196</a> aborted = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="197" href="#197">197</a> }
-<a class="jxr_linenumber" name="198" href="#198">198</a> assertTrue(aborted, <span class="jxr_string">"Transaction didn't raise exception"</span>);
-<a class="jxr_linenumber" name="199" href="#199">199</a>
-<a class="jxr_linenumber" name="200" href="#200">200</a> r = tt.getHTable().get(g);
-<a class="jxr_linenumber" name="201" href="#201">201</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
-<a class="jxr_linenumber" name="202" href="#202">202</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
-<a class="jxr_linenumber" name="203" href="#203">203</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
-<a class="jxr_linenumber" name="204" href="#204">204</a> }
-<a class="jxr_linenumber" name="205" href="#205">205</a>
-<a class="jxr_linenumber" name="206" href="#206">206</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanupWithDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="210" href="#210">210</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="211" href="#211">211</a>
-<a class="jxr_linenumber" name="212" href="#212">212</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="213" href="#213">213</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="214" href="#214">214</a>
-<a class="jxr_linenumber" name="215" href="#215">215</a> <strong class="jxr_keyword">int</strong> rowcount = 10;
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="217" href="#217">217</a>
-<a class="jxr_linenumber" name="218" href="#218">218</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="219" href="#219">219</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
-<a class="jxr_linenumber" name="220" href="#220">220</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="221" href="#221">221</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
-<a class="jxr_linenumber" name="222" href="#222">222</a>
-<a class="jxr_linenumber" name="223" href="#223">223</a> byte[] modrow = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + 3);
-<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
-<a class="jxr_linenumber" name="225" href="#225">225</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
+<a class="jxr_linenumber" name="182" href="#182">182</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="183" href="#183">183</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="184" href="#184">184</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="185" href="#185">185</a>
+<a class="jxr_linenumber" name="186" href="#186">186</a> r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="187" href="#187">187</a> assertEquals(r.size(), 2, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="188" href="#188">188</a> r = tt.get(t2, g);
+<a class="jxr_linenumber" name="189" href="#189">189</a> assertEquals(r.size(),1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="190" href="#190">190</a> assertTrue(Bytes.equals(data2, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="191" href="#191">191</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
+<a class="jxr_linenumber" name="192" href="#192">192</a>
+<a class="jxr_linenumber" name="193" href="#193">193</a> tm.commit(t1);
+<a class="jxr_linenumber" name="194" href="#194">194</a>
+<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
+<a class="jxr_linenumber" name="196" href="#196">196</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="197" href="#197">197</a> tm.commit(t2);
+<a class="jxr_linenumber" name="198" href="#198">198</a> fail(<span class="jxr_string">"Transaction commited successfully"</span>);
+<a class="jxr_linenumber" name="199" href="#199">199</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="200" href="#200">200</a> aborted = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="201" href="#201">201</a> }
+<a class="jxr_linenumber" name="202" href="#202">202</a> assertTrue(aborted, <span class="jxr_string">"Transaction didn't raise exception"</span>);
+<a class="jxr_linenumber" name="203" href="#203">203</a>
+<a class="jxr_linenumber" name="204" href="#204">204</a> r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="205" href="#205">205</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="206" href="#206">206</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="207" href="#207">207</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
+<a class="jxr_linenumber" name="208" href="#208">208</a> }
+<a class="jxr_linenumber" name="209" href="#209">209</a>
+<a class="jxr_linenumber" name="210" href="#210">210</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanupWithDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="212" href="#212">212</a>
+<a class="jxr_linenumber" name="213" href="#213">213</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="214" href="#214">214</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="215" href="#215">215</a>
+<a class="jxr_linenumber" name="216" href="#216">216</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="217" href="#217">217</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="218" href="#218">218</a>
+<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">int</strong> rowcount = 10;
+<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="221" href="#221">221</a>
+<a class="jxr_linenumber" name="222" href="#222">222</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="223" href="#223">223</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="224" href="#224">224</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="225" href="#225">225</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
<a class="jxr_linenumber" name="226" href="#226">226</a>
-<a class="jxr_linenumber" name="227" href="#227">227</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="228" href="#228">228</a> p.add(fam, col, data1);
-<a class="jxr_linenumber" name="229" href="#229">229</a> tt.put(t1, p);
-<a class="jxr_linenumber" name="230" href="#230">230</a> }
-<a class="jxr_linenumber" name="231" href="#231">231</a> tm.commit(t1);
-<a class="jxr_linenumber" name="232" href="#232">232</a>
-<a class="jxr_linenumber" name="233" href="#233">233</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="234" href="#234">234</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t2);
-<a class="jxr_linenumber" name="235" href="#235">235</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
-<a class="jxr_linenumber" name="236" href="#236">236</a> tt.delete(t2, d);
-<a class="jxr_linenumber" name="237" href="#237">237</a>
-<a class="jxr_linenumber" name="238" href="#238">238</a> ResultScanner rs = tt.getScanner(t2, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="239" href="#239">239</a> Result r = rs.next();
-<a class="jxr_linenumber" name="240" href="#240">240</a> count = 0;
-<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="242" href="#242">242</a> count++;
-<a class="jxr_linenumber" name="243" href="#243">243</a> LOG.trace(<span class="jxr_string">"row: "</span> + Bytes.toString(r.getRow()) + <span class="jxr_string">" count: "</span> + count);
-<a class="jxr_linenumber" name="244" href="#244">244</a> r = rs.next();
-<a class="jxr_linenumber" name="245" href="#245">245</a> }
-<a class="jxr_linenumber" name="246" href="#246">246</a> assertEquals(count, rowcount - 1, <span class="jxr_string">"Wrong count"</span>);
-<a class="jxr_linenumber" name="247" href="#247">247</a>
-<a class="jxr_linenumber" name="248" href="#248">248</a> Transaction t3 = tm.begin();
-<a class="jxr_linenumber" name="249" href="#249">249</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t3);
-<a class="jxr_linenumber" name="250" href="#250">250</a> Put p = <strong class="jxr_keyword">new</strong> Put(modrow);
-<a class="jxr_linenumber" name="251" href="#251">251</a> p.add(fam, col, data2);
-<a class="jxr_linenumber" name="252" href="#252">252</a> tt.put(t3, p);
-<a class="jxr_linenumber" name="253" href="#253">253</a>
-<a class="jxr_linenumber" name="254" href="#254">254</a> tm.commit(t3);
-<a class="jxr_linenumber" name="255" href="#255">255</a>
-<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
-<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="258" href="#258">258</a> tm.commit(t2);
-<a class="jxr_linenumber" name="259" href="#259">259</a> fail(<span class="jxr_string">"Didn't abort"</span>);
-<a class="jxr_linenumber" name="260" href="#260">260</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="261" href="#261">261</a> aborted = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="262" href="#262">262</a> }
-<a class="jxr_linenumber" name="263" href="#263">263</a> assertTrue(aborted, <span class="jxr_string">"Didn't raise exception"</span>);
-<a class="jxr_linenumber" name="264" href="#264">264</a>
-<a class="jxr_linenumber" name="265" href="#265">265</a> Transaction tscan = tm.begin();
-<a class="jxr_linenumber" name="266" href="#266">266</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="267" href="#267">267</a> r = rs.next();
-<a class="jxr_linenumber" name="268" href="#268">268</a> count = 0;
-<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="270" href="#270">270</a> count++;
-<a class="jxr_linenumber" name="271" href="#271">271</a> r = rs.next();
-<a class="jxr_linenumber" name="272" href="#272">272</a> }
-<a class="jxr_linenumber" name="273" href="#273">273</a> assertEquals(count, rowcount, <span class="jxr_string">"Wrong count"</span>);
-<a class="jxr_linenumber" name="274" href="#274">274</a>
-<a class="jxr_linenumber" name="275" href="#275">275</a> }
-<a class="jxr_linenumber" name="276" href="#276">276</a>
-<a class="jxr_linenumber" name="277" href="#277">277</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleCellChangesOnSameRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="279" href="#279">279</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="280" href="#280">280</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="281" href="#281">281</a>
-<a class="jxr_linenumber" name="282" href="#282">282</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="283" href="#283">283</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="284" href="#284">284</a> LOG.info(<span class="jxr_string">"Transactions created "</span> + t1 + <span class="jxr_string">" "</span> + t2);
+<a class="jxr_linenumber" name="227" href="#227">227</a> byte[] modrow = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + 3);
+<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
+<a class="jxr_linenumber" name="229" href="#229">229</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
+<a class="jxr_linenumber" name="230" href="#230">230</a>
+<a class="jxr_linenumber" name="231" href="#231">231</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="232" href="#232">232</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="233" href="#233">233</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="234" href="#234">234</a> }
+<a class="jxr_linenumber" name="235" href="#235">235</a> tm.commit(t1);
+<a class="jxr_linenumber" name="236" href="#236">236</a>
+<a class="jxr_linenumber" name="237" href="#237">237</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="238" href="#238">238</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t2);
+<a class="jxr_linenumber" name="239" href="#239">239</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="240" href="#240">240</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="241" href="#241">241</a>
+<a class="jxr_linenumber" name="242" href="#242">242</a> ResultScanner rs = tt.getScanner(t2, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="243" href="#243">243</a> Result r = rs.next();
+<a class="jxr_linenumber" name="244" href="#244">244</a> count = 0;
+<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="246" href="#246">246</a> count++;
+<a class="jxr_linenumber" name="247" href="#247">247</a> LOG.trace(<span class="jxr_string">"row: "</span> + Bytes.toString(r.getRow()) + <span class="jxr_string">" count: "</span> + count);
+<a class="jxr_linenumber" name="248" href="#248">248</a> r = rs.next();
+<a class="jxr_linenumber" name="249" href="#249">249</a> }
+<a class="jxr_linenumber" name="250" href="#250">250</a> assertEquals(count, rowcount - 1, <span class="jxr_string">"Wrong count"</span>);
+<a class="jxr_linenumber" name="251" href="#251">251</a>
+<a class="jxr_linenumber" name="252" href="#252">252</a> Transaction t3 = tm.begin();
+<a class="jxr_linenumber" name="253" href="#253">253</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t3);
+<a class="jxr_linenumber" name="254" href="#254">254</a> Put p = <strong class="jxr_keyword">new</strong> Put(modrow);
+<a class="jxr_linenumber" name="255" href="#255">255</a> p.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="256" href="#256">256</a> tt.put(t3, p);
+<a class="jxr_linenumber" name="257" href="#257">257</a>
+<a class="jxr_linenumber" name="258" href="#258">258</a> tm.commit(t3);
+<a class="jxr_linenumber" name="259" href="#259">259</a>
+<a class="jxr_linenumber" name="260" href="#260">260</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
+<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="262" href="#262">262</a> tm.commit(t2);
+<a class="jxr_linenumber" name="263" href="#263">263</a> fail(<span class="jxr_string">"Didn't abort"</span>);
+<a class="jxr_linenumber" name="264" href="#264">264</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="265" href="#265">265</a> aborted = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="266" href="#266">266</a> }
+<a class="jxr_linenumber" name="267" href="#267">267</a> assertTrue(aborted, <span class="jxr_string">"Didn't raise exception"</span>);
+<a class="jxr_linenumber" name="268" href="#268">268</a>
+<a class="jxr_linenumber" name="269" href="#269">269</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="270" href="#270">270</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="271" href="#271">271</a> r = rs.next();
+<a class="jxr_linenumber" name="272" href="#272">272</a> count = 0;
+<a class="jxr_linenumber" name="273" href="#273">273</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="274" href="#274">274</a> count++;
+<a class="jxr_linenumber" name="275" href="#275">275</a> r = rs.next();
+<a class="jxr_linenumber" name="276" href="#276">276</a> }
+<a class="jxr_linenumber" name="277" href="#277">277</a> assertEquals(count, rowcount, <span class="jxr_string">"Wrong count"</span>);
+<a class="jxr_linenumber" name="278" href="#278">278</a>
+<a class="jxr_linenumber" name="279" href="#279">279</a> }
+<a class="jxr_linenumber" name="280" href="#280">280</a>
+<a class="jxr_linenumber" name="281" href="#281">281</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleCellChangesOnSameRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="283" href="#283">283</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="284" href="#284">284</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="285" href="#285">285</a>
-<a class="jxr_linenumber" name="286" href="#286">286</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"row"</span>);
-<a class="jxr_linenumber" name="287" href="#287">287</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="288" href="#288">288</a> byte[] col1 = Bytes.toBytes(<span class="jxr_string">"testdata1"</span>);
-<a class="jxr_linenumber" name="289" href="#289">289</a> byte[] col2 = Bytes.toBytes(<span class="jxr_string">"testdata2"</span>);
-<a class="jxr_linenumber" name="290" href="#290">290</a> byte[] data = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="291" href="#291">291</a>
-<a class="jxr_linenumber" name="292" href="#292">292</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="293" href="#293">293</a> p2.add(fam, col1, data);
-<a class="jxr_linenumber" name="294" href="#294">294</a> tt.put(t2, p2);
-<a class="jxr_linenumber" name="295" href="#295">295</a> tm.commit(t2);
-<a class="jxr_linenumber" name="296" href="#296">296</a>
-<a class="jxr_linenumber" name="297" href="#297">297</a> Put p1 = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="298" href="#298">298</a> p1.add(fam, col2, data);
-<a class="jxr_linenumber" name="299" href="#299">299</a> tt.put(t1, p1);
-<a class="jxr_linenumber" name="300" href="#300">300</a> tm.commit(t1);
-<a class="jxr_linenumber" name="301" href="#301">301</a> }
-<a class="jxr_linenumber" name="302" href="#302">302</a>
-<a class="jxr_linenumber" name="303" href="#303">303</a> }
+<a class="jxr_linenumber" name="286" href="#286">286</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="287" href="#287">287</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="288" href="#288">288</a> LOG.info(<span class="jxr_string">"Transactions created "</span> + t1 + <span class="jxr_string">" "</span> + t2);
+<a class="jxr_linenumber" name="289" href="#289">289</a>
+<a class="jxr_linenumber" name="290" href="#290">290</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"row"</span>);
+<a class="jxr_linenumber" name="291" href="#291">291</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="292" href="#292">292</a> byte[] col1 = Bytes.toBytes(<span class="jxr_string">"testdata1"</span>);
+<a class="jxr_linenumber" name="293" href="#293">293</a> byte[] col2 = Bytes.toBytes(<span class="jxr_string">"testdata2"</span>);
+<a class="jxr_linenumber" name="294" href="#294">294</a> byte[] data = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="295" href="#295">295</a>
+<a class="jxr_linenumber" name="296" href="#296">296</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="297" href="#297">297</a> p2.addColumn(fam, col1, data);
+<a class="jxr_linenumber" name="298" href="#298">298</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="299" href="#299">299</a> tm.commit(t2);
+<a class="jxr_linenumber" name="300" href="#300">300</a>
+<a class="jxr_linenumber" name="301" href="#301">301</a> Put p1 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="302" href="#302">302</a> p1.addColumn(fam, col2, data);
+<a class="jxr_linenumber" name="303" href="#303">303</a> tt.put(t1, p1);
+<a class="jxr_linenumber" name="304" href="#304">304</a> tm.commit(t1);
+<a class="jxr_linenumber" name="305" href="#305">305</a> }
+<a class="jxr_linenumber" name="306" href="#306">306</a>
+<a class="jxr_linenumber" name="307" href="#307">307</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="308" href="#308">308</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflictWithAdditionalConflictFreeWrites(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="309" href="#309">309</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="310" href="#310">310</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="311" href="#311">311</a>
+<a class="jxr_linenumber" name="312" href="#312">312</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="313" href="#313">313</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="314" href="#314">314</a>
+<a class="jxr_linenumber" name="315" href="#315">315</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="316" href="#316">316</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="317" href="#317">317</a>
+<a class="jxr_linenumber" name="318" href="#318">318</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="319" href="#319">319</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="320" href="#320">320</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="321" href="#321">321</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="322" href="#322">322</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="323" href="#323">323</a>
+<a class="jxr_linenumber" name="324" href="#324">324</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="325" href="#325">325</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="326" href="#326">326</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="327" href="#327">327</a>
+<a class="jxr_linenumber" name="328" href="#328">328</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="329" href="#329">329</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="330" href="#330">330</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="331" href="#331">331</a>
+<a class="jxr_linenumber" name="332" href="#332">332</a> row = Bytes.toBytes(<span class="jxr_string">"test-simple-cf"</span>);
+<a class="jxr_linenumber" name="333" href="#333">333</a> p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="334" href="#334">334</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="335" href="#335">335</a> tt.markPutAsConflictFreeMutation(p);
+<a class="jxr_linenumber" name="336" href="#336">336</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="337" href="#337">337</a>
+<a class="jxr_linenumber" name="338" href="#338">338</a> p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="339" href="#339">339</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="340" href="#340">340</a> tt.markPutAsConflictFreeMutation(p2);
+<a class="jxr_linenumber" name="341" href="#341">341</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="342" href="#342">342</a>
+<a class="jxr_linenumber" name="343" href="#343">343</a> tm.commit(t2);
+<a class="jxr_linenumber" name="344" href="#344">344</a>
+<a class="jxr_linenumber" name="345" href="#345">345</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="346" href="#346">346</a> tm.commit(t1);
+<a class="jxr_linenumber" name="347" href="#347">347</a> fail(<span class="jxr_string">"Transaction should not commit successfully"</span>);
+<a class="jxr_linenumber" name="348" href="#348">348</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="349" href="#349">349</a> }
+<a class="jxr_linenumber" name="350" href="#350">350</a> }
+<a class="jxr_linenumber" name="351" href="#351">351</a>
+<a class="jxr_linenumber" name="352" href="#352">352</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="353" href="#353">353</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflictFreeWrites(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="354" href="#354">354</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="355" href="#355">355</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="356" href="#356">356</a>
+<a class="jxr_linenumber" name="357" href="#357">357</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="358" href="#358">358</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="359" href="#359">359</a>
+<a class="jxr_linenumber" name="360" href="#360">360</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="361" href="#361">361</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="362" href="#362">362</a>
+<a class="jxr_linenumber" name="363" href="#363">363</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="364" href="#364">364</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="365" href="#365">365</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="366" href="#366">366</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="367" href="#367">367</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="368" href="#368">368</a>
+<a class="jxr_linenumber" name="369" href="#369">369</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="370" href="#370">370</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="371" href="#371">371</a> tt.markPutAsConflictFreeMutation(p);
+<a class="jxr_linenumber" name="372" href="#372">372</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="373" href="#373">373</a>
+<a class="jxr_linenumber" name="374" href="#374">374</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="375" href="#375">375</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="376" href="#376">376</a> tt.markPutAsConflictFreeMutation(p2);
+<a class="jxr_linenumber" name="377" href="#377">377</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="378" href="#378">378</a>
+<a class="jxr_linenumber" name="379" href="#379">379</a> row = Bytes.toBytes(<span class="jxr_string">"test-simple-cf"</span>);
+<a class="jxr_linenumber" name="380" href="#380">380</a> p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="381" href="#381">381</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="382" href="#382">382</a> tt.markPutAsConflictFreeMutation(p);
+<a class="jxr_linenumber" name="383" href="#383">383</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="384" href="#384">384</a>
+<a class="jxr_linenumber" name="385" href="#385">385</a> p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="386" href="#386">386</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="387" href="#387">387</a> tt.markPutAsConflictFreeMutation(p2);
+<a class="jxr_linenumber" name="388" href="#388">388</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="389" href="#389">389</a>
+<a class="jxr_linenumber" name="390" href="#390">390</a> tm.commit(t2);
+<a class="jxr_linenumber" name="391" href="#391">391</a>
+<a class="jxr_linenumber" name="392" href="#392">392</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="393" href="#393">393</a> tm.commit(t1);
+<a class="jxr_linenumber" name="394" href="#394">394</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="395" href="#395">395</a> fail(<span class="jxr_string">"Transaction should not commit successfully"</span>);
+<a class="jxr_linenumber" name="396" href="#396">396</a> }
+<a class="jxr_linenumber" name="397" href="#397">397</a> }
+<a class="jxr_linenumber" name="398" href="#398">398</a>
+<a class="jxr_linenumber" name="399" href="#399">399</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="400" href="#400">400</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflictFreeWritesWithOtherWrites(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="401" href="#401">401</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="402" href="#402">402</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="403" href="#403">403</a>
+<a class="jxr_linenumber" name="404" href="#404">404</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="405" href="#405">405</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="406" href="#406">406</a>
+<a class="jxr_linenumber" name="407" href="#407">407</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="408" href="#408">408</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="409" href="#409">409</a>
+<a class="jxr_linenumber" name="410" href="#410">410</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="411" href="#411">411</a> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"test-simple-1"</span>);
+<a class="jxr_linenumber" name="412" href="#412">412</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="413" href="#413">413</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="414" href="#414">414</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="415" href="#415">415</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="416" href="#416">416</a>
+<a class="jxr_linenumber" name="417" href="#417">417</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="418" href="#418">418</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="419" href="#419">419</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="420" href="#420">420</a>
+<a class="jxr_linenumber" name="421" href="#421">421</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="422" href="#422">422</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="423" href="#423">423</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="424" href="#424">424</a>
+<a class="jxr_linenumber" name="425" href="#425">425</a> row = Bytes.toBytes(<span class="jxr_string">"test-simple-cf"</span>);
+<a class="jxr_linenumber" name="426" href="#426">426</a> p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="427" href="#427">427</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="428" href="#428">428</a> tt.markPutAsConflictFreeMutation(p);
+<a class="jxr_linenumber" name="429" href="#429">429</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="430" href="#430">430</a>
+<a class="jxr_linenumber" name="431" href="#431">431</a> p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="432" href="#432">432</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="433" href="#433">433</a> tt.markPutAsConflictFreeMutation(p2);
+<a class="jxr_linenumber" name="434" href="#434">434</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="435" href="#435">435</a>
+<a class="jxr_linenumber" name="436" href="#436">436</a> tm.commit(t2);
+<a class="jxr_linenumber" name="437" href="#437">437</a>
+<a class="jxr_linenumber" name="438" href="#438">438</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="439" href="#439">439</a> tm.commit(t1);
+<a class="jxr_linenumber" name="440" href="#440">440</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="441" href="#441">441</a> fail(<span class="jxr_string">"Transaction should not commit successfully"</span>);
+<a class="jxr_linenumber" name="442" href="#442">442</a> }
+<a class="jxr_linenumber" name="443" href="#443">443</a> }
+<a class="jxr_linenumber" name="444" href="#444">444</a>
+<a class="jxr_linenumber" name="445" href="#445">445</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="446" href="#446">446</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestCleanupConflictFreeWritesAfterConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="447" href="#447">447</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="448" href="#448">448</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="449" href="#449">449</a>
+<a class="jxr_linenumber" name="450" href="#450">450</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="451" href="#451">451</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="452" href="#452">452</a>
+<a class="jxr_linenumber" name="453" href="#453">453</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="454" href="#454">454</a> LOG.info(<span class="jxr_string">"Transaction created"</span> + t2);
+<a class="jxr_linenumber" name="455" href="#455">455</a>
+<a class="jxr_linenumber" name="456" href="#456">456</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-simple"</span>);
+<a class="jxr_linenumber" name="457" href="#457">457</a> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"test-simple-1"</span>);
+<a class="jxr_linenumber" name="458" href="#458">458</a> byte[] fam = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="459" href="#459">459</a> byte[] col = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="460" href="#460">460</a> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="461" href="#461">461</a> byte[] data2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2"</span>);
+<a class="jxr_linenumber" name="462" href="#462">462</a>
+<a class="jxr_linenumber" name="463" href="#463">463</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="464" href="#464">464</a> p.addColumn(fam, col, data1);
+<a class="jxr_linenumber" name="465" href="#465">465</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="466" href="#466">466</a>
+<a class="jxr_linenumber" name="467" href="#467">467</a> Get g = <strong class="jxr_keyword">new</strong> Get(row).setMaxVersions();
+<a class="jxr_linenumber" name="468" href="#468">468</a> g.addColumn(fam, col);
+<a class="jxr_linenumber" name="469" href="#469">469</a> Result r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="470" href="#470">470</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="471" href="#471">471</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="472" href="#472">472</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
+<a class="jxr_linenumber" name="473" href="#473">473</a>
+<a class="jxr_linenumber" name="474" href="#474">474</a> Put p2 = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="475" href="#475">475</a> p2.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="476" href="#476">476</a> tt.put(t2, p2);
+<a class="jxr_linenumber" name="477" href="#477">477</a>
+<a class="jxr_linenumber" name="478" href="#478">478</a> Put p3 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="479" href="#479">479</a> p3.addColumn(fam, col, data2);
+<a class="jxr_linenumber" name="480" href="#480">480</a> tt.markPutAsConflictFreeMutation(p3);
+<a class="jxr_linenumber" name="481" href="#481">481</a> tt.put(t2, p3);
+<a class="jxr_linenumber" name="482" href="#482">482</a>
+<a class="jxr_linenumber" name="483" href="#483">483</a> r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="484" href="#484">484</a> assertEquals(r.size(), 2, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="485" href="#485">485</a> r = tt.get(t2, g);
+<a class="jxr_linenumber" name="486" href="#486">486</a> assertEquals(r.size(),1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="487" href="#487">487</a> assertTrue(Bytes.equals(data2, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="488" href="#488">488</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
+<a class="jxr_linenumber" name="489" href="#489">489</a>
+<a class="jxr_linenumber" name="490" href="#490">490</a> Get g1 = <strong class="jxr_keyword">new</strong> Get(row1).setMaxVersions();
+<a class="jxr_linenumber" name="491" href="#491">491</a> g1.addColumn(fam, col);
+<a class="jxr_linenumber" name="492" href="#492">492</a> r = tt.getHTable().get(g1);
+<a class="jxr_linenumber" name="493" href="#493">493</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="494" href="#494">494</a>
+<a class="jxr_linenumber" name="495" href="#495">495</a> tm.commit(t1);
+<a class="jxr_linenumber" name="496" href="#496">496</a>
+<a class="jxr_linenumber" name="497" href="#497">497</a> <strong class="jxr_keyword">boolean</strong> aborted = false;
+<a class="jxr_linenumber" name="498" href="#498">498</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="499" href="#499">499</a> tm.commit(t2);
+<a class="jxr_linenumber" name="500" href="#500">500</a> fail(<span class="jxr_string">"Transaction commited successfully"</span>);
+<a class="jxr_linenumber" name="501" href="#501">501</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="502" href="#502">502</a> aborted = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="503" href="#503">503</a> }
+<a class="jxr_linenumber" name="504" href="#504">504</a> assertTrue(aborted, <span class="jxr_string">"Transaction didn't raise exception"</span>);
+<a class="jxr_linenumber" name="505" href="#505">505</a>
+<a class="jxr_linenumber" name="506" href="#506">506</a> r = tt.getHTable().get(g);
+<a class="jxr_linenumber" name="507" href="#507">507</a> assertEquals(r.size(), 1, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="508" href="#508">508</a> assertTrue(Bytes.equals(data1, r.getValue(fam, col)),
+<a class="jxr_linenumber" name="509" href="#509">509</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
+<a class="jxr_linenumber" name="510" href="#510">510</a> r = tt.getHTable().get(g1);
+<a class="jxr_linenumber" name="511" href="#511">511</a> assertEquals(r.size(), 0, <span class="jxr_string">"Unexpected size for read."</span>);
+<a class="jxr_linenumber" name="512" href="#512">512</a> }
+<a class="jxr_linenumber" name="513" href="#513">513</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>