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/07/23 12:05:11 UTC
[27/34] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 7/23/18 3:04 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestCompaction.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestCompaction.html b/xref-test/org/apache/omid/transaction/TestCompaction.html
index 4e522e0..eeb18f9 100644
--- a/xref-test/org/apache/omid/transaction/TestCompaction.html
+++ b/xref-test/org/apache/omid/transaction/TestCompaction.html
@@ -121,7 +121,7 @@
<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setupTestCompation() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="112" href="#112">112</a> TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
<a class="jxr_linenumber" name="113" href="#113">113</a> tsoConfig.setPort(1234);
-<a class="jxr_linenumber" name="114" href="#114">114</a> tsoConfig.setMaxItems(1);
+<a class="jxr_linenumber" name="114" href="#114">114</a> tsoConfig.setConflictMapSize(1);
<a class="jxr_linenumber" name="115" href="#115">115</a> injector = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TSOForHBaseCompactorTestModule.html">TSOForHBaseCompactorTestModule</a>(tsoConfig));
<a class="jxr_linenumber" name="116" href="#116">116</a> hbaseConf = injector.getInstance(Configuration.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="117" href="#117">117</a> HBaseCommitTableConfig hBaseCommitTableConfig = injector.getInstance(HBaseCommitTableConfig.<strong class="jxr_keyword">class</strong>);
@@ -215,7 +215,7 @@
<a class="jxr_linenumber" name="205" href="#205">205</a> .build();
<a class="jxr_linenumber" name="206" href="#206">206</a> }
<a class="jxr_linenumber" name="207" href="#207">207</a>
-<a class="jxr_linenumber" name="208" href="#208">208</a> @Test
+<a class="jxr_linenumber" name="208" href="#208">208</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testStandardTXsWithShadowCellsAndWithSTBelowAndAboveLWMArePresevedAfterCompaction() <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="210" href="#210">210</a> String TEST_TABLE = <span class="jxr_string">"testStandardTXsWithShadowCellsAndWithSTBelowAndAboveLWMArePresevedAfterCompaction"</span>;
<a class="jxr_linenumber" name="211" href="#211">211</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -261,7 +261,7 @@
<a class="jxr_linenumber" name="251" href="#251">251</a> assertEquals(rowCount(TEST_TABLE, fam), ROWS_TO_ADD, <span class="jxr_string">"Rows in table after compacting should be "</span> + ROWS_TO_ADD);
<a class="jxr_linenumber" name="252" href="#252">252</a> }
<a class="jxr_linenumber" name="253" href="#253">253</a>
-<a class="jxr_linenumber" name="254" href="#254">254</a> @Test
+<a class="jxr_linenumber" name="254" href="#254">254</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTXWithoutShadowCellsAndWithSTBelowLWMGetsShadowCellHealedAfterCompaction() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="256" href="#256">256</a> String TEST_TABLE = <span class="jxr_string">"testTXWithoutShadowCellsAndWithSTBelowLWMGetsShadowCellHealedAfterCompaction"</span>;
<a class="jxr_linenumber" name="257" href="#257">257</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -320,7 +320,7 @@
<a class="jxr_linenumber" name="310" href="#310">310</a> <span class="jxr_string">"Shadow cell should not be there"</span>);
<a class="jxr_linenumber" name="311" href="#311">311</a> }
<a class="jxr_linenumber" name="312" href="#312">312</a>
-<a class="jxr_linenumber" name="313" href="#313">313</a> @Test
+<a class="jxr_linenumber" name="313" href="#313">313</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="314" href="#314">314</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNeverendingTXsWithSTBelowAndAboveLWMAreDiscardedAndPreservedRespectivelyAfterCompaction()
<a class="jxr_linenumber" name="315" href="#315">315</a> <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="316" href="#316">316</a> String
@@ -396,7 +396,7 @@
<a class="jxr_linenumber" name="386" href="#386">386</a>
<a class="jxr_linenumber" name="387" href="#387">387</a> }
<a class="jxr_linenumber" name="388" href="#388">388</a>
-<a class="jxr_linenumber" name="389" href="#389">389</a> @Test
+<a class="jxr_linenumber" name="389" href="#389">389</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="390" href="#390">390</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRowsUnalteredWhenCommitTableCannotBeReached() <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="391" href="#391">391</a> String TEST_TABLE = <span class="jxr_string">"testRowsUnalteredWhenCommitTableCannotBeReached"</span>;
<a class="jxr_linenumber" name="392" href="#392">392</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -449,7 +449,7 @@
<a class="jxr_linenumber" name="439" href="#439">439</a> <span class="jxr_string">"Shadow cell should not be there"</span>);
<a class="jxr_linenumber" name="440" href="#440">440</a> }
<a class="jxr_linenumber" name="441" href="#441">441</a>
-<a class="jxr_linenumber" name="442" href="#442">442</a> @Test
+<a class="jxr_linenumber" name="442" href="#442">442</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="443" href="#443">443</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOriginalTableParametersAreAvoidedAlsoWhenCompacting() <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="444" href="#444">444</a> String TEST_TABLE = <span class="jxr_string">"testOriginalTableParametersAreAvoidedAlsoWhenCompacting"</span>;
<a class="jxr_linenumber" name="445" href="#445">445</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -508,7 +508,7 @@
<a class="jxr_linenumber" name="498" href="#498">498</a> TimeUnit.SECONDS.sleep(2);
<a class="jxr_linenumber" name="499" href="#499">499</a> }
<a class="jxr_linenumber" name="500" href="#500">500</a>
-<a class="jxr_linenumber" name="501" href="#501">501</a> @Test
+<a class="jxr_linenumber" name="501" href="#501">501</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="502" href="#502">502</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testOldCellsAreDiscardedAfterCompaction() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="503" href="#503">503</a> String TEST_TABLE = <span class="jxr_string">"testOldCellsAreDiscardedAfterCompaction"</span>;
<a class="jxr_linenumber" name="504" href="#504">504</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -614,7 +614,7 @@
<a class="jxr_linenumber" name="604" href="#604">604</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="605" href="#605">605</a> <em class="jxr_javadoccomment"> * Tests a case where a temporary failure to flush causes the compactor to crash</em>
<a class="jxr_linenumber" name="606" href="#606">606</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="607" href="#607">607</a> @Test
+<a class="jxr_linenumber" name="607" href="#607">607</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="608" href="#608">608</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDuplicateDeletes() <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="609" href="#609">609</a> String TEST_TABLE = <span class="jxr_string">"testDuplicateDeletes"</span>;
<a class="jxr_linenumber" name="610" href="#610">610</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -721,7 +721,7 @@
<a class="jxr_linenumber" name="711" href="#711">711</a> <span class="jxr_string">"Cell should not be be there"</span>);
<a class="jxr_linenumber" name="712" href="#712">712</a> }
<a class="jxr_linenumber" name="713" href="#713">713</a>
-<a class="jxr_linenumber" name="714" href="#714">714</a> @Test(timeOut = 60000)
+<a class="jxr_linenumber" name="714" href="#714">714</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="715" href="#715">715</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNonOmidCFIsUntouched() <strong class="jxr_keyword">throws</strong> Throwable {
<a class="jxr_linenumber" name="716" href="#716">716</a> String TEST_TABLE = <span class="jxr_string">"testNonOmidCFIsUntouched"</span>;
<a class="jxr_linenumber" name="717" href="#717">717</a> createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestCompactorScanner.html b/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
index 95849fb..d05cae9 100644
--- a/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
+++ b/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
@@ -33,87 +33,86 @@
<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue.Type;
<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.coprocessor.ObserverContext;
<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.CompactorScanner;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.HRegion;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.InternalScanner;
-<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.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Client;
-<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.annotations.DataProvider;
-<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.Queue;
-<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> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
-<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.spy;
-<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.when;
-<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.assertEquals;
-<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.assertFalse;
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestCompactorScanner.html">TestCompactorScanner</a> {
-<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestCompactorScanner.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="48" href="#48">48</a>
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> TEST_TS = 1L;
-<a class="jxr_linenumber" name="50" href="#50">50</a>
-<a class="jxr_linenumber" name="51" href="#51">51</a> @DataProvider(name = <span class="jxr_string">"cell-retain-options"</span>)
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">public</strong> Object[][] createCellRetainOptions() {
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Object[][]{
-<a class="jxr_linenumber" name="54" href="#54">54</a> {1, <strong class="jxr_keyword">true</strong>}, {2, false},
-<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>
-<a class="jxr_linenumber" name="58" href="#58">58</a> @Test(dataProvider = <span class="jxr_string">"cell-retain-options"</span>)
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShouldRetainNonTransactionallyDeletedCellMethod(<strong class="jxr_keyword">int</strong> optionIdx, <strong class="jxr_keyword">boolean</strong> retainOption)
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_comment">// Create required mocks</em>
-<a class="jxr_linenumber" name="63" href="#63">63</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="64" href="#64">64</a> ObserverContext<RegionCoprocessorEnvironment> ctx = mock(ObserverContext.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="65" href="#65">65</a> InternalScanner internalScanner = mock(InternalScanner.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="66" href="#66">66</a> CommitTable.Client ctClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="67" href="#67">67</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="68" href="#68">68</a> Queue<Client> queue = mock(Queue.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="69" href="#69">69</a> RegionCoprocessorEnvironment rce = mock(RegionCoprocessorEnvironment.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="70" href="#70">70</a> HRegion hRegion = mock(HRegion.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="71" href="#71">71</a> HRegionInfo hRegionInfo = mock(HRegionInfo.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="72" href="#72">72</a> SettableFuture<Long> f = SettableFuture.create();
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_comment">// Wire required mock internals</em>
-<a class="jxr_linenumber" name="75" href="#75">75</a> f.set(TEST_TS);
-<a class="jxr_linenumber" name="76" href="#76">76</a> when(ctClient.readLowWatermark()).thenReturn(f);
-<a class="jxr_linenumber" name="77" href="#77">77</a> when(ctx.getEnvironment()).thenReturn(rce);
-<a class="jxr_linenumber" name="78" href="#78">78</a> when(rce.getRegion()).thenReturn(hRegion);
-<a class="jxr_linenumber" name="79" href="#79">79</a> when(hRegion.getRegionInfo()).thenReturn(hRegionInfo);
-<a class="jxr_linenumber" name="80" href="#80">80</a>
-<a class="jxr_linenumber" name="81" href="#81">81</a> LOG.info(<span class="jxr_string">"Testing when retain is {}"</span>, retainOption);
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">try</strong> (CompactorScanner scanner = spy(<strong class="jxr_keyword">new</strong> CompactorScanner(ctx,
-<a class="jxr_linenumber" name="83" href="#83">83</a> internalScanner,
-<a class="jxr_linenumber" name="84" href="#84">84</a> ctClient,
-<a class="jxr_linenumber" name="85" href="#85">85</a> queue,
-<a class="jxr_linenumber" name="86" href="#86">86</a> false,
-<a class="jxr_linenumber" name="87" href="#87">87</a> retainOption))) {
-<a class="jxr_linenumber" name="88" href="#88">88</a>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// Different cell types to test</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> KeyValue regularKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.Put);
-<a class="jxr_linenumber" name="91" href="#91">91</a> KeyValue deleteKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.Delete);
-<a class="jxr_linenumber" name="92" href="#92">92</a> KeyValue deleteColumnKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteColumn);
-<a class="jxr_linenumber" name="93" href="#93">93</a> KeyValue deleteFamilyKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteFamily);
-<a class="jxr_linenumber" name="94" href="#94">94</a> KeyValue deleteFamilyVersionKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteFamilyVersion);
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> assertFalse(scanner.shouldRetainNonTransactionallyDeletedCell(regularKV));
-<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteKV), retainOption);
-<a class="jxr_linenumber" name="98" href="#98">98</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteColumnKV), retainOption);
-<a class="jxr_linenumber" name="99" href="#99">99</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyKV), retainOption);
-<a class="jxr_linenumber" name="100" href="#100">100</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyVersionKV), retainOption);
-<a class="jxr_linenumber" name="101" href="#101">101</a>
-<a class="jxr_linenumber" name="102" href="#102">102</a> }
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> }
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.HRegion;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.InternalScanner;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Client;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.DataProvider;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="35" href="#35">35</a>
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> java.util.Queue;
+<a class="jxr_linenumber" name="37" href="#37">37</a>
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.mock;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.Mockito.spy;
+<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.when;
+<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>
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestCompactorScanner.html">TestCompactorScanner</a> {
+<a class="jxr_linenumber" name="45" href="#45">45</a>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestCompactorScanner.<strong class="jxr_keyword">class</strong>);
+<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> <strong class="jxr_keyword">long</strong> TEST_TS = 1L;
+<a class="jxr_linenumber" name="49" href="#49">49</a>
+<a class="jxr_linenumber" name="50" href="#50">50</a> @DataProvider(name = <span class="jxr_string">"cell-retain-options"</span>)
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">public</strong> Object[][] createCellRetainOptions() {
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Object[][]{
+<a class="jxr_linenumber" name="53" href="#53">53</a> {1, <strong class="jxr_keyword">true</strong>}, {2, false},
+<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(dataProvider = <span class="jxr_string">"cell-retain-options"</span>, timeOut = 60_000)
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShouldRetainNonTransactionallyDeletedCellMethod(<strong class="jxr_keyword">int</strong> optionIdx, <strong class="jxr_keyword">boolean</strong> retainOption)
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="60" href="#60">60</a>
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_comment">// Create required mocks</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="63" href="#63">63</a> ObserverContext<RegionCoprocessorEnvironment> ctx = mock(ObserverContext.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="64" href="#64">64</a> InternalScanner internalScanner = mock(InternalScanner.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="65" href="#65">65</a> CommitTable.Client ctClient = mock(CommitTable.Client.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="66" href="#66">66</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
+<a class="jxr_linenumber" name="67" href="#67">67</a> Queue<Client> queue = mock(Queue.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="68" href="#68">68</a> RegionCoprocessorEnvironment rce = mock(RegionCoprocessorEnvironment.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="69" href="#69">69</a> HRegion hRegion = mock(HRegion.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="70" href="#70">70</a> HRegionInfo hRegionInfo = mock(HRegionInfo.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="71" href="#71">71</a> SettableFuture<Long> f = SettableFuture.create();
+<a class="jxr_linenumber" name="72" href="#72">72</a>
+<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_comment">// Wire required mock internals</em>
+<a class="jxr_linenumber" name="74" href="#74">74</a> f.set(TEST_TS);
+<a class="jxr_linenumber" name="75" href="#75">75</a> when(ctClient.readLowWatermark()).thenReturn(f);
+<a class="jxr_linenumber" name="76" href="#76">76</a> when(ctx.getEnvironment()).thenReturn(rce);
+<a class="jxr_linenumber" name="77" href="#77">77</a> when(rce.getRegion()).thenReturn(hRegion);
+<a class="jxr_linenumber" name="78" href="#78">78</a> when(hRegion.getRegionInfo()).thenReturn(hRegionInfo);
+<a class="jxr_linenumber" name="79" href="#79">79</a>
+<a class="jxr_linenumber" name="80" href="#80">80</a> LOG.info(<span class="jxr_string">"Testing when retain is {}"</span>, retainOption);
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">try</strong> (CompactorScanner scanner = spy(<strong class="jxr_keyword">new</strong> CompactorScanner(ctx,
+<a class="jxr_linenumber" name="82" href="#82">82</a> internalScanner,
+<a class="jxr_linenumber" name="83" href="#83">83</a> ctClient,
+<a class="jxr_linenumber" name="84" href="#84">84</a> queue,
+<a class="jxr_linenumber" name="85" href="#85">85</a> false,
+<a class="jxr_linenumber" name="86" href="#86">86</a> retainOption))) {
+<a class="jxr_linenumber" name="87" href="#87">87</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// Different cell types to test</em>
+<a class="jxr_linenumber" name="89" href="#89">89</a> KeyValue regularKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.Put);
+<a class="jxr_linenumber" name="90" href="#90">90</a> KeyValue deleteKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.Delete);
+<a class="jxr_linenumber" name="91" href="#91">91</a> KeyValue deleteColumnKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteColumn);
+<a class="jxr_linenumber" name="92" href="#92">92</a> KeyValue deleteFamilyKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteFamily);
+<a class="jxr_linenumber" name="93" href="#93">93</a> KeyValue deleteFamilyVersionKV = <strong class="jxr_keyword">new</strong> KeyValue(Bytes.toBytes(<span class="jxr_string">"test-row"</span>), TEST_TS, Type.DeleteFamilyVersion);
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> assertFalse(scanner.shouldRetainNonTransactionallyDeletedCell(regularKV));
+<a class="jxr_linenumber" name="96" href="#96">96</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteKV), retainOption);
+<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteColumnKV), retainOption);
+<a class="jxr_linenumber" name="98" href="#98">98</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyKV), retainOption);
+<a class="jxr_linenumber" name="99" href="#99">99</a> assertEquals(scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyVersionKV), retainOption);
+<a class="jxr_linenumber" name="100" href="#100">100</a>
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a>
+<a class="jxr_linenumber" name="103" href="#103">103</a> }
+<a class="jxr_linenumber" name="104" href="#104">104</a>
+<a class="jxr_linenumber" name="105" href="#105">105</a> }
</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/dc01c0be/xref-test/org/apache/omid/transaction/TestDeletion.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestDeletion.html b/xref-test/org/apache/omid/transaction/TestDeletion.html
index 2bbbf3c..86c3811 100644
--- a/xref-test/org/apache/omid/transaction/TestDeletion.html
+++ b/xref-test/org/apache/omid/transaction/TestDeletion.html
@@ -71,7 +71,7 @@
<a class="jxr_linenumber" name="61" href="#61">61</a>
<a class="jxr_linenumber" name="62" href="#62">62</a> }
<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> @Test
+<a class="jxr_linenumber" name="64" href="#64">64</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="66" href="#66">66</a>
<a class="jxr_linenumber" name="67" href="#67">67</a> TransactionManager tm = newTransactionManager(context);
@@ -108,7 +108,7 @@
<a class="jxr_linenumber" name="98" href="#98">98</a>
<a class="jxr_linenumber" name="99" href="#99">99</a> }
<a class="jxr_linenumber" name="100" href="#100">100</a>
-<a class="jxr_linenumber" name="101" href="#101">101</a> @Test
+<a class="jxr_linenumber" name="101" href="#101">101</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteColumn(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="103" href="#103">103</a>
<a class="jxr_linenumber" name="104" href="#104">104</a> TransactionManager tm = newTransactionManager(context);
@@ -149,7 +149,7 @@
<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_javadoccomment"> * This test is very similar to #runTestDeleteColumn() but exercises Delete#deleteColumns()</em>
<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> @Test
+<a class="jxr_linenumber" name="142" href="#142">142</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteColumns(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="144" href="#144">144</a>
<a class="jxr_linenumber" name="145" href="#145">145</a> TransactionManager tm = newTransactionManager(context);
@@ -188,7 +188,7 @@
<a class="jxr_linenumber" name="178" href="#178">178</a>
<a class="jxr_linenumber" name="179" href="#179">179</a> }
<a class="jxr_linenumber" name="180" href="#180">180</a>
-<a class="jxr_linenumber" name="181" href="#181">181</a> @Test
+<a class="jxr_linenumber" name="181" href="#181">181</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="182" href="#182">182</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="183" href="#183">183</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="184" href="#184">184</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -223,7 +223,7 @@
<a class="jxr_linenumber" name="213" href="#213">213</a>
<a class="jxr_linenumber" name="214" href="#214">214</a> }
<a class="jxr_linenumber" name="215" href="#215">215</a>
-<a class="jxr_linenumber" name="216" href="#216">216</a> @Test
+<a class="jxr_linenumber" name="216" href="#216">216</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDeletionOfNonExistingColumnFamilyDoesNotWriteToHBase(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="218" href="#218">218</a>
<a class="jxr_linenumber" name="219" href="#219">219</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html b/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
index d412270..b69abfe 100644
--- a/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
+++ b/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
@@ -125,7 +125,7 @@
<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_comment">// Configure TSO 1</em>
<a class="jxr_linenumber" name="116" href="#116">116</a> TSOServerConfig config1 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
<a class="jxr_linenumber" name="117" href="#117">117</a> config1.setPort(TSO1_PORT);
-<a class="jxr_linenumber" name="118" href="#118">118</a> config1.setMaxItems(1000);
+<a class="jxr_linenumber" name="118" href="#118">118</a> config1.setConflictMapSize(1000);
<a class="jxr_linenumber" name="119" href="#119">119</a> config1.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
<a class="jxr_linenumber" name="120" href="#120">120</a> Injector injector1 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config1));
<a class="jxr_linenumber" name="121" href="#121">121</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 1 ====================="</span>);
@@ -138,7 +138,7 @@
<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// Configure TSO 2</em>
<a class="jxr_linenumber" name="129" href="#129">129</a> TSOServerConfig config2 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
<a class="jxr_linenumber" name="130" href="#130">130</a> config2.setPort(TSO2_PORT);
-<a class="jxr_linenumber" name="131" href="#131">131</a> config2.setMaxItems(1000);
+<a class="jxr_linenumber" name="131" href="#131">131</a> config2.setConflictMapSize(1000);
<a class="jxr_linenumber" name="132" href="#132">132</a> config2.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
<a class="jxr_linenumber" name="133" href="#133">133</a> Injector injector2 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config2));
<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 2 ====================="</span>);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html b/xref-test/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html
index f55cbf0..81d5d6c 100644
--- a/xref-test/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html
+++ b/xref-test/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html
@@ -32,7 +32,7 @@
<a class="jxr_linenumber" name="22" href="#22">22</a>
<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestHBaseOmidClientConfiguration.html">TestHBaseOmidClientConfiguration</a> {
<a class="jxr_linenumber" name="24" href="#24">24</a>
-<a class="jxr_linenumber" name="25" href="#25">25</a> @Test
+<a class="jxr_linenumber" name="25" href="#25">25</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testYamlReading() {
<a class="jxr_linenumber" name="27" href="#27">27</a> HBaseOmidClientConfiguration configuration = <strong class="jxr_keyword">new</strong> HBaseOmidClientConfiguration();
<a class="jxr_linenumber" name="28" href="#28">28</a> Assert.assertNotNull(configuration.getCommitTableName());
@@ -41,7 +41,7 @@
<a class="jxr_linenumber" name="31" href="#31">31</a> Assert.assertNotNull(configuration.getOmidClientConfiguration());
<a class="jxr_linenumber" name="32" href="#32">32</a> }
<a class="jxr_linenumber" name="33" href="#33">33</a>
-<a class="jxr_linenumber" name="34" href="#34">34</a> @Test
+<a class="jxr_linenumber" name="34" href="#34">34</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testYamlReadingFromFile() {
<a class="jxr_linenumber" name="36" href="#36">36</a> HBaseOmidClientConfiguration configuration = <strong class="jxr_keyword">new</strong> HBaseOmidClientConfiguration(<span class="jxr_string">"/test-hbase-omid-client-config.yml"</span>);
<a class="jxr_linenumber" name="37" href="#37">37</a> Assert.assertNotNull(configuration.getCommitTableName());
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestReadPath.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestReadPath.html b/xref-test/org/apache/omid/transaction/TestReadPath.html
index cfc72d8..ab3049b 100644
--- a/xref-test/org/apache/omid/transaction/TestReadPath.html
+++ b/xref-test/org/apache/omid/transaction/TestReadPath.html
@@ -53,7 +53,7 @@
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">final</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"data"</span>);
<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[] uncommitted = Bytes.toBytes(<span class="jxr_string">"uncommitted"</span>);
<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> @Test
+<a class="jxr_linenumber" name="46" href="#46">46</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadInterleaved(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="48" href="#48">48</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="49" href="#49">49</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -72,7 +72,7 @@
<a class="jxr_linenumber" name="62" href="#62">62</a> assertFalse(result.containsColumn(family, col), <span class="jxr_string">"Should be unable to read column"</span>);
<a class="jxr_linenumber" name="63" href="#63">63</a> }
<a class="jxr_linenumber" name="64" href="#64">64</a>
-<a class="jxr_linenumber" name="65" href="#65">65</a> @Test
+<a class="jxr_linenumber" name="65" href="#65">65</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadWithSeveralUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="67" href="#67">67</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="68" href="#68">68</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestShadowCells.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestShadowCells.html b/xref-test/org/apache/omid/transaction/TestShadowCells.html
index 4e2b9e9..7a88640 100644
--- a/xref-test/org/apache/omid/transaction/TestShadowCells.html
+++ b/xref-test/org/apache/omid/transaction/TestShadowCells.html
@@ -408,7 +408,7 @@
<a class="jxr_linenumber" name="398" href="#398">398</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="399" href="#399">399</a> <em class="jxr_javadoccomment"> * Test that the new client can read shadow cells written by the old client.</em>
<a class="jxr_linenumber" name="400" href="#400">400</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="401" href="#401">401</a> @Test
+<a class="jxr_linenumber" name="401" href="#401">401</a> @Test(timeOut = 60_000)
<a class="jxr_linenumber" name="402" href="#402">402</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetOldShadowCells(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="403" href="#403">403</a>
<a class="jxr_linenumber" name="404" href="#404">404</a> TransactionManager tm = newTransactionManager(context);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
index 0bb926e..61676e6 100644
--- a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
+++ b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
@@ -44,7 +44,7 @@
<a class="jxr_linenumber" name="34" href="#34">34</a>
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestSingleColumnFamily.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> @Test
+<a class="jxr_linenumber" name="37" href="#37">37</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSingleColumnFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="39" href="#39">39</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table1 = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestTSOModule.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTSOModule.html b/xref-test/org/apache/omid/transaction/TestTSOModule.html
index 887af6b..f9c82a1 100644
--- a/xref-test/org/apache/omid/transaction/TestTSOModule.html
+++ b/xref-test/org/apache/omid/transaction/TestTSOModule.html
@@ -86,7 +86,7 @@
<a class="jxr_linenumber" name="76" href="#76">76</a> install(<strong class="jxr_keyword">new</strong> BatchPoolModule(config));
<a class="jxr_linenumber" name="77" href="#77">77</a>
<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_comment">// Disruptor setup</em>
-<a class="jxr_linenumber" name="79" href="#79">79</a> install(<strong class="jxr_keyword">new</strong> DisruptorModule());
+<a class="jxr_linenumber" name="79" href="#79">79</a> install(<strong class="jxr_keyword">new</strong> DisruptorModule(config));
<a class="jxr_linenumber" name="80" href="#80">80</a>
<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_comment">// LeaseManagement setup</em>
<a class="jxr_linenumber" name="82" href="#82">82</a> install(config.getLeaseModule());
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
index 9df2f1c..e88f3f8 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
@@ -66,7 +66,7 @@
<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// lacks some assertions and includes some magic numbers, so we should</em>
<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// try to review and improve the tests in these two classes in a further</em>
<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_comment">// commit.</em>
-<a class="jxr_linenumber" name="59" href="#59">59</a> @Test
+<a class="jxr_linenumber" name="59" href="#59">59</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="61" href="#61">61</a>
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWS_MODIFIED = 1;
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/dc01c0be/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
index ea5d14e..4a11a91 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="42" href="#42">42</a>
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionConflict.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Test
+<a class="jxr_linenumber" name="45" href="#45">45</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="47" href="#47">47</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="48" href="#48">48</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -86,7 +86,7 @@
<a class="jxr_linenumber" name="76" href="#76">76</a> }
<a class="jxr_linenumber" name="77" href="#77">77</a> }
<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> @Test
+<a class="jxr_linenumber" name="79" href="#79">79</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestMultiTableConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="81" href="#81">81</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="82" href="#82">82</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -157,7 +157,7 @@
<a class="jxr_linenumber" name="147" href="#147">147</a> assertEquals(count, 1, <span class="jxr_string">"Should have cell"</span>);
<a class="jxr_linenumber" name="148" href="#148">148</a> }
<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> @Test
+<a class="jxr_linenumber" name="150" href="#150">150</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestCleanupAfterConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="152" href="#152">152</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="153" href="#153">153</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -213,7 +213,7 @@
<a class="jxr_linenumber" name="203" href="#203">203</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
<a class="jxr_linenumber" name="204" href="#204">204</a> }
<a class="jxr_linenumber" name="205" href="#205">205</a>
-<a class="jxr_linenumber" name="206" href="#206">206</a> @Test
+<a class="jxr_linenumber" name="206" href="#206">206</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanupWithDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="208" href="#208">208</a>
<a class="jxr_linenumber" name="209" href="#209">209</a> TransactionManager tm = newTransactionManager(context);
@@ -284,7 +284,7 @@
<a class="jxr_linenumber" name="274" href="#274">274</a>
<a class="jxr_linenumber" name="275" href="#275">275</a> }
<a class="jxr_linenumber" name="276" href="#276">276</a>
-<a class="jxr_linenumber" name="277" href="#277">277</a> @Test
+<a class="jxr_linenumber" name="277" href="#277">277</a> @Test(timeOut = 10_000)
<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleCellChangesOnSameRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="279" href="#279">279</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="280" href="#280">280</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);