You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by yo...@apache.org on 2018/09/26 09:03:30 UTC
[31/56] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 9/25/18 12:09 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/077788dd/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
index 61676e6..166d582 100644
--- a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
+++ b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
@@ -27,17 +27,17 @@
<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.Put;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="29" href="#29">29</a>
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="21" href="#21">21</a>
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
<a class="jxr_linenumber" name="31" href="#31">31</a>
<a class="jxr_linenumber" name="32" href="#32">32</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestSingleColumnFamily.html">TestSingleColumnFamily</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
@@ -47,14 +47,14 @@
<a class="jxr_linenumber" name="37" href="#37">37</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSingleColumnFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="39" href="#39">39</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table1 = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table1 = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE);
<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">int</strong> num = 10;
<a class="jxr_linenumber" name="42" href="#42">42</a> Transaction t = tm.begin();
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j = 0; j < num; j++) {
<a class="jxr_linenumber" name="44" href="#44">44</a> byte[] data = Bytes.toBytes(j);
<a class="jxr_linenumber" name="45" href="#45">45</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="46" href="#46">46</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value1"</span>), data);
-<a class="jxr_linenumber" name="47" href="#47">47</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value2"</span>), data);
+<a class="jxr_linenumber" name="46" href="#46">46</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value1"</span>), data);
+<a class="jxr_linenumber" name="47" href="#47">47</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value2"</span>), data);
<a class="jxr_linenumber" name="48" href="#48">48</a> table1.put(t, put);
<a class="jxr_linenumber" name="49" href="#49">49</a> }
<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_comment">//tm.tryCommit(t);</em>
@@ -78,7 +78,7 @@
<a class="jxr_linenumber" name="68" href="#68">68</a> byte[] data = Bytes.toBytes(j);
<a class="jxr_linenumber" name="69" href="#69">69</a> byte[] ndata = Bytes.toBytes(j * 10);
<a class="jxr_linenumber" name="70" href="#70">70</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="71" href="#71">71</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value2"</span>), ndata);
+<a class="jxr_linenumber" name="71" href="#71">71</a> put.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(<span class="jxr_string">"value2"</span>), ndata);
<a class="jxr_linenumber" name="72" href="#72">72</a> table1.put(t, put);
<a class="jxr_linenumber" name="73" href="#73">73</a> }
<a class="jxr_linenumber" name="74" href="#74">74</a> tm.commit(t);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/077788dd/xref-test/org/apache/omid/transaction/TestTTableBehaviour.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTTableBehaviour.html b/xref-test/org/apache/omid/transaction/TestTTableBehaviour.html
index dd07395..41bad84 100644
--- a/xref-test/org/apache/omid/transaction/TestTTableBehaviour.html
+++ b/xref-test/org/apache/omid/transaction/TestTTableBehaviour.html
@@ -27,142 +27,143 @@
<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> com.google.common.base.Charsets;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HTableInterface;
+<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.fail;
+<a class="jxr_linenumber" name="21" href="#21">21</a>
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.mockito.Mockito;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="29" href="#29">29</a>
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
-<a class="jxr_linenumber" name="31" href="#31">31</a>
-<a class="jxr_linenumber" name="32" href="#32">32</a> @Test(groups = <span class="jxr_string">"noHBase"</span>)
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTTableBehaviour.html">TestTTableBehaviour</a> {
-<a class="jxr_linenumber" name="34" href="#34">34</a>
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">private</strong> byte[] row = Bytes.toBytes(<span class="jxr_string">"1row"</span>);
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">private</strong> byte[] famName = Bytes.toBytes(<span class="jxr_string">"tf"</span>);
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">private</strong> byte[] colName = Bytes.toBytes(<span class="jxr_string">"tc"</span>);
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> byte[] dataValue = Bytes.toBytes(<span class="jxr_string">"test-data"</span>);
-<a class="jxr_linenumber" name="39" href="#39">39</a>
-<a class="jxr_linenumber" name="40" href="#40">40</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUserOperationsDontAllowTimestampSpecification() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="42" href="#42">42</a>
-<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_comment">// Component under test</em>
-<a class="jxr_linenumber" name="44" href="#44">44</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(Mockito.mock(HTableInterface.<strong class="jxr_keyword">class</strong>), Mockito.mock(HTableInterface.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">long</strong> randomTimestampValue = Bytes.toLong(<span class="jxr_string">"deadbeef"</span>.getBytes());
-<a class="jxr_linenumber" name="47" href="#47">47</a>
-<a class="jxr_linenumber" name="48" href="#48">48</a> Transaction tx = Mockito.mock(Transaction.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_comment">// Test put fails when a timestamp is specified in the put</em>
-<a class="jxr_linenumber" name="51" href="#51">51</a> Put put = <strong class="jxr_keyword">new</strong> Put(row, randomTimestampValue);
-<a class="jxr_linenumber" name="52" href="#52">52</a> put.add(famName, colName, dataValue);
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="54" href="#54">54</a> tt.put(tx, put);
-<a class="jxr_linenumber" name="55" href="#55">55</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="56" href="#56">56</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Continue</em>
-<a class="jxr_linenumber" name="58" href="#58">58</a> }
-<a class="jxr_linenumber" name="59" href="#59">59</a>
-<a class="jxr_linenumber" name="60" href="#60">60</a> <em class="jxr_comment">// Test put fails when a timestamp is specified in a qualifier</em>
-<a class="jxr_linenumber" name="61" href="#61">61</a> put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="62" href="#62">62</a> put.add(famName, colName, randomTimestampValue, dataValue);
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="64" href="#64">64</a> tt.put(tx, put);
-<a class="jxr_linenumber" name="65" href="#65">65</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="66" href="#66">66</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="67" href="#67">67</a> <em class="jxr_comment">// Continue</em>
-<a class="jxr_linenumber" name="68" href="#68">68</a> }
-<a class="jxr_linenumber" name="69" href="#69">69</a>
-<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_comment">// Test that get fails when a timestamp is specified</em>
-<a class="jxr_linenumber" name="71" href="#71">71</a> Get get = <strong class="jxr_keyword">new</strong> Get(row);
-<a class="jxr_linenumber" name="72" href="#72">72</a> get.setTimeStamp(randomTimestampValue);
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="74" href="#74">74</a> tt.get(tx, get);
-<a class="jxr_linenumber" name="75" href="#75">75</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="76" href="#76">76</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_comment">// Continue</em>
-<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> <em class="jxr_comment">// Test scan fails when a timerange is specified</em>
-<a class="jxr_linenumber" name="81" href="#81">81</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan(get);
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="83" href="#83">83</a> tt.getScanner(tx, scan);
-<a class="jxr_linenumber" name="84" href="#84">84</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="85" href="#85">85</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// Continue</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> }
-<a class="jxr_linenumber" name="88" href="#88">88</a>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// Test delete fails when a timestamp is specified</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> Delete delete = <strong class="jxr_keyword">new</strong> Delete(row);
-<a class="jxr_linenumber" name="91" href="#91">91</a> delete.setTimestamp(randomTimestampValue);
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="93" href="#93">93</a> tt.delete(tx, delete);
-<a class="jxr_linenumber" name="94" href="#94">94</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="95" href="#95">95</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_comment">// Continue</em>
-<a class="jxr_linenumber" name="97" href="#97">97</a> }
-<a class="jxr_linenumber" name="98" href="#98">98</a>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_comment">// Test delete fails when a timestamp is specified in a qualifier</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a> delete = <strong class="jxr_keyword">new</strong> Delete(row);
-<a class="jxr_linenumber" name="101" href="#101">101</a> delete.deleteColumn(famName, colName, randomTimestampValue);
-<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> tt.delete(tx, delete);
-<a class="jxr_linenumber" name="104" href="#104">104</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
-<a class="jxr_linenumber" name="105" href="#105">105</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// Continue</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> }
-<a class="jxr_linenumber" name="108" href="#108">108</a>
-<a class="jxr_linenumber" name="109" href="#109">109</a> }
-<a class="jxr_linenumber" name="110" href="#110">110</a>
-<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_javadoccomment"> * Test that we cannot use reserved names for shadow cell identifiers as qualifiers in user operations</em>
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_javadoccomment"> */</em>
-<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> testReservedNamesForShadowCellsCanNotBeUsedAsQualifiersInUserOperations() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="116" href="#116">116</a> byte[] nonValidQualifier1 = <span class="jxr_string">"blahblah\u0080"</span>.getBytes(Charsets.UTF_8);
-<a class="jxr_linenumber" name="117" href="#117">117</a> byte[] validQualifierIncludingOldShadowCellSuffix = <span class="jxr_string">"blahblah:OMID_CTS"</span>.getBytes(Charsets.UTF_8);
-<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(Mockito.mock(HTableInterface.<strong class="jxr_keyword">class</strong>), Mockito.mock(HTableInterface.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="120" href="#120">120</a>
-<a class="jxr_linenumber" name="121" href="#121">121</a> HBaseTransaction t1 = Mockito.mock(HBaseTransaction.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="122" href="#122">122</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="123" href="#123">123</a> put.add(famName, nonValidQualifier1, dataValue);
-<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="125" href="#125">125</a> table.put(t1, put);
-<a class="jxr_linenumber" name="126" href="#126">126</a> fail(<span class="jxr_string">"Shouldn't be able to put this"</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// correct</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> }
-<a class="jxr_linenumber" name="130" href="#130">130</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(row);
-<a class="jxr_linenumber" name="131" href="#131">131</a> del.deleteColumn(famName, nonValidQualifier1);
-<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> table.delete(t1, del);
-<a class="jxr_linenumber" name="134" href="#134">134</a> fail(<span class="jxr_string">"Shouldn't be able to delete this"</span>);
-<a class="jxr_linenumber" name="135" href="#135">135</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
-<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_comment">// correct</em>
-<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> put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="140" href="#140">140</a> put.add(famName, validQualifierIncludingOldShadowCellSuffix, dataValue);
-<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="142" href="#142">142</a> table.put(t1, put);
-<a class="jxr_linenumber" name="143" href="#143">143</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
-<a class="jxr_linenumber" name="144" href="#144">144</a> fail(<span class="jxr_string">"Qualifier shouldn't be rejected anymore"</span>);
-<a class="jxr_linenumber" name="145" href="#145">145</a> }
-<a class="jxr_linenumber" name="146" href="#146">146</a> del = <strong class="jxr_keyword">new</strong> Delete(row);
-<a class="jxr_linenumber" name="147" href="#147">147</a> del.deleteColumn(famName, validQualifierIncludingOldShadowCellSuffix);
-<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="149" href="#149">149</a> table.delete(t1, del);
-<a class="jxr_linenumber" name="150" href="#150">150</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
-<a class="jxr_linenumber" name="151" href="#151">151</a> fail(<span class="jxr_string">"Qualifier shouldn't be rejected anymore"</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>
-<a class="jxr_linenumber" name="155" href="#155">155</a> }
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
+<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.mockito.Mockito;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="30" href="#30">30</a>
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Charsets;
+<a class="jxr_linenumber" name="32" href="#32">32</a>
+<a class="jxr_linenumber" name="33" href="#33">33</a> @Test(groups = <span class="jxr_string">"noHBase"</span>)
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTTableBehaviour.html">TestTTableBehaviour</a> {
+<a class="jxr_linenumber" name="35" href="#35">35</a>
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">private</strong> byte[] row = Bytes.toBytes(<span class="jxr_string">"1row"</span>);
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">private</strong> byte[] famName = Bytes.toBytes(<span class="jxr_string">"tf"</span>);
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> byte[] colName = Bytes.toBytes(<span class="jxr_string">"tc"</span>);
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">private</strong> byte[] dataValue = Bytes.toBytes(<span class="jxr_string">"test-data"</span>);
+<a class="jxr_linenumber" name="40" href="#40">40</a>
+<a class="jxr_linenumber" name="41" href="#41">41</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUserOperationsDontAllowTimestampSpecification() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="43" href="#43">43</a>
+<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_comment">// Component under test</em>
+<a class="jxr_linenumber" name="45" href="#45">45</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(Mockito.mock(Table.<strong class="jxr_keyword">class</strong>), false);
+<a class="jxr_linenumber" name="46" href="#46">46</a>
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">long</strong> randomTimestampValue = Bytes.toLong(<span class="jxr_string">"deadbeef"</span>.getBytes());
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> Transaction tx = Mockito.mock(Transaction.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="50" href="#50">50</a>
+<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_comment">// Test put fails when a timestamp is specified in the put</em>
+<a class="jxr_linenumber" name="52" href="#52">52</a> Put put = <strong class="jxr_keyword">new</strong> Put(row, randomTimestampValue);
+<a class="jxr_linenumber" name="53" href="#53">53</a> put.addColumn(famName, colName, dataValue);
+<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="55" href="#55">55</a> tt.put(tx, put);
+<a class="jxr_linenumber" name="56" href="#56">56</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="57" href="#57">57</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_comment">// Continue</em>
+<a class="jxr_linenumber" name="59" href="#59">59</a> }
+<a class="jxr_linenumber" name="60" href="#60">60</a>
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_comment">// Test put fails when a timestamp is specified in a qualifier</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a> put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="63" href="#63">63</a> put.addColumn(famName, colName, randomTimestampValue, dataValue);
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="65" href="#65">65</a> tt.put(tx, put);
+<a class="jxr_linenumber" name="66" href="#66">66</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="67" href="#67">67</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_comment">// Continue</em>
+<a class="jxr_linenumber" name="69" href="#69">69</a> }
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_comment">// Test that get fails when a timestamp is specified</em>
+<a class="jxr_linenumber" name="72" href="#72">72</a> Get get = <strong class="jxr_keyword">new</strong> Get(row);
+<a class="jxr_linenumber" name="73" href="#73">73</a> get.setTimeStamp(randomTimestampValue);
+<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> tt.get(tx, get);
+<a class="jxr_linenumber" name="76" href="#76">76</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="77" href="#77">77</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_comment">// Continue</em>
+<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> <em class="jxr_comment">// Test scan fails when a timerange is specified</em>
+<a class="jxr_linenumber" name="82" href="#82">82</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan(get);
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="84" href="#84">84</a> tt.getScanner(tx, scan);
+<a class="jxr_linenumber" name="85" href="#85">85</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="86" href="#86">86</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_comment">// Continue</em>
+<a class="jxr_linenumber" name="88" href="#88">88</a> }
+<a class="jxr_linenumber" name="89" href="#89">89</a>
+<a class="jxr_linenumber" name="90" href="#90">90</a> <em class="jxr_comment">// Test delete fails when a timestamp is specified</em>
+<a class="jxr_linenumber" name="91" href="#91">91</a> Delete delete = <strong class="jxr_keyword">new</strong> Delete(row);
+<a class="jxr_linenumber" name="92" href="#92">92</a> delete.setTimestamp(randomTimestampValue);
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="94" href="#94">94</a> tt.delete(tx, delete);
+<a class="jxr_linenumber" name="95" href="#95">95</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="96" href="#96">96</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">// Continue</em>
+<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> <em class="jxr_comment">// Test delete fails when a timestamp is specified in a qualifier</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> delete = <strong class="jxr_keyword">new</strong> Delete(row);
+<a class="jxr_linenumber" name="102" href="#102">102</a> delete.addColumn(famName, colName, randomTimestampValue);
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="104" href="#104">104</a> tt.delete(tx, delete);
+<a class="jxr_linenumber" name="105" href="#105">105</a> fail(<span class="jxr_string">"Should have thrown an IllegalArgumentException due to timestamp specification"</span>);
+<a class="jxr_linenumber" name="106" href="#106">106</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_comment">// Continue</em>
+<a class="jxr_linenumber" name="108" href="#108">108</a> }
+<a class="jxr_linenumber" name="109" href="#109">109</a>
+<a class="jxr_linenumber" name="110" href="#110">110</a> }
+<a class="jxr_linenumber" name="111" href="#111">111</a>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_javadoccomment"> * Test that we cannot use reserved names for shadow cell identifiers as qualifiers in user operations</em>
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReservedNamesForShadowCellsCanNotBeUsedAsQualifiersInUserOperations() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="117" href="#117">117</a> byte[] nonValidQualifier1 = <span class="jxr_string">"blahblah\u0080"</span>.getBytes(Charsets.UTF_8);
+<a class="jxr_linenumber" name="118" href="#118">118</a> byte[] validQualifierIncludingOldShadowCellSuffix = <span class="jxr_string">"blahblah:OMID_CTS"</span>.getBytes(Charsets.UTF_8);
+<a class="jxr_linenumber" name="119" href="#119">119</a>
+<a class="jxr_linenumber" name="120" href="#120">120</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(Mockito.mock(Table.<strong class="jxr_keyword">class</strong>), false);
+<a class="jxr_linenumber" name="121" href="#121">121</a>
+<a class="jxr_linenumber" name="122" href="#122">122</a> HBaseTransaction t1 = Mockito.mock(HBaseTransaction.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="123" href="#123">123</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="124" href="#124">124</a> put.addColumn(famName, nonValidQualifier1, dataValue);
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="126" href="#126">126</a> table.put(t1, put);
+<a class="jxr_linenumber" name="127" href="#127">127</a> fail(<span class="jxr_string">"Shouldn't be able to put this"</span>);
+<a class="jxr_linenumber" name="128" href="#128">128</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
+<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_comment">// correct</em>
+<a class="jxr_linenumber" name="130" href="#130">130</a> }
+<a class="jxr_linenumber" name="131" href="#131">131</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(row);
+<a class="jxr_linenumber" name="132" href="#132">132</a> del.addColumn(famName, nonValidQualifier1);
+<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="134" href="#134">134</a> table.delete(t1, del);
+<a class="jxr_linenumber" name="135" href="#135">135</a> fail(<span class="jxr_string">"Shouldn't be able to delete this"</span>);
+<a class="jxr_linenumber" name="136" href="#136">136</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
+<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment">// correct</em>
+<a class="jxr_linenumber" name="138" href="#138">138</a> }
+<a class="jxr_linenumber" name="139" href="#139">139</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a> put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="141" href="#141">141</a> put.addColumn(famName, validQualifierIncludingOldShadowCellSuffix, dataValue);
+<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="143" href="#143">143</a> table.put(t1, put);
+<a class="jxr_linenumber" name="144" href="#144">144</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
+<a class="jxr_linenumber" name="145" href="#145">145</a> fail(<span class="jxr_string">"Qualifier shouldn't be rejected anymore"</span>);
+<a class="jxr_linenumber" name="146" href="#146">146</a> }
+<a class="jxr_linenumber" name="147" href="#147">147</a> del = <strong class="jxr_keyword">new</strong> Delete(row);
+<a class="jxr_linenumber" name="148" href="#148">148</a> del.addColumn(famName, validQualifierIncludingOldShadowCellSuffix);
+<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="150" href="#150">150</a> table.delete(t1, del);
+<a class="jxr_linenumber" name="151" href="#151">151</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException iae) {
+<a class="jxr_linenumber" name="152" href="#152">152</a> fail(<span class="jxr_string">"Qualifier shouldn't be rejected anymore"</span>);
+<a class="jxr_linenumber" name="153" href="#153">153</a> }
+<a class="jxr_linenumber" name="154" href="#154">154</a> }
+<a class="jxr_linenumber" name="155" href="#155">155</a>
+<a class="jxr_linenumber" name="156" href="#156">156</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/077788dd/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
index e88f3f8..2913845 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
@@ -27,105 +27,106 @@
<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> com.google.common.util.concurrent.SettableFuture;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.AbortException;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.ForwardingTSOFuture;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.TSOClient;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="34" href="#34">34</a>
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anySetOf;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.eq;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="40" href="#40">40</a>
-<a class="jxr_linenumber" name="41" href="#41">41</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestTransactionCleanup.html">TestTransactionCleanup</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<a class="jxr_linenumber" name="43" href="#43">43</a>
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionCleanup.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> START_TS = 1L;
-<a class="jxr_linenumber" name="47" href="#47">47</a>
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">private</strong> byte[] row = Bytes.toBytes(<span class="jxr_string">"row"</span>);
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> byte[] qual = Bytes.toBytes(<span class="jxr_string">"qual"</span>);
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"data"</span>);
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_comment">// NOTE: This test is maybe redundant with runTestCleanupAfterConflict()</em>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_comment">// and testCleanupWithDeleteRow() tests in TestTransactionCleanup class.</em>
-<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_comment">// Code in TestTransactionCleanup is a little more difficult to follow,</em>
-<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// lacks some assertions and includes some magic numbers, so we should</em>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// try to review and improve the tests in these two classes in a further</em>
-<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_comment">// commit.</em>
-<a class="jxr_linenumber" name="59" href="#59">59</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWS_MODIFIED = 1;
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_comment">// Prepare the mocking results</em>
-<a class="jxr_linenumber" name="65" href="#65">65</a> SettableFuture<Long> startTSF = SettableFuture.create();
-<a class="jxr_linenumber" name="66" href="#66">66</a> startTSF.set(START_TS);
-<a class="jxr_linenumber" name="67" href="#67">67</a> ForwardingTSOFuture<Long> stFF = <strong class="jxr_keyword">new</strong> ForwardingTSOFuture<>(startTSF);
-<a class="jxr_linenumber" name="68" href="#68">68</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a> SettableFuture<Long> abortingF = SettableFuture.create();
-<a class="jxr_linenumber" name="70" href="#70">70</a> abortingF.setException(<strong class="jxr_keyword">new</strong> AbortException());
-<a class="jxr_linenumber" name="71" href="#71">71</a> ForwardingTSOFuture<Long> abortingFF = <strong class="jxr_keyword">new</strong> ForwardingTSOFuture<>(abortingF);
-<a class="jxr_linenumber" name="72" href="#72">72</a>
-<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_comment">// Mock the TSO Client setting the right method responses</em>
-<a class="jxr_linenumber" name="74" href="#74">74</a> TSOClient mockedTSOClient = mock(TSOClient.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="75" href="#75">75</a>
-<a class="jxr_linenumber" name="76" href="#76">76</a> doReturn(stFF)
-<a class="jxr_linenumber" name="77" href="#77">77</a> .when(mockedTSOClient).getNewStartTimestamp();
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> doReturn(abortingFF)
-<a class="jxr_linenumber" name="80" href="#80">80</a> .when(mockedTSOClient).commit(eq(START_TS), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="81" href="#81">81</a>
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">try</strong> (TransactionManager tm = newTransactionManager(context, mockedTSOClient);
-<a class="jxr_linenumber" name="83" href="#83">83</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="84" href="#84">84</a>
-<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_comment">// Start a transaction and put some data in a column</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> Transaction tx = tm.begin();
-<a class="jxr_linenumber" name="87" href="#87">87</a>
-<a class="jxr_linenumber" name="88" href="#88">88</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="89" href="#89">89</a> put.add(family, qual, data);
-<a class="jxr_linenumber" name="90" href="#90">90</a> txTable.put(tx, put);
-<a class="jxr_linenumber" name="91" href="#91">91</a>
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// Abort transaction when committing, so the cleanup</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// process we want to test is triggered</em>
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="95" href="#95">95</a> tm.commit(tx);
-<a class="jxr_linenumber" name="96" href="#96">96</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">// Expected</em>
-<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> <em class="jxr_comment">// So now we have to check that the Delete marker introduced by the</em>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_comment">// cleanup process is there</em>
-<a class="jxr_linenumber" name="102" href="#102">102</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan(row);
-<a class="jxr_linenumber" name="103" href="#103">103</a> scan.setRaw(<strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// Raw scan to obtain the deleted cells</em>
-<a class="jxr_linenumber" name="104" href="#104">104</a> ResultScanner resultScanner = txTable.getHTable().getScanner(scan);
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">int</strong> resultCount = 0;
-<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">for</strong> (Result result : resultScanner) {
-<a class="jxr_linenumber" name="107" href="#107">107</a> assertEquals(result.size(), 2); <em class="jxr_comment">// Size == 2, including the put and delete from cleanup</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> LOG.trace(<span class="jxr_string">"Result {}"</span>, result);
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// The last element of the qualifier should have the Delete marker</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> byte encodedType = result.getColumnLatestCell(family, qual).getTypeByte();
-<a class="jxr_linenumber" name="111" href="#111">111</a> assertEquals(KeyValue.Type.codeToType(encodedType), KeyValue.Type.Delete);
-<a class="jxr_linenumber" name="112" href="#112">112</a> resultCount++;
-<a class="jxr_linenumber" name="113" href="#113">113</a> }
-<a class="jxr_linenumber" name="114" href="#114">114</a> assertEquals(resultCount, ROWS_MODIFIED);
-<a class="jxr_linenumber" name="115" href="#115">115</a> }
-<a class="jxr_linenumber" name="116" href="#116">116</a> }
-<a class="jxr_linenumber" name="117" href="#117">117</a>
-<a class="jxr_linenumber" name="118" href="#118">118</a> }
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.anySetOf;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.eq;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="25" href="#25">25</a>
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.AbortException;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.ForwardingTSOFuture;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.client.TSOClient;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.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> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
+<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/TestTransactionCleanup.html">TestTransactionCleanup</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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionCleanup.<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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> START_TS = 1L;
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> byte[] row = Bytes.toBytes(<span class="jxr_string">"row"</span>);
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> byte[] qual = Bytes.toBytes(<span class="jxr_string">"qual"</span>);
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">private</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"data"</span>);
+<a class="jxr_linenumber" name="53" href="#53">53</a>
+<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_comment">// NOTE: This test is maybe redundant with runTestCleanupAfterConflict()</em>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_comment">// and testCleanupWithDeleteRow() tests in TestTransactionCleanup class.</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// Code in TestTransactionCleanup is a little more difficult to follow,</em>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// lacks some assertions and includes some magic numbers, so we should</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_comment">// try to review and improve the tests in these two classes in a further</em>
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// commit.</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWS_MODIFIED = 1;
+<a class="jxr_linenumber" name="64" href="#64">64</a>
+<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// Prepare the mocking results</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> SettableFuture<Long> startTSF = SettableFuture.create();
+<a class="jxr_linenumber" name="67" href="#67">67</a> startTSF.set(START_TS);
+<a class="jxr_linenumber" name="68" href="#68">68</a> ForwardingTSOFuture<Long> stFF = <strong class="jxr_keyword">new</strong> ForwardingTSOFuture<>(startTSF);
+<a class="jxr_linenumber" name="69" href="#69">69</a>
+<a class="jxr_linenumber" name="70" href="#70">70</a> SettableFuture<Long> abortingF = SettableFuture.create();
+<a class="jxr_linenumber" name="71" href="#71">71</a> abortingF.setException(<strong class="jxr_keyword">new</strong> AbortException());
+<a class="jxr_linenumber" name="72" href="#72">72</a> ForwardingTSOFuture<Long> abortingFF = <strong class="jxr_keyword">new</strong> ForwardingTSOFuture<>(abortingF);
+<a class="jxr_linenumber" name="73" href="#73">73</a>
+<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_comment">// Mock the TSO Client setting the right method responses</em>
+<a class="jxr_linenumber" name="75" href="#75">75</a> TSOClient mockedTSOClient = mock(TSOClient.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="76" href="#76">76</a>
+<a class="jxr_linenumber" name="77" href="#77">77</a> doReturn(stFF)
+<a class="jxr_linenumber" name="78" href="#78">78</a> .when(mockedTSOClient).getNewStartTimestamp();
+<a class="jxr_linenumber" name="79" href="#79">79</a>
+<a class="jxr_linenumber" name="80" href="#80">80</a> doReturn(abortingFF)
+<a class="jxr_linenumber" name="81" href="#81">81</a> .when(mockedTSOClient).commit(eq(START_TS), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>), anySetOf(HBaseCellId.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">try</strong> (TransactionManager tm = newTransactionManager(context, mockedTSOClient);
+<a class="jxr_linenumber" name="84" href="#84">84</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="85" href="#85">85</a>
+<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// Start a transaction and put some data in a column</em>
+<a class="jxr_linenumber" name="87" href="#87">87</a> Transaction tx = tm.begin();
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> Put put = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="90" href="#90">90</a> put.addColumn(family, qual, data);
+<a class="jxr_linenumber" name="91" href="#91">91</a> txTable.put(tx, put);
+<a class="jxr_linenumber" name="92" href="#92">92</a>
+<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// Abort transaction when committing, so the cleanup</em>
+<a class="jxr_linenumber" name="94" href="#94">94</a> <em class="jxr_comment">// process we want to test is triggered</em>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="96" href="#96">96</a> tm.commit(tx);
+<a class="jxr_linenumber" name="97" href="#97">97</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_comment">// Expected</em>
+<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> <em class="jxr_comment">// So now we have to check that the Delete marker introduced by the</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_comment">// cleanup process is there</em>
+<a class="jxr_linenumber" name="103" href="#103">103</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan(row);
+<a class="jxr_linenumber" name="104" href="#104">104</a> scan.setRaw(<strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// Raw scan to obtain the deleted cells</em>
+<a class="jxr_linenumber" name="105" href="#105">105</a> ResultScanner resultScanner = txTable.getHTable().getScanner(scan);
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">int</strong> resultCount = 0;
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">for</strong> (Result result : resultScanner) {
+<a class="jxr_linenumber" name="108" href="#108">108</a> assertEquals(result.size(), 2); <em class="jxr_comment">// Size == 2, including the put and delete from cleanup</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> LOG.trace(<span class="jxr_string">"Result {}"</span>, result);
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_comment">// The last element of the qualifier should have the Delete marker</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a> byte encodedType = result.getColumnLatestCell(family, qual).getTypeByte();
+<a class="jxr_linenumber" name="112" href="#112">112</a> assertEquals(KeyValue.Type.codeToType(encodedType), KeyValue.Type.Delete);
+<a class="jxr_linenumber" name="113" href="#113">113</a> resultCount++;
+<a class="jxr_linenumber" name="114" href="#114">114</a> }
+<a class="jxr_linenumber" name="115" href="#115">115</a> assertEquals(resultCount, ROWS_MODIFIED);
+<a class="jxr_linenumber" name="116" href="#116">116</a> }
+<a class="jxr_linenumber" name="117" href="#117">117</a> }
+<a class="jxr_linenumber" name="118" href="#118">118</a>
+<a class="jxr_linenumber" name="119" href="#119">119</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>