You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/09/20 07:48:09 UTC
[24/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 9/20/18 10:47 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/6826ad03/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html b/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
index e9ef446..3836cf0 100644
--- a/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
+++ b/xref-test/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html
@@ -31,216 +31,266 @@
<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> com.google.inject.Guice;
<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> com.google.inject.Injector;
<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> com.google.inject.Module;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOMockModule;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServer;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServerConfig;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.util.DummyCellIdImpl;
-<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.Assert;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.AfterClass;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeClass;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> java.util.HashSet;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> java.util.Set;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.ExecutionException;
-<a class="jxr_linenumber" name="40" href="#40">40</a>
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
-<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.assertNotNull;
-<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.assertTrue;
-<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html">TestIntegrationOfTSOClientServerBasicFunctionality</a> {
+<a class="jxr_linenumber" name="24" href="#24">24</a>
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.omid.transaction.AbstractTransactionManager;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOMockModule;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServer;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServerConfig;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.util.DummyCellIdImpl;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.testng.Assert;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.AfterClass;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeClass;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="38" href="#38">38</a>
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> java.util.HashSet;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> java.util.Set;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.ExecutionException;
+<a class="jxr_linenumber" name="42" href="#42">42</a>
+<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.assertNotNull;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
<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> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestIntegrationOfTSOClientServerBasicFunctionality.<strong class="jxr_keyword">class</strong>);
+<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/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.html">TestIntegrationOfTSOClientServerBasicFunctionality</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> String TSO_SERVER_HOST = <span class="jxr_string">"localhost"</span>;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> tsoServerPortForTest;
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_comment">// Cells for tests</em>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> CellId c1 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xdeadbeefL);
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> CellId c2 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xfeedcafeL);
-<a class="jxr_linenumber" name="56" href="#56">56</a>
-<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Required infrastructure for TSO tsoClient-server integration testing</em>
-<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">private</strong> TSOServer tsoServer;
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">private</strong> TSOClient tsoClient;
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> TSOClient justAnotherTSOClient;
-<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">private</strong> CommitTable.Client commitTableClient;
-<a class="jxr_linenumber" name="62" href="#62">62</a>
-<a class="jxr_linenumber" name="63" href="#63">63</a> @BeforeClass
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setup() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> tsoServerPortForTest = TestUtils.getFreeLocalPort();
+<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> Logger LOG = LoggerFactory.getLogger(TestIntegrationOfTSOClientServerBasicFunctionality.<strong class="jxr_keyword">class</strong>);
+<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> String TSO_SERVER_HOST = <span class="jxr_string">"localhost"</span>;
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> tsoServerPortForTest;
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_comment">// Cells for tests</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> CellId c1 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xdeadbeefL);
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> CellId c2 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xfeedcafeL);
+<a class="jxr_linenumber" name="58" href="#58">58</a>
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// Required infrastructure for TSO tsoClient-server integration testing</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> TSOServer tsoServer;
+<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">private</strong> TSOClient tsoClient;
+<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> TSOClient justAnotherTSOClient;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> CommitTable.Client commitTableClient;
+<a class="jxr_linenumber" name="64" href="#64">64</a>
+<a class="jxr_linenumber" name="65" href="#65">65</a> @BeforeClass
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setup() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="69" href="#69">69</a> tsoConfig.setConflictMapSize(1000);
-<a class="jxr_linenumber" name="70" href="#70">70</a> tsoConfig.setPort(tsoServerPortForTest);
-<a class="jxr_linenumber" name="71" href="#71">71</a> Module tsoServerMockModule = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(tsoConfig);
-<a class="jxr_linenumber" name="72" href="#72">72</a> Injector injector = Guice.createInjector(tsoServerMockModule);
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> CommitTable commitTable = injector.getInstance(CommitTable.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="75" href="#75">75</a> commitTableClient = commitTable.getClient();
-<a class="jxr_linenumber" name="76" href="#76">76</a>
-<a class="jxr_linenumber" name="77" href="#77">77</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="78" href="#78">78</a> LOG.info(<span class="jxr_string">"======================================= Init TSO Server =========================================="</span>);
+<a class="jxr_linenumber" name="68" href="#68">68</a> tsoServerPortForTest = TestUtils.getFreeLocalPort();
+<a class="jxr_linenumber" name="69" href="#69">69</a>
+<a class="jxr_linenumber" name="70" href="#70">70</a> TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="71" href="#71">71</a> tsoConfig.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="72" href="#72">72</a> tsoConfig.setPort(tsoServerPortForTest);
+<a class="jxr_linenumber" name="73" href="#73">73</a> Module tsoServerMockModule = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(tsoConfig);
+<a class="jxr_linenumber" name="74" href="#74">74</a> Injector injector = Guice.createInjector(tsoServerMockModule);
+<a class="jxr_linenumber" name="75" href="#75">75</a>
+<a class="jxr_linenumber" name="76" href="#76">76</a> CommitTable commitTable = injector.getInstance(CommitTable.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="77" href="#77">77</a> commitTableClient = commitTable.getClient();
+<a class="jxr_linenumber" name="78" href="#78">78</a>
<a class="jxr_linenumber" name="79" href="#79">79</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="80" href="#80">80</a>
-<a class="jxr_linenumber" name="81" href="#81">81</a> tsoServer = injector.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="82" href="#82">82</a> tsoServer.startAndWait();
-<a class="jxr_linenumber" name="83" href="#83">83</a> TestUtils.waitForSocketListening(TSO_SERVER_HOST, tsoServerPortForTest, 100);
-<a class="jxr_linenumber" name="84" href="#84">84</a>
-<a class="jxr_linenumber" name="85" href="#85">85</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="86" href="#86">86</a> LOG.info(<span class="jxr_string">"===================================== TSO Server Initialized ====================================="</span>);
+<a class="jxr_linenumber" name="80" href="#80">80</a> LOG.info(<span class="jxr_string">"======================================= Init TSO Server =========================================="</span>);
+<a class="jxr_linenumber" name="81" href="#81">81</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> tsoServer = injector.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="84" href="#84">84</a> tsoServer.startAndWait();
+<a class="jxr_linenumber" name="85" href="#85">85</a> TestUtils.waitForSocketListening(TSO_SERVER_HOST, tsoServerPortForTest, 100);
+<a class="jxr_linenumber" name="86" href="#86">86</a>
<a class="jxr_linenumber" name="87" href="#87">87</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> LOG.info(<span class="jxr_string">"===================================== TSO Server Initialized ====================================="</span>);
<a class="jxr_linenumber" name="89" href="#89">89</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="90" href="#90">90</a> LOG.info(<span class="jxr_string">"======================================= Setup TSO Clients ========================================"</span>);
+<a class="jxr_linenumber" name="90" href="#90">90</a>
<a class="jxr_linenumber" name="91" href="#91">91</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="92" href="#92">92</a>
-<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// Configure direct connection to the server</em>
-<a class="jxr_linenumber" name="94" href="#94">94</a> OmidClientConfiguration tsoClientConf = <strong class="jxr_keyword">new</strong> OmidClientConfiguration();
-<a class="jxr_linenumber" name="95" href="#95">95</a> tsoClientConf.setConnectionString(TSO_SERVER_HOST + <span class="jxr_string">":"</span> + tsoServerPortForTest);
-<a class="jxr_linenumber" name="96" href="#96">96</a>
-<a class="jxr_linenumber" name="97" href="#97">97</a> tsoClient = TSOClient.newInstance(tsoClientConf);
-<a class="jxr_linenumber" name="98" href="#98">98</a> justAnotherTSOClient = TSOClient.newInstance(tsoClientConf);
-<a class="jxr_linenumber" name="99" href="#99">99</a>
-<a class="jxr_linenumber" name="100" href="#100">100</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="101" href="#101">101</a> LOG.info(<span class="jxr_string">"===================================== TSO Clients Initialized ===================================="</span>);
+<a class="jxr_linenumber" name="92" href="#92">92</a> LOG.info(<span class="jxr_string">"======================================= Setup TSO Clients ========================================"</span>);
+<a class="jxr_linenumber" name="93" href="#93">93</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_comment">// Configure direct connection to the server</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> OmidClientConfiguration tsoClientConf = <strong class="jxr_keyword">new</strong> OmidClientConfiguration();
+<a class="jxr_linenumber" name="97" href="#97">97</a> tsoClientConf.setConnectionString(TSO_SERVER_HOST + <span class="jxr_string">":"</span> + tsoServerPortForTest);
+<a class="jxr_linenumber" name="98" href="#98">98</a>
+<a class="jxr_linenumber" name="99" href="#99">99</a> tsoClient = TSOClient.newInstance(tsoClientConf);
+<a class="jxr_linenumber" name="100" href="#100">100</a> justAnotherTSOClient = TSOClient.newInstance(tsoClientConf);
+<a class="jxr_linenumber" name="101" href="#101">101</a>
<a class="jxr_linenumber" name="102" href="#102">102</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> Thread.currentThread().setName(<span class="jxr_string">"Test Thread"</span>);
+<a class="jxr_linenumber" name="103" href="#103">103</a> LOG.info(<span class="jxr_string">"===================================== TSO Clients Initialized ===================================="</span>);
+<a class="jxr_linenumber" name="104" href="#104">104</a> LOG.info(<span class="jxr_string">"=================================================================================================="</span>);
<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> }
+<a class="jxr_linenumber" name="106" href="#106">106</a> Thread.currentThread().setName(<span class="jxr_string">"Test Thread"</span>);
<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> @AfterClass
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="110" href="#110">110</a>
-<a class="jxr_linenumber" name="111" href="#111">111</a> tsoClient.close().get();
+<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> @AfterClass
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> tsoServer.stopAndWait();
-<a class="jxr_linenumber" name="114" href="#114">114</a> tsoServer = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="115" href="#115">115</a> TestUtils.waitForSocketNotListening(TSO_SERVER_HOST, tsoServerPortForTest, 1000);
-<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="113" href="#113">113</a> tsoClient.close().get();
+<a class="jxr_linenumber" name="114" href="#114">114</a>
+<a class="jxr_linenumber" name="115" href="#115">115</a> tsoServer.stopAndWait();
+<a class="jxr_linenumber" name="116" href="#116">116</a> tsoServer = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="117" href="#117">117</a> TestUtils.waitForSocketNotListening(TSO_SERVER_HOST, tsoServerPortForTest, 1000);
<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestampsOrderingGrowMonotonically() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">long</strong> referenceTimestamp;
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="123" href="#123">123</a> referenceTimestamp = startTsTx1;
-<a class="jxr_linenumber" name="124" href="#124">124</a>
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="126" href="#126">126</a> assertEquals(startTsTx2, ++referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a> assertTrue(startTsTx2 > startTsTx1, <span class="jxr_string">"Two timestamps obtained consecutively should grow"</span>);
-<a class="jxr_linenumber" name="128" href="#128">128</a>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">long</strong> commitTsTx2 = tsoClient.commit(startTsTx2, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="130" href="#130">130</a> assertEquals(commitTsTx2, ++referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
+<a class="jxr_linenumber" name="119" href="#119">119</a> }
+<a class="jxr_linenumber" name="120" href="#120">120</a>
+<a class="jxr_linenumber" name="121" href="#121">121</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTimestampsOrderingGrowMonotonically() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">long</strong> referenceTimestamp;
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="125" href="#125">125</a> referenceTimestamp = startTsTx1;
+<a class="jxr_linenumber" name="126" href="#126">126</a>
+<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="128" href="#128">128</a> referenceTimestamp += AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="129" href="#129">129</a> assertEquals(startTsTx2, referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
+<a class="jxr_linenumber" name="130" href="#130">130</a> assertTrue(startTsTx2 > startTsTx1, <span class="jxr_string">"Two timestamps obtained consecutively should grow"</span>);
<a class="jxr_linenumber" name="131" href="#131">131</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c2)).get();
-<a class="jxr_linenumber" name="133" href="#133">133</a> assertEquals(commitTsTx1, ++referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
-<a class="jxr_linenumber" name="134" href="#134">134</a>
-<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">long</strong> startTsTx3 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="136" href="#136">136</a> assertEquals(startTsTx3, ++referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
-<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> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSimpleTransactionWithNoWriteSetCanCommit() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.<CellId>newHashSet()).get();
-<a class="jxr_linenumber" name="143" href="#143">143</a> assertTrue(commitTsTx1 > startTsTx1);
-<a class="jxr_linenumber" name="144" href="#144">144</a> }
-<a class="jxr_linenumber" name="145" href="#145">145</a>
-<a class="jxr_linenumber" name="146" href="#146">146</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionWithMassiveWriteSetCanCommit() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">long</strong> startTs = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> Set<CellId> cells = <strong class="jxr_keyword">new</strong> HashSet<>();
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 1_000_000; i++) {
-<a class="jxr_linenumber" name="152" href="#152">152</a> cells.add(<strong class="jxr_keyword">new</strong> DummyCellIdImpl(i));
-<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> <strong class="jxr_keyword">long</strong> commitTs = tsoClient.commit(startTs, cells).get();
-<a class="jxr_linenumber" name="156" href="#156">156</a> assertTrue(commitTs > startTs, <span class="jxr_string">"Commit TS should be higher than Start TS"</span>);
-<a class="jxr_linenumber" name="157" href="#157">157</a> }
-<a class="jxr_linenumber" name="158" href="#158">158</a>
-<a class="jxr_linenumber" name="159" href="#159">159</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleSerialCommitsDoNotConflict() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="163" href="#163">163</a> assertTrue(commitTsTx1 > startTsTx1, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">long</strong> commitTsTx2 = tsoClient.commit(startTsTx2, Sets.newHashSet(c1)).get();
+<a class="jxr_linenumber" name="133" href="#133">133</a> referenceTimestamp += AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="134" href="#134">134</a> assertEquals(commitTsTx2, referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
+<a class="jxr_linenumber" name="135" href="#135">135</a>
+<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c2)).get();
+<a class="jxr_linenumber" name="137" href="#137">137</a> referenceTimestamp += AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="138" href="#138">138</a> assertEquals(commitTsTx1, referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
+<a class="jxr_linenumber" name="139" href="#139">139</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">long</strong> startTsTx3 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="141" href="#141">141</a> referenceTimestamp += AbstractTransactionManager.MAX_CHECKPOINTS_PER_TXN;
+<a class="jxr_linenumber" name="142" href="#142">142</a> assertEquals(startTsTx3, referenceTimestamp, <span class="jxr_string">"Should grow monotonically"</span>);
+<a class="jxr_linenumber" name="143" href="#143">143</a> }
+<a class="jxr_linenumber" name="144" href="#144">144</a>
+<a class="jxr_linenumber" name="145" href="#145">145</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSimpleTransactionWithNoWriteSetCanCommit() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.<CellId>newHashSet()).get();
+<a class="jxr_linenumber" name="149" href="#149">149</a> assertTrue(commitTsTx1 > startTsTx1);
+<a class="jxr_linenumber" name="150" href="#150">150</a> }
+<a class="jxr_linenumber" name="151" href="#151">151</a>
+<a class="jxr_linenumber" name="152" href="#152">152</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionWithMassiveWriteSetCanCommit() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">long</strong> startTs = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="155" href="#155">155</a>
+<a class="jxr_linenumber" name="156" href="#156">156</a> Set<CellId> cells = <strong class="jxr_keyword">new</strong> HashSet<>();
+<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < 1_000_000; i++) {
+<a class="jxr_linenumber" name="158" href="#158">158</a> cells.add(<strong class="jxr_keyword">new</strong> DummyCellIdImpl(i));
+<a class="jxr_linenumber" name="159" href="#159">159</a> }
+<a class="jxr_linenumber" name="160" href="#160">160</a>
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">long</strong> commitTs = tsoClient.commit(startTs, cells).get();
+<a class="jxr_linenumber" name="162" href="#162">162</a> assertTrue(commitTs > startTs, <span class="jxr_string">"Commit TS should be higher than Start TS"</span>);
+<a class="jxr_linenumber" name="163" href="#163">163</a> }
<a class="jxr_linenumber" name="164" href="#164">164</a>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="166" href="#166">166</a> assertTrue(startTsTx2 > commitTsTx1, <span class="jxr_string">"TS should grow monotonically"</span>);
-<a class="jxr_linenumber" name="167" href="#167">167</a>
-<a class="jxr_linenumber" name="168" href="#168">168</a> <strong class="jxr_keyword">long</strong> commitTsTx2 = tsoClient.commit(startTsTx2, Sets.newHashSet(c1, c2)).get();
-<a class="jxr_linenumber" name="169" href="#169">169</a> assertTrue(commitTsTx2 > startTsTx2, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
+<a class="jxr_linenumber" name="165" href="#165">165</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleSerialCommitsDoNotConflict() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="168" href="#168">168</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c1)).get();
+<a class="jxr_linenumber" name="169" href="#169">169</a> assertTrue(commitTsTx1 > startTsTx1, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
<a class="jxr_linenumber" name="170" href="#170">170</a>
-<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">long</strong> startTsTx3 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">long</strong> commitTsTx3 = tsoClient.commit(startTsTx3, Sets.newHashSet(c2)).get();
-<a class="jxr_linenumber" name="173" href="#173">173</a> assertTrue(commitTsTx3 > startTsTx3, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
-<a class="jxr_linenumber" name="174" href="#174">174</a> }
-<a class="jxr_linenumber" name="175" href="#175">175</a>
-<a class="jxr_linenumber" name="176" href="#176">176</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitWritesToCommitTable() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">long</strong> startTsForTx1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">long</strong> startTsForTx2 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="180" href="#180">180</a> assertTrue(startTsForTx2 > startTsForTx1, <span class="jxr_string">"Start TS should grow"</span>);
+<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="172" href="#172">172</a> assertTrue(startTsTx2 > commitTsTx1, <span class="jxr_string">"TS should grow monotonically"</span>);
+<a class="jxr_linenumber" name="173" href="#173">173</a>
+<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">long</strong> commitTsTx2 = tsoClient.commit(startTsTx2, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="175" href="#175">175</a> assertTrue(commitTsTx2 > startTsTx2, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
+<a class="jxr_linenumber" name="176" href="#176">176</a>
+<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">long</strong> startTsTx3 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">long</strong> commitTsTx3 = tsoClient.commit(startTsTx3, Sets.newHashSet(c2)).get();
+<a class="jxr_linenumber" name="179" href="#179">179</a> assertTrue(commitTsTx3 > startTsTx3, <span class="jxr_string">"Commit TS must be greater than Start TS"</span>);
+<a class="jxr_linenumber" name="180" href="#180">180</a> }
<a class="jxr_linenumber" name="181" href="#181">181</a>
-<a class="jxr_linenumber" name="182" href="#182">182</a> assertFalse(commitTableClient.getCommitTimestamp(startTsForTx1).get().isPresent(),
-<a class="jxr_linenumber" name="183" href="#183">183</a> <span class="jxr_string">"Commit TS for Tx1 shouldn't appear in Commit Table"</span>);
-<a class="jxr_linenumber" name="184" href="#184">184</a>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">long</strong> commitTsForTx1 = tsoClient.commit(startTsForTx1, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="186" href="#186">186</a> assertTrue(commitTsForTx1 > startTsForTx1, <span class="jxr_string">"Commit TS should be higher than Start TS for the same tx"</span>);
+<a class="jxr_linenumber" name="182" href="#182">182</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="183" href="#183">183</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCommitWritesToCommitTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">long</strong> startTsForTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">long</strong> startTsForTx2 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="186" href="#186">186</a> assertTrue(startTsForTx2 > startTsForTx1, <span class="jxr_string">"Start TS should grow"</span>);
<a class="jxr_linenumber" name="187" href="#187">187</a>
-<a class="jxr_linenumber" name="188" href="#188">188</a> Long commitTs1InCommitTable = commitTableClient.getCommitTimestamp(startTsForTx1).get().get().getValue();
-<a class="jxr_linenumber" name="189" href="#189">189</a> assertNotNull(commitTs1InCommitTable, <span class="jxr_string">"Tx is committed, should return as such from Commit Table"</span>);
-<a class="jxr_linenumber" name="190" href="#190">190</a> assertEquals(commitTsForTx1, (<strong class="jxr_keyword">long</strong>) commitTs1InCommitTable,
-<a class="jxr_linenumber" name="191" href="#191">191</a> <span class="jxr_string">"getCommitTimestamp() & commit() should report same Commit TS value for same tx"</span>);
-<a class="jxr_linenumber" name="192" href="#192">192</a> assertTrue(commitTs1InCommitTable > startTsForTx2, <span class="jxr_string">"Commit TS should be higher than tx's Start TS"</span>);
-<a class="jxr_linenumber" name="193" href="#193">193</a> }
-<a class="jxr_linenumber" name="194" href="#194">194</a>
-<a class="jxr_linenumber" name="195" href="#195">195</a> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="196" href="#196">196</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTwoConcurrentTxWithOverlappingWritesetsHaveConflicts() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="199" href="#199">199</a> assertTrue(startTsTx2 > startTsTx1, <span class="jxr_string">"Second TX should have higher TS"</span>);
+<a class="jxr_linenumber" name="188" href="#188">188</a> assertFalse(commitTableClient.getCommitTimestamp(startTsForTx1).get().isPresent(),
+<a class="jxr_linenumber" name="189" href="#189">189</a> <span class="jxr_string">"Commit TS for Tx1 shouldn't appear in Commit Table"</span>);
+<a class="jxr_linenumber" name="190" href="#190">190</a>
+<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">long</strong> commitTsForTx1 = tsoClient.commit(startTsForTx1, Sets.newHashSet(c1)).get();
+<a class="jxr_linenumber" name="192" href="#192">192</a> assertTrue(commitTsForTx1 > startTsForTx1, <span class="jxr_string">"Commit TS should be higher than Start TS for the same tx"</span>);
+<a class="jxr_linenumber" name="193" href="#193">193</a>
+<a class="jxr_linenumber" name="194" href="#194">194</a> Long commitTs1InCommitTable = commitTableClient.getCommitTimestamp(startTsForTx1).get().get().getValue();
+<a class="jxr_linenumber" name="195" href="#195">195</a> assertNotNull(commitTs1InCommitTable, <span class="jxr_string">"Tx is committed, should return as such from Commit Table"</span>);
+<a class="jxr_linenumber" name="196" href="#196">196</a> assertEquals(commitTsForTx1, (<strong class="jxr_keyword">long</strong>) commitTs1InCommitTable,
+<a class="jxr_linenumber" name="197" href="#197">197</a> <span class="jxr_string">"getCommitTimestamp() & commit() should report same Commit TS value for same tx"</span>);
+<a class="jxr_linenumber" name="198" href="#198">198</a> assertTrue(commitTs1InCommitTable > startTsForTx2, <span class="jxr_string">"Commit TS should be higher than tx's Start TS"</span>);
+<a class="jxr_linenumber" name="199" href="#199">199</a> }
<a class="jxr_linenumber" name="200" href="#200">200</a>
-<a class="jxr_linenumber" name="201" href="#201">201</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="202" href="#202">202</a> assertTrue(commitTsTx1 > startTsTx1, <span class="jxr_string">"Commit TS must be higher than Start TS for the same tx"</span>);
-<a class="jxr_linenumber" name="203" href="#203">203</a>
-<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="205" href="#205">205</a> tsoClient.commit(startTsTx2, Sets.newHashSet(c1, c2)).get();
-<a class="jxr_linenumber" name="206" href="#206">206</a> Assert.fail(<span class="jxr_string">"Second TX should fail on commit"</span>);
-<a class="jxr_linenumber" name="207" href="#207">207</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
-<a class="jxr_linenumber" name="208" href="#208">208</a> assertEquals(AbortException.<strong class="jxr_keyword">class</strong>, ee.getCause().getClass(), <span class="jxr_string">"Should have aborted"</span>);
-<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> @Test(timeOut = 30_000)
-<a class="jxr_linenumber" name="213" href="#213">213</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConflictsAndMonotonicallyTimestampGrowthWithTwoDifferentTSOClients() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">long</strong> startTsTx1Client1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="215" href="#215">215</a> <strong class="jxr_keyword">long</strong> startTsTx2Client1 = tsoClient.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">long</strong> startTsTx3Client1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="201" href="#201">201</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="202" href="#202">202</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTwoConcurrentTxWithOverlappingWritesetsHaveConflicts() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">long</strong> startTsTx2 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="205" href="#205">205</a> assertTrue(startTsTx2 > startTsTx1, <span class="jxr_string">"Second TX should have higher TS"</span>);
+<a class="jxr_linenumber" name="206" href="#206">206</a>
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">long</strong> commitTsTx1 = tsoClient.commit(startTsTx1, Sets.newHashSet(c1)).get();
+<a class="jxr_linenumber" name="208" href="#208">208</a> assertTrue(commitTsTx1 > startTsTx1, <span class="jxr_string">"Commit TS must be higher than Start TS for the same tx"</span>);
+<a class="jxr_linenumber" name="209" href="#209">209</a>
+<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="211" href="#211">211</a> tsoClient.commit(startTsTx2, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="212" href="#212">212</a> Assert.fail(<span class="jxr_string">"Second TX should fail on commit"</span>);
+<a class="jxr_linenumber" name="213" href="#213">213</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="214" href="#214">214</a> assertEquals(AbortException.<strong class="jxr_keyword">class</strong>, ee.getCause().getClass(), <span class="jxr_string">"Should have aborted"</span>);
+<a class="jxr_linenumber" name="215" href="#215">215</a> }
+<a class="jxr_linenumber" name="216" href="#216">216</a> }
<a class="jxr_linenumber" name="217" href="#217">217</a>
-<a class="jxr_linenumber" name="218" href="#218">218</a> tsoClient.commit(startTsTx1Client1, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="220" href="#220">220</a> tsoClient.commit(startTsTx3Client1, Sets.newHashSet(c1, c2)).get();
-<a class="jxr_linenumber" name="221" href="#221">221</a> Assert.fail(<span class="jxr_string">"Second commit should fail as conflicts with the previous concurrent one"</span>);
-<a class="jxr_linenumber" name="222" href="#222">222</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
-<a class="jxr_linenumber" name="223" href="#223">223</a> assertEquals(AbortException.<strong class="jxr_keyword">class</strong>, ee.getCause().getClass(), <span class="jxr_string">"Should have aborted"</span>);
-<a class="jxr_linenumber" name="224" href="#224">224</a> }
-<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">long</strong> startTsTx4Client2 = justAnotherTSOClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="218" href="#218">218</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionStartedBeforeFenceAborts() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="220" href="#220">220</a>
+<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="222" href="#222">222</a>
+<a class="jxr_linenumber" name="223" href="#223">223</a> <strong class="jxr_keyword">long</strong> fenceID = tsoClient.getFence(c1.getTableId()).get();
+<a class="jxr_linenumber" name="224" href="#224">224</a>
+<a class="jxr_linenumber" name="225" href="#225">225</a> assertTrue(fenceID > startTsTx1, <span class="jxr_string">"Fence ID should be higher thank Tx1ID"</span>);
<a class="jxr_linenumber" name="226" href="#226">226</a>
-<a class="jxr_linenumber" name="227" href="#227">227</a> assertFalse(commitTableClient.getCommitTimestamp(startTsTx3Client1).get().isPresent(), <span class="jxr_string">"Tx3 didn't commit"</span>);
-<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">long</strong> commitTSTx1 = commitTableClient.getCommitTimestamp(startTsTx1Client1).get().get().getValue();
-<a class="jxr_linenumber" name="229" href="#229">229</a> assertTrue(commitTSTx1 > startTsTx2Client1, <span class="jxr_string">"Tx1 committed after Tx2 started"</span>);
-<a class="jxr_linenumber" name="230" href="#230">230</a> assertTrue(commitTSTx1 < startTsTx4Client2, <span class="jxr_string">"Tx1 committed before Tx4 started on the other TSO Client"</span>);
-<a class="jxr_linenumber" name="231" href="#231">231</a> }
-<a class="jxr_linenumber" name="232" href="#232">232</a>
-<a class="jxr_linenumber" name="233" href="#233">233</a> }
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="228" href="#228">228</a> tsoClient.commit(startTsTx1, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="229" href="#229">229</a> Assert.fail(<span class="jxr_string">"TX should fail on commit"</span>);
+<a class="jxr_linenumber" name="230" href="#230">230</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="231" href="#231">231</a> assertEquals(AbortException.<strong class="jxr_keyword">class</strong>, ee.getCause().getClass(), <span class="jxr_string">"Should have aborted"</span>);
+<a class="jxr_linenumber" name="232" href="#232">232</a> }
+<a class="jxr_linenumber" name="233" href="#233">233</a> }
+<a class="jxr_linenumber" name="234" href="#234">234</a>
+<a class="jxr_linenumber" name="235" href="#235">235</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="236" href="#236">236</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionStartedBeforeNonOverlapFenceCommits() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="237" href="#237">237</a>
+<a class="jxr_linenumber" name="238" href="#238">238</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="239" href="#239">239</a>
+<a class="jxr_linenumber" name="240" href="#240">240</a> tsoClient.getFence(7).get();
+<a class="jxr_linenumber" name="241" href="#241">241</a>
+<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="243" href="#243">243</a> tsoClient.commit(startTsTx1, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="244" href="#244">244</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="245" href="#245">245</a> Assert.fail(<span class="jxr_string">"TX should successfully commit"</span>); }
+<a class="jxr_linenumber" name="246" href="#246">246</a> }
+<a class="jxr_linenumber" name="247" href="#247">247</a>
+<a class="jxr_linenumber" name="248" href="#248">248</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="249" href="#249">249</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionStartedAfterFenceCommits() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="250" href="#250">250</a>
+<a class="jxr_linenumber" name="251" href="#251">251</a> tsoClient.getFence(c1.getTableId()).get();
+<a class="jxr_linenumber" name="252" href="#252">252</a>
+<a class="jxr_linenumber" name="253" href="#253">253</a> <strong class="jxr_keyword">long</strong> startTsTx1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="254" href="#254">254</a>
+<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="256" href="#256">256</a> tsoClient.commit(startTsTx1, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="257" href="#257">257</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="258" href="#258">258</a> Assert.fail(<span class="jxr_string">"TX should successfully commit"</span>);
+<a class="jxr_linenumber" name="259" href="#259">259</a> }
+<a class="jxr_linenumber" name="260" href="#260">260</a> }
+<a class="jxr_linenumber" name="261" href="#261">261</a>
+<a class="jxr_linenumber" name="262" href="#262">262</a> @Test(timeOut = 30_000)
+<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConflictsAndMonotonicallyTimestampGrowthWithTwoDifferentTSOClients() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">long</strong> startTsTx1Client1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">long</strong> startTsTx2Client1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">long</strong> startTsTx3Client1 = tsoClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="267" href="#267">267</a>
+<a class="jxr_linenumber" name="268" href="#268">268</a> tsoClient.commit(startTsTx1Client1, Sets.newHashSet(c1)).get();
+<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="270" href="#270">270</a> tsoClient.commit(startTsTx3Client1, Sets.newHashSet(c1, c2)).get();
+<a class="jxr_linenumber" name="271" href="#271">271</a> Assert.fail(<span class="jxr_string">"Second commit should fail as conflicts with the previous concurrent one"</span>);
+<a class="jxr_linenumber" name="272" href="#272">272</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="273" href="#273">273</a> assertEquals(AbortException.<strong class="jxr_keyword">class</strong>, ee.getCause().getClass(), <span class="jxr_string">"Should have aborted"</span>);
+<a class="jxr_linenumber" name="274" href="#274">274</a> }
+<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">long</strong> startTsTx4Client2 = justAnotherTSOClient.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="276" href="#276">276</a>
+<a class="jxr_linenumber" name="277" href="#277">277</a> assertFalse(commitTableClient.getCommitTimestamp(startTsTx3Client1).get().isPresent(), <span class="jxr_string">"Tx3 didn't commit"</span>);
+<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">long</strong> commitTSTx1 = commitTableClient.getCommitTimestamp(startTsTx1Client1).get().get().getValue();
+<a class="jxr_linenumber" name="279" href="#279">279</a> assertTrue(commitTSTx1 > startTsTx2Client1, <span class="jxr_string">"Tx1 committed after Tx2 started"</span>);
+<a class="jxr_linenumber" name="280" href="#280">280</a> assertTrue(commitTSTx1 < startTsTx4Client2, <span class="jxr_string">"Tx1 committed before Tx4 started on the other TSO Client"</span>);
+<a class="jxr_linenumber" name="281" href="#281">281</a> }
+<a class="jxr_linenumber" name="282" href="#282">282</a>
+<a class="jxr_linenumber" name="283" href="#283">283</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/6826ad03/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html b/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
index 3846e24..57a0f8b 100644
--- a/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
+++ b/xref-test/org/apache/omid/tso/client/TestMockTSOClient.html
@@ -28,58 +28,60 @@
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.tso.client;
<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.collect.Sets;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.InMemoryCommitTable;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.util.DummyCellIdImpl;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<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> java.util.concurrent.ExecutionException;
-<a class="jxr_linenumber" name="27" href="#27">27</a>
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.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.assertTrue;
-<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/omid/tso/client/TestMockTSOClient.html">TestMockTSOClient</a> {
+<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.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.InMemoryCommitTable;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.util.DummyCellIdImpl;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="26" href="#26">26</a>
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> java.util.HashSet;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.ExecutionException;
+<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.assertEquals;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
<a class="jxr_linenumber" name="33" href="#33">33</a>
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c1 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xdeadbeefL);
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c2 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(-0xfeedcafeL);
-<a class="jxr_linenumber" name="36" href="#36">36</a>
-<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> testConflicts() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="39" href="#39">39</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
-<a class="jxr_linenumber" name="40" href="#40">40</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());
-<a class="jxr_linenumber" name="41" href="#41">41</a>
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">long</strong> tr1 = client.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">long</strong> tr2 = client.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> client.commit(tr1, Sets.newHashSet(c1)).get();
+<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/tso/client/TestMockTSOClient.html">TestMockTSOClient</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">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c1 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(0xdeadbeefL);
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">public</strong> CellId c2 = <strong class="jxr_keyword">new</strong> DummyCellIdImpl(-0xfeedcafeL);
+<a class="jxr_linenumber" name="38" href="#38">38</a>
+<a class="jxr_linenumber" name="39" href="#39">39</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConflicts() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="41" href="#41">41</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
+<a class="jxr_linenumber" name="42" href="#42">42</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());
+<a class="jxr_linenumber" name="43" href="#43">43</a>
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">long</strong> tr1 = client.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">long</strong> tr2 = client.getNewStartTimestamp().get();
<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="48" href="#48">48</a> client.commit(tr2, Sets.newHashSet(c1, c2)).get();
-<a class="jxr_linenumber" name="49" href="#49">49</a> fail(<span class="jxr_string">"Shouldn't have committed"</span>);
-<a class="jxr_linenumber" name="50" href="#50">50</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
-<a class="jxr_linenumber" name="51" href="#51">51</a> assertEquals(ee.getCause().getClass(), AbortException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Should have aborted"</span>);
-<a class="jxr_linenumber" name="52" href="#52">52</a> }
-<a class="jxr_linenumber" name="53" href="#53">53</a> }
-<a class="jxr_linenumber" name="54" href="#54">54</a>
-<a class="jxr_linenumber" name="55" href="#55">55</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testWatermarkUpdate() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="57" href="#57">57</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
-<a class="jxr_linenumber" name="58" href="#58">58</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());
-<a class="jxr_linenumber" name="59" href="#59">59</a> CommitTable.Client commitTableClient = commitTable.getClient();
-<a class="jxr_linenumber" name="60" href="#60">60</a>
-<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">long</strong> tr1 = client.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="62" href="#62">62</a> client.commit(tr1, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">long</strong> initWatermark = commitTableClient.readLowWatermark().get();
+<a class="jxr_linenumber" name="47" href="#47">47</a> client.commit(tr1, Sets.newHashSet(c1), <strong class="jxr_keyword">new</strong> HashSet<CellId>()).get();
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="50" href="#50">50</a> client.commit(tr2, Sets.newHashSet(c1, c2), <strong class="jxr_keyword">new</strong> HashSet<CellId>()).get();
+<a class="jxr_linenumber" name="51" href="#51">51</a> fail(<span class="jxr_string">"Shouldn't have committed"</span>);
+<a class="jxr_linenumber" name="52" href="#52">52</a> } <strong class="jxr_keyword">catch</strong> (ExecutionException ee) {
+<a class="jxr_linenumber" name="53" href="#53">53</a> assertEquals(ee.getCause().getClass(), AbortException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Should have aborted"</span>);
+<a class="jxr_linenumber" name="54" href="#54">54</a> }
+<a class="jxr_linenumber" name="55" href="#55">55</a> }
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testWatermarkUpdate() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="59" href="#59">59</a> CommitTable commitTable = <strong class="jxr_keyword">new</strong> InMemoryCommitTable();
+<a class="jxr_linenumber" name="60" href="#60">60</a> TSOProtocol client = <strong class="jxr_keyword">new</strong> MockTSOClient(commitTable.getWriter());
+<a class="jxr_linenumber" name="61" href="#61">61</a> CommitTable.Client commitTableClient = commitTable.getClient();
+<a class="jxr_linenumber" name="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">long</strong> tr1 = client.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="64" href="#64">64</a> client.commit(tr1, Sets.newHashSet(c1), <strong class="jxr_keyword">new</strong> HashSet<CellId>()).get();
<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">long</strong> tr2 = client.getNewStartTimestamp().get();
-<a class="jxr_linenumber" name="67" href="#67">67</a> client.commit(tr2, Sets.newHashSet(c1)).get();
-<a class="jxr_linenumber" name="68" href="#68">68</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">long</strong> newWatermark = commitTableClient.readLowWatermark().get();
-<a class="jxr_linenumber" name="70" href="#70">70</a> assertTrue(newWatermark > initWatermark, <span class="jxr_string">"new low watermark should be bigger"</span>);
-<a class="jxr_linenumber" name="71" href="#71">71</a> }
-<a class="jxr_linenumber" name="72" href="#72">72</a> }
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">long</strong> initWatermark = commitTableClient.readLowWatermark().get();
+<a class="jxr_linenumber" name="67" href="#67">67</a>
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">long</strong> tr2 = client.getNewStartTimestamp().get();
+<a class="jxr_linenumber" name="69" href="#69">69</a> client.commit(tr2, Sets.newHashSet(c1), <strong class="jxr_keyword">new</strong> HashSet<CellId>()).get();
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">long</strong> newWatermark = commitTableClient.readLowWatermark().get();
+<a class="jxr_linenumber" name="72" href="#72">72</a> assertTrue(newWatermark > initWatermark, <span class="jxr_string">"new low watermark should be bigger"</span>);
+<a class="jxr_linenumber" name="73" href="#73">73</a> }
+<a class="jxr_linenumber" name="74" href="#74">74</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>