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/12/04 08:27:09 UTC
[33/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 12/4/18 10:26 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/9ccae1ee/xref-test/org/apache/omid/transaction/TestHBaseTransactionClient.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestHBaseTransactionClient.html b/xref-test/org/apache/omid/transaction/TestHBaseTransactionClient.html
index 18fc9de..ef6cd19 100644
--- a/xref-test/org/apache/omid/transaction/TestHBaseTransactionClient.html
+++ b/xref-test/org/apache/omid/transaction/TestHBaseTransactionClient.html
@@ -27,445 +27,476 @@
<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.Optional;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> com.google.common.collect.Maps;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.CommitTimestamp;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.HBaseTransactionManager.CommitTimestampLocatorImpl;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HTable;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.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.util.Map;
-<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.apache.omid.committable.CommitTable.CommitTimestamp.Location.CACHE;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.any;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doThrow;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestHBaseTransactionClient.html">TestHBaseTransactionClient</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"test-is-committed1"</span>);
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"test-is-committed2"</span>);
-<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">final</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
-<a class="jxr_linenumber" name="55" href="#55">55</a>
-<a class="jxr_linenumber" name="56" href="#56">56</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIsCommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="58" href="#58">58</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="59" href="#59">59</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="60" href="#60">60</a>
-<a class="jxr_linenumber" name="61" href="#61">61</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="62" href="#62">62</a>
-<a class="jxr_linenumber" name="63" href="#63">63</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="64" href="#64">64</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="65" href="#65">65</a> table.put(t1, put);
-<a class="jxr_linenumber" name="66" href="#66">66</a> tm.commit(t1);
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.CACHE;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Matchers.any;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doReturn;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.doThrow;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
+<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="31" href="#31">31</a>
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="33" href="#33">33</a>
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.CommitTimestamp;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.omid.metrics.NullMetricsProvider;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.HBaseTransactionManager.CommitTimestampLocatorImpl;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="44" href="#44">44</a>
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Optional;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> com.google.common.collect.Maps;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestHBaseTransactionClient.html">TestHBaseTransactionClient</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
+<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">final</strong> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"test-is-committed1"</span>);
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"test-is-committed2"</span>);
+<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] family = Bytes.toBytes(TEST_FAMILY);
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier = Bytes.toBytes(<span class="jxr_string">"testdata"</span>);
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1"</span>);
+<a class="jxr_linenumber" name="57" href="#57">57</a>
+<a class="jxr_linenumber" name="58" href="#58">58</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testIsCommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="60" href="#60">60</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="61" href="#61">61</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="62" href="#62">62</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="63" href="#63">63</a> ((AbstractTransactionManager)tm).getCommitTableClient());
+<a class="jxr_linenumber" name="64" href="#64">64</a> TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false));
+<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="66" href="#66">66</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> HBaseTransaction t2 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="69" href="#69">69</a> put = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="70" href="#70">70</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="71" href="#71">71</a> table.put(t2, put);
-<a class="jxr_linenumber" name="72" href="#72">72</a> table.getHTable().flushCommits();
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> HBaseTransaction t3 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="75" href="#75">75</a> put = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="76" href="#76">76</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="77" href="#77">77</a> table.put(t3, put);
-<a class="jxr_linenumber" name="78" href="#78">78</a> tm.commit(t3);
-<a class="jxr_linenumber" name="79" href="#79">79</a>
-<a class="jxr_linenumber" name="80" href="#80">80</a> HTable htable = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="81" href="#81">81</a> HBaseCellId hBaseCellId1 = <strong class="jxr_keyword">new</strong> HBaseCellId(htable, row1, family, qualifier, t1.getStartTimestamp());
-<a class="jxr_linenumber" name="82" href="#82">82</a> HBaseCellId hBaseCellId2 = <strong class="jxr_keyword">new</strong> HBaseCellId(htable, row2, family, qualifier, t2.getStartTimestamp());
-<a class="jxr_linenumber" name="83" href="#83">83</a> HBaseCellId hBaseCellId3 = <strong class="jxr_keyword">new</strong> HBaseCellId(htable, row2, family, qualifier, t3.getStartTimestamp());
+<a class="jxr_linenumber" name="68" href="#68">68</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="69" href="#69">69</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="70" href="#70">70</a> table.put(t1, put);
+<a class="jxr_linenumber" name="71" href="#71">71</a> tm.commit(t1);
+<a class="jxr_linenumber" name="72" href="#72">72</a>
+<a class="jxr_linenumber" name="73" href="#73">73</a> HBaseTransaction t2 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="74" href="#74">74</a> put = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="75" href="#75">75</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="76" href="#76">76</a> table.put(t2, put);
+<a class="jxr_linenumber" name="77" href="#77">77</a> table.flushCommits();
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</a> HBaseTransaction t3 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="80" href="#80">80</a> put = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="81" href="#81">81</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="82" href="#82">82</a> table.put(t3, put);
+<a class="jxr_linenumber" name="83" href="#83">83</a> tm.commit(t3);
<a class="jxr_linenumber" name="84" href="#84">84</a>
-<a class="jxr_linenumber" name="85" href="#85">85</a> HBaseTransactionClient hbaseTm = (HBaseTransactionClient) newTransactionManager(context);
-<a class="jxr_linenumber" name="86" href="#86">86</a> assertTrue(hbaseTm.isCommitted(hBaseCellId1), <span class="jxr_string">"row1 should be committed"</span>);
-<a class="jxr_linenumber" name="87" href="#87">87</a> assertFalse(hbaseTm.isCommitted(hBaseCellId2), <span class="jxr_string">"row2 should not be committed for kv2"</span>);
-<a class="jxr_linenumber" name="88" href="#88">88</a> assertTrue(hbaseTm.isCommitted(hBaseCellId3), <span class="jxr_string">"row2 should be committed for kv3"</span>);
-<a class="jxr_linenumber" name="89" href="#89">89</a> }
-<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCrashAfterCommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="93" href="#93">93</a> PostCommitActions syncPostCommitter =
-<a class="jxr_linenumber" name="94" href="#94">94</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
-<a class="jxr_linenumber" name="95" href="#95">95</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
-<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
-<a class="jxr_linenumber" name="97" href="#97">97</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="98" href="#98">98</a>
-<a class="jxr_linenumber" name="99" href="#99">99</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="102" href="#102">102</a>
-<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_comment">// Test shadow cell are created properly</em>
-<a class="jxr_linenumber" name="104" href="#104">104</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="105" href="#105">105</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="106" href="#106">106</a> table.put(t1, put);
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="108" href="#108">108</a> tm.commit(t1);
-<a class="jxr_linenumber" name="109" href="#109">109</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_comment">// Do nothing</em>
-<a class="jxr_linenumber" name="111" href="#111">111</a> }
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> assertTrue(CellUtils.hasCell(row1, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
-<a class="jxr_linenumber" name="114" href="#114">114</a> <span class="jxr_string">"Cell should be there"</span>);
-<a class="jxr_linenumber" name="115" href="#115">115</a> assertFalse(CellUtils.hasShadowCell(row1, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
-<a class="jxr_linenumber" name="116" href="#116">116</a> <span class="jxr_string">"Shadow cell should not be there"</span>);
-<a class="jxr_linenumber" name="117" href="#117">117</a>
-<a class="jxr_linenumber" name="118" href="#118">118</a> HTable htable = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="119" href="#119">119</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(htable, row1, family, qualifier, t1.getStartTimestamp());
-<a class="jxr_linenumber" name="120" href="#120">120</a>
-<a class="jxr_linenumber" name="121" href="#121">121</a> HBaseTransactionClient hbaseTm = (HBaseTransactionClient) newTransactionManager(context);
-<a class="jxr_linenumber" name="122" href="#122">122</a> assertTrue(hbaseTm.isCommitted(hBaseCellId), <span class="jxr_string">"row1 should be committed"</span>);
-<a class="jxr_linenumber" name="123" href="#123">123</a> }
-<a class="jxr_linenumber" name="124" href="#124">124</a>
-<a class="jxr_linenumber" name="125" href="#125">125</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="126" href="#126">126</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadCommitTimestampFromCommitTable(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="127" href="#127">127</a>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NON_EXISTING_CELL_TS = 1000L;
+<a class="jxr_linenumber" name="85" href="#85">85</a> HBaseCellId hBaseCellId1 = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier, t1.getStartTimestamp());
+<a class="jxr_linenumber" name="86" href="#86">86</a> HBaseCellId hBaseCellId2 = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row2, family, qualifier, t2.getStartTimestamp());
+<a class="jxr_linenumber" name="87" href="#87">87</a> HBaseCellId hBaseCellId3 = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row2, family, qualifier, t3.getStartTimestamp());
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> assertTrue(snapshotFilter.isCommitted(hBaseCellId1, 0, false), <span class="jxr_string">"row1 should be committed"</span>);
+<a class="jxr_linenumber" name="90" href="#90">90</a> assertFalse(snapshotFilter.isCommitted(hBaseCellId2, 0, false), <span class="jxr_string">"row2 should not be committed for kv2"</span>);
+<a class="jxr_linenumber" name="91" href="#91">91</a> assertTrue(snapshotFilter.isCommitted(hBaseCellId3, 0, false), <span class="jxr_string">"row2 should be committed for kv3"</span>);
+<a class="jxr_linenumber" name="92" href="#92">92</a> }
+<a class="jxr_linenumber" name="93" href="#93">93</a>
+<a class="jxr_linenumber" name="94" href="#94">94</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCrashAfterCommit(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="96" href="#96">96</a> PostCommitActions syncPostCommitter =
+<a class="jxr_linenumber" name="97" href="#97">97</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
+<a class="jxr_linenumber" name="98" href="#98">98</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="101" href="#101">101</a>
+<a class="jxr_linenumber" name="102" href="#102">102</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="103" href="#103">103</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="104" href="#104">104</a> tm.getCommitTableClient());
+<a class="jxr_linenumber" name="105" href="#105">105</a> TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false));
+<a class="jxr_linenumber" name="106" href="#106">106</a>
+<a class="jxr_linenumber" name="107" href="#107">107</a> HBaseTransaction t1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// Test shadow cell are created properly</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="111" href="#111">111</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="112" href="#112">112</a> table.put(t1, put);
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="114" href="#114">114</a> tm.commit(t1);
+<a class="jxr_linenumber" name="115" href="#115">115</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
+<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_comment">// Do nothing</em>
+<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> assertTrue(CellUtils.hasCell(row1, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="120" href="#120">120</a> <span class="jxr_string">"Cell should be there"</span>);
+<a class="jxr_linenumber" name="121" href="#121">121</a> assertFalse(CellUtils.hasShadowCell(row1, family, qualifier, t1.getStartTimestamp(), <strong class="jxr_keyword">new</strong> TTableCellGetterAdapter(table)),
+<a class="jxr_linenumber" name="122" href="#122">122</a> <span class="jxr_string">"Shadow cell should not be there"</span>);
+<a class="jxr_linenumber" name="123" href="#123">123</a>
+<a class="jxr_linenumber" name="124" href="#124">124</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier, t1.getStartTimestamp());
+<a class="jxr_linenumber" name="125" href="#125">125</a>
+<a class="jxr_linenumber" name="126" href="#126">126</a> HBaseTransactionClient hbaseTm = (HBaseTransactionClient) newTransactionManager(context);
+<a class="jxr_linenumber" name="127" href="#127">127</a> assertTrue(snapshotFilter.isCommitted(hBaseCellId, 0, false), <span class="jxr_string">"row1 should be committed"</span>);
+<a class="jxr_linenumber" name="128" href="#128">128</a> }
<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> PostCommitActions syncPostCommitter =
-<a class="jxr_linenumber" name="131" href="#131">131</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
-<a class="jxr_linenumber" name="132" href="#132">132</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="130" href="#130">130</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadCommitTimestampFromCommitTable(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="132" href="#132">132</a>
+<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">//connection = ConnectionFactory.createConnection(hbaseConf);</em>
+<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NON_EXISTING_CELL_TS = 1000L;
<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_comment">// Test that a non-existing cell timestamp returns an empty result</em>
-<a class="jxr_linenumber" name="137" href="#137">137</a> Optional<CommitTimestamp> optionalCT = tm.commitTableClient.getCommitTimestamp(NON_EXISTING_CELL_TS).get();
-<a class="jxr_linenumber" name="138" href="#138">138</a> assertFalse(optionalCT.isPresent());
-<a class="jxr_linenumber" name="139" href="#139">139</a>
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment">// Test that we get an invalidation mark for an invalidated transaction</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a>
-<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_comment">// Start a transaction and invalidate it before commiting it</em>
-<a class="jxr_linenumber" name="144" href="#144">144</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="145" href="#145">145</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="146" href="#146">146</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="147" href="#147">147</a> table.put(tx1, put);
+<a class="jxr_linenumber" name="136" href="#136">136</a> PostCommitActions syncPostCommitter =
+<a class="jxr_linenumber" name="137" href="#137">137</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
+<a class="jxr_linenumber" name="138" href="#138">138</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
+<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
+<a class="jxr_linenumber" name="140" href="#140">140</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="141" href="#141">141</a>
+<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment">// Test that a non-existing cell timestamp returns an empty result</em>
+<a class="jxr_linenumber" name="143" href="#143">143</a> Optional<CommitTimestamp> optionalCT = tm.commitTableClient.getCommitTimestamp(NON_EXISTING_CELL_TS).get();
+<a class="jxr_linenumber" name="144" href="#144">144</a> assertFalse(optionalCT.isPresent());
+<a class="jxr_linenumber" name="145" href="#145">145</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">try</strong> (TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE, tm.getCommitTableClient()))) {
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// Test that we get an invalidation mark for an invalidated transaction</em>
<a class="jxr_linenumber" name="148" href="#148">148</a>
-<a class="jxr_linenumber" name="149" href="#149">149</a> assertTrue(tm.commitTableClient.tryInvalidateTransaction(tx1.getStartTimestamp()).get());
-<a class="jxr_linenumber" name="150" href="#150">150</a> optionalCT = tm.commitTableClient.getCommitTimestamp(tx1.getStartTimestamp()).get();
-<a class="jxr_linenumber" name="151" href="#151">151</a> assertTrue(optionalCT.isPresent());
-<a class="jxr_linenumber" name="152" href="#152">152</a> CommitTimestamp ct = optionalCT.get();
-<a class="jxr_linenumber" name="153" href="#153">153</a> assertFalse(ct.isValid());
-<a class="jxr_linenumber" name="154" href="#154">154</a> assertEquals(ct.getValue(), CommitTable.INVALID_TRANSACTION_MARKER);
-<a class="jxr_linenumber" name="155" href="#155">155</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
-<a class="jxr_linenumber" name="156" href="#156">156</a>
-<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_comment">// Finally test that we get the right commit timestamp for a committed tx</em>
-<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_comment">// that couldn't get</em>
-<a class="jxr_linenumber" name="159" href="#159">159</a> HBaseTransaction tx2 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="160" href="#160">160</a> Put otherPut = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="161" href="#161">161</a> otherPut.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="162" href="#162">162</a> table.put(tx2, otherPut);
-<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="164" href="#164">164</a> tm.commit(tx2);
-<a class="jxr_linenumber" name="165" href="#165">165</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
-<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// Do nothing</em>
-<a class="jxr_linenumber" name="167" href="#167">167</a> }
-<a class="jxr_linenumber" name="168" href="#168">168</a>
-<a class="jxr_linenumber" name="169" href="#169">169</a> optionalCT = tm.commitTableClient.getCommitTimestamp(tx2.getStartTimestamp()).get();
-<a class="jxr_linenumber" name="170" href="#170">170</a> assertTrue(optionalCT.isPresent());
-<a class="jxr_linenumber" name="171" href="#171">171</a> ct = optionalCT.get();
-<a class="jxr_linenumber" name="172" href="#172">172</a> assertTrue(ct.isValid());
-<a class="jxr_linenumber" name="173" href="#173">173</a> assertEquals(ct.getValue(), tx2.getCommitTimestamp());
-<a class="jxr_linenumber" name="174" href="#174">174</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
-<a class="jxr_linenumber" name="175" href="#175">175</a> }
-<a class="jxr_linenumber" name="176" href="#176">176</a> }
-<a class="jxr_linenumber" name="177" href="#177">177</a>
-<a class="jxr_linenumber" name="178" href="#178">178</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadCommitTimestampFromShadowCell(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="180" href="#180">180</a>
-<a class="jxr_linenumber" name="181" href="#181">181</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NON_EXISTING_CELL_TS = 1L;
-<a class="jxr_linenumber" name="182" href="#182">182</a>
-<a class="jxr_linenumber" name="183" href="#183">183</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
-<a class="jxr_linenumber" name="184" href="#184">184</a>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment">// Start a transaction and invalidate it before commiting it</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="151" href="#151">151</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="152" href="#152">152</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="153" href="#153">153</a> table.put(tx1, put);
+<a class="jxr_linenumber" name="154" href="#154">154</a>
+<a class="jxr_linenumber" name="155" href="#155">155</a> assertTrue(tm.commitTableClient.tryInvalidateTransaction(tx1.getStartTimestamp()).get());
+<a class="jxr_linenumber" name="156" href="#156">156</a> optionalCT = tm.commitTableClient.getCommitTimestamp(tx1.getStartTimestamp()).get();
+<a class="jxr_linenumber" name="157" href="#157">157</a> assertTrue(optionalCT.isPresent());
+<a class="jxr_linenumber" name="158" href="#158">158</a> CommitTimestamp ct = optionalCT.get();
+<a class="jxr_linenumber" name="159" href="#159">159</a> assertFalse(ct.isValid());
+<a class="jxr_linenumber" name="160" href="#160">160</a> assertEquals(ct.getValue(), CommitTable.INVALID_TRANSACTION_MARKER);
+<a class="jxr_linenumber" name="161" href="#161">161</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
+<a class="jxr_linenumber" name="162" href="#162">162</a>
+<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_comment">// Finally test that we get the right commit timestamp for a committed tx</em>
+<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// that couldn't get</em>
+<a class="jxr_linenumber" name="165" href="#165">165</a> HBaseTransaction tx2 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="166" href="#166">166</a> Put otherPut = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="167" href="#167">167</a> otherPut.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="168" href="#168">168</a> table.put(tx2, otherPut);
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="170" href="#170">170</a> tm.commit(tx2);
+<a class="jxr_linenumber" name="171" href="#171">171</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
+<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment">// Do nothing</em>
+<a class="jxr_linenumber" name="173" href="#173">173</a> }
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> optionalCT = tm.commitTableClient.getCommitTimestamp(tx2.getStartTimestamp()).get();
+<a class="jxr_linenumber" name="176" href="#176">176</a> assertTrue(optionalCT.isPresent());
+<a class="jxr_linenumber" name="177" href="#177">177</a> ct = optionalCT.get();
+<a class="jxr_linenumber" name="178" href="#178">178</a> assertTrue(ct.isValid());
+<a class="jxr_linenumber" name="179" href="#179">179</a> assertEquals(ct.getValue(), tx2.getCommitTimestamp());
+<a class="jxr_linenumber" name="180" href="#180">180</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
+<a class="jxr_linenumber" name="181" href="#181">181</a> }
+<a class="jxr_linenumber" name="182" href="#182">182</a> }
+<a class="jxr_linenumber" name="183" href="#183">183</a>
+<a class="jxr_linenumber" name="184" href="#184">184</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadCommitTimestampFromShadowCell(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="186" href="#186">186</a>
-<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// Test first we can not found a non-existent cell ts</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table.getHTable(), row1, family, qualifier, NON_EXISTING_CELL_TS);
-<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment">// Set an empty cache to allow to bypass the checking</em>
-<a class="jxr_linenumber" name="190" href="#190">190</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
-<a class="jxr_linenumber" name="191" href="#191">191</a> Maps.<Long, Long>newHashMap());
-<a class="jxr_linenumber" name="192" href="#192">192</a> Optional<CommitTimestamp> optionalCT = tm
-<a class="jxr_linenumber" name="193" href="#193">193</a> .readCommitTimestampFromShadowCell(NON_EXISTING_CELL_TS, ctLocator);
-<a class="jxr_linenumber" name="194" href="#194">194</a> assertFalse(optionalCT.isPresent());
-<a class="jxr_linenumber" name="195" href="#195">195</a>
-<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// Then test that for a transaction committed, we get the right CT</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="198" href="#198">198</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="199" href="#199">199</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="200" href="#200">200</a> table.put(tx1, put);
-<a class="jxr_linenumber" name="201" href="#201">201</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="202" href="#202">202</a> <em class="jxr_comment">// Upon commit, the commit data should be in the shadow cells, so test it</em>
-<a class="jxr_linenumber" name="203" href="#203">203</a> optionalCT = tm.readCommitTimestampFromShadowCell(tx1.getStartTimestamp(), ctLocator);
-<a class="jxr_linenumber" name="204" href="#204">204</a> assertTrue(optionalCT.isPresent());
-<a class="jxr_linenumber" name="205" href="#205">205</a> CommitTimestamp ct = optionalCT.get();
-<a class="jxr_linenumber" name="206" href="#206">206</a> assertTrue(ct.isValid());
-<a class="jxr_linenumber" name="207" href="#207">207</a> assertEquals(ct.getValue(), tx1.getCommitTimestamp());
-<a class="jxr_linenumber" name="208" href="#208">208</a> assertTrue(ct.getLocation().compareTo(SHADOW_CELL) == 0);
-<a class="jxr_linenumber" name="209" href="#209">209</a>
-<a class="jxr_linenumber" name="210" href="#210">210</a> }
-<a class="jxr_linenumber" name="211" href="#211">211</a>
-<a class="jxr_linenumber" name="212" href="#212">212</a> }
-<a class="jxr_linenumber" name="213" href="#213">213</a>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_comment">// Tests step 1 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="215" href="#215">215</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInCache(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="217" href="#217">217</a>
-<a class="jxr_linenumber" name="218" href="#218">218</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CELL_ST = 1L;
-<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CELL_CT = 2L;
-<a class="jxr_linenumber" name="220" href="#220">220</a>
-<a class="jxr_linenumber" name="221" href="#221">221</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
-<a class="jxr_linenumber" name="222" href="#222">222</a>
-<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// Pre-load the element to look for in the cache</em>
-<a class="jxr_linenumber" name="224" href="#224">224</a> HTable table = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="225" href="#225">225</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier, CELL_ST);
-<a class="jxr_linenumber" name="226" href="#226">226</a> Map<Long, Long> fakeCache = Maps.newHashMap();
-<a class="jxr_linenumber" name="227" href="#227">227</a> fakeCache.put(CELL_ST, CELL_CT);
-<a class="jxr_linenumber" name="228" href="#228">228</a>
-<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_comment">// Then test that locator finds it in the cache</em>
-<a class="jxr_linenumber" name="230" href="#230">230</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId, fakeCache);
-<a class="jxr_linenumber" name="231" href="#231">231</a> CommitTimestamp ct = tm.locateCellCommitTimestamp(CELL_ST, tm.tsoClient.getEpoch(), ctLocator);
-<a class="jxr_linenumber" name="232" href="#232">232</a> assertTrue(ct.isValid());
-<a class="jxr_linenumber" name="233" href="#233">233</a> assertEquals(ct.getValue(), CELL_CT);
-<a class="jxr_linenumber" name="234" href="#234">234</a> assertTrue(ct.getLocation().compareTo(CACHE) == 0);
-<a class="jxr_linenumber" name="235" href="#235">235</a>
-<a class="jxr_linenumber" name="236" href="#236">236</a> }
-<a class="jxr_linenumber" name="237" href="#237">237</a>
-<a class="jxr_linenumber" name="238" href="#238">238</a> <em class="jxr_comment">// Tests step 2 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="239" href="#239">239</a> <em class="jxr_comment">// Note: This test is very similar to testCrashAfterCommit() above so</em>
-<a class="jxr_linenumber" name="240" href="#240">240</a> <em class="jxr_comment">// maybe we should merge them in this test, adding the missing assertions</em>
-<a class="jxr_linenumber" name="241" href="#241">241</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInCommitTable(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="243" href="#243">243</a>
-<a class="jxr_linenumber" name="244" href="#244">244</a> PostCommitActions syncPostCommitter =
-<a class="jxr_linenumber" name="245" href="#245">245</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
-<a class="jxr_linenumber" name="246" href="#246">246</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
-<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
-<a class="jxr_linenumber" name="248" href="#248">248</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="249" href="#249">249</a>
-<a class="jxr_linenumber" name="250" href="#250">250</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="251" href="#251">251</a> <em class="jxr_comment">// Commit a transaction that is broken on commit to avoid</em>
-<a class="jxr_linenumber" name="252" href="#252">252</a> <em class="jxr_comment">// write to the shadow cells and avoid cleaning the commit table</em>
-<a class="jxr_linenumber" name="253" href="#253">253</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="254" href="#254">254</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="255" href="#255">255</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="256" href="#256">256</a> table.put(tx1, put);
-<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="258" href="#258">258</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="259" href="#259">259</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
-<a class="jxr_linenumber" name="260" href="#260">260</a> <em class="jxr_comment">// Do nothing</em>
-<a class="jxr_linenumber" name="261" href="#261">261</a> }
-<a class="jxr_linenumber" name="262" href="#262">262</a>
-<a class="jxr_linenumber" name="263" href="#263">263</a> <em class="jxr_comment">// Test the locator finds the appropriate data in the commit table</em>
-<a class="jxr_linenumber" name="264" href="#264">264</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table.getHTable(), row1, family, qualifier,
-<a class="jxr_linenumber" name="265" href="#265">265</a> tx1.getStartTimestamp());
-<a class="jxr_linenumber" name="266" href="#266">266</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
-<a class="jxr_linenumber" name="267" href="#267">267</a> Maps.<Long, Long>newHashMap());
-<a class="jxr_linenumber" name="268" href="#268">268</a> CommitTimestamp ct = tm.locateCellCommitTimestamp(tx1.getStartTimestamp(), tm.tsoClient.getEpoch(),
-<a class="jxr_linenumber" name="269" href="#269">269</a> ctLocator);
-<a class="jxr_linenumber" name="270" href="#270">270</a> assertTrue(ct.isValid());
-<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">long</strong> expectedCommitTS = tx1.getStartTimestamp() + 1;
-<a class="jxr_linenumber" name="272" href="#272">272</a> assertEquals(ct.getValue(), expectedCommitTS);
-<a class="jxr_linenumber" name="273" href="#273">273</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
-<a class="jxr_linenumber" name="274" href="#274">274</a> }
-<a class="jxr_linenumber" name="275" href="#275">275</a>
-<a class="jxr_linenumber" name="276" href="#276">276</a> }
-<a class="jxr_linenumber" name="277" href="#277">277</a>
-<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">// Tests step 3 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="279" href="#279">279</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInShadowCells(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="187" href="#187">187</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> NON_EXISTING_CELL_TS = 1L;
+<a class="jxr_linenumber" name="188" href="#188">188</a>
+<a class="jxr_linenumber" name="189" href="#189">189</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
+<a class="jxr_linenumber" name="190" href="#190">190</a>
+<a class="jxr_linenumber" name="191" href="#191">191</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="192" href="#192">192</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="193" href="#193">193</a> tm.getCommitTableClient());
+<a class="jxr_linenumber" name="194" href="#194">194</a>
+<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">try</strong> (TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false))) {
+<a class="jxr_linenumber" name="196" href="#196">196</a>
+<a class="jxr_linenumber" name="197" href="#197">197</a> <em class="jxr_comment">// Test first we can not found a non-existent cell ts</em>
+<a class="jxr_linenumber" name="198" href="#198">198</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier, NON_EXISTING_CELL_TS);
+<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// Set an empty cache to allow to bypass the checking</em>
+<a class="jxr_linenumber" name="200" href="#200">200</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
+<a class="jxr_linenumber" name="201" href="#201">201</a> Maps.<Long, Long>newHashMap());
+<a class="jxr_linenumber" name="202" href="#202">202</a> Optional<CommitTimestamp> optionalCT = snapshotFilter
+<a class="jxr_linenumber" name="203" href="#203">203</a> .readCommitTimestampFromShadowCell(NON_EXISTING_CELL_TS, ctLocator);
+<a class="jxr_linenumber" name="204" href="#204">204</a> assertFalse(optionalCT.isPresent());
+<a class="jxr_linenumber" name="205" href="#205">205</a>
+<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_comment">// Then test that for a transaction committed, we get the right CT</em>
+<a class="jxr_linenumber" name="207" href="#207">207</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="208" href="#208">208</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="209" href="#209">209</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="210" href="#210">210</a> table.put(tx1, put);
+<a class="jxr_linenumber" name="211" href="#211">211</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment">// Upon commit, the commit data should be in the shadow cells, so test it</em>
+<a class="jxr_linenumber" name="213" href="#213">213</a> optionalCT = snapshotFilter.readCommitTimestampFromShadowCell(tx1.getStartTimestamp(), ctLocator);
+<a class="jxr_linenumber" name="214" href="#214">214</a> assertTrue(optionalCT.isPresent());
+<a class="jxr_linenumber" name="215" href="#215">215</a> CommitTimestamp ct = optionalCT.get();
+<a class="jxr_linenumber" name="216" href="#216">216</a> assertTrue(ct.isValid());
+<a class="jxr_linenumber" name="217" href="#217">217</a> assertEquals(ct.getValue(), tx1.getCommitTimestamp());
+<a class="jxr_linenumber" name="218" href="#218">218</a> assertTrue(ct.getLocation().compareTo(SHADOW_CELL) == 0);
+<a class="jxr_linenumber" name="219" href="#219">219</a>
+<a class="jxr_linenumber" name="220" href="#220">220</a> }
+<a class="jxr_linenumber" name="221" href="#221">221</a>
+<a class="jxr_linenumber" name="222" href="#222">222</a> }
+<a class="jxr_linenumber" name="223" href="#223">223</a>
+<a class="jxr_linenumber" name="224" href="#224">224</a> <em class="jxr_comment">// Tests step 1 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
+<a class="jxr_linenumber" name="225" href="#225">225</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="226" href="#226">226</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInCache(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="227" href="#227">227</a>
+<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CELL_ST = 1L;
+<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CELL_CT = 2L;
+<a class="jxr_linenumber" name="230" href="#230">230</a>
+<a class="jxr_linenumber" name="231" href="#231">231</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
+<a class="jxr_linenumber" name="232" href="#232">232</a>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// Pre-load the element to look for in the cache</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a> Table htable = hBaseUtils.getConnection().getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="235" href="#235">235</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="236" href="#236">236</a> tm.getCommitTableClient());
+<a class="jxr_linenumber" name="237" href="#237">237</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false);
+<a class="jxr_linenumber" name="238" href="#238">238</a>
+<a class="jxr_linenumber" name="239" href="#239">239</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier, CELL_ST);
+<a class="jxr_linenumber" name="240" href="#240">240</a> Map<Long, Long> fakeCache = Maps.newHashMap();
+<a class="jxr_linenumber" name="241" href="#241">241</a> fakeCache.put(CELL_ST, CELL_CT);
+<a class="jxr_linenumber" name="242" href="#242">242</a>
+<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment">// Then test that locator finds it in the cache</em>
+<a class="jxr_linenumber" name="244" href="#244">244</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId, fakeCache);
+<a class="jxr_linenumber" name="245" href="#245">245</a> CommitTimestamp ct = snapshotFilter.locateCellCommitTimestamp(CELL_ST, tm.tsoClient.getEpoch(), ctLocator,
+<a class="jxr_linenumber" name="246" href="#246">246</a> false);
+<a class="jxr_linenumber" name="247" href="#247">247</a> assertTrue(ct.isValid());
+<a class="jxr_linenumber" name="248" href="#248">248</a> assertEquals(ct.getValue(), CELL_CT);
+<a class="jxr_linenumber" name="249" href="#249">249</a> assertTrue(ct.getLocation().compareTo(CACHE) == 0);
+<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> <em class="jxr_comment">// Tests step 2 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
+<a class="jxr_linenumber" name="254" href="#254">254</a> <em class="jxr_comment">// Note: This test is very similar to testCrashAfterCommit() above so</em>
+<a class="jxr_linenumber" name="255" href="#255">255</a> <em class="jxr_comment">// maybe we should merge them in this test, adding the missing assertions</em>
+<a class="jxr_linenumber" name="256" href="#256">256</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInCommitTable(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="258" href="#258">258</a>
+<a class="jxr_linenumber" name="259" href="#259">259</a> PostCommitActions syncPostCommitter =
+<a class="jxr_linenumber" name="260" href="#260">260</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), getCommitTable(context).getClient()));
+<a class="jxr_linenumber" name="261" href="#261">261</a> AbstractTransactionManager tm = (AbstractTransactionManager) newTransactionManager(context, syncPostCommitter);
+<a class="jxr_linenumber" name="262" href="#262">262</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
+<a class="jxr_linenumber" name="263" href="#263">263</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="264" href="#264">264</a>
+<a class="jxr_linenumber" name="265" href="#265">265</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="266" href="#266">266</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="267" href="#267">267</a> tm.getCommitTableClient());
+<a class="jxr_linenumber" name="268" href="#268">268</a>
+<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">try</strong> (TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false))) {
+<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment">// Commit a transaction that is broken on commit to avoid</em>
+<a class="jxr_linenumber" name="271" href="#271">271</a> <em class="jxr_comment">// write to the shadow cells and avoid cleaning the commit table</em>
+<a class="jxr_linenumber" name="272" href="#272">272</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="273" href="#273">273</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="274" href="#274">274</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="275" href="#275">275</a> table.put(tx1, put);
+<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="277" href="#277">277</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="278" href="#278">278</a> } <strong class="jxr_keyword">catch</strong> (Exception e) { <em class="jxr_comment">// (*) crash</em>
+<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">// Do nothing</em>
+<a class="jxr_linenumber" name="280" href="#280">280</a> }
<a class="jxr_linenumber" name="281" href="#281">281</a>
-<a class="jxr_linenumber" name="282" href="#282">282</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
-<a class="jxr_linenumber" name="283" href="#283">283</a>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">// Commit a transaction to add ST/CT in commit table</em>
-<a class="jxr_linenumber" name="286" href="#286">286</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="287" href="#287">287</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="288" href="#288">288</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="289" href="#289">289</a> table.put(tx1, put);
-<a class="jxr_linenumber" name="290" href="#290">290</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="291" href="#291">291</a> <em class="jxr_comment">// Upon commit, the commit data should be in the shadow cells</em>
-<a class="jxr_linenumber" name="292" href="#292">292</a>
-<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_comment">// Test the locator finds the appropriate data in the shadow cells</em>
-<a class="jxr_linenumber" name="294" href="#294">294</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table.getHTable(), row1, family, qualifier,
-<a class="jxr_linenumber" name="295" href="#295">295</a> tx1.getStartTimestamp());
-<a class="jxr_linenumber" name="296" href="#296">296</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
-<a class="jxr_linenumber" name="297" href="#297">297</a> Maps.<Long, Long>newHashMap());
-<a class="jxr_linenumber" name="298" href="#298">298</a> CommitTimestamp ct = tm.locateCellCommitTimestamp(tx1.getStartTimestamp(), tm.tsoClient.getEpoch(),
-<a class="jxr_linenumber" name="299" href="#299">299</a> ctLocator);
-<a class="jxr_linenumber" name="300" href="#300">300</a> assertTrue(ct.isValid());
-<a class="jxr_linenumber" name="301" href="#301">301</a> assertEquals(ct.getValue(), tx1.getCommitTimestamp());
-<a class="jxr_linenumber" name="302" href="#302">302</a> assertTrue(ct.getLocation().compareTo(SHADOW_CELL) == 0);
-<a class="jxr_linenumber" name="303" href="#303">303</a> }
-<a class="jxr_linenumber" name="304" href="#304">304</a>
-<a class="jxr_linenumber" name="305" href="#305">305</a> }
+<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment">// Test the locator finds the appropriate data in the commit table</em>
+<a class="jxr_linenumber" name="283" href="#283">283</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier,
+<a class="jxr_linenumber" name="284" href="#284">284</a> tx1.getStartTimestamp());
+<a class="jxr_linenumber" name="285" href="#285">285</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
+<a class="jxr_linenumber" name="286" href="#286">286</a> Maps.<Long, Long>newHashMap());
+<a class="jxr_linenumber" name="287" href="#287">287</a> CommitTimestamp ct = snapshotFilter.locateCellCommitTimestamp(tx1.getStartTimestamp(), tm.tsoClient.getEpoch(),
+<a class="jxr_linenumber" name="288" href="#288">288</a> ctLocator, false);
+<a class="jxr_linenumber" name="289" href="#289">289</a> assertTrue(ct.isValid());
+<a class="jxr_linenumber" name="290" href="#290">290</a> <strong class="jxr_keyword">long</strong> expectedCommitTS = tx1.getStartTimestamp() + AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="291" href="#291">291</a> assertEquals(ct.getValue(), expectedCommitTS);
+<a class="jxr_linenumber" name="292" href="#292">292</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
+<a class="jxr_linenumber" name="293" href="#293">293</a> }
+<a class="jxr_linenumber" name="294" href="#294">294</a>
+<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> <em class="jxr_comment">// Tests step 3 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
+<a class="jxr_linenumber" name="298" href="#298">298</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="299" href="#299">299</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInShadowCells(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="300" href="#300">300</a>
+<a class="jxr_linenumber" name="301" href="#301">301</a> HBaseTransactionManager tm = (HBaseTransactionManager) newTransactionManager(context);
+<a class="jxr_linenumber" name="302" href="#302">302</a>
+<a class="jxr_linenumber" name="303" href="#303">303</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="304" href="#304">304</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="305" href="#305">305</a> tm.getCommitTableClient());
<a class="jxr_linenumber" name="306" href="#306">306</a>
-<a class="jxr_linenumber" name="307" href="#307">307</a> <em class="jxr_comment">// Tests step 4 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="308" href="#308">308</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="309" href="#309">309</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellFromTransactionInPreviousEpochGetsInvalidComitTimestamp(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="310" href="#310">310</a>
-<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CURRENT_EPOCH_FAKE = 1000L;
-<a class="jxr_linenumber" name="312" href="#312">312</a>
-<a class="jxr_linenumber" name="313" href="#313">313</a> CommitTable.Client commitTableClient = spy(getCommitTable(context).getClient());
-<a class="jxr_linenumber" name="314" href="#314">314</a> AbstractTransactionManager tm = spy((AbstractTransactionManager) newTransactionManager(context, commitTableClient));
-<a class="jxr_linenumber" name="315" href="#315">315</a> <em class="jxr_comment">// The following lines allow to reach step 4)</em>
-<a class="jxr_linenumber" name="316" href="#316">316</a> <em class="jxr_comment">// in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="317" href="#317">317</a> SettableFuture<Optional<CommitTimestamp>> f = SettableFuture.create();
-<a class="jxr_linenumber" name="318" href="#318">318</a> f.set(Optional.<CommitTimestamp>absent());
-<a class="jxr_linenumber" name="319" href="#319">319</a> doReturn(f).when(commitTableClient).getCommitTimestamp(any(Long.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="320" href="#320">320</a> doReturn(Optional.<CommitTimestamp>absent()).when(tm).readCommitTimestampFromShadowCell(any(Long.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="321" href="#321">321</a> any(CommitTimestampLocator.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="322" href="#322">322</a>
-<a class="jxr_linenumber" name="323" href="#323">323</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="324" href="#324">324</a>
-<a class="jxr_linenumber" name="325" href="#325">325</a> <em class="jxr_comment">// Commit a transaction to add ST/CT in commit table</em>
-<a class="jxr_linenumber" name="326" href="#326">326</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="327" href="#327">327</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="328" href="#328">328</a> put.add(family, qualifier, data1);
-<a class="jxr_linenumber" name="329" href="#329">329</a> table.put(tx1, put);
-<a class="jxr_linenumber" name="330" href="#330">330</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="331" href="#331">331</a> <em class="jxr_comment">// Upon commit, the commit data should be in the shadow cells</em>
-<a class="jxr_linenumber" name="332" href="#332">332</a>
-<a class="jxr_linenumber" name="333" href="#333">333</a> <em class="jxr_comment">// Test a transaction in the previous epoch gets an InvalidCommitTimestamp class</em>
-<a class="jxr_linenumber" name="334" href="#334">334</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table.getHTable(), row1, family, qualifier,
-<a class="jxr_linenumber" name="335" href="#335">335</a> tx1.getStartTimestamp());
-<a class="jxr_linenumber" name="336" href="#336">336</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
-<a class="jxr_linenumber" name="337" href="#337">337</a> Maps.<Long, Long>newHashMap());
-<a class="jxr_linenumber" name="338" href="#338">338</a> <em class="jxr_comment">// Fake the current epoch to simulate a newer TSO</em>
-<a class="jxr_linenumber" name="339" href="#339">339</a> CommitTimestamp ct = tm.locateCellCommitTimestamp(tx1.getStartTimestamp(), CURRENT_EPOCH_FAKE, ctLocator);
-<a class="jxr_linenumber" name="340" href="#340">340</a> assertFalse(ct.isValid());
-<a class="jxr_linenumber" name="341" href="#341">341</a> assertEquals(ct.getValue(), CommitTable.INVALID_TRANSACTION_MARKER);
-<a class="jxr_linenumber" name="342" href="#342">342</a> assertTrue(ct.getLocation().compareTo(COMMIT_TABLE) == 0);
-<a class="jxr_linenumber" name="343" href="#343">343</a> }
-<a class="jxr_linenumber" name="344" href="#344">344</a> }
-<a class="jxr_linenumber" name="345" href="#345">345</a>
-<a class="jxr_linenumber" name="346" href="#346">346</a> <em class="jxr_comment">// Tests step 5 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="347" href="#347">347</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="348" href="#348">348</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellCommitTimestampIsLocatedInCommitTableAfterNotBeingInvalidated(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="307" href="#307">307</a> <strong class="jxr_keyword">try</strong> (TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false))) {
+<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_comment">// Commit a transaction to addColumn ST/CT in commit table</em>
+<a class="jxr_linenumber" name="309" href="#309">309</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="310" href="#310">310</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="311" href="#311">311</a> put.addColumn(family, qualifier, data1);
+<a class="jxr_linenumber" name="312" href="#312">312</a> table.put(tx1, put);
+<a class="jxr_linenumber" name="313" href="#313">313</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="314" href="#314">314</a> <em class="jxr_comment">// Upon commit, the commit data should be in the shadow cells</em>
+<a class="jxr_linenumber" name="315" href="#315">315</a>
+<a class="jxr_linenumber" name="316" href="#316">316</a> <em class="jxr_comment">// Test the locator finds the appropriate data in the shadow cells</em>
+<a class="jxr_linenumber" name="317" href="#317">317</a> HBaseCellId hBaseCellId = <strong class="jxr_keyword">new</strong> HBaseCellId(table, row1, family, qualifier,
+<a class="jxr_linenumber" name="318" href="#318">318</a> tx1.getStartTimestamp());
+<a class="jxr_linenumber" name="319" href="#319">319</a> CommitTimestampLocator ctLocator = <strong class="jxr_keyword">new</strong> CommitTimestampLocatorImpl(hBaseCellId,
+<a class="jxr_linenumber" name="320" href="#320">320</a> Maps.<Long, Long>newHashMap());
+<a class="jxr_linenumber" name="321" href="#321">321</a> CommitTimestamp ct = snapshotFilter.locateCellCommitTimestamp(tx1.getStartTimestamp(), tm.tsoClient.getEpoch(),
+<a class="jxr_linenumber" name="322" href="#322">322</a> ctLocator, false);
+<a class="jxr_linenumber" name="323" href="#323">323</a> assertTrue(ct.isValid());
+<a class="jxr_linenumber" name="324" href="#324">324</a> assertEquals(ct.getValue(), tx1.getCommitTimestamp());
+<a class="jxr_linenumber" name="325" href="#325">325</a> assertTrue(ct.getLocation().compareTo(SHADOW_CELL) == 0);
+<a class="jxr_linenumber" name="326" href="#326">326</a> }
+<a class="jxr_linenumber" name="327" href="#327">327</a>
+<a class="jxr_linenumber" name="328" href="#328">328</a> }
+<a class="jxr_linenumber" name="329" href="#329">329</a>
+<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">// Tests step 4 in AbstractTransactionManager.locateCellCommitTimestamp()</em>
+<a class="jxr_linenumber" name="331" href="#331">331</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCellFromTransactionInPreviousEpochGetsInvalidComitTimestamp(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="333" href="#333">333</a>
+<a class="jxr_linenumber" name="334" href="#334">334</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> CURRENT_EPOCH_FAKE = 1000L * AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="335" href="#335">335</a>
+<a class="jxr_linenumber" name="336" href="#336">336</a> CommitTable.Client commitTableClient = spy(getCommitTable(context).getClient());
+<a class="jxr_linenumber" name="337" href="#337">337</a> AbstractTransactionManager tm = spy((AbstractTransactionManager) newTransactionManager(context, commitTableClient));
+<a class="jxr_linenumber" name="338" href="#338">338</a> <em class="jxr_comment">// The following lines allow to reach step 4)</em>
+<a class="jxr_linenumber" name="339" href="#339">339</a> <em class="jxr_comment">// in AbstractTransactionManager.locateCellCommitTimestamp()</em>
+<a class="jxr_linenumber" name="340" href="#340">340</a> SettableFuture<Optional<CommitTimestamp>> f = SettableFuture.create();
+<a class="jxr_linenumber" name="341" href="#341">341</a> f.set(Optional.<CommitTimestamp>absent());
+<a class="jxr_linenumber" name="342" href="#342">342</a> doReturn(f).when(commitTableClient).getCommitTimestamp(any(Long.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="343" href="#343">343</a>
+<a class="jxr_linenumber" name="344" href="#344">344</a> Table htable = connection.getTable(TableName.valueOf(TEST_TABLE));
+<a class="jxr_linenumber" name="345" href="#345">345</a> SnapshotFilterImpl snapshotFilter = <strong class="jxr_keyword">new</strong> SnapshotFilterImpl(<strong class="jxr_keyword">new</strong> HTableAccessWrapper(htable, htable),
+<a class="jxr_linenumber" name="346" href="#346">346</a> tm.getCommitTableClient());
+<a class="jxr_linenumber" name="347" href="#347">347</a>
+<a class="jxr_linenumber" name="348" href="#348">348</a> <strong class="jxr_keyword">try</strong> (TTable table = spy(<strong class="jxr_keyword">new</strong> TTable(htable, snapshotFilter, false))) {
<a class="jxr_linenumber" name="349" href="#349">349</a>
-<a class="jxr_linenumber" name="350" href="#350">350</a> CommitTable.Client commitTableClient = spy(getCommitTable(context).getClient());
-<a class="jxr_linenumber" name="351" href="#351">351</a> PostCommitActions syncPostCommitter =
-<a class="jxr_linenumber" name="352" href="#352">352</a> spy(<strong class="jxr_keyword">new</strong> HBaseSyncPostCommitter(<strong class="jxr_keyword">new</strong> NullMetricsProvider(), commitTableClient));
-<a class="jxr_linenumber" name="353" href="#353">353</a> AbstractTransactionManager tm = spy((AbstractTransactionManager) newTransactionManager(context, syncPostCommitter));
-<a class="jxr_linenumber" name="354" href="#354">354</a>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <em class="jxr_comment">// The following line emulates a crash after commit that is observed in (*) below</em>
-<a class="jxr_linenumber" name="356" href="#356">356</a> doThrow(<strong class="jxr_keyword">new</strong> RuntimeException()).when(syncPostCommitter).updateShadowCells(any(HBaseTransaction.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="357" href="#357">357</a> <em class="jxr_comment">// The next two lines avoid steps 2) and 3) and go directly to step 5)</em>
-<a class="jxr_linenumber" name="358" href="#358">358</a> <em class="jxr_comment">// in AbstractTransactionManager.locateCellCommitTimestamp()</em>
-<a class="jxr_linenumber" name="359" href="#359">359</a> SettableFuture<Optional<CommitTimestamp>> f = SettableFuture.create();
-<a class="jxr_linenumber" name="360" href="#360">360</a> f.set(Optional.<CommitTimestamp>absent());
-<a class="jxr_linenumber" name="361" href="#361">361</a> doReturn(f).doCallRealMethod().when(commitTableClient).getCommitTimestamp(any(Long.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="362" href="#362">362</a> doReturn(Optional.<CommitTimestamp>absent()).when(tm).readCommitTimestampFromShadowCell(any(Long.<strong class="jxr_keyword">class</strong>),
-<a class="jxr_linenumber" name="363" href="#363">363</a> any(CommitTimestampLocator.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="364" href="#364">364</a>
-<a class="jxr_linenumber" name="365" href="#365">365</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="366" href="#366">366</a>
-<a class="jxr_linenumber" name="367" href="#367">367</a> <em class="jxr_comment">// Commit a transaction that is broken on commit to avoid</em>
-<a class="jxr_linenumber" name="368" href="#368">368</a> <em class="jxr_comment">// write to the shadow cells and avoid cleaning the commit table</em>
-<a class="jxr_linenumber" name="369" href="#369">369</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="370" href="#370">370</a> Put put = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="371" hre
<TRUNCATED>