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/06/17 21:21:16 UTC
[41/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 6/17/16 2:20 PM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/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 8adeb73..99b8f66 100644
--- a/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
+++ b/xref-test/org/apache/omid/transaction/TestCompactorScanner.html
@@ -8,37 +8,37 @@
<body>
<div id="overview"><a href="../../../../../../target/site/testapidocs/org/apache/omid/transaction/TestCompactorScanner.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.transaction;
<a class="jxr_linenumber" name="19" href="#19">19</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> com.google.common.util.concurrent.SettableFuture;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.omid.committable.CommitTable.Client;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue.Type;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.coprocessor.ObserverContext;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.CompactorScanner;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.HRegion;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.InternalScanner;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.KeyValue;
+<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;
@@ -49,8 +49,8 @@
<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.AssertJUnit.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.AssertJUnit.assertFalse;
+<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>
@@ -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>)
+<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="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>
@@ -79,7 +79,7 @@
<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.<Long>create();
+<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);
@@ -104,10 +104,10 @@
<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(retainOption, scanner.shouldRetainNonTransactionallyDeletedCell(deleteKV));
-<a class="jxr_linenumber" name="98" href="#98">98</a> assertEquals(retainOption, scanner.shouldRetainNonTransactionallyDeletedCell(deleteColumnKV));
-<a class="jxr_linenumber" name="99" href="#99">99</a> assertEquals(retainOption, scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyKV));
-<a class="jxr_linenumber" name="100" href="#100">100</a> assertEquals(retainOption, scanner.shouldRetainNonTransactionallyDeletedCell(deleteFamilyVersionKV));
+<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>
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/3a40a657/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 359bc8d..86c3811 100644
--- a/xref-test/org/apache/omid/transaction/TestDeletion.html
+++ b/xref-test/org/apache/omid/transaction/TestDeletion.html
@@ -8,23 +8,23 @@
<body>
<div id="overview"><a href="../../../../../../target/site/testapidocs/org/apache/omid/transaction/TestDeletion.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.transaction;
<a class="jxr_linenumber" name="19" href="#19">19</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Delete;
@@ -37,14 +37,14 @@
<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.AssertJUnit;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="33" href="#33">33</a>
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="37" href="#37">37</a>
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.testng.ITestContext;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="32" href="#32">32</a>
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> java.util.Map;
+<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> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
<a class="jxr_linenumber" name="39" href="#39">39</a>
<a class="jxr_linenumber" name="40" href="#40">40</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
@@ -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);
@@ -95,20 +95,20 @@
<a class="jxr_linenumber" name="85" href="#85">85</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="86" href="#86">86</a>
<a class="jxr_linenumber" name="87" href="#87">87</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="88" href="#88">88</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="89" href="#89">89</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="88" href="#88">88</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="89" href="#89">89</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
<a class="jxr_linenumber" name="90" href="#90">90</a> tm.commit(t2);
<a class="jxr_linenumber" name="91" href="#91">91</a>
<a class="jxr_linenumber" name="92" href="#92">92</a> tscan = tm.begin();
<a class="jxr_linenumber" name="93" href="#93">93</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="94" href="#94">94</a>
<a class="jxr_linenumber" name="95" href="#95">95</a> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="96" href="#96">96</a> AssertJUnit
-<a class="jxr_linenumber" name="97" href="#97">97</a> .assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>, (rowsWritten - 1), (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="98" href="#98">98</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="96" href="#96">96</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="97" href="#97">97</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<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);
@@ -133,23 +133,23 @@
<a class="jxr_linenumber" name="123" href="#123">123</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="124" href="#124">124</a>
<a class="jxr_linenumber" name="125" href="#125">125</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="126" href="#126">126</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="127" href="#127">127</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="126" href="#126">126</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="127" href="#127">127</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
<a class="jxr_linenumber" name="128" href="#128">128</a> tm.commit(t2);
<a class="jxr_linenumber" name="129" href="#129">129</a>
<a class="jxr_linenumber" name="130" href="#130">130</a> tscan = tm.begin();
<a class="jxr_linenumber" name="131" href="#131">131</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="132" href="#132">132</a>
<a class="jxr_linenumber" name="133" href="#133">133</a> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="134" href="#134">134</a> AssertJUnit
-<a class="jxr_linenumber" name="135" href="#135">135</a> .assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>, (rowsWritten - 1), (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="136" href="#136">136</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="134" href="#134">134</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="136" href="#136">136</a>
<a class="jxr_linenumber" name="137" href="#137">137</a> }
<a class="jxr_linenumber" name="138" href="#138">138</a>
<a class="jxr_linenumber" name="139" href="#139">139</a> <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);
@@ -174,8 +174,8 @@
<a class="jxr_linenumber" name="164" href="#164">164</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="165" href="#165">165</a>
<a class="jxr_linenumber" name="166" href="#166">166</a> Map<FamCol, Integer> count = countColsInRows(rs, famColA, famColB);
-<a class="jxr_linenumber" name="167" href="#167">167</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="168" href="#168">168</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="167" href="#167">167</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), rowsWritten, <span class="jxr_string">"ColA count should be equal to rowsWritten"</span>);
+<a class="jxr_linenumber" name="168" href="#168">168</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
<a class="jxr_linenumber" name="169" href="#169">169</a> tm.commit(t2);
<a class="jxr_linenumber" name="170" href="#170">170</a>
<a class="jxr_linenumber" name="171" href="#171">171</a> tscan = tm.begin();
@@ -183,12 +183,12 @@
<a class="jxr_linenumber" name="173" href="#173">173</a>
<a class="jxr_linenumber" name="174" href="#174">174</a> count = countColsInRows(rs, famColA, famColB);
<a class="jxr_linenumber" name="175" href="#175">175</a>
-<a class="jxr_linenumber" name="176" href="#176">176</a> AssertJUnit
-<a class="jxr_linenumber" name="177" href="#177">177</a> .assertEquals(<span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>, (rowsWritten - 1), (<strong class="jxr_keyword">int</strong>) count.get(famColA));
-<a class="jxr_linenumber" name="178" href="#178">178</a> AssertJUnit.assertEquals(<span class="jxr_string">"ColB count should be equal to rowsWritten"</span>, rowsWritten, (<strong class="jxr_keyword">int</strong>) count.get(famColB));
+<a class="jxr_linenumber" name="176" href="#176">176</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColA), (rowsWritten - 1), <span class="jxr_string">"ColA count should be equal to rowsWritten - 1"</span>);
+<a class="jxr_linenumber" name="177" href="#177">177</a> assertEquals((<strong class="jxr_keyword">int</strong>) count.get(famColB), rowsWritten, <span class="jxr_string">"ColB count should be equal to rowsWritten"</span>);
+<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);
@@ -211,102 +211,100 @@
<a class="jxr_linenumber" name="201" href="#201">201</a> ResultScanner rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
<a class="jxr_linenumber" name="202" href="#202">202</a>
<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">int</strong> rowsRead = countRows(rs);
-<a class="jxr_linenumber" name="204" href="#204">204</a> AssertJUnit.assertTrue(<span class="jxr_string">"Expected "</span> + rowsWritten + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>,
-<a class="jxr_linenumber" name="205" href="#205">205</a> rowsRead == rowsWritten);
-<a class="jxr_linenumber" name="206" href="#206">206</a>
-<a class="jxr_linenumber" name="207" href="#207">207</a> tm.commit(t2);
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> tscan = tm.begin();
-<a class="jxr_linenumber" name="210" href="#210">210</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
-<a class="jxr_linenumber" name="211" href="#211">211</a>
-<a class="jxr_linenumber" name="212" href="#212">212</a> rowsRead = countRows(rs);
-<a class="jxr_linenumber" name="213" href="#213">213</a> AssertJUnit.assertTrue(<span class="jxr_string">"Expected "</span> + (rowsWritten - 1) + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>,
-<a class="jxr_linenumber" name="214" href="#214">214</a> rowsRead == (rowsWritten - 1));
+<a class="jxr_linenumber" name="204" href="#204">204</a> assertTrue(rowsRead == rowsWritten, <span class="jxr_string">"Expected "</span> + rowsWritten + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
+<a class="jxr_linenumber" name="205" href="#205">205</a>
+<a class="jxr_linenumber" name="206" href="#206">206</a> tm.commit(t2);
+<a class="jxr_linenumber" name="207" href="#207">207</a>
+<a class="jxr_linenumber" name="208" href="#208">208</a> tscan = tm.begin();
+<a class="jxr_linenumber" name="209" href="#209">209</a> rs = tt.getScanner(tscan, <strong class="jxr_keyword">new</strong> Scan());
+<a class="jxr_linenumber" name="210" href="#210">210</a>
+<a class="jxr_linenumber" name="211" href="#211">211</a> rowsRead = countRows(rs);
+<a class="jxr_linenumber" name="212" href="#212">212</a> assertTrue(rowsRead == (rowsWritten - 1), <span class="jxr_string">"Expected "</span> + (rowsWritten - 1) + <span class="jxr_string">" rows but "</span> + rowsRead + <span class="jxr_string">" found"</span>);
+<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> }
-<a class="jxr_linenumber" name="217" href="#217">217</a>
-<a class="jxr_linenumber" name="218" href="#218">218</a> @Test
-<a class="jxr_linenumber" name="219" href="#219">219</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="220" href="#220">220</a>
+<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>
+<a class="jxr_linenumber" name="220" href="#220">220</a> <em class="jxr_comment">// Setup initial environment for the test</em>
<a class="jxr_linenumber" name="221" href="#221">221</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="222" href="#222">222</a> <em class="jxr_comment">// Setup initial environment for the test</em>
-<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="224" href="#224">224</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="225" href="#225">225</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="226" href="#226">226</a>
-<a class="jxr_linenumber" name="227" href="#227">227</a> Transaction tx1 = tm.begin();
-<a class="jxr_linenumber" name="228" href="#228">228</a> LOG.info(<span class="jxr_string">"{} writing initial data created "</span>, tx1);
-<a class="jxr_linenumber" name="229" href="#229">229</a> Put p = <strong class="jxr_keyword">new</strong> Put(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="230" href="#230">230</a> p.add(famA, colA, data1);
-<a class="jxr_linenumber" name="231" href="#231">231</a> txTable.put(tx1, p);
-<a class="jxr_linenumber" name="232" href="#232">232</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="233" href="#233">233</a>
+<a class="jxr_linenumber" name="222" href="#222">222</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="223" href="#223">223</a> TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="224" href="#224">224</a>
+<a class="jxr_linenumber" name="225" href="#225">225</a> Transaction tx1 = tm.begin();
+<a class="jxr_linenumber" name="226" href="#226">226</a> LOG.info(<span class="jxr_string">"{} writing initial data created "</span>, tx1);
+<a class="jxr_linenumber" name="227" href="#227">227</a> Put p = <strong class="jxr_keyword">new</strong> Put(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="228" href="#228">228</a> p.add(famA, colA, data1);
+<a class="jxr_linenumber" name="229" href="#229">229</a> txTable.put(tx1, p);
+<a class="jxr_linenumber" name="230" href="#230">230</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="231" href="#231">231</a>
+<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// Try to delete a non existing CF</em>
<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment">// Try to delete a non existing CF</em>
-<a class="jxr_linenumber" name="236" href="#236">236</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="237" href="#237">237</a> Transaction deleteTx = tm.begin();
-<a class="jxr_linenumber" name="238" href="#238">238</a> LOG.info(<span class="jxr_string">"{} trying to delete a non-existing family created "</span>, deleteTx);
-<a class="jxr_linenumber" name="239" href="#239">239</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="240" href="#240">240</a> del.deleteFamily(famB);
-<a class="jxr_linenumber" name="241" href="#241">241</a> <em class="jxr_comment">// This delete should not put data on HBase</em>
-<a class="jxr_linenumber" name="242" href="#242">242</a> txTable.delete(deleteTx, del);
-<a class="jxr_linenumber" name="243" href="#243">243</a>
+<a class="jxr_linenumber" name="235" href="#235">235</a> Transaction deleteTx = tm.begin();
+<a class="jxr_linenumber" name="236" href="#236">236</a> LOG.info(<span class="jxr_string">"{} trying to delete a non-existing family created "</span>, deleteTx);
+<a class="jxr_linenumber" name="237" href="#237">237</a> Delete del = <strong class="jxr_keyword">new</strong> Delete(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="238" href="#238">238</a> del.deleteFamily(famB);
+<a class="jxr_linenumber" name="239" href="#239">239</a> <em class="jxr_comment">// This delete should not put data on HBase</em>
+<a class="jxr_linenumber" name="240" href="#240">240</a> txTable.delete(deleteTx, del);
+<a class="jxr_linenumber" name="241" href="#241">241</a>
+<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="243" href="#243">243</a> <em class="jxr_comment">// Check data has not been written to HBase</em>
<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="245" href="#245">245</a> <em class="jxr_comment">// Check data has not been written to HBase</em>
-<a class="jxr_linenumber" name="246" href="#246">246</a> <em class="jxr_comment">// --------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="247" href="#247">247</a> HTable table = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="248" href="#248">248</a> Get get = <strong class="jxr_keyword">new</strong> Get(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
-<a class="jxr_linenumber" name="249" href="#249">249</a> get.setTimeStamp(deleteTx.getTransactionId());
-<a class="jxr_linenumber" name="250" href="#250">250</a> Result result = table.get(get);
-<a class="jxr_linenumber" name="251" href="#251">251</a> assertTrue(result.isEmpty());
+<a class="jxr_linenumber" name="245" href="#245">245</a> HTable table = <strong class="jxr_keyword">new</strong> HTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="246" href="#246">246</a> Get get = <strong class="jxr_keyword">new</strong> Get(Bytes.toBytes(<span class="jxr_string">"row1"</span>));
+<a class="jxr_linenumber" name="247" href="#247">247</a> get.setTimeStamp(deleteTx.getTransactionId());
+<a class="jxr_linenumber" name="248" href="#248">248</a> Result result = table.get(get);
+<a class="jxr_linenumber" name="249" href="#249">249</a> assertTrue(result.isEmpty());
+<a class="jxr_linenumber" name="250" href="#250">250</a>
+<a class="jxr_linenumber" name="251" href="#251">251</a> }
<a class="jxr_linenumber" name="252" href="#252">252</a>
-<a class="jxr_linenumber" name="253" href="#253">253</a> }
-<a class="jxr_linenumber" name="254" href="#254">254</a>
-<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> countRows(ResultScanner rs) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">int</strong> count;
-<a class="jxr_linenumber" name="257" href="#257">257</a> Result r = rs.next();
-<a class="jxr_linenumber" name="258" href="#258">258</a> count = 0;
-<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="260" href="#260">260</a> count++;
-<a class="jxr_linenumber" name="261" href="#261">261</a> LOG.trace(<span class="jxr_string">"row: "</span> + Bytes.toString(r.getRow()) + <span class="jxr_string">" count: "</span> + count);
-<a class="jxr_linenumber" name="262" href="#262">262</a> r = rs.next();
-<a class="jxr_linenumber" name="263" href="#263">263</a> }
-<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">return</strong> count;
-<a class="jxr_linenumber" name="265" href="#265">265</a> }
-<a class="jxr_linenumber" name="266" href="#266">266</a>
-<a class="jxr_linenumber" name="267" href="#267">267</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> writeRows(TTable tt, Transaction t1, <strong class="jxr_keyword">int</strong> rowcount, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="268" href="#268">268</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
-<a class="jxr_linenumber" name="269" href="#269">269</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
-<a class="jxr_linenumber" name="270" href="#270">270</a>
-<a class="jxr_linenumber" name="271" href="#271">271</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
-<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
-<a class="jxr_linenumber" name="273" href="#273">273</a> p.add(col.fam, col.col, data1);
-<a class="jxr_linenumber" name="274" href="#274">274</a> }
-<a class="jxr_linenumber" name="275" href="#275">275</a> tt.put(t1, p);
-<a class="jxr_linenumber" name="276" href="#276">276</a> }
-<a class="jxr_linenumber" name="277" href="#277">277</a> }
-<a class="jxr_linenumber" name="278" href="#278">278</a>
-<a class="jxr_linenumber" name="279" href="#279">279</a> <strong class="jxr_keyword">private</strong> Map<FamCol, Integer> countColsInRows(ResultScanner rs, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="280" href="#280">280</a> Map<FamCol, Integer> colCount = <strong class="jxr_keyword">new</strong> HashMap<>();
-<a class="jxr_linenumber" name="281" href="#281">281</a> Result r = rs.next();
-<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
-<a class="jxr_linenumber" name="284" href="#284">284</a> <strong class="jxr_keyword">if</strong> (r.containsColumn(col.fam, col.col)) {
-<a class="jxr_linenumber" name="285" href="#285">285</a> Integer c = colCount.get(col);
-<a class="jxr_linenumber" name="286" href="#286">286</a>
-<a class="jxr_linenumber" name="287" href="#287">287</a> <strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="288" href="#288">288</a> colCount.put(col, 1);
-<a class="jxr_linenumber" name="289" href="#289">289</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="290" href="#290">290</a> colCount.put(col, c + 1);
-<a class="jxr_linenumber" name="291" href="#291">291</a> }
-<a class="jxr_linenumber" name="292" href="#292">292</a> }
-<a class="jxr_linenumber" name="293" href="#293">293</a> }
-<a class="jxr_linenumber" name="294" href="#294">294</a> r = rs.next();
-<a class="jxr_linenumber" name="295" href="#295">295</a> }
-<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">return</strong> colCount;
-<a class="jxr_linenumber" name="297" href="#297">297</a> }
-<a class="jxr_linenumber" name="298" href="#298">298</a>
-<a class="jxr_linenumber" name="299" href="#299">299</a> }
+<a class="jxr_linenumber" name="253" href="#253">253</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> countRows(ResultScanner rs) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">int</strong> count;
+<a class="jxr_linenumber" name="255" href="#255">255</a> Result r = rs.next();
+<a class="jxr_linenumber" name="256" href="#256">256</a> count = 0;
+<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="258" href="#258">258</a> count++;
+<a class="jxr_linenumber" name="259" href="#259">259</a> LOG.trace(<span class="jxr_string">"row: "</span> + Bytes.toString(r.getRow()) + <span class="jxr_string">" count: "</span> + count);
+<a class="jxr_linenumber" name="260" href="#260">260</a> r = rs.next();
+<a class="jxr_linenumber" name="261" href="#261">261</a> }
+<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">return</strong> count;
+<a class="jxr_linenumber" name="263" href="#263">263</a> }
+<a class="jxr_linenumber" name="264" href="#264">264</a>
+<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> writeRows(TTable tt, Transaction t1, <strong class="jxr_keyword">int</strong> rowcount, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < rowcount; i++) {
+<a class="jxr_linenumber" name="267" href="#267">267</a> byte[] row = Bytes.toBytes(<span class="jxr_string">"test-del"</span> + i);
+<a class="jxr_linenumber" name="268" href="#268">268</a>
+<a class="jxr_linenumber" name="269" href="#269">269</a> Put p = <strong class="jxr_keyword">new</strong> Put(row);
+<a class="jxr_linenumber" name="270" href="#270">270</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
+<a class="jxr_linenumber" name="271" href="#271">271</a> p.add(col.fam, col.col, data1);
+<a class="jxr_linenumber" name="272" href="#272">272</a> }
+<a class="jxr_linenumber" name="273" href="#273">273</a> tt.put(t1, p);
+<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> <strong class="jxr_keyword">private</strong> Map<FamCol, Integer> countColsInRows(ResultScanner rs, FamCol... famCols) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="278" href="#278">278</a> Map<FamCol, Integer> colCount = <strong class="jxr_keyword">new</strong> HashMap<>();
+<a class="jxr_linenumber" name="279" href="#279">279</a> Result r = rs.next();
+<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">while</strong> (r != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">for</strong> (FamCol col : famCols) {
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">if</strong> (r.containsColumn(col.fam, col.col)) {
+<a class="jxr_linenumber" name="283" href="#283">283</a> Integer c = colCount.get(col);
+<a class="jxr_linenumber" name="284" href="#284">284</a>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <strong class="jxr_keyword">if</strong> (c == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="286" href="#286">286</a> colCount.put(col, 1);
+<a class="jxr_linenumber" name="287" href="#287">287</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="288" href="#288">288</a> colCount.put(col, c + 1);
+<a class="jxr_linenumber" name="289" href="#289">289</a> }
+<a class="jxr_linenumber" name="290" href="#290">290</a> }
+<a class="jxr_linenumber" name="291" href="#291">291</a> }
+<a class="jxr_linenumber" name="292" href="#292">292</a> r = rs.next();
+<a class="jxr_linenumber" name="293" href="#293">293</a> }
+<a class="jxr_linenumber" name="294" href="#294">294</a> <strong class="jxr_keyword">return</strong> colCount;
+<a class="jxr_linenumber" name="295" href="#295">295</a> }
+<a class="jxr_linenumber" name="296" href="#296">296</a>
+<a class="jxr_linenumber" name="297" href="#297">297</a> }
</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/3a40a657/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 1e6206d..b69abfe 100644
--- a/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
+++ b/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
@@ -8,23 +8,23 @@
<body>
<div id="overview"><a href="../../../../../../target/site/testapidocs/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
-<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_javadoccomment"> * with the License. You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_javadoccomment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_javadoccomment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="1" href="#1">1</a> <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="2" href="#2">2</a> <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="3" href="#3">3</a> <em class="jxr_comment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="4" href="#4">4</a> <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a> <em class="jxr_comment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a> <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="11" href="#11">11</a> <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a> <em class="jxr_comment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.transaction;
<a class="jxr_linenumber" name="19" href="#19">19</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Charsets;
@@ -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>);
@@ -379,7 +379,7 @@
<a class="jxr_linenumber" name="369" href="#369">369</a> }
<a class="jxr_linenumber" name="370" href="#370">370</a>
<a class="jxr_linenumber" name="371" href="#371">371</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkRowValues(TTable txTable, byte[] expectedDataR1Q1, byte[] expectedDataR2Q2)
-<a class="jxr_linenumber" name="372" href="#372">372</a> <strong class="jxr_keyword">throws</strong> TransactionException, IOException, RollbackException {
+<a class="jxr_linenumber" name="372" href="#372">372</a> <strong class="jxr_keyword">throws</strong> IOException, RollbackException {
<a class="jxr_linenumber" name="373" href="#373">373</a> Transaction readTx = tm.begin();
<a class="jxr_linenumber" name="374" href="#374">374</a> LOG.info(<span class="jxr_string">"Starting Read Tx {} for checking cell values"</span>, readTx.getTransactionId());
<a class="jxr_linenumber" name="375" href="#375">375</a> Get getRow1 = <strong class="jxr_keyword">new</strong> Get(row1).setMaxVersions(1);