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:24 UTC
[39/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/TestDeletion.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestDeletion.html b/xref-test/org/apache/omid/transaction/TestDeletion.html
index 86c3811..2d9f6f1 100644
--- a/xref-test/org/apache/omid/transaction/TestDeletion.html
+++ b/xref-test/org/apache/omid/transaction/TestDeletion.html
@@ -27,25 +27,25 @@
<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.transaction;
<a class="jxr_linenumber" name="19" href="#19">19</a>
-<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HTable;
-<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.client.ResultScanner;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<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> java.io.IOException;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="22" href="#22">22</a>
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="26" href="#26">26</a>
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.OmidClientConfiguration.ConflictDetectionLevel;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
<a class="jxr_linenumber" name="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/TestDeletion.html">TestDeletion</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -57,7 +57,7 @@
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">private</strong> byte[] colA = Bytes.toBytes(<span class="jxr_string">"testdataA"</span>);
<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> byte[] colB = Bytes.toBytes(<span class="jxr_string">"testdataB"</span>);
<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> byte[] modrow = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + 3);
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> byte[] modrow = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + 0);
<a class="jxr_linenumber" name="51" href="#51">51</a>
<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> {
<a class="jxr_linenumber" name="53" href="#53">53</a>
@@ -72,239 +72,414 @@
<a class="jxr_linenumber" name="62" href="#62">62</a> }
<a class="jxr_linenumber" name="63" href="#63">63</a>
<a class="jxr_linenumber" name="64" href="#64">64</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamilyRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="66" href="#66">66</a>
<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 tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="68" href="#68">68</a> TTable tt = <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> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="71" href="#71">71</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="72" href="#72">72</a>
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
-<a class="jxr_linenumber" name="74" href="#74">74</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
-<a class="jxr_linenumber" name="75" href="#75">75</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famB, colB);
-<a class="jxr_linenumber" name="76" href="#76">76</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
-<a class="jxr_linenumber" name="77" href="#77">77</a> tm.commit(t1);
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="80" href="#80">80</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
-<a class="jxr_linenumber" name="81" href="#81">81</a> d.deleteFamily(famA);
-<a class="jxr_linenumber" name="82" href="#82">82</a> tt.delete(t2, d);
-<a class="jxr_linenumber" name="83" href="#83">83</a>
-<a class="jxr_linenumber" name="84" href="#84">84</a> Transaction tscan = tm.begin();
-<a class="jxr_linenumber" name="85" href="#85">85</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="86" href="#86">86</a>
-<a class="jxr_linenumber" name="87" href="#87">87</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="88" href="#88">88</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="89" href="#89">89</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="70" href="#70">70</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.ROW);
+<a class="jxr_linenumber" name="71" href="#71">71</a>
+<a class="jxr_linenumber" name="72" href="#72">72</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="73" href="#73">73</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="74" href="#74">74</a>
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">int</strong> rowsWritten = 1;
+<a class="jxr_linenumber" name="76" href="#76">76</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="77" href="#77">77</a> writeRows(tt, t1, rowsWritten, famColA);
+<a class="jxr_linenumber" name="78" href="#78">78</a> tm.commit(t1);
+<a class="jxr_linenumber" name="79" href="#79">79</a>
+<a class="jxr_linenumber" name="80" href="#80">80</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="81" href="#81">81</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="82" href="#82">82</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="83" href="#83">83</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="86" href="#86">86</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="87" href="#87">87</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="89" href="#89">89</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
<a class="jxr_linenumber" name="90" href="#90">90</a> tm.commit(t2);
<a class="jxr_linenumber" name="91" href="#91">91</a>
<a class="jxr_linenumber" name="92" href="#92">92</a> tscan = tm.begin();
<a class="jxr_linenumber" name="93" href="#93">93</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="94" href="#94">94</a>
-<a class="jxr_linenumber" name="95" href="#95">95</a> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="96" href="#96">96</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
-<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="95" href="#95">95</a> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="96" href="#96">96</a> Integer countFamColA = count.get(famColA);
+<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals(countFamColA, <strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="98" href="#98">98</a>
-<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> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteColumn(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="105" href="#105">105</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="106" href="#106">106</a>
-<a class="jxr_linenumber" name="107" href="#107">107</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="108" href="#108">108</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="99" href="#99">99</a> Transaction t3 = tm.begin();
+<a class="jxr_linenumber" name="100" href="#100">100</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="101" href="#101">101</a> tt.delete(t3, d);
+<a class="jxr_linenumber" name="102" href="#102">102</a>
+<a class="jxr_linenumber" name="103" href="#103">103</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="104" href="#104">104</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="105" href="#105">105</a>
+<a class="jxr_linenumber" name="106" href="#106">106</a> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="107" href="#107">107</a> countFamColA = count.get(famColA);
+<a class="jxr_linenumber" name="108" href="#108">108</a> assertEquals(countFamColA, <strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="110" href="#110">110</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.CELL);
<a class="jxr_linenumber" name="111" href="#111">111</a>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
-<a class="jxr_linenumber" name="113" href="#113">113</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colB);
-<a class="jxr_linenumber" name="114" href="#114">114</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
-<a class="jxr_linenumber" name="115" href="#115">115</a> tm.commit(t1);
+<a class="jxr_linenumber" name="112" href="#112">112</a> }
+<a class="jxr_linenumber" name="113" href="#113">113</a>
+<a class="jxr_linenumber" name="114" href="#114">114</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamilyCell(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="118" href="#118">118</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
-<a class="jxr_linenumber" name="119" href="#119">119</a> d.deleteColumn(famA, colA);
-<a class="jxr_linenumber" name="120" href="#120">120</a> tt.delete(t2, d);
-<a class="jxr_linenumber" name="121" href="#121">121</a>
-<a class="jxr_linenumber" name="122" href="#122">122</a> Transaction tscan = tm.begin();
-<a class="jxr_linenumber" name="123" href="#123">123</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="124" href="#124">124</a>
-<a class="jxr_linenumber" name="125" href="#125">125</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="126" href="#126">126</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="128" href="#128">128</a> tm.commit(t2);
-<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> tscan = tm.begin();
-<a class="jxr_linenumber" name="131" href="#131">131</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="117" href="#117">117</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="118" href="#118">118</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="119" href="#119">119</a>
+<a class="jxr_linenumber" name="120" href="#120">120</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="121" href="#121">121</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="122" href="#122">122</a>
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">int</strong> rowsWritten = 1;
+<a class="jxr_linenumber" name="124" href="#124">124</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="125" href="#125">125</a> writeRows(tt, t1, rowsWritten, famColA);
+<a class="jxr_linenumber" name="126" href="#126">126</a> tm.commit(t1);
+<a class="jxr_linenumber" name="127" href="#127">127</a>
+<a class="jxr_linenumber" name="128" href="#128">128</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="129" href="#129">129</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="130" href="#130">130</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="131" href="#131">131</a> tt.delete(t2, d);
<a class="jxr_linenumber" name="132" href="#132">132</a>
-<a class="jxr_linenumber" name="133" href="#133">133</a> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="134" href="#134">134</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
-<a class="jxr_linenumber" name="135" href="#135">135</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="136" href="#136">136</a>
-<a class="jxr_linenumber" name="137" href="#137">137</a> }
-<a class="jxr_linenumber" name="138" href="#138">138</a>
-<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_javadoccomment"> * This test is very similar to #runTestDeleteColumn() but exercises Delete#deleteColumns()</em>
-<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteColumns(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="144" href="#144">144</a>
-<a class="jxr_linenumber" name="145" href="#145">145</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="146" href="#146">146</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="147" href="#147">147</a>
-<a class="jxr_linenumber" name="148" href="#148">148</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="149" href="#149">149</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="133" href="#133">133</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="134" href="#134">134</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="135" href="#135">135</a>
+<a class="jxr_linenumber" name="136" href="#136">136</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="137" href="#137">137</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="138" href="#138">138</a> tm.commit(t2);
+<a class="jxr_linenumber" name="139" href="#139">139</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="141" href="#141">141</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="142" href="#142">142</a>
+<a class="jxr_linenumber" name="143" href="#143">143</a> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="144" href="#144">144</a> Integer countFamColA = count.get(famColA);
+<a class="jxr_linenumber" name="145" href="#145">145</a> assertEquals(countFamColA, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> Transaction t3 = tm.begin();
+<a class="jxr_linenumber" name="148" href="#148">148</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="149" href="#149">149</a> tt.delete(t3, d);
<a class="jxr_linenumber" name="150" href="#150">150</a>
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
-<a class="jxr_linenumber" name="152" href="#152">152</a>
-<a class="jxr_linenumber" name="153" href="#153">153</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
-<a class="jxr_linenumber" name="154" href="#154">154</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colB);
-<a class="jxr_linenumber" name="155" href="#155">155</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
-<a class="jxr_linenumber" name="156" href="#156">156</a> tm.commit(t1);
+<a class="jxr_linenumber" name="151" href="#151">151</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="152" href="#152">152</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="153" href="#153">153</a>
+<a class="jxr_linenumber" name="154" href="#154">154</a> count = countColsInRows(rs, famColA);
+<a class="jxr_linenumber" name="155" href="#155">155</a> countFamColA = count.get(famColA);
+<a class="jxr_linenumber" name="156" href="#156">156</a> assertEquals(countFamColA, <strong class="jxr_keyword">null</strong>);
<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> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
-<a class="jxr_linenumber" name="160" href="#160">160</a> d.deleteColumns(famA, colA);
-<a class="jxr_linenumber" name="161" href="#161">161</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="158" href="#158">158</a> }
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="162" href="#162">162</a>
-<a class="jxr_linenumber" name="163" href="#163">163</a> Transaction tscan = tm.begin();
-<a class="jxr_linenumber" name="164" href="#164">164</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="163" href="#163">163</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="164" href="#164">164</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="165" href="#165">165</a>
-<a class="jxr_linenumber" name="166" href="#166">166</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="167" href="#167">167</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="168" href="#168">168</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="169" href="#169">169</a> tm.commit(t2);
-<a class="jxr_linenumber" name="170" href="#170">170</a>
-<a class="jxr_linenumber" name="171" href="#171">171</a> tscan = tm.begin();
-<a class="jxr_linenumber" name="172" href="#172">172</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="173" href="#173">173</a>
-<a class="jxr_linenumber" name="174" href="#174">174</a> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="175" href="#175">175</a>
-<a class="jxr_linenumber" name="176" href="#176">176</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
-<a class="jxr_linenumber" name="177" href="#177">177</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
-<a class="jxr_linenumber" name="178" href="#178">178</a>
-<a class="jxr_linenumber" name="179" href="#179">179</a> }
-<a class="jxr_linenumber" name="180" href="#180">180</a>
-<a class="jxr_linenumber" name="181" href="#181">181</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="182" href="#182">182</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="183" href="#183">183</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="184" href="#184">184</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="185" href="#185">185</a>
-<a class="jxr_linenumber" name="186" href="#186">186</a> Transaction t1 = tm.begin();
-<a class="jxr_linenumber" name="187" href="#187">187</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
-<a class="jxr_linenumber" name="188" href="#188">188</a>
-<a class="jxr_linenumber" name="189" href="#189">189</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="166" href="#166">166</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="167" href="#167">167</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="168" href="#168">168</a>
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="170" href="#170">170</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="171" href="#171">171</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famB, colB);
+<a class="jxr_linenumber" name="172" href="#172">172</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
+<a class="jxr_linenumber" name="173" href="#173">173</a> tm.commit(t1);
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="176" href="#176">176</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="177" href="#177">177</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="178" href="#178">178</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="179" href="#179">179</a>
+<a class="jxr_linenumber" name="180" href="#180">180</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="181" href="#181">181</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="182" href="#182">182</a>
+<a class="jxr_linenumber" name="183" href="#183">183</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="184" href="#184">184</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="185" href="#185">185</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="186" href="#186">186</a> tm.commit(t2);
+<a class="jxr_linenumber" name="187" href="#187">187</a>
+<a class="jxr_linenumber" name="188" href="#188">188</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="189" href="#189">189</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="190" href="#190">190</a>
-<a class="jxr_linenumber" name="191" href="#191">191</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
-<a class="jxr_linenumber" name="192" href="#192">192</a> writeRows(tt, t1, rowsWritten, famColA);
-<a class="jxr_linenumber" name="193" href="#193">193</a>
-<a class="jxr_linenumber" name="194" href="#194">194</a> tm.commit(t1);
+<a class="jxr_linenumber" name="191" href="#191">191</a> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="192" href="#192">192</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="193" href="#193">193</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="194" href="#194">194</a> }
<a class="jxr_linenumber" name="195" href="#195">195</a>
-<a class="jxr_linenumber" name="196" href="#196">196</a> Transaction t2 = tm.begin();
-<a class="jxr_linenumber" name="197" href="#197">197</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
-<a class="jxr_linenumber" name="198" href="#198">198</a> tt.delete(t2, d);
-<a class="jxr_linenumber" name="199" href="#199">199</a>
-<a class="jxr_linenumber" name="200" href="#200">200</a> Transaction tscan = tm.begin();
-<a class="jxr_linenumber" name="201" href="#201">201</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="202" href="#202">202</a>
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">int</strong> rowsRead = countRows(rs);
-<a class="jxr_linenumber" name="204" href="#204">204</a> assertTrue(rowsRead == rowsWritten, <span class="jxr_string">"Expected "</span> + rowsWritten + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
-<a class="jxr_linenumber" name="205" href="#205">205</a>
-<a class="jxr_linenumber" name="206" href="#206">206</a> tm.commit(t2);
-<a class="jxr_linenumber" name="207" href="#207">207</a>
-<a class="jxr_linenumber" name="208" href="#208">208</a> tscan = tm.begin();
-<a class="jxr_linenumber" name="209" href="#209">209</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="210" href="#210">210</a>
-<a class="jxr_linenumber" name="211" href="#211">211</a> rowsRead = countRows(rs);
-<a class="jxr_linenumber" name="212" href="#212">212</a> assertTrue(rowsRead == (rowsWritten - 1), <span class="jxr_string">"Expected "</span> + (rowsWritten - 1) + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
-<a class="jxr_linenumber" name="213" href="#213">213</a>
-<a class="jxr_linenumber" name="214" href="#214">214</a> }
-<a class="jxr_linenumber" name="215" href="#215">215</a>
-<a class="jxr_linenumber" name="216" href="#216">216</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDeletionOfNonExistingColumnFamilyDoesNotWriteToHBase(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="218" href="#218">218</a>
-<a class="jxr_linenumber" name="219" href="#219">219</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="220" href="#220">220</a> <em class="jxr_comment">// Setup initial environment for the test</em>
-<a class="jxr_linenumber" name="221" href="#221">221</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="222" href="#222">222</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="223" href="#223">223</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="224" href="#224">224</a>
-<a class="jxr_linenumber" name="225" href="#225">225</a> Transaction tx1 = tm.begin();
-<a class="jxr_linenumber" name="226" href="#226">226</a> LOG.info(<span class="jxr_string">"{} writing initial data created "</span>, tx1);
-<a class="jxr_linenumber" name="227" href="#227">227</a> Put p = <strong class="jxr_keyword">new</strong> Put(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="228" href="#228">228</a> p.add(famA, colA, data1);
-<a class="jxr_linenumber" name="229" href="#229">229</a> txTable.put(tx1, p);
-<a class="jxr_linenumber" name="230" href="#230">230</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="231" href="#231">231</a>
-<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// Try to delete a non existing CF</em>
-<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="235" href="#235">235</a> Transaction deleteTx = tm.begin();
-<a class="jxr_linenumber" name="236" href="#236">236</a> LOG.info(<span class="jxr_string">"{} trying to delete a non-existing family created "</span>, deleteTx);
-<a class="jxr_linenumber" name="237" href="#237">237</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="238" href="#238">238</a> del.deleteFamily(famB);
-<a class="jxr_linenumber" name="239" href="#239">239</a> <em class="jxr_comment">// This delete should not put data on HBase</em>
-<a class="jxr_linenumber" name="240" href="#240">240</a> txTable.delete(deleteTx, del);
+<a class="jxr_linenumber" name="196" href="#196">196</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamilyRowLevelCA(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="198" href="#198">198</a>
+<a class="jxr_linenumber" name="199" href="#199">199</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="200" href="#200">200</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="201" href="#201">201</a>
+<a class="jxr_linenumber" name="202" href="#202">202</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.ROW);
+<a class="jxr_linenumber" name="203" href="#203">203</a>
+<a class="jxr_linenumber" name="204" href="#204">204</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="205" href="#205">205</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="206" href="#206">206</a>
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="208" href="#208">208</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="209" href="#209">209</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famB, colB);
+<a class="jxr_linenumber" name="210" href="#210">210</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
+<a class="jxr_linenumber" name="211" href="#211">211</a> tm.commit(t1);
+<a class="jxr_linenumber" name="212" href="#212">212</a>
+<a class="jxr_linenumber" name="213" href="#213">213</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="214" href="#214">214</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="215" href="#215">215</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="216" href="#216">216</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="217" href="#217">217</a>
+<a class="jxr_linenumber" name="218" href="#218">218</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="219" href="#219">219</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="220" href="#220">220</a>
+<a class="jxr_linenumber" name="221" href="#221">221</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="222" href="#222">222</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="223" href="#223">223</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="224" href="#224">224</a> tm.commit(t2);
+<a class="jxr_linenumber" name="225" href="#225">225</a>
+<a class="jxr_linenumber" name="226" href="#226">226</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="227" href="#227">227</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="228" href="#228">228</a>
+<a class="jxr_linenumber" name="229" href="#229">229</a> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="230" href="#230">230</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="231" href="#231">231</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="232" href="#232">232</a>
+<a class="jxr_linenumber" name="233" href="#233">233</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.CELL);
+<a class="jxr_linenumber" name="234" href="#234">234</a> }
+<a class="jxr_linenumber" name="235" href="#235">235</a>
+<a class="jxr_linenumber" name="236" href="#236">236</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamilyAborts(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="238" href="#238">238</a>
+<a class="jxr_linenumber" name="239" href="#239">239</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="240" href="#240">240</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="241" href="#241">241</a>
-<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment">// Check data has not been written to HBase</em>
-<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="245" href="#245">245</a> HTable table = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="246" href="#246">246</a> Get get = <strong class="jxr_keyword">new</strong> Get(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="247" href="#247">247</a> get.setTimeStamp(deleteTx.getTransactionId());
-<a class="jxr_linenumber" name="248" href="#248">248</a> Result result = table.get(get);
-<a class="jxr_linenumber" name="249" href="#249">249</a> assertTrue(result.isEmpty());
-<a class="jxr_linenumber" name="250" href="#250">250</a>
-<a class="jxr_linenumber" name="251" href="#251">251</a> }
-<a class="jxr_linenumber" name="252" href="#252">252</a>
-<a class="jxr_linenumber" name="253" href="#253">253</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> countRows(ResultScanner rs) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">int</strong> count;
-<a class="jxr_linenumber" name="255" href="#255">255</a> Result r = rs.next();
-<a class="jxr_linenumber" name="256" href="#256">256</a> count = 0;
-<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="258" href="#258">258</a> count++;
-<a class="jxr_linenumber" name="259" href="#259">259</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="260" href="#260">260</a> r = rs.next();
-<a class="jxr_linenumber" name="261" href="#261">261</a> }
-<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">return</strong> count;
-<a class="jxr_linenumber" name="263" href="#263">263</a> }
-<a class="jxr_linenumber" name="264" href="#264">264</a>
-<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> writeRows(TTable tt, Transaction t1, <strong class="jxr_keyword">int</strong> rowcount, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
-<a class="jxr_linenumber" name="267" href="#267">267</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
-<a class="jxr_linenumber" name="268" href="#268">268</a>
-<a class="jxr_linenumber" name="269" href="#269">269</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="270" href="#270">270</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
-<a class="jxr_linenumber" name="271" href="#271">271</a> p.add(col.fam, col.col, data1);
-<a class="jxr_linenumber" name="272" href="#272">272</a> }
-<a class="jxr_linenumber" name="273" href="#273">273</a> tt.put(t1, p);
-<a class="jxr_linenumber" name="274" href="#274">274</a> }
+<a class="jxr_linenumber" name="242" href="#242">242</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.ROW);
+<a class="jxr_linenumber" name="243" href="#243">243</a>
+<a class="jxr_linenumber" name="244" href="#244">244</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="245" href="#245">245</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="246" href="#246">246</a>
+<a class="jxr_linenumber" name="247" href="#247">247</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="248" href="#248">248</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="249" href="#249">249</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famB, colB);
+<a class="jxr_linenumber" name="250" href="#250">250</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
+<a class="jxr_linenumber" name="251" href="#251">251</a>
+<a class="jxr_linenumber" name="252" href="#252">252</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="253" href="#253">253</a>
+<a class="jxr_linenumber" name="254" href="#254">254</a> tm.commit(t1);
+<a class="jxr_linenumber" name="255" href="#255">255</a>
+<a class="jxr_linenumber" name="256" href="#256">256</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="257" href="#257">257</a> d.addFamily(famA);
+<a class="jxr_linenumber" name="258" href="#258">258</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="259" href="#259">259</a>
+<a class="jxr_linenumber" name="260" href="#260">260</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="261" href="#261">261</a> tm.commit(t2);
+<a class="jxr_linenumber" name="262" href="#262">262</a> } <strong class="jxr_keyword">catch</strong>(RollbackException e) {
+<a class="jxr_linenumber" name="263" href="#263">263</a> System.out.println(<span class="jxr_string">"Rollback"</span>);
+<a class="jxr_linenumber" name="264" href="#264">264</a> System.out.flush();
+<a class="jxr_linenumber" name="265" href="#265">265</a> }
+<a class="jxr_linenumber" name="266" href="#266">266</a>
+<a class="jxr_linenumber" name="267" href="#267">267</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="268" href="#268">268</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="269" href="#269">269</a>
+<a class="jxr_linenumber" name="270" href="#270">270</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="271" href="#271">271</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="272" href="#272">272</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="273" href="#273">273</a>
+<a class="jxr_linenumber" name="274" href="#274">274</a> ((HBaseTransactionManager) tm).setConflictDetectionLevel(ConflictDetectionLevel.CELL);
<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> <strong class="jxr_keyword">private</strong> Map<FamCol, Integer> countColsInRows(ResultScanner rs, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="278" href="#278">278</a> Map<FamCol, Integer> colCount = <strong class="jxr_keyword">new</strong> HashMap<>();
-<a class="jxr_linenumber" name="279" href="#279">279</a> Result r = rs.next();
-<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
-<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">if</strong> (r.containsColumn(col.fam, col.col)) {
-<a class="jxr_linenumber" name="283" href="#283">283</a> Integer c = colCount.get(col);
-<a class="jxr_linenumber" name="284" href="#284">284</a>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="286" href="#286">286</a> colCount.put(col, 1);
-<a class="jxr_linenumber" name="287" href="#287">287</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="288" href="#288">288</a> colCount.put(col, c + 1);
-<a class="jxr_linenumber" name="289" href="#289">289</a> }
-<a class="jxr_linenumber" name="290" href="#290">290</a> }
-<a class="jxr_linenumber" name="291" href="#291">291</a> }
-<a class="jxr_linenumber" name="292" href="#292">292</a> r = rs.next();
-<a class="jxr_linenumber" name="293" href="#293">293</a> }
-<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">return</strong> colCount;
-<a class="jxr_linenumber" name="295" href="#295">295</a> }
-<a class="jxr_linenumber" name="296" href="#296">296</a>
-<a class="jxr_linenumber" name="297" href="#297">297</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> runTestDeleteColumn(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="279" href="#279">279</a>
+<a class="jxr_linenumber" name="280" href="#280">280</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="281" href="#281">281</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="282" href="#282">282</a>
+<a class="jxr_linenumber" name="283" href="#283">283</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="284" href="#284">284</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="285" href="#285">285</a>
+<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="287" href="#287">287</a>
+<a class="jxr_linenumber" name="288" href="#288">288</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="289" href="#289">289</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colB);
+<a class="jxr_linenumber" name="290" href="#290">290</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
+<a class="jxr_linenumber" name="291" href="#291">291</a> tm.commit(t1);
+<a class="jxr_linenumber" name="292" href="#292">292</a>
+<a class="jxr_linenumber" name="293" href="#293">293</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="294" href="#294">294</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="295" href="#295">295</a> d.addColumn(famA, colA);
+<a class="jxr_linenumber" name="296" href="#296">296</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="297" href="#297">297</a>
+<a class="jxr_linenumber" name="298" href="#298">298</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="299" href="#299">299</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="300" href="#300">300</a>
+<a class="jxr_linenumber" name="301" href="#301">301</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="302" href="#302">302</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="303" href="#303">303</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="304" href="#304">304</a> tm.commit(t2);
+<a class="jxr_linenumber" name="305" href="#305">305</a>
+<a class="jxr_linenumber" name="306" href="#306">306</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="307" href="#307">307</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="308" href="#308">308</a>
+<a class="jxr_linenumber" name="309" href="#309">309</a> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="310" href="#310">310</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="311" href="#311">311</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="312" href="#312">312</a>
+<a class="jxr_linenumber" name="313" href="#313">313</a> }
+<a class="jxr_linenumber" name="314" href="#314">314</a>
+<a class="jxr_linenumber" name="315" href="#315">315</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="316" href="#316">316</a> <em class="jxr_javadoccomment"> * This test is very similar to #runTestDeleteColumn() but exercises Delete#addColumns()</em>
+<a class="jxr_linenumber" name="317" href="#317">317</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="318" href="#318">318</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="319" href="#319">319</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteColumns(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="320" href="#320">320</a>
+<a class="jxr_linenumber" name="321" href="#321">321</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="322" href="#322">322</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="323" href="#323">323</a>
+<a class="jxr_linenumber" name="324" href="#324">324</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="325" href="#325">325</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="326" href="#326">326</a>
+<a class="jxr_linenumber" name="327" href="#327">327</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="328" href="#328">328</a>
+<a class="jxr_linenumber" name="329" href="#329">329</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="330" href="#330">330</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColB = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colB);
+<a class="jxr_linenumber" name="331" href="#331">331</a> writeRows(tt, t1, rowsWritten, famColA, famColB);
+<a class="jxr_linenumber" name="332" href="#332">332</a> tm.commit(t1);
+<a class="jxr_linenumber" name="333" href="#333">333</a>
+<a class="jxr_linenumber" name="334" href="#334">334</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="335" href="#335">335</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="336" href="#336">336</a> d.addColumns(famA, colA);
+<a class="jxr_linenumber" name="337" href="#337">337</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="338" href="#338">338</a>
+<a class="jxr_linenumber" name="339" href="#339">339</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="340" href="#340">340</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="341" href="#341">341</a>
+<a class="jxr_linenumber" name="342" href="#342">342</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="343" href="#343">343</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="344" href="#344">344</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="345" href="#345">345</a> tm.commit(t2);
+<a class="jxr_linenumber" name="346" href="#346">346</a>
+<a class="jxr_linenumber" name="347" href="#347">347</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="348" href="#348">348</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="349" href="#349">349</a>
+<a class="jxr_linenumber" name="350" href="#350">350</a> count = countColsInRows(rs, famColA, famColB);
+<a class="jxr_linenumber" name="351" href="#351">351</a>
+<a class="jxr_linenumber" name="352" href="#352">352</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="353" href="#353">353</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="354" href="#354">354</a>
+<a class="jxr_linenumber" name="355" href="#355">355</a> }
+<a class="jxr_linenumber" name="356" href="#356">356</a>
+<a class="jxr_linenumber" name="357" href="#357">357</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="358" href="#358">358</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="359" href="#359">359</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="360" href="#360">360</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="361" href="#361">361</a>
+<a class="jxr_linenumber" name="362" href="#362">362</a> Transaction t1 = tm.begin();
+<a class="jxr_linenumber" name="363" href="#363">363</a> LOG.info(<span class="jxr_string">"Transaction created "</span> + t1);
+<a class="jxr_linenumber" name="364" href="#364">364</a>
+<a class="jxr_linenumber" name="365" href="#365">365</a> <strong class="jxr_keyword">int</strong> rowsWritten = 10;
+<a class="jxr_linenumber" name="366" href="#366">366</a>
+<a class="jxr_linenumber" name="367" href="#367">367</a> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a> famColA = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestDeletion.html">FamCol</a>(famA, colA);
+<a class="jxr_linenumber" name="368" href="#368">368</a> writeRows(tt, t1, rowsWritten, famColA);
+<a class="jxr_linenumber" name="369" href="#369">369</a>
+<a class="jxr_linenumber" name="370" href="#370">370</a> tm.commit(t1);
+<a class="jxr_linenumber" name="371" href="#371">371</a>
+<a class="jxr_linenumber" name="372" href="#372">372</a> Transaction t2 = tm.begin();
+<a class="jxr_linenumber" name="373" href="#373">373</a> Delete d = <strong class="jxr_keyword">new</strong> Delete(modrow);
+<a class="jxr_linenumber" name="374" href="#374">374</a> tt.delete(t2, d);
+<a class="jxr_linenumber" name="375" href="#375">375</a>
+<a class="jxr_linenumber" name="376" href="#376">376</a> Transaction tscan = tm.begin();
+<a class="jxr_linenumber" name="377" href="#377">377</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="378" href="#378">378</a>
+<a class="jxr_linenumber" name="379" href="#379">379</a> <strong class="jxr_keyword">int</strong> rowsRead = countRows(rs);
+<a class="jxr_linenumber" name="380" href="#380">380</a> assertTrue(rowsRead == rowsWritten, <span class="jxr_string">"Expected "</span> + rowsWritten + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
+<a class="jxr_linenumber" name="381" href="#381">381</a>
+<a class="jxr_linenumber" name="382" href="#382">382</a> tm.commit(t2);
+<a class="jxr_linenumber" name="383" href="#383">383</a>
+<a class="jxr_linenumber" name="384" href="#384">384</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="385" href="#385">385</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="386" href="#386">386</a>
+<a class="jxr_linenumber" name="387" href="#387">387</a> rowsRead = countRows(rs);
+<a class="jxr_linenumber" name="388" href="#388">388</a> assertTrue(rowsRead == (rowsWritten - 1), <span class="jxr_string">"Expected "</span> + (rowsWritten - 1) + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
+<a class="jxr_linenumber" name="389" href="#389">389</a>
+<a class="jxr_linenumber" name="390" href="#390">390</a> }
+<a class="jxr_linenumber" name="391" href="#391">391</a>
+<a class="jxr_linenumber" name="392" href="#392">392</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="393" href="#393">393</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDeletionOfNonExistingColumnFamilyDoesNotWriteToHBase(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="394" href="#394">394</a>
+<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="396" href="#396">396</a> <em class="jxr_comment">// Setup initial environment for the test</em>
+<a class="jxr_linenumber" name="397" href="#397">397</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="398" href="#398">398</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="399" href="#399">399</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
+<a class="jxr_linenumber" name="400" href="#400">400</a>
+<a class="jxr_linenumber" name="401" href="#401">401</a> Transaction tx1 = tm.begin();
+<a class="jxr_linenumber" name="402" href="#402">402</a> LOG.info(<span class="jxr_string">"{} writing initial data created "</span>, tx1);
+<a class="jxr_linenumber" name="403" href="#403">403</a> Put p = <strong class="jxr_keyword">new</strong> Put(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="404" href="#404">404</a> p.addColumn(famA, colA, data1);
+<a class="jxr_linenumber" name="405" href="#405">405</a> txTable.put(tx1, p);
+<a class="jxr_linenumber" name="406" href="#406">406</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="407" href="#407">407</a>
+<a class="jxr_linenumber" name="408" href="#408">408</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="409" href="#409">409</a> <em class="jxr_comment">// Try to delete a non existing CF</em>
+<a class="jxr_linenumber" name="410" href="#410">410</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="411" href="#411">411</a> Transaction deleteTx = tm.begin();
+<a class="jxr_linenumber" name="412" href="#412">412</a> LOG.info(<span class="jxr_string">"{} trying to delete a non-existing family created "</span>, deleteTx);
+<a class="jxr_linenumber" name="413" href="#413">413</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="414" href="#414">414</a> del.addFamily(famB);
+<a class="jxr_linenumber" name="415" href="#415">415</a> <em class="jxr_comment">// This delete should not put data on HBase</em>
+<a class="jxr_linenumber" name="416" href="#416">416</a> txTable.delete(deleteTx, del);
+<a class="jxr_linenumber" name="417" href="#417">417</a>
+<a class="jxr_linenumber" name="418" href="#418">418</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">// Check data has not been written to HBase</em>
+<a class="jxr_linenumber" name="420" href="#420">420</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="421" href="#421">421</a> Get get = <strong class="jxr_keyword">new</strong> Get(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="422" href="#422">422</a> get.setTimeStamp(deleteTx.getTransactionId());
+<a class="jxr_linenumber" name="423" href="#423">423</a> Result result = txTable.getHTable().get(get);
+<a class="jxr_linenumber" name="424" href="#424">424</a> assertTrue(result.isEmpty());
+<a class="jxr_linenumber" name="425" href="#425">425</a>
+<a class="jxr_linenumber" name="426" href="#426">426</a> }
+<a class="jxr_linenumber" name="427" href="#427">427</a>
+<a class="jxr_linenumber" name="428" href="#428">428</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> countRows(ResultScanner rs) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="429" href="#429">429</a> <strong class="jxr_keyword">int</strong> count;
+<a class="jxr_linenumber" name="430" href="#430">430</a> Result r = rs.next();
+<a class="jxr_linenumber" name="431" href="#431">431</a> count = 0;
+<a class="jxr_linenumber" name="432" href="#432">432</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="433" href="#433">433</a> count++;
+<a class="jxr_linenumber" name="434" href="#434">434</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="435" href="#435">435</a> r = rs.next();
+<a class="jxr_linenumber" name="436" href="#436">436</a> }
+<a class="jxr_linenumber" name="437" href="#437">437</a> <strong class="jxr_keyword">return</strong> count;
+<a class="jxr_linenumber" name="438" href="#438">438</a> }
+<a class="jxr_linenumber" name="439" href="#439">439</a>
+<a class="jxr_linenumber" name="440" href="#440">440</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> writeRows(TTable tt, Transaction t1, <strong class="jxr_keyword">int</strong> rowcount, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="441" href="#441">441</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
+<a class="jxr_linenumber" name="442" href="#442">442</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
+<a class="jxr_linenumber" name="443" href="#443">443</a>
+<a class="jxr_linenumber" name="444" href="#444">444</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="445" href="#445">445</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
+<a class="jxr_linenumber" name="446" href="#446">446</a> p.addColumn(col.fam, col.col, data1);
+<a class="jxr_linenumber" name="447" href="#447">447</a> }
+<a class="jxr_linenumber" name="448" href="#448">448</a> tt.put(t1, p);
+<a class="jxr_linenumber" name="449" href="#449">449</a> }
+<a class="jxr_linenumber" name="450" href="#450">450</a> }
+<a class="jxr_linenumber" name="451" href="#451">451</a>
+<a class="jxr_linenumber" name="452" href="#452">452</a> <strong class="jxr_keyword">private</strong> Map<FamCol, Integer> countColsInRows(ResultScanner rs, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="453" href="#453">453</a> Map<FamCol, Integer> colCount = <strong class="jxr_keyword">new</strong> HashMap<>();
+<a class="jxr_linenumber" name="454" href="#454">454</a> Result r = rs.next();
+<a class="jxr_linenumber" name="455" href="#455">455</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="456" href="#456">456</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
+<a class="jxr_linenumber" name="457" href="#457">457</a> <strong class="jxr_keyword">if</strong> (r.containsColumn(col.fam, col.col)) {
+<a class="jxr_linenumber" name="458" href="#458">458</a> Integer c = colCount.get(col);
+<a class="jxr_linenumber" name="459" href="#459">459</a>
+<a class="jxr_linenumber" name="460" href="#460">460</a> <strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="461" href="#461">461</a> colCount.put(col, 1);
+<a class="jxr_linenumber" name="462" href="#462">462</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="463" href="#463">463</a> colCount.put(col, c + 1);
+<a class="jxr_linenumber" name="464" href="#464">464</a> }
+<a class="jxr_linenumber" name="465" href="#465">465</a> }
+<a class="jxr_linenumber" name="466" href="#466">466</a> }
+<a class="jxr_linenumber" name="467" href="#467">467</a> r = rs.next();
+<a class="jxr_linenumber" name="468" href="#468">468</a> }
+<a class="jxr_linenumber" name="469" href="#469">469</a> <strong class="jxr_keyword">return</strong> colCount;
+<a class="jxr_linenumber" name="470" href="#470">470</a> }
+<a class="jxr_linenumber" name="471" href="#471">471</a>
+<a class="jxr_linenumber" name="472" href="#472">472</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>