You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/07/01 22:49:47 UTC
[18/23] incubator-omid-site git commit: [wagon-git] commit to branch
asf-site 7/1/16 3:49 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html b/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
index 8c81606..2a93287 100644
--- a/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
+++ b/xref-test/org/apache/omid/timestamp/storage/TestZKTimestampStorage.html
@@ -99,11 +99,11 @@
<a class="jxr_linenumber" name="89" href="#89">89</a>
<a class="jxr_linenumber" name="90" href="#90">90</a> LOG.info(<span class="jxr_string">"Creating Internal Zookeeper Client connected to {}"</span>, ZK_CLUSTER);
<a class="jxr_linenumber" name="91" href="#91">91</a> storageInternalZKClient = Mockito.spy(CuratorFrameworkFactory.builder()
-<a class="jxr_linenumber" name="92" href="#92">92</a> .namespace(<span class="jxr_string">"omid"</span>)
-<a class="jxr_linenumber" name="93" href="#93">93</a> .connectString(ZK_CLUSTER)
-<a class="jxr_linenumber" name="94" href="#94">94</a> .retryPolicy(retryPolicy)
-<a class="jxr_linenumber" name="95" href="#95">95</a> .connectionTimeoutMs(10) <em class="jxr_comment">// Low timeout for tests</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> .build());
+<a class="jxr_linenumber" name="92" href="#92">92</a> .namespace(<span class="jxr_string">"omid"</span>)
+<a class="jxr_linenumber" name="93" href="#93">93</a> .connectString(ZK_CLUSTER)
+<a class="jxr_linenumber" name="94" href="#94">94</a> .retryPolicy(retryPolicy)
+<a class="jxr_linenumber" name="95" href="#95">95</a> .connectionTimeoutMs(10) <em class="jxr_comment">// Low timeout for tests</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> .build());
<a class="jxr_linenumber" name="97" href="#97">97</a> storageInternalZKClient.start();
<a class="jxr_linenumber" name="98" href="#98">98</a> storageInternalZKClient.blockUntilConnected();
<a class="jxr_linenumber" name="99" href="#99">99</a>
@@ -127,7 +127,7 @@
<a class="jxr_linenumber" name="117" href="#117">117</a>
<a class="jxr_linenumber" name="118" href="#118">118</a> }
<a class="jxr_linenumber" name="119" href="#119">119</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="120" href="#120">120</a> @Test
<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBasicFunctionality() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="122" href="#122">122</a>
<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// Check ZNode for timestamp exists (storage instantiation should create it)</em>
@@ -197,7 +197,7 @@
<a class="jxr_linenumber" name="187" href="#187">187</a> assertEquals(zNodeStats.getVersion(), ITERATION_COUNT);
<a class="jxr_linenumber" name="188" href="#188">188</a> }
<a class="jxr_linenumber" name="189" href="#189">189</a>
-<a class="jxr_linenumber" name="190" href="#190">190</a> @Test(timeOut = 20_000)
+<a class="jxr_linenumber" name="190" href="#190">190</a> @Test
<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testZkClientWhenZKIsDownAndRestarts() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="192" href="#192">192</a>
<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment">// Iterate updating the timestamp and check the final value</em>
@@ -227,7 +227,7 @@
<a class="jxr_linenumber" name="217" href="#217">217</a>
<a class="jxr_linenumber" name="218" href="#218">218</a> }
<a class="jxr_linenumber" name="219" href="#219">219</a>
-<a class="jxr_linenumber" name="220" href="#220">220</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="220" href="#220">220</a> @Test
<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testZkClientLosingSession() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="222" href="#222">222</a>
<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// Cut the session in the server through the client</em>
@@ -248,8 +248,7 @@
<a class="jxr_linenumber" name="238" href="#238">238</a> assertEquals(storage.getMaxTimestamp(), 1_000_000 * ITERATION_COUNT);
<a class="jxr_linenumber" name="239" href="#239">239</a>
<a class="jxr_linenumber" name="240" href="#240">240</a> }
-<a class="jxr_linenumber" name="241" href="#241">241</a>
-<a class="jxr_linenumber" name="242" href="#242">242</a> }
+<a class="jxr_linenumber" name="241" href="#241">241</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/49fbc5e7/xref-test/org/apache/omid/timestamp/storage/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/package-frame.html b/xref-test/org/apache/omid/timestamp/storage/package-frame.html
index 1ef4528..df50124 100644
--- a/xref-test/org/apache/omid/timestamp/storage/package-frame.html
+++ b/xref-test/org/apache/omid/timestamp/storage/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.timestamp.storage</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/timestamp/storage/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/timestamp/storage/package-summary.html b/xref-test/org/apache/omid/timestamp/storage/package-summary.html
index 0c4037c..35cb348 100644
--- a/xref-test/org/apache/omid/timestamp/storage/package-summary.html
+++ b/xref-test/org/apache/omid/timestamp/storage/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.timestamp.storage</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.timestamp.storage</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tools/hbase/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tools/hbase/package-frame.html b/xref-test/org/apache/omid/tools/hbase/package-frame.html
index 87e8aff..d11a290 100644
--- a/xref-test/org/apache/omid/tools/hbase/package-frame.html
+++ b/xref-test/org/apache/omid/tools/hbase/package-frame.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.tools.hbase</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.tools.hbase</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tools/hbase/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tools/hbase/package-summary.html b/xref-test/org/apache/omid/tools/hbase/package-summary.html
index d04e395..413f20d 100644
--- a/xref-test/org/apache/omid/tools/hbase/package-summary.html
+++ b/xref-test/org/apache/omid/tools/hbase/package-summary.html
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Omid 0.8.2.9-SNAPSHOT Reference Package org.apache.omid.tools.hbase</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.tools.hbase</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/OmidTestBase.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/OmidTestBase.html b/xref-test/org/apache/omid/transaction/OmidTestBase.html
index 4567a05..f46479e 100644
--- a/xref-test/org/apache/omid/transaction/OmidTestBase.html
+++ b/xref-test/org/apache/omid/transaction/OmidTestBase.html
@@ -92,7 +92,7 @@
<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// TSO Setup</em>
<a class="jxr_linenumber" name="83" href="#83">83</a> TSOServerConfig tsoConfig = <strong class="jxr_keyword">new</strong> TSOServerConfig();
<a class="jxr_linenumber" name="84" href="#84">84</a> tsoConfig.setPort(1234);
-<a class="jxr_linenumber" name="85" href="#85">85</a> tsoConfig.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="85" href="#85">85</a> tsoConfig.setMaxItems(1000);
<a class="jxr_linenumber" name="86" href="#86">86</a> Injector injector = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/tso/TSOMockModule.html">TSOMockModule</a>(tsoConfig));
<a class="jxr_linenumber" name="87" href="#87">87</a> LOG.info(<span class="jxr_string">"Starting TSO"</span>);
<a class="jxr_linenumber" name="88" href="#88">88</a> TSOServer tso = injector.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestAutoFlush.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestAutoFlush.html b/xref-test/org/apache/omid/transaction/TestAutoFlush.html
index c8c7961..5c39836 100644
--- a/xref-test/org/apache/omid/transaction/TestAutoFlush.html
+++ b/xref-test/org/apache/omid/transaction/TestAutoFlush.html
@@ -39,7 +39,7 @@
<a class="jxr_linenumber" name="29" href="#29">29</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestAutoFlush.html">TestAutoFlush</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
<a class="jxr_linenumber" name="31" href="#31">31</a>
-<a class="jxr_linenumber" name="32" href="#32">32</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="32" href="#32">32</a> @Test
<a class="jxr_linenumber" name="33" href="#33">33</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="34" href="#34">34</a>
<a class="jxr_linenumber" name="35" href="#35">35</a> byte[] family = Bytes.toBytes(TEST_FAMILY);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html b/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
index 9692d9e..c507375 100644
--- a/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
+++ b/xref-test/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.html
@@ -86,7 +86,7 @@
<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> byte[] dataValue3 = Bytes.toBytes(30);
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="79" href="#79">79</a> @Test
<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIPreventsPredicateManyPrecedersForReadPredicates(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_comment">// TX History for PMP for Read Predicate:</em>
<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -127,7 +127,7 @@
<a class="jxr_linenumber" name="117" href="#117">117</a> tm.commit(tx1);
<a class="jxr_linenumber" name="118" href="#118">118</a> }
<a class="jxr_linenumber" name="119" href="#119">119</a>
-<a class="jxr_linenumber" name="120" href="#120">120</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="120" href="#120">120</a> @Test
<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIPreventsPredicateManyPrecedersForWritePredicates(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// TX History for PMP for Write Predicate:</em>
<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -194,7 +194,7 @@
<a class="jxr_linenumber" name="184" href="#184">184</a>
<a class="jxr_linenumber" name="185" href="#185">185</a> }
<a class="jxr_linenumber" name="186" href="#186">186</a>
-<a class="jxr_linenumber" name="187" href="#187">187</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="187" href="#187">187</a> @Test
<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIPreventsLostUpdates(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment">// TX History for P4:</em>
<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -268,7 +268,7 @@
<a class="jxr_linenumber" name="258" href="#258">258</a>
<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> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="261" href="#261">261</a> @Test
<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIPreventsReadSkew(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="263" href="#263">263</a> <em class="jxr_comment">// TX History for G-single:</em>
<a class="jxr_linenumber" name="264" href="#264">264</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -369,7 +369,7 @@
<a class="jxr_linenumber" name="359" href="#359">359</a>
<a class="jxr_linenumber" name="360" href="#360">360</a> }
<a class="jxr_linenumber" name="361" href="#361">361</a>
-<a class="jxr_linenumber" name="362" href="#362">362</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="362" href="#362">362</a> @Test
<a class="jxr_linenumber" name="363" href="#363">363</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIPreventsReadSkewUsingWritePredicate(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">// TX History for G-single:</em>
<a class="jxr_linenumber" name="365" href="#365">365</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -431,7 +431,7 @@
<a class="jxr_linenumber" name="421" href="#421">421</a> }
<a class="jxr_linenumber" name="422" href="#422">422</a>
<a class="jxr_linenumber" name="423" href="#423">423</a> <em class="jxr_comment">// this test shows that Omid does not provide serilizable level of isolation other wise last commit would have failed</em>
-<a class="jxr_linenumber" name="424" href="#424">424</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="424" href="#424">424</a> @Test
<a class="jxr_linenumber" name="425" href="#425">425</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIDoesNotPreventWriteSkew(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="426" href="#426">426</a> <em class="jxr_comment">// TX History for G2-item:</em>
<a class="jxr_linenumber" name="427" href="#427">427</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
@@ -518,7 +518,7 @@
<a class="jxr_linenumber" name="508" href="#508">508</a> }
<a class="jxr_linenumber" name="509" href="#509">509</a>
<a class="jxr_linenumber" name="510" href="#510">510</a> <em class="jxr_comment">// this test shows that Omid does not provide serilizable level of isolation other wise last commit would have failed</em>
-<a class="jxr_linenumber" name="511" href="#511">511</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="511" href="#511">511</a> @Test
<a class="jxr_linenumber" name="512" href="#512">512</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSIDoesNotPreventAntiDependencyCycles(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="513" href="#513">513</a> <em class="jxr_comment">// TX History for G2:</em>
<a class="jxr_linenumber" name="514" href="#514">514</a> <em class="jxr_comment">// begin; set transaction isolation level repeatable read; -- T1</em>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestCellUtils.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestCellUtils.html b/xref-test/org/apache/omid/transaction/TestCellUtils.html
index a0cb870..31bcc71 100644
--- a/xref-test/org/apache/omid/transaction/TestCellUtils.html
+++ b/xref-test/org/apache/omid/transaction/TestCellUtils.html
@@ -62,7 +62,7 @@
<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(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>, timeOut = 10_000)
+<a class="jxr_linenumber" name="55" href="#55">55</a> @Test(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>)
<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellQualifiers(byte[] shadowCellSuffixToTest) <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="57" href="#57">57</a>
<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">final</strong> byte[] validShadowCellQualifier =
@@ -72,171 +72,172 @@
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">final</strong> byte[] doubleEndedValidShadowCellQualifier =
<a class="jxr_linenumber" name="63" href="#63">63</a> com.google.common.primitives.Bytes.concat(validShadowCellQualifier, shadowCellSuffixToTest);
<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">final</strong> byte[] interleavedValidShadowCellQualifier =
-<a class="jxr_linenumber" name="65" href="#65">65</a> com.google.common.primitives.Bytes.concat(validShadowCellQualifier, com.google.common.primitives.Bytes
-<a class="jxr_linenumber" name="66" href="#66">66</a> .concat(validShadowCellQualifier, validShadowCellQualifier));
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">final</strong> byte[] value = Bytes.toBytes(<span class="jxr_string">"test-value"</span>);
-<a class="jxr_linenumber" name="68" href="#68">68</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_comment">// Test the qualifier passed is a shadow cell</em>
-<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_comment">// qualifier because it contains only one suffix</em>
-<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_comment">// and is placed at the end of the qualifier:</em>
-<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// qual_nameSUFFIX</em>
-<a class="jxr_linenumber" name="73" href="#73">73</a> KeyValue kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier, value);
-<a class="jxr_linenumber" name="74" href="#74">74</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
-<a class="jxr_linenumber" name="75" href="#75">75</a>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
-<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_comment">// SUFFIXqual_nameSUFFIX</em>
-<a class="jxr_linenumber" name="78" href="#78">78</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, sandwichValidShadowCellQualifier, value);
-<a class="jxr_linenumber" name="79" href="#79">79</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
-<a class="jxr_linenumber" name="80" href="#80">80</a>
-<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
-<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// qual_nameSUFFIXSUFFIX</em>
-<a class="jxr_linenumber" name="83" href="#83">83</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, doubleEndedValidShadowCellQualifier, value);
-<a class="jxr_linenumber" name="84" href="#84">84</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
-<a class="jxr_linenumber" name="85" href="#85">85</a>
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_comment">// qual_nameSUFFIXqual_nameSUFFIXqual_nameSUFFIX</em>
-<a class="jxr_linenumber" name="88" href="#88">88</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, interleavedValidShadowCellQualifier, value);
-<a class="jxr_linenumber" name="89" href="#89">89</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
-<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_comment">// Test the qualifier passed is not a shadow cell</em>
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// qualifier if there's nothing else apart from the suffix</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, shadowCellSuffixToTest, value);
-<a class="jxr_linenumber" name="94" href="#94">94</a> assertFalse(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should not include a valid shadowCell identifier"</span>);
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> }
-<a class="jxr_linenumber" name="97" href="#97">97</a>
-<a class="jxr_linenumber" name="98" href="#98">98</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCorrectMapingOfCellsToShadowCells() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_comment">// Create the required data</em>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">final</strong> byte[] validShadowCellQualifier =
-<a class="jxr_linenumber" name="102" href="#102">102</a> com.google.common.primitives.Bytes.concat(qualifier, SHADOW_CELL_SUFFIX);
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">final</strong> byte[] qualifier2 = Bytes.toBytes(<span class="jxr_string">"test-qual2"</span>);
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">final</strong> byte[] validShadowCellQualifier2 =
-<a class="jxr_linenumber" name="106" href="#106">106</a> com.google.common.primitives.Bytes.concat(qualifier2, SHADOW_CELL_SUFFIX);
-<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">final</strong> byte[] qualifier3 = Bytes.toBytes(<span class="jxr_string">"test-qual3"</span>);
-<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> Cell cell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>)); <em class="jxr_comment">// Default type is Put</em>
-<a class="jxr_linenumber" name="111" href="#111">111</a> Cell dupCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>)); <em class="jxr_comment">// Default type is Put</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a> Cell dupCell1WithAnotherValue = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"other-value"</span>));
-<a class="jxr_linenumber" name="113" href="#113">113</a> Cell delCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Type.Delete, Bytes.toBytes(<span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="114" href="#114">114</a> Cell shadowCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier, 1, Bytes.toBytes(<span class="jxr_string">"sc-value"</span>));
-<a class="jxr_linenumber" name="115" href="#115">115</a>
-<a class="jxr_linenumber" name="116" href="#116">116</a> Cell cell2 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier2, 1, Bytes.toBytes(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="117" href="#117">117</a> Cell shadowCell2 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier2, 1, Bytes.toBytes(<span class="jxr_string">"sc-value2"</span>));
-<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> Cell cell3 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier3, 1, Bytes.toBytes(<span class="jxr_string">"value3"</span>));
-<a class="jxr_linenumber" name="120" href="#120">120</a>
-<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_comment">// Check a list of cells with duplicate values</em>
-<a class="jxr_linenumber" name="122" href="#122">122</a> List<Cell> badListWithDups = <strong class="jxr_keyword">new</strong> ArrayList<>();
-<a class="jxr_linenumber" name="123" href="#123">123</a> badListWithDups.add(cell1);
-<a class="jxr_linenumber" name="124" href="#124">124</a> badListWithDups.add(dupCell1WithAnotherValue);
-<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// Check dup shadow cell with same MVCC is ignored</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> SortedMap<Cell, Optional<Cell>> cellsToShadowCells = CellUtils.mapCellsToShadowCells(badListWithDups);
-<a class="jxr_linenumber" name="128" href="#128">128</a> assertEquals(cellsToShadowCells.size(), 1, <span class="jxr_string">"There should be only 1 key-value maps"</span>);
-<a class="jxr_linenumber" name="129" href="#129">129</a> assertTrue(cellsToShadowCells.containsKey(cell1));
-<a class="jxr_linenumber" name="130" href="#130">130</a> KeyValue firstKey = (KeyValue) cellsToShadowCells.firstKey();
-<a class="jxr_linenumber" name="131" href="#131">131</a> KeyValue lastKey = (KeyValue) cellsToShadowCells.lastKey();
-<a class="jxr_linenumber" name="132" href="#132">132</a> assertTrue(firstKey.equals(lastKey));
-<a class="jxr_linenumber" name="133" href="#133">133</a> assertTrue(0 == Bytes.compareTo(firstKey.getValueArray(), firstKey.getValueOffset(), firstKey.getValueLength(),
-<a class="jxr_linenumber" name="134" href="#134">134</a> cell1.getValueArray(), cell1.getValueOffset(), cell1.getValueLength()),
-<a class="jxr_linenumber" name="135" href="#135">135</a> <span class="jxr_string">"Should be equal"</span>);
-<a class="jxr_linenumber" name="136" href="#136">136</a>
-<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment">// Modify dup shadow cell to have a greater MVCC and check that is replaced</em>
-<a class="jxr_linenumber" name="138" href="#138">138</a> HBaseShims.setKeyValueSequenceId((KeyValue) dupCell1WithAnotherValue, 1);
-<a class="jxr_linenumber" name="139" href="#139">139</a> cellsToShadowCells = CellUtils.mapCellsToShadowCells(badListWithDups);
-<a class="jxr_linenumber" name="140" href="#140">140</a> assertEquals(cellsToShadowCells.size(), 1, <span class="jxr_string">"There should be only 1 key-value maps"</span>);
-<a class="jxr_linenumber" name="141" href="#141">141</a> assertTrue(cellsToShadowCells.containsKey(dupCell1WithAnotherValue));
-<a class="jxr_linenumber" name="142" href="#142">142</a> firstKey = (KeyValue) cellsToShadowCells.firstKey();
-<a class="jxr_linenumber" name="143" href="#143">143</a> lastKey = (KeyValue) cellsToShadowCells.lastKey();
-<a class="jxr_linenumber" name="144" href="#144">144</a> assertTrue(firstKey.equals(lastKey));
-<a class="jxr_linenumber" name="145" href="#145">145</a> assertTrue(0 == Bytes.compareTo(firstKey.getValueArray(), firstKey.getValueOffset(),
-<a class="jxr_linenumber" name="146" href="#146">146</a> firstKey.getValueLength(), dupCell1WithAnotherValue.getValueArray(),
-<a class="jxr_linenumber" name="147" href="#147">147</a> dupCell1WithAnotherValue.getValueOffset(), dupCell1WithAnotherValue.getValueLength()),
-<a class="jxr_linenumber" name="148" href="#148">148</a> <span class="jxr_string">"Should be equal"</span>);
-<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment">// Check a list of cells with duplicate values</em>
-<a class="jxr_linenumber" name="150" href="#150">150</a> List<Cell> cellListWithDups = <strong class="jxr_keyword">new</strong> ArrayList<>();
-<a class="jxr_linenumber" name="151" href="#151">151</a> cellListWithDups.add(cell1);
-<a class="jxr_linenumber" name="152" href="#152">152</a> cellListWithDups.add(shadowCell1);
-<a class="jxr_linenumber" name="153" href="#153">153</a> cellListWithDups.add(dupCell1); <em class="jxr_comment">// Dup cell</em>
-<a class="jxr_linenumber" name="154" href="#154">154</a> cellListWithDups.add(delCell1); <em class="jxr_comment">// Another Dup cell but with different type</em>
-<a class="jxr_linenumber" name="155" href="#155">155</a> cellListWithDups.add(cell2);
-<a class="jxr_linenumber" name="156" href="#156">156</a> cellListWithDups.add(cell3);
-<a class="jxr_linenumber" name="157" href="#157">157</a> cellListWithDups.add(shadowCell2);
-<a class="jxr_linenumber" name="158" href="#158">158</a>
-<a class="jxr_linenumber" name="159" href="#159">159</a> cellsToShadowCells = CellUtils.mapCellsToShadowCells(cellListWithDups);
-<a class="jxr_linenumber" name="160" href="#160">160</a> assertEquals(cellsToShadowCells.size(), 3, <span class="jxr_string">"There should be only 3 key-value maps"</span>);
-<a class="jxr_linenumber" name="161" href="#161">161</a> assertTrue(cellsToShadowCells.get(cell1).get().equals(shadowCell1));
-<a class="jxr_linenumber" name="162" href="#162">162</a> assertTrue(cellsToShadowCells.get(dupCell1).get().equals(shadowCell1));
-<a class="jxr_linenumber" name="163" href="#163">163</a> assertFalse(cellsToShadowCells.containsKey(delCell1)); <em class="jxr_comment">// TODO This is strange and needs to be solved.</em>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// The current algo avoids to put the delete cell</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// as key after the put cell with same value was added</em>
-<a class="jxr_linenumber" name="166" href="#166">166</a> assertTrue(cellsToShadowCells.get(cell2).get().equals(shadowCell2));
-<a class="jxr_linenumber" name="167" href="#167">167</a> assertTrue(cellsToShadowCells.get(cell3).equals(Optional.absent()));
-<a class="jxr_linenumber" name="168" href="#168">168</a>
-<a class="jxr_linenumber" name="169" href="#169">169</a> }
-<a class="jxr_linenumber" name="170" href="#170">170</a>
-<a class="jxr_linenumber" name="171" href="#171">171</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellSuffixConcatenationToQualifier() {
-<a class="jxr_linenumber" name="173" href="#173">173</a>
-<a class="jxr_linenumber" name="174" href="#174">174</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="175" href="#175">175</a> byte[] suffixedQualifier = CellUtils.addShadowCellSuffix(cell.getQualifierArray(),
-<a class="jxr_linenumber" name="176" href="#176">176</a> cell.getQualifierOffset(),
-<a class="jxr_linenumber" name="177" href="#177">177</a> cell.getQualifierLength());
-<a class="jxr_linenumber" name="178" href="#178">178</a> byte[] expectedQualifier = com.google.common.primitives.Bytes.concat(qualifier, SHADOW_CELL_SUFFIX);
-<a class="jxr_linenumber" name="179" href="#179">179</a> assertEquals(suffixedQualifier, expectedQualifier);
-<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>
-<a class="jxr_linenumber" name="183" href="#183">183</a> @Test(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>, timeOut = 10_000)
-<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellSuffixRemovalFromQualifier(byte[] shadowCellSuffixToTest) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="185" href="#185">185</a>
-<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment">// Test removal from a correclty suffixed qualifier</em>
-<a class="jxr_linenumber" name="187" href="#187">187</a> byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
-<a class="jxr_linenumber" name="188" href="#188">188</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, suffixedQualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="189" href="#189">189</a> byte[] resultedQualifier = CellUtils.removeShadowCellSuffix(cell.getQualifierArray(),
-<a class="jxr_linenumber" name="190" href="#190">190</a> cell.getQualifierOffset(),
-<a class="jxr_linenumber" name="191" href="#191">191</a> cell.getQualifierLength());
-<a class="jxr_linenumber" name="192" href="#192">192</a> byte[] expectedQualifier = qualifier;
-<a class="jxr_linenumber" name="193" href="#193">193</a> assertEquals(resultedQualifier, expectedQualifier);
-<a class="jxr_linenumber" name="194" href="#194">194</a>
-<a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_comment">// Test removal from a badly suffixed qualifier</em>
-<a class="jxr_linenumber" name="196" href="#196">196</a> byte[] badlySuffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, Bytes.toBytes(<span class="jxr_string">"BAD"</span>));
-<a class="jxr_linenumber" name="197" href="#197">197</a> Cell badCell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, badlySuffixedQualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="199" href="#199">199</a> CellUtils.removeShadowCellSuffix(badCell.getQualifierArray(),
-<a class="jxr_linenumber" name="200" href="#200">200</a> badCell.getQualifierOffset(),
-<a class="jxr_linenumber" name="201" href="#201">201</a> badCell.getQualifierLength());
-<a class="jxr_linenumber" name="202" href="#202">202</a> fail();
-<a class="jxr_linenumber" name="203" href="#203">203</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
-<a class="jxr_linenumber" name="204" href="#204">204</a> <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="205" href="#205">205</a> }
-<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(timeOut = 10_000)
-<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMatchingQualifiers() {
-<a class="jxr_linenumber" name="210" href="#210">210</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="211" href="#211">211</a> assertTrue(CellUtils.matchingQualifier(cell, qualifier, 0, qualifier.length));
-<a class="jxr_linenumber" name="212" href="#212">212</a> assertFalse(CellUtils.matchingQualifier(cell, otherQualifier, 0, otherQualifier.length));
-<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> @Test(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>, timeOut = 10_000)
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testQualifierLengthFromShadowCellQualifier(byte[] shadowCellSuffixToTest) {
-<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment">// Test suffixed qualifier</em>
-<a class="jxr_linenumber" name="218" href="#218">218</a> byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
-<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">int</strong> originalQualifierLength =
-<a class="jxr_linenumber" name="220" href="#220">220</a> CellUtils.qualifierLengthFromShadowCellQualifier(suffixedQualifier, 0, suffixedQualifier.length);
-<a class="jxr_linenumber" name="221" href="#221">221</a> assertEquals(originalQualifierLength, qualifier.length);
-<a class="jxr_linenumber" name="222" href="#222">222</a>
-<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// Test passing qualifier without shadow cell suffix</em>
-<a class="jxr_linenumber" name="224" href="#224">224</a> originalQualifierLength =
-<a class="jxr_linenumber" name="225" href="#225">225</a> CellUtils.qualifierLengthFromShadowCellQualifier(qualifier, 0, qualifier.length);
-<a class="jxr_linenumber" name="226" href="#226">226</a> assertEquals(originalQualifierLength, qualifier.length);
-<a class="jxr_linenumber" name="227" href="#227">227</a> }
-<a class="jxr_linenumber" name="228" href="#228">228</a>
-<a class="jxr_linenumber" name="229" href="#229">229</a> }
+<a class="jxr_linenumber" name="65" href="#65">65</a> com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
+<a class="jxr_linenumber" name="66" href="#66">66</a> com.google.common.primitives.Bytes
+<a class="jxr_linenumber" name="67" href="#67">67</a> .concat(validShadowCellQualifier, validShadowCellQualifier));
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">final</strong> byte[] value = Bytes.toBytes(<span class="jxr_string">"test-value"</span>);
+<a class="jxr_linenumber" name="69" href="#69">69</a>
+<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_comment">// Test the qualifier passed is a shadow cell</em>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_comment">// qualifier because it contains only one suffix</em>
+<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// and is placed at the end of the qualifier:</em>
+<a class="jxr_linenumber" name="73" href="#73">73</a> <em class="jxr_comment">// qual_nameSUFFIX</em>
+<a class="jxr_linenumber" name="74" href="#74">74</a> KeyValue kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier, value);
+<a class="jxr_linenumber" name="75" href="#75">75</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
+<a class="jxr_linenumber" name="76" href="#76">76</a>
+<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
+<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_comment">// SUFFIXqual_nameSUFFIX</em>
+<a class="jxr_linenumber" name="79" href="#79">79</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, sandwichValidShadowCellQualifier, value);
+<a class="jxr_linenumber" name="80" href="#80">80</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
+<a class="jxr_linenumber" name="81" href="#81">81</a>
+<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <em class="jxr_comment">// qual_nameSUFFIXSUFFIX</em>
+<a class="jxr_linenumber" name="84" href="#84">84</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, doubleEndedValidShadowCellQualifier, value);
+<a class="jxr_linenumber" name="85" href="#85">85</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
+<a class="jxr_linenumber" name="86" href="#86">86</a>
+<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_comment">// We also accept this pattern in the qualifier:</em>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// qual_nameSUFFIXqual_nameSUFFIXqual_nameSUFFIX</em>
+<a class="jxr_linenumber" name="89" href="#89">89</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, interleavedValidShadowCellQualifier, value);
+<a class="jxr_linenumber" name="90" href="#90">90</a> assertTrue(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should include a valid shadowCell identifier"</span>);
+<a class="jxr_linenumber" name="91" href="#91">91</a>
+<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// Test the qualifier passed is not a shadow cell</em>
+<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// qualifier if there's nothing else apart from the suffix</em>
+<a class="jxr_linenumber" name="94" href="#94">94</a> kv = <strong class="jxr_keyword">new</strong> KeyValue(row, family, shadowCellSuffixToTest, value);
+<a class="jxr_linenumber" name="95" href="#95">95</a> assertFalse(CellUtils.isShadowCell(kv), <span class="jxr_string">"Should not include a valid shadowCell identifier"</span>);
+<a class="jxr_linenumber" name="96" href="#96">96</a>
+<a class="jxr_linenumber" name="97" href="#97">97</a> }
+<a class="jxr_linenumber" name="98" href="#98">98</a>
+<a class="jxr_linenumber" name="99" href="#99">99</a> @Test
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCorrectMapingOfCellsToShadowCells() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_comment">// Create the required data</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">final</strong> byte[] validShadowCellQualifier =
+<a class="jxr_linenumber" name="103" href="#103">103</a> com.google.common.primitives.Bytes.concat(qualifier, SHADOW_CELL_SUFFIX);
+<a class="jxr_linenumber" name="104" href="#104">104</a>
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">final</strong> byte[] qualifier2 = Bytes.toBytes(<span class="jxr_string">"test-qual2"</span>);
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">final</strong> byte[] validShadowCellQualifier2 =
+<a class="jxr_linenumber" name="107" href="#107">107</a> com.google.common.primitives.Bytes.concat(qualifier2, SHADOW_CELL_SUFFIX);
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">final</strong> byte[] qualifier3 = Bytes.toBytes(<span class="jxr_string">"test-qual3"</span>);
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> Cell cell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>)); <em class="jxr_comment">// Default type is Put</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> Cell dupCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>)); <em class="jxr_comment">// Default type is Put</em>
+<a class="jxr_linenumber" name="113" href="#113">113</a> Cell dupCell1WithAnotherValue = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"other-value"</span>));
+<a class="jxr_linenumber" name="114" href="#114">114</a> Cell delCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Type.Delete, Bytes.toBytes(<span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="115" href="#115">115</a> Cell shadowCell1 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier, 1, Bytes.toBytes(<span class="jxr_string">"sc-value"</span>));
+<a class="jxr_linenumber" name="116" href="#116">116</a>
+<a class="jxr_linenumber" name="117" href="#117">117</a> Cell cell2 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier2, 1, Bytes.toBytes(<span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="118" href="#118">118</a> Cell shadowCell2 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, validShadowCellQualifier2, 1, Bytes.toBytes(<span class="jxr_string">"sc-value2"</span>));
+<a class="jxr_linenumber" name="119" href="#119">119</a>
+<a class="jxr_linenumber" name="120" href="#120">120</a> Cell cell3 = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier3, 1, Bytes.toBytes(<span class="jxr_string">"value3"</span>));
+<a class="jxr_linenumber" name="121" href="#121">121</a>
+<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// Check a list of cells with duplicate values</em>
+<a class="jxr_linenumber" name="123" href="#123">123</a> List<Cell> badListWithDups = <strong class="jxr_keyword">new</strong> ArrayList<>();
+<a class="jxr_linenumber" name="124" href="#124">124</a> badListWithDups.add(cell1);
+<a class="jxr_linenumber" name="125" href="#125">125</a> badListWithDups.add(dupCell1WithAnotherValue);
+<a class="jxr_linenumber" name="126" href="#126">126</a>
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// Check dup shadow cell with same MVCC is ignored</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> SortedMap<Cell, Optional<Cell>> cellsToShadowCells = CellUtils.mapCellsToShadowCells(badListWithDups);
+<a class="jxr_linenumber" name="129" href="#129">129</a> assertEquals(cellsToShadowCells.size(), 1, <span class="jxr_string">"There should be only 1 key-value maps"</span>);
+<a class="jxr_linenumber" name="130" href="#130">130</a> assertTrue(cellsToShadowCells.containsKey(cell1));
+<a class="jxr_linenumber" name="131" href="#131">131</a> KeyValue firstKey = (KeyValue) cellsToShadowCells.firstKey();
+<a class="jxr_linenumber" name="132" href="#132">132</a> KeyValue lastKey = (KeyValue) cellsToShadowCells.lastKey();
+<a class="jxr_linenumber" name="133" href="#133">133</a> assertTrue(firstKey.equals(lastKey));
+<a class="jxr_linenumber" name="134" href="#134">134</a> assertTrue(0 == Bytes.compareTo(firstKey.getValueArray(), firstKey.getValueOffset(), firstKey.getValueLength(),
+<a class="jxr_linenumber" name="135" href="#135">135</a> cell1.getValueArray(), cell1.getValueOffset(), cell1.getValueLength()),
+<a class="jxr_linenumber" name="136" href="#136">136</a> <span class="jxr_string">"Should be equal"</span>);
+<a class="jxr_linenumber" name="137" href="#137">137</a>
+<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// Modify dup shadow cell to have a greater MVCC and check that is replaced</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a> HBaseShims.setKeyValueSequenceId((KeyValue) dupCell1WithAnotherValue, 1);
+<a class="jxr_linenumber" name="140" href="#140">140</a> cellsToShadowCells = CellUtils.mapCellsToShadowCells(badListWithDups);
+<a class="jxr_linenumber" name="141" href="#141">141</a> assertEquals(cellsToShadowCells.size(), 1, <span class="jxr_string">"There should be only 1 key-value maps"</span>);
+<a class="jxr_linenumber" name="142" href="#142">142</a> assertTrue(cellsToShadowCells.containsKey(dupCell1WithAnotherValue));
+<a class="jxr_linenumber" name="143" href="#143">143</a> firstKey = (KeyValue) cellsToShadowCells.firstKey();
+<a class="jxr_linenumber" name="144" href="#144">144</a> lastKey = (KeyValue) cellsToShadowCells.lastKey();
+<a class="jxr_linenumber" name="145" href="#145">145</a> assertTrue(firstKey.equals(lastKey));
+<a class="jxr_linenumber" name="146" href="#146">146</a> assertTrue(0 == Bytes.compareTo(firstKey.getValueArray(), firstKey.getValueOffset(),
+<a class="jxr_linenumber" name="147" href="#147">147</a> firstKey.getValueLength(), dupCell1WithAnotherValue.getValueArray(),
+<a class="jxr_linenumber" name="148" href="#148">148</a> dupCell1WithAnotherValue.getValueOffset(), dupCell1WithAnotherValue.getValueLength()),
+<a class="jxr_linenumber" name="149" href="#149">149</a> <span class="jxr_string">"Should be equal"</span>);
+<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_comment">// Check a list of cells with duplicate values</em>
+<a class="jxr_linenumber" name="151" href="#151">151</a> List<Cell> cellListWithDups = <strong class="jxr_keyword">new</strong> ArrayList<>();
+<a class="jxr_linenumber" name="152" href="#152">152</a> cellListWithDups.add(cell1);
+<a class="jxr_linenumber" name="153" href="#153">153</a> cellListWithDups.add(shadowCell1);
+<a class="jxr_linenumber" name="154" href="#154">154</a> cellListWithDups.add(dupCell1); <em class="jxr_comment">// Dup cell</em>
+<a class="jxr_linenumber" name="155" href="#155">155</a> cellListWithDups.add(delCell1); <em class="jxr_comment">// Another Dup cell but with different type</em>
+<a class="jxr_linenumber" name="156" href="#156">156</a> cellListWithDups.add(cell2);
+<a class="jxr_linenumber" name="157" href="#157">157</a> cellListWithDups.add(cell3);
+<a class="jxr_linenumber" name="158" href="#158">158</a> cellListWithDups.add(shadowCell2);
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> cellsToShadowCells = CellUtils.mapCellsToShadowCells(cellListWithDups);
+<a class="jxr_linenumber" name="161" href="#161">161</a> assertEquals(cellsToShadowCells.size(), 3, <span class="jxr_string">"There should be only 3 key-value maps"</span>);
+<a class="jxr_linenumber" name="162" href="#162">162</a> assertTrue(cellsToShadowCells.get(cell1).get().equals(shadowCell1));
+<a class="jxr_linenumber" name="163" href="#163">163</a> assertTrue(cellsToShadowCells.get(dupCell1).get().equals(shadowCell1));
+<a class="jxr_linenumber" name="164" href="#164">164</a> assertFalse(cellsToShadowCells.containsKey(delCell1)); <em class="jxr_comment">// TODO This is strange and needs to be solved.</em>
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// The current algo avoids to put the delete cell</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// as key after the put cell with same value was added</em>
+<a class="jxr_linenumber" name="167" href="#167">167</a> assertTrue(cellsToShadowCells.get(cell2).get().equals(shadowCell2));
+<a class="jxr_linenumber" name="168" href="#168">168</a> assertTrue(cellsToShadowCells.get(cell3).equals(Optional.absent()));
+<a class="jxr_linenumber" name="169" href="#169">169</a>
+<a class="jxr_linenumber" name="170" href="#170">170</a> }
+<a class="jxr_linenumber" name="171" href="#171">171</a>
+<a class="jxr_linenumber" name="172" href="#172">172</a> @Test
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellSuffixConcatenationToQualifier() {
+<a class="jxr_linenumber" name="174" href="#174">174</a>
+<a class="jxr_linenumber" name="175" href="#175">175</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="176" href="#176">176</a> byte[] suffixedQualifier = CellUtils.addShadowCellSuffix(cell.getQualifierArray(),
+<a class="jxr_linenumber" name="177" href="#177">177</a> cell.getQualifierOffset(),
+<a class="jxr_linenumber" name="178" href="#178">178</a> cell.getQualifierLength());
+<a class="jxr_linenumber" name="179" href="#179">179</a> byte[] expectedQualifier = com.google.common.primitives.Bytes.concat(qualifier, SHADOW_CELL_SUFFIX);
+<a class="jxr_linenumber" name="180" href="#180">180</a> assertEquals(suffixedQualifier, expectedQualifier);
+<a class="jxr_linenumber" name="181" href="#181">181</a>
+<a class="jxr_linenumber" name="182" href="#182">182</a> }
+<a class="jxr_linenumber" name="183" href="#183">183</a>
+<a class="jxr_linenumber" name="184" href="#184">184</a> @Test(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>)
+<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testShadowCellSuffixRemovalFromQualifier(byte[] shadowCellSuffixToTest) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="186" href="#186">186</a>
+<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// Test removal from a correclty suffixed qualifier</em>
+<a class="jxr_linenumber" name="188" href="#188">188</a> byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
+<a class="jxr_linenumber" name="189" href="#189">189</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, suffixedQualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="190" href="#190">190</a> byte[] resultedQualifier = CellUtils.removeShadowCellSuffix(cell.getQualifierArray(),
+<a class="jxr_linenumber" name="191" href="#191">191</a> cell.getQualifierOffset(),
+<a class="jxr_linenumber" name="192" href="#192">192</a> cell.getQualifierLength());
+<a class="jxr_linenumber" name="193" href="#193">193</a> byte[] expectedQualifier = qualifier;
+<a class="jxr_linenumber" name="194" href="#194">194</a> assertEquals(resultedQualifier, expectedQualifier);
+<a class="jxr_linenumber" name="195" href="#195">195</a>
+<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// Test removal from a badly suffixed qualifier</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a> byte[] badlySuffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, Bytes.toBytes(<span class="jxr_string">"BAD"</span>));
+<a class="jxr_linenumber" name="198" href="#198">198</a> Cell badCell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, badlySuffixedQualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="199" href="#199">199</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="200" href="#200">200</a> CellUtils.removeShadowCellSuffix(badCell.getQualifierArray(),
+<a class="jxr_linenumber" name="201" href="#201">201</a> badCell.getQualifierOffset(),
+<a class="jxr_linenumber" name="202" href="#202">202</a> badCell.getQualifierLength());
+<a class="jxr_linenumber" name="203" href="#203">203</a> fail();
+<a class="jxr_linenumber" name="204" href="#204">204</a> } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="205" href="#205">205</a> <em class="jxr_comment">// Expected</em>
+<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>
+<a class="jxr_linenumber" name="209" href="#209">209</a> @Test
+<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMatchingQualifiers() {
+<a class="jxr_linenumber" name="211" href="#211">211</a> Cell cell = <strong class="jxr_keyword">new</strong> KeyValue(row, family, qualifier, 1, Bytes.toBytes(<span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="212" href="#212">212</a> assertTrue(CellUtils.matchingQualifier(cell, qualifier, 0, qualifier.length));
+<a class="jxr_linenumber" name="213" href="#213">213</a> assertFalse(CellUtils.matchingQualifier(cell, otherQualifier, 0, otherQualifier.length));
+<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(dataProvider = <span class="jxr_string">"shadow-cell-suffixes"</span>)
+<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testQualifierLengthFromShadowCellQualifier(byte[] shadowCellSuffixToTest) {
+<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment">// Test suffixed qualifier</em>
+<a class="jxr_linenumber" name="219" href="#219">219</a> byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
+<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">int</strong> originalQualifierLength =
+<a class="jxr_linenumber" name="221" href="#221">221</a> CellUtils.qualifierLengthFromShadowCellQualifier(suffixedQualifier, 0, suffixedQualifier.length);
+<a class="jxr_linenumber" name="222" href="#222">222</a> assertEquals(originalQualifierLength, qualifier.length);
+<a class="jxr_linenumber" name="223" href="#223">223</a>
+<a class="jxr_linenumber" name="224" href="#224">224</a> <em class="jxr_comment">// Test passing qualifier without shadow cell suffix</em>
+<a class="jxr_linenumber" name="225" href="#225">225</a> originalQualifierLength =
+<a class="jxr_linenumber" name="226" href="#226">226</a> CellUtils.qualifierLengthFromShadowCellQualifier(qualifier, 0, qualifier.length);
+<a class="jxr_linenumber" name="227" href="#227">227</a> assertEquals(originalQualifierLength, qualifier.length);
+<a class="jxr_linenumber" name="228" href="#228">228</a> }
+<a class="jxr_linenumber" name="229" href="#229">229</a>
+<a class="jxr_linenumber" name="230" href="#230">230</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/49fbc5e7/xref-test/org/apache/omid/transaction/TestColumnIterator.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestColumnIterator.html b/xref-test/org/apache/omid/transaction/TestColumnIterator.html
index 0c4c67a..276f281 100644
--- a/xref-test/org/apache/omid/transaction/TestColumnIterator.html
+++ b/xref-test/org/apache/omid/transaction/TestColumnIterator.html
@@ -67,7 +67,7 @@
<a class="jxr_linenumber" name="57" href="#57">57</a> )
<a class="jxr_linenumber" name="58" href="#58">58</a> );
<a class="jxr_linenumber" name="59" href="#59">59</a>
-<a class="jxr_linenumber" name="60" href="#60">60</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="60" href="#60">60</a> @Test
<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGroupingCellsByColumnFilteringShadowCells() {
<a class="jxr_linenumber" name="62" href="#62">62</a>
<a class="jxr_linenumber" name="63" href="#63">63</a> ImmutableList<Collection<Cell>> groupedColumnsWithoutShadowCells =
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/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 eeb18f9..4e522e0 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.setConflictMapSize(1);
+<a class="jxr_linenumber" name="114" href="#114">114</a> tsoConfig.setMaxItems(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(timeOut = 60_000)
+<a class="jxr_linenumber" name="208" href="#208">208</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="254" href="#254">254</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="313" href="#313">313</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="389" href="#389">389</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="442" href="#442">442</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="501" href="#501">501</a> @Test
<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(timeOut = 60_000)
+<a class="jxr_linenumber" name="607" href="#607">607</a> @Test
<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 = 60_000)
+<a class="jxr_linenumber" name="714" href="#714">714</a> @Test(timeOut = 60000)
<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/49fbc5e7/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 99b8f66..95849fb 100644
--- a/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
+++ b/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
@@ -65,7 +65,7 @@
<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>, timeOut = 60_000)
+<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>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestDeletion.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestDeletion.html b/xref-test/org/apache/omid/transaction/TestDeletion.html
index 86c3811..2bbbf3c 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(timeOut = 10_000)
+<a class="jxr_linenumber" name="64" href="#64">64</a> @Test
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="101" href="#101">101</a> @Test
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="142" href="#142">142</a> @Test
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="181" href="#181">181</a> @Test
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="216" href="#216">216</a> @Test
<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/49fbc5e7/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 b69abfe..d412270 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.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="118" href="#118">118</a> config1.setMaxItems(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.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="131" href="#131">131</a> config2.setMaxItems(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/49fbc5e7/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 81d5d6c..f55cbf0 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(timeOut = 10_000)
+<a class="jxr_linenumber" name="25" href="#25">25</a> @Test
<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(timeOut = 10_000)
+<a class="jxr_linenumber" name="34" href="#34">34</a> @Test
<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());