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:46 UTC
[17/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/transaction/TestReadPath.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestReadPath.html b/xref-test/org/apache/omid/transaction/TestReadPath.html
index ab3049b..cfc72d8 100644
--- a/xref-test/org/apache/omid/transaction/TestReadPath.html
+++ b/xref-test/org/apache/omid/transaction/TestReadPath.html
@@ -53,7 +53,7 @@
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">final</strong> byte[] data = Bytes.toBytes(<span class="jxr_string">"data"</span>);
<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[] uncommitted = Bytes.toBytes(<span class="jxr_string">"uncommitted"</span>);
<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="46" href="#46">46</a> @Test
<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadInterleaved(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="48" href="#48">48</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="49" href="#49">49</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -72,7 +72,7 @@
<a class="jxr_linenumber" name="62" href="#62">62</a> assertFalse(result.containsColumn(family, col), <span class="jxr_string">"Should be unable to read column"</span>);
<a class="jxr_linenumber" name="63" href="#63">63</a> }
<a class="jxr_linenumber" name="64" href="#64">64</a>
-<a class="jxr_linenumber" name="65" href="#65">65</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="65" href="#65">65</a> @Test
<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testReadWithSeveralUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="67" href="#67">67</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="68" href="#68">68</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestShadowCells.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestShadowCells.html b/xref-test/org/apache/omid/transaction/TestShadowCells.html
index 7a88640..4e2b9e9 100644
--- a/xref-test/org/apache/omid/transaction/TestShadowCells.html
+++ b/xref-test/org/apache/omid/transaction/TestShadowCells.html
@@ -408,7 +408,7 @@
<a class="jxr_linenumber" name="398" href="#398">398</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="399" href="#399">399</a> <em class="jxr_javadoccomment"> * Test that the new client can read shadow cells written by the old client.</em>
<a class="jxr_linenumber" name="400" href="#400">400</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="401" href="#401">401</a> @Test(timeOut = 60_000)
+<a class="jxr_linenumber" name="401" href="#401">401</a> @Test
<a class="jxr_linenumber" name="402" href="#402">402</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetOldShadowCells(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="403" href="#403">403</a>
<a class="jxr_linenumber" name="404" href="#404">404</a> TransactionManager tm = newTransactionManager(context);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
index 61676e6..0bb926e 100644
--- a/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
+++ b/xref-test/org/apache/omid/transaction/TestSingleColumnFamily.html
@@ -44,7 +44,7 @@
<a class="jxr_linenumber" name="34" href="#34">34</a>
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestSingleColumnFamily.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="37" href="#37">37</a> @Test
<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSingleColumnFamily(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="39" href="#39">39</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="40" href="#40">40</a> TTable table1 = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
index e88f3f8..9df2f1c 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionCleanup.html
@@ -66,7 +66,7 @@
<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// lacks some assertions and includes some magic numbers, so we should</em>
<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// try to review and improve the tests in these two classes in a further</em>
<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_comment">// commit.</em>
-<a class="jxr_linenumber" name="59" href="#59">59</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="59" href="#59">59</a> @Test
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="61" href="#61">61</a>
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWS_MODIFIED = 1;
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
index 4a11a91..ea5d14e 100644
--- a/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
+++ b/xref-test/org/apache/omid/transaction/TestTransactionConflict.html
@@ -52,7 +52,7 @@
<a class="jxr_linenumber" name="42" href="#42">42</a>
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestTransactionConflict.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="45" href="#45">45</a> @Test
<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestWriteWriteConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="47" href="#47">47</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="48" href="#48">48</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -86,7 +86,7 @@
<a class="jxr_linenumber" name="76" href="#76">76</a> }
<a class="jxr_linenumber" name="77" href="#77">77</a> }
<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> @Test(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> runTestMultiTableConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="81" href="#81">81</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="82" href="#82">82</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -157,7 +157,7 @@
<a class="jxr_linenumber" name="147" href="#147">147</a> assertEquals(count, 1, <span class="jxr_string">"Should have cell"</span>);
<a class="jxr_linenumber" name="148" href="#148">148</a> }
<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="150" href="#150">150</a> @Test
<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> runTestCleanupAfterConflict(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="152" href="#152">152</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="153" href="#153">153</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
@@ -213,7 +213,7 @@
<a class="jxr_linenumber" name="203" href="#203">203</a> <span class="jxr_string">"Unexpected value for read: "</span> + Bytes.toString(r.getValue(fam, col)));
<a class="jxr_linenumber" name="204" href="#204">204</a> }
<a class="jxr_linenumber" name="205" href="#205">205</a>
-<a class="jxr_linenumber" name="206" href="#206">206</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="206" href="#206">206</a> @Test
<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanupWithDeleteRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="208" href="#208">208</a>
<a class="jxr_linenumber" name="209" href="#209">209</a> TransactionManager tm = newTransactionManager(context);
@@ -284,7 +284,7 @@
<a class="jxr_linenumber" name="274" href="#274">274</a>
<a class="jxr_linenumber" name="275" href="#275">275</a> }
<a class="jxr_linenumber" name="276" href="#276">276</a>
-<a class="jxr_linenumber" name="277" href="#277">277</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="277" href="#277">277</a> @Test
<a class="jxr_linenumber" name="278" href="#278">278</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultipleCellChangesOnSameRow(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="279" href="#279">279</a> TransactionManager tm = newTransactionManager(context);
<a class="jxr_linenumber" name="280" href="#280">280</a> TTable tt = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/transaction/TestUpdateScan.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestUpdateScan.html b/xref-test/org/apache/omid/transaction/TestUpdateScan.html
index 8c8d87a..03deeb9 100644
--- a/xref-test/org/apache/omid/transaction/TestUpdateScan.html
+++ b/xref-test/org/apache/omid/transaction/TestUpdateScan.html
@@ -54,7 +54,7 @@
<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TEST_COL = <span class="jxr_string">"value"</span>;
<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TEST_COL_2 = <span class="jxr_string">"col_2"</span>;
<a class="jxr_linenumber" name="46" href="#46">46</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="47" href="#47">47</a> @Test
<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGet(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="50" href="#50">50</a> TransactionManager tm = newTransactionManager(context);
@@ -74,148 +74,154 @@
<a class="jxr_linenumber" name="64" href="#64">64</a> Get g = <strong class="jxr_keyword">new</strong> Get(startKey);
<a class="jxr_linenumber" name="65" href="#65">65</a> Result r = table.get(t, g);
<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">if</strong> (!r.isEmpty()) {
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">int</strong> tmp = Bytes.toInt(r.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
-<a class="jxr_linenumber" name="68" href="#68">68</a> LOG.info(<span class="jxr_string">"Result:"</span> + tmp);
-<a class="jxr_linenumber" name="69" href="#69">69</a> assertTrue(tmp == startKeyValue, <span class="jxr_string">"Bad value, should be "</span> + startKeyValue + <span class="jxr_string">" but is "</span> + tmp);
-<a class="jxr_linenumber" name="70" href="#70">70</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="71" href="#71">71</a> Assert.fail(<span class="jxr_string">"Bad result"</span>);
-<a class="jxr_linenumber" name="72" href="#72">72</a> }
-<a class="jxr_linenumber" name="73" href="#73">73</a> tm.commit(t);
-<a class="jxr_linenumber" name="74" href="#74">74</a>
-<a class="jxr_linenumber" name="75" href="#75">75</a> Scan s = <strong class="jxr_keyword">new</strong> Scan(startKey);
-<a class="jxr_linenumber" name="76" href="#76">76</a> CompareFilter.CompareOp op = CompareFilter.CompareOp.LESS_OR_EQUAL;
-<a class="jxr_linenumber" name="77" href="#77">77</a> RowFilter toFilter = <strong class="jxr_keyword">new</strong> RowFilter(op, <strong class="jxr_keyword">new</strong> BinaryPrefixComparator(stopKey));
-<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">boolean</strong> startInclusive = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">if</strong> (!startInclusive) {
-<a class="jxr_linenumber" name="80" href="#80">80</a> FilterList filters = <strong class="jxr_keyword">new</strong> FilterList(FilterList.Operator.MUST_PASS_ALL);
-<a class="jxr_linenumber" name="81" href="#81">81</a> filters.addFilter(<strong class="jxr_keyword">new</strong> RowFilter(CompareFilter.CompareOp.GREATER, <strong class="jxr_keyword">new</strong> BinaryPrefixComparator(startKey)));
-<a class="jxr_linenumber" name="82" href="#82">82</a> filters.addFilter(<strong class="jxr_keyword">new</strong> WhileMatchFilter(toFilter));
-<a class="jxr_linenumber" name="83" href="#83">83</a> s.setFilter(filters);
-<a class="jxr_linenumber" name="84" href="#84">84</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="85" href="#85">85</a> s.setFilter(<strong class="jxr_keyword">new</strong> WhileMatchFilter(toFilter));
-<a class="jxr_linenumber" name="86" href="#86">86</a> }
-<a class="jxr_linenumber" name="87" href="#87">87</a> t = tm.begin();
-<a class="jxr_linenumber" name="88" href="#88">88</a> ResultScanner res = table.getScanner(t, s);
-<a class="jxr_linenumber" name="89" href="#89">89</a> Result rr;
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
-<a class="jxr_linenumber" name="93" href="#93">93</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
-<a class="jxr_linenumber" name="94" href="#94">94</a> count++;
-<a class="jxr_linenumber" name="95" href="#95">95</a> }
-<a class="jxr_linenumber" name="96" href="#96">96</a> assertEquals(count, 1, <span class="jxr_string">"Count is wrong"</span>);
-<a class="jxr_linenumber" name="97" href="#97">97</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
-<a class="jxr_linenumber" name="98" href="#98">98</a> tm.commit(t);
-<a class="jxr_linenumber" name="99" href="#99">99</a> table.close();
-<a class="jxr_linenumber" name="100" href="#100">100</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="101" href="#101">101</a> LOG.error(<span class="jxr_string">"Exception in test"</span>, e);
-<a class="jxr_linenumber" name="102" href="#102">102</a> }
-<a class="jxr_linenumber" name="103" href="#103">103</a> }
-<a class="jxr_linenumber" name="104" href="#104">104</a>
-<a class="jxr_linenumber" name="105" href="#105">105</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScan(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">int</strong> tmp = Bytes.toInt(r.getValue(Bytes.toBytes(TEST_FAMILY),
+<a class="jxr_linenumber" name="68" href="#68">68</a> Bytes.toBytes(TEST_COL)));
+<a class="jxr_linenumber" name="69" href="#69">69</a> LOG.info(<span class="jxr_string">"Result:"</span> + tmp);
+<a class="jxr_linenumber" name="70" href="#70">70</a> assertTrue(tmp == startKeyValue, <span class="jxr_string">"Bad value, should be "</span> + startKeyValue + <span class="jxr_string">" but is "</span> + tmp);
+<a class="jxr_linenumber" name="71" href="#71">71</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="72" href="#72">72</a> Assert.fail(<span class="jxr_string">"Bad result"</span>);
+<a class="jxr_linenumber" name="73" href="#73">73</a> }
+<a class="jxr_linenumber" name="74" href="#74">74</a> tm.commit(t);
+<a class="jxr_linenumber" name="75" href="#75">75</a>
+<a class="jxr_linenumber" name="76" href="#76">76</a> Scan s = <strong class="jxr_keyword">new</strong> Scan(startKey);
+<a class="jxr_linenumber" name="77" href="#77">77</a> CompareFilter.CompareOp op = CompareFilter.CompareOp.LESS_OR_EQUAL;
+<a class="jxr_linenumber" name="78" href="#78">78</a> RowFilter toFilter = <strong class="jxr_keyword">new</strong> RowFilter(op, <strong class="jxr_keyword">new</strong> BinaryPrefixComparator(stopKey));
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">boolean</strong> startInclusive = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">if</strong> (!startInclusive) {
+<a class="jxr_linenumber" name="81" href="#81">81</a> FilterList filters = <strong class="jxr_keyword">new</strong> FilterList(FilterList.Operator.MUST_PASS_ALL);
+<a class="jxr_linenumber" name="82" href="#82">82</a> filters.addFilter(<strong class="jxr_keyword">new</strong> RowFilter(CompareFilter.CompareOp.GREATER,
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">new</strong> BinaryPrefixComparator(startKey)));
+<a class="jxr_linenumber" name="84" href="#84">84</a> filters.addFilter(<strong class="jxr_keyword">new</strong> WhileMatchFilter(toFilter));
+<a class="jxr_linenumber" name="85" href="#85">85</a> s.setFilter(filters);
+<a class="jxr_linenumber" name="86" href="#86">86</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="87" href="#87">87</a> s.setFilter(<strong class="jxr_keyword">new</strong> WhileMatchFilter(toFilter));
+<a class="jxr_linenumber" name="88" href="#88">88</a> }
+<a class="jxr_linenumber" name="89" href="#89">89</a> t = tm.begin();
+<a class="jxr_linenumber" name="90" href="#90">90</a> ResultScanner res = table.getScanner(t, s);
+<a class="jxr_linenumber" name="91" href="#91">91</a> Result rr;
+<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
+<a class="jxr_linenumber" name="95" href="#95">95</a> Bytes.toBytes(TEST_COL)));
+<a class="jxr_linenumber" name="96" href="#96">96</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
+<a class="jxr_linenumber" name="97" href="#97">97</a> count++;
+<a class="jxr_linenumber" name="98" href="#98">98</a> }
+<a class="jxr_linenumber" name="99" href="#99">99</a> assertEquals(count, 1, <span class="jxr_string">"Count is wrong"</span>);
+<a class="jxr_linenumber" name="100" href="#100">100</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
+<a class="jxr_linenumber" name="101" href="#101">101</a> tm.commit(t);
+<a class="jxr_linenumber" name="102" href="#102">102</a> table.close();
+<a class="jxr_linenumber" name="103" href="#103">103</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="104" href="#104">104</a> LOG.error(<span class="jxr_string">"Exception in test"</span>, e);
+<a class="jxr_linenumber" name="105" href="#105">105</a> }
+<a class="jxr_linenumber" name="106" href="#106">106</a> }
<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="109" href="#109">109</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="110" href="#110">110</a> Transaction t = tm.begin();
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">int</strong>[] lInts = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
-<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> lInt : lInts) {
-<a class="jxr_linenumber" name="113" href="#113">113</a> byte[] data = Bytes.toBytes(lInt);
-<a class="jxr_linenumber" name="114" href="#114">114</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="115" href="#115">115</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
-<a class="jxr_linenumber" name="116" href="#116">116</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2), data);
-<a class="jxr_linenumber" name="117" href="#117">117</a> table.put(t, put);
-<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> Scan s = <strong class="jxr_keyword">new</strong> Scan();
-<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_comment">// Adding two columns to the scanner should not throw a</em>
-<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// ConcurrentModificationException when getting the scanner</em>
-<a class="jxr_linenumber" name="123" href="#123">123</a> s.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL));
-<a class="jxr_linenumber" name="124" href="#124">124</a> s.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2));
-<a class="jxr_linenumber" name="125" href="#125">125</a> ResultScanner res = table.getScanner(t, s);
-<a class="jxr_linenumber" name="126" href="#126">126</a> Result rr;
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
-<a class="jxr_linenumber" name="130" href="#130">130</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
-<a class="jxr_linenumber" name="131" href="#131">131</a> count++;
-<a class="jxr_linenumber" name="132" href="#132">132</a> }
-<a class="jxr_linenumber" name="133" href="#133">133</a> assertTrue(count == lInts.length, <span class="jxr_string">"Count should be "</span> + lInts.length + <span class="jxr_string">" but is "</span> + count);
-<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
-<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> tm.commit(t);
-<a class="jxr_linenumber" name="137" href="#137">137</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a> t = tm.begin();
-<a class="jxr_linenumber" name="139" href="#139">139</a> res = table.getScanner(t, s);
-<a class="jxr_linenumber" name="140" href="#140">140</a> count = 0;
-<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
-<a class="jxr_linenumber" name="143" href="#143">143</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
-<a class="jxr_linenumber" name="144" href="#144">144</a> count++;
-<a class="jxr_linenumber" name="145" href="#145">145</a> }
-<a class="jxr_linenumber" name="146" href="#146">146</a> assertTrue(count == lInts.length, <span class="jxr_string">"Count should be "</span> + lInts.length + <span class="jxr_string">" but is "</span> + count);
-<a class="jxr_linenumber" name="147" href="#147">147</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
-<a class="jxr_linenumber" name="148" href="#148">148</a> tm.commit(t);
-<a class="jxr_linenumber" name="149" href="#149">149</a> }
-<a class="jxr_linenumber" name="150" href="#150">150</a>
-<a class="jxr_linenumber" name="151" href="#151">151</a> }
-<a class="jxr_linenumber" name="152" href="#152">152</a>
-<a class="jxr_linenumber" name="153" href="#153">153</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="156" href="#156">156</a> TransactionManager tm = newTransactionManager(context);
-<a class="jxr_linenumber" name="157" href="#157">157</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
-<a class="jxr_linenumber" name="158" href="#158">158</a> Transaction t = tm.begin();
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">int</strong>[] lIntsA = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsA : lIntsA) {
-<a class="jxr_linenumber" name="161" href="#161">161</a> byte[] data = Bytes.toBytes(aLIntsA);
-<a class="jxr_linenumber" name="162" href="#162">162</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="163" href="#163">163</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
-<a class="jxr_linenumber" name="164" href="#164">164</a> table.put(t, put);
-<a class="jxr_linenumber" name="165" href="#165">165</a> }
-<a class="jxr_linenumber" name="166" href="#166">166</a> tm.commit(t);
-<a class="jxr_linenumber" name="167" href="#167">167</a>
-<a class="jxr_linenumber" name="168" href="#168">168</a> Transaction tu = tm.begin();
-<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">int</strong>[] lIntsB = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{105, 24, 4342, 32, 7, 3, 30, 40};
-<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsB : lIntsB) {
-<a class="jxr_linenumber" name="171" href="#171">171</a> byte[] data = Bytes.toBytes(aLIntsB);
-<a class="jxr_linenumber" name="172" href="#172">172</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="173" href="#173">173</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
-<a class="jxr_linenumber" name="174" href="#174">174</a> table.put(tu, put);
-<a class="jxr_linenumber" name="175" href="#175">175</a> }
-<a class="jxr_linenumber" name="176" href="#176">176</a>
-<a class="jxr_linenumber" name="177" href="#177">177</a> t = tm.begin();
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">int</strong>[] lIntsC = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{109, 224, 242, 2, 16, 59, 23, 26};
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsC : lIntsC) {
-<a class="jxr_linenumber" name="180" href="#180">180</a> byte[] data = Bytes.toBytes(aLIntsC);
-<a class="jxr_linenumber" name="181" href="#181">181</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
-<a class="jxr_linenumber" name="182" href="#182">182</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
-<a class="jxr_linenumber" name="183" href="#183">183</a> table.put(t, put);
-<a class="jxr_linenumber" name="184" href="#184">184</a> }
-<a class="jxr_linenumber" name="185" href="#185">185</a> tm.commit(t);
-<a class="jxr_linenumber" name="186" href="#186">186</a>
-<a class="jxr_linenumber" name="187" href="#187">187</a> t = tm.begin();
-<a class="jxr_linenumber" name="188" href="#188">188</a> Scan s = <strong class="jxr_keyword">new</strong> Scan();
-<a class="jxr_linenumber" name="189" href="#189">189</a> ResultScanner res = table.getScanner(t, s);
-<a class="jxr_linenumber" name="190" href="#190">190</a> Result rr;
-<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="108" href="#108">108</a> @Test
+<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScan(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">try</strong> (TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
+<a class="jxr_linenumber" name="112" href="#112">112</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="113" href="#113">113</a> Transaction t = tm.begin();
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">int</strong>[] lInts = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> lInt : lInts) {
+<a class="jxr_linenumber" name="116" href="#116">116</a> byte[] data = Bytes.toBytes(lInt);
+<a class="jxr_linenumber" name="117" href="#117">117</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
+<a class="jxr_linenumber" name="118" href="#118">118</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="119" href="#119">119</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2), data);
+<a class="jxr_linenumber" name="120" href="#120">120</a> table.put(t, put);
+<a class="jxr_linenumber" name="121" href="#121">121</a> }
+<a class="jxr_linenumber" name="122" href="#122">122</a>
+<a class="jxr_linenumber" name="123" href="#123">123</a> Scan s = <strong class="jxr_keyword">new</strong> Scan();
+<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment">// Adding two columns to the scanner should not throw a</em>
+<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">// ConcurrentModificationException when getting the scanner</em>
+<a class="jxr_linenumber" name="126" href="#126">126</a> s.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL));
+<a class="jxr_linenumber" name="127" href="#127">127</a> s.addColumn(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL_2));
+<a class="jxr_linenumber" name="128" href="#128">128</a> ResultScanner res = table.getScanner(t, s);
+<a class="jxr_linenumber" name="129" href="#129">129</a> Result rr;
+<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
+<a class="jxr_linenumber" name="133" href="#133">133</a> Bytes.toBytes(TEST_COL)));
+<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
+<a class="jxr_linenumber" name="135" href="#135">135</a> count++;
+<a class="jxr_linenumber" name="136" href="#136">136</a> }
+<a class="jxr_linenumber" name="137" href="#137">137</a> assertTrue(count == lInts.length, <span class="jxr_string">"Count should be "</span> + lInts.length + <span class="jxr_string">" but is "</span> + count);
+<a class="jxr_linenumber" name="138" href="#138">138</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
+<a class="jxr_linenumber" name="139" href="#139">139</a>
+<a class="jxr_linenumber" name="140" href="#140">140</a> tm.commit(t);
+<a class="jxr_linenumber" name="141" href="#141">141</a>
+<a class="jxr_linenumber" name="142" href="#142">142</a> t = tm.begin();
+<a class="jxr_linenumber" name="143" href="#143">143</a> res = table.getScanner(t, s);
+<a class="jxr_linenumber" name="144" href="#144">144</a> count = 0;
+<a class="jxr_linenumber" name="145" href="#145">145</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
+<a class="jxr_linenumber" name="147" href="#147">147</a> Bytes.toBytes(TEST_COL)));
+<a class="jxr_linenumber" name="148" href="#148">148</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
+<a class="jxr_linenumber" name="149" href="#149">149</a> count++;
+<a class="jxr_linenumber" name="150" href="#150">150</a> }
+<a class="jxr_linenumber" name="151" href="#151">151</a> assertTrue(count == lInts.length, <span class="jxr_string">"Count should be "</span> + lInts.length + <span class="jxr_string">" but is "</span> + count);
+<a class="jxr_linenumber" name="152" href="#152">152</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
+<a class="jxr_linenumber" name="153" href="#153">153</a> tm.commit(t);
+<a class="jxr_linenumber" name="154" href="#154">154</a> }
+<a class="jxr_linenumber" name="155" href="#155">155</a>
+<a class="jxr_linenumber" name="156" href="#156">156</a> }
+<a class="jxr_linenumber" name="157" href="#157">157</a>
+<a class="jxr_linenumber" name="158" href="#158">158</a>
+<a class="jxr_linenumber" name="159" href="#159">159</a> @Test
+<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScanUncommitted(ITestContext context) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="162" href="#162">162</a> TransactionManager tm = newTransactionManager(context);
+<a class="jxr_linenumber" name="163" href="#163">163</a> TTable table = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE);
+<a class="jxr_linenumber" name="164" href="#164">164</a> Transaction t = tm.begin();
+<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">int</strong>[] lIntsA = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{100, 243, 2342, 22, 1, 5, 43, 56};
+<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsA : lIntsA) {
+<a class="jxr_linenumber" name="167" href="#167">167</a> byte[] data = Bytes.toBytes(aLIntsA);
+<a class="jxr_linenumber" name="168" href="#168">168</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
+<a class="jxr_linenumber" name="169" href="#169">169</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="170" href="#170">170</a> table.put(t, put);
+<a class="jxr_linenumber" name="171" href="#171">171</a> }
+<a class="jxr_linenumber" name="172" href="#172">172</a> tm.commit(t);
+<a class="jxr_linenumber" name="173" href="#173">173</a>
+<a class="jxr_linenumber" name="174" href="#174">174</a> Transaction tu = tm.begin();
+<a class="jxr_linenumber" name="175" href="#175">175</a> <strong class="jxr_keyword">int</strong>[] lIntsB = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{105, 24, 4342, 32, 7, 3, 30, 40};
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsB : lIntsB) {
+<a class="jxr_linenumber" name="177" href="#177">177</a> byte[] data = Bytes.toBytes(aLIntsB);
+<a class="jxr_linenumber" name="178" href="#178">178</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
+<a class="jxr_linenumber" name="179" href="#179">179</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="180" href="#180">180</a> table.put(tu, put);
+<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> t = tm.begin();
+<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">int</strong>[] lIntsC = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[]{109, 224, 242, 2, 16, 59, 23, 26};
+<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> aLIntsC : lIntsC) {
+<a class="jxr_linenumber" name="186" href="#186">186</a> byte[] data = Bytes.toBytes(aLIntsC);
+<a class="jxr_linenumber" name="187" href="#187">187</a> Put put = <strong class="jxr_keyword">new</strong> Put(data);
+<a class="jxr_linenumber" name="188" href="#188">188</a> put.add(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL), data);
+<a class="jxr_linenumber" name="189" href="#189">189</a> table.put(t, put);
+<a class="jxr_linenumber" name="190" href="#190">190</a> }
+<a class="jxr_linenumber" name="191" href="#191">191</a> tm.commit(t);
<a class="jxr_linenumber" name="192" href="#192">192</a>
-<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
-<a class="jxr_linenumber" name="195" href="#195">195</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
-<a class="jxr_linenumber" name="196" href="#196">196</a> count++;
-<a class="jxr_linenumber" name="197" href="#197">197</a> }
-<a class="jxr_linenumber" name="198" href="#198">198</a> assertTrue(count == lIntsA.length + lIntsC.length,
-<a class="jxr_linenumber" name="199" href="#199">199</a> <span class="jxr_string">"Count should be "</span> + (lIntsA.length * lIntsC.length) + <span class="jxr_string">" but is "</span> + count);
-<a class="jxr_linenumber" name="200" href="#200">200</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
-<a class="jxr_linenumber" name="201" href="#201">201</a> tm.commit(t);
-<a class="jxr_linenumber" name="202" href="#202">202</a> table.close();
-<a class="jxr_linenumber" name="203" href="#203">203</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="204" href="#204">204</a> LOG.error(<span class="jxr_string">"Exception in test"</span>, e);
-<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> }
+<a class="jxr_linenumber" name="193" href="#193">193</a> t = tm.begin();
+<a class="jxr_linenumber" name="194" href="#194">194</a> Scan s = <strong class="jxr_keyword">new</strong> Scan();
+<a class="jxr_linenumber" name="195" href="#195">195</a> ResultScanner res = table.getScanner(t, s);
+<a class="jxr_linenumber" name="196" href="#196">196</a> Result rr;
+<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="198" href="#198">198</a>
+<a class="jxr_linenumber" name="199" href="#199">199</a> <strong class="jxr_keyword">while</strong> ((rr = res.next()) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="200" href="#200">200</a> <strong class="jxr_keyword">int</strong> iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
+<a class="jxr_linenumber" name="201" href="#201">201</a> Bytes.toBytes(TEST_COL)));
+<a class="jxr_linenumber" name="202" href="#202">202</a> LOG.info(<span class="jxr_string">"Result: "</span> + iTmp);
+<a class="jxr_linenumber" name="203" href="#203">203</a> count++;
+<a class="jxr_linenumber" name="204" href="#204">204</a> }
+<a class="jxr_linenumber" name="205" href="#205">205</a> assertTrue(count == lIntsA.length + lIntsC.length,
+<a class="jxr_linenumber" name="206" href="#206">206</a> <span class="jxr_string">"Count should be "</span> + (lIntsA.length * lIntsC.length) + <span class="jxr_string">" but is "</span> + count);
+<a class="jxr_linenumber" name="207" href="#207">207</a> LOG.info(<span class="jxr_string">"Rows found "</span> + count);
+<a class="jxr_linenumber" name="208" href="#208">208</a> tm.commit(t);
+<a class="jxr_linenumber" name="209" href="#209">209</a> table.close();
+<a class="jxr_linenumber" name="210" href="#210">210</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="211" href="#211">211</a> LOG.error(<span class="jxr_string">"Exception in test"</span>, e);
+<a class="jxr_linenumber" name="212" href="#212">212</a> }
+<a class="jxr_linenumber" name="213" href="#213">213</a> }
+<a class="jxr_linenumber" name="214" href="#214">214</a> }
</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/package-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/package-frame.html b/xref-test/org/apache/omid/transaction/package-frame.html
index c8e2de6..3dca2fb 100644
--- a/xref-test/org/apache/omid/transaction/package-frame.html
+++ b/xref-test/org/apache/omid/transaction/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.transaction</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.transaction</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/package-summary.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/package-summary.html b/xref-test/org/apache/omid/transaction/package-summary.html
index 094149e..8743ded 100644
--- a/xref-test/org/apache/omid/transaction/package-summary.html
+++ b/xref-test/org/apache/omid/transaction/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.transaction</title>
+ <title>Omid 0.8.2.0 Reference Package org.apache.omid.transaction</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/tso/PausableTimestampOracle.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/PausableTimestampOracle.html b/xref-test/org/apache/omid/tso/PausableTimestampOracle.html
index ad0d7ac..c7a432f 100644
--- a/xref-test/org/apache/omid/tso/PausableTimestampOracle.html
+++ b/xref-test/org/apache/omid/tso/PausableTimestampOracle.html
@@ -49,7 +49,7 @@
<a class="jxr_linenumber" name="39" href="#39">39</a> }
<a class="jxr_linenumber" name="40" href="#40">40</a>
<a class="jxr_linenumber" name="41" href="#41">41</a> @Override
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> next() {
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> next() <strong class="jxr_keyword">throws</strong> IOException {
<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">while</strong> (tsoPaused) {
<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">synchronized</strong> (<strong class="jxr_keyword">this</strong>) {
<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">try</strong> {
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TSOServerConfigTest.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TSOServerConfigTest.html b/xref-test/org/apache/omid/tso/TSOServerConfigTest.html
index 9a228ae..dd30d98 100644
--- a/xref-test/org/apache/omid/tso/TSOServerConfigTest.html
+++ b/xref-test/org/apache/omid/tso/TSOServerConfigTest.html
@@ -31,7 +31,7 @@
<a class="jxr_linenumber" name="21" href="#21">21</a>
<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TSOServerConfigTest.html">TSOServerConfigTest</a> {
<a class="jxr_linenumber" name="23" href="#23">23</a>
-<a class="jxr_linenumber" name="24" href="#24">24</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="24" href="#24">24</a> @Test
<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testParsesOK() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">new</strong> TSOServerConfig(<span class="jxr_string">"test-omid.yml"</span>);
<a class="jxr_linenumber" name="27" href="#27">27</a> }
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/49fbc5e7/xref-test/org/apache/omid/tso/TestBatch.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/tso/TestBatch.html b/xref-test/org/apache/omid/tso/TestBatch.html
index e34c8be..d744326 100644
--- a/xref-test/org/apache/omid/tso/TestBatch.html
+++ b/xref-test/org/apache/omid/tso/TestBatch.html
@@ -32,146 +32,135 @@
<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.mockito.Mock;
<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="27" href="#27">27</a>
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.mockito.MockitoAnnotations.initMocks;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="26" href="#26">26</a>
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertFalse;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
+<a class="jxr_linenumber" name="31" href="#31">31</a>
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TestBatch.html">TestBatch</a> {
<a class="jxr_linenumber" name="33" href="#33">33</a>
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/tso/TestBatch.html">TestBatch</a> {
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestBatch.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="35" href="#35">35</a>
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestBatch.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> BATCH_SIZE = 1000;
<a class="jxr_linenumber" name="37" href="#37">37</a>
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> BATCH_SIZE = 1000;
-<a class="jxr_linenumber" name="39" href="#39">39</a>
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> ANY_ST = 1231;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> ANY_CT = 2241;
-<a class="jxr_linenumber" name="42" href="#42">42</a>
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> ANY_ST = 1231;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> ANY_CT = 2241;
+<a class="jxr_linenumber" name="40" href="#40">40</a>
+<a class="jxr_linenumber" name="41" href="#41">41</a> @Mock
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">private</strong> Channel channel;
<a class="jxr_linenumber" name="43" href="#43">43</a> @Mock
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> Channel channel;
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Mock
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> MonitoringContext monCtx;
-<a class="jxr_linenumber" name="47" href="#47">47</a>
-<a class="jxr_linenumber" name="48" href="#48">48</a> @BeforeMethod
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">void</strong> setup() {
-<a class="jxr_linenumber" name="50" href="#50">50</a> initMocks(<strong class="jxr_keyword">this</strong>);
-<a class="jxr_linenumber" name="51" href="#51">51</a> }
-<a class="jxr_linenumber" name="52" href="#52">52</a>
-<a class="jxr_linenumber" name="53" href="#53">53</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBatchFunctionality() {
-<a class="jxr_linenumber" name="55" href="#55">55</a>
-<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_comment">// Component to test</em>
-<a class="jxr_linenumber" name="57" href="#57">57</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(0, BATCH_SIZE);
-<a class="jxr_linenumber" name="58" href="#58">58</a>
-<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_comment">// Test initial state is OK</em>
-<a class="jxr_linenumber" name="60" href="#60">60</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
-<a class="jxr_linenumber" name="61" href="#61">61</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
-<a class="jxr_linenumber" name="62" href="#62">62</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_comment">// Test getting or setting an element in the batch greater than the current number of events is illegal</em>
-<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="66" href="#66">66</a> batch.get(1);
-<a class="jxr_linenumber" name="67" href="#67">67</a> fail();
-<a class="jxr_linenumber" name="68" href="#68">68</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
-<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
-<a class="jxr_linenumber" name="70" href="#70">70</a> }
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="72" href="#72">72</a> batch.set(1, <strong class="jxr_keyword">new</strong> PersistEvent());
-<a class="jxr_linenumber" name="73" href="#73">73</a> fail();
-<a class="jxr_linenumber" name="74" href="#74">74</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
-<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
-<a class="jxr_linenumber" name="76" href="#76">76</a> }
-<a class="jxr_linenumber" name="77" href="#77">77</a>
-<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_comment">// Test when filling the batch with different types of events, that becomes full</em>
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < BATCH_SIZE; i++) {
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">if</strong> (i % 4 == 0) {
-<a class="jxr_linenumber" name="81" href="#81">81</a> batch.addTimestamp(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="82" href="#82">82</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (i % 4 == 1) {
-<a class="jxr_linenumber" name="83" href="#83">83</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
-<a class="jxr_linenumber" name="84" href="#84">84</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (i % 4 == 2) {
-<a class="jxr_linenumber" name="85" href="#85">85</a> batch.addCommitRetry(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="86" href="#86">86</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="87" href="#87">87</a> batch.addAbort(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="88" href="#88">88</a> }
-<a class="jxr_linenumber" name="89" href="#89">89</a> }
-<a class="jxr_linenumber" name="90" href="#90">90</a> assertFalse(batch.isEmpty(), <span class="jxr_string">"Batch should contain elements"</span>);
-<a class="jxr_linenumber" name="91" href="#91">91</a> assertTrue(batch.isFull(), <span class="jxr_string">"Batch should be full"</span>);
-<a class="jxr_linenumber" name="92" href="#92">92</a> assertEquals(batch.getNumEvents(), BATCH_SIZE, <span class="jxr_string">"Num events should be "</span> + BATCH_SIZE);
-<a class="jxr_linenumber" name="93" href="#93">93</a>
-<a class="jxr_linenumber" name="94" href="#94">94</a> <em class="jxr_comment">// Test an exception is thrown when batch is full and a new element is going to be added</em>
-<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="96" href="#96">96</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
-<a class="jxr_linenumber" name="97" href="#97">97</a> fail(<span class="jxr_string">"Should throw an IllegalStateException"</span>);
-<a class="jxr_linenumber" name="98" href="#98">98</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException e) {
-<a class="jxr_linenumber" name="99" href="#99">99</a> assertEquals(e.getMessage(), <span class="jxr_string">"batch is full"</span>, <span class="jxr_string">"message returned doesn't match"</span>);
-<a class="jxr_linenumber" name="100" href="#100">100</a> LOG.debug(<span class="jxr_string">"IllegalStateException catch properly"</span>);
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
-<a class="jxr_linenumber" name="102" href="#102">102</a> assertTrue(batch.isFull(), <span class="jxr_string">"Batch shouldn't be empty"</span>);
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_comment">// Check the first 3 events and the last one correspond to the filling done above</em>
-<a class="jxr_linenumber" name="105" href="#105">105</a> assertTrue(batch.get(0).getType().equals(PersistEvent.Type.TIMESTAMP));
-<a class="jxr_linenumber" name="106" href="#106">106</a> assertTrue(batch.get(1).getType().equals(PersistEvent.Type.COMMIT));
-<a class="jxr_linenumber" name="107" href="#107">107</a> assertTrue(batch.get(2).getType().equals(PersistEvent.Type.COMMIT_RETRY));
-<a class="jxr_linenumber" name="108" href="#108">108</a> assertTrue(batch.get(3).getType().equals(PersistEvent.Type.ABORT));
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> MonitoringContext monCtx;
+<a class="jxr_linenumber" name="45" href="#45">45</a>
+<a class="jxr_linenumber" name="46" href="#46">46</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBatchFunctionality() {
+<a class="jxr_linenumber" name="48" href="#48">48</a>
+<a class="jxr_linenumber" name="49" href="#49">49</a> <em class="jxr_comment">// Component to test</em>
+<a class="jxr_linenumber" name="50" href="#50">50</a> Batch batch = <strong class="jxr_keyword">new</strong> Batch(0, BATCH_SIZE);
+<a class="jxr_linenumber" name="51" href="#51">51</a>
+<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_comment">// Test initial state is OK</em>
+<a class="jxr_linenumber" name="53" href="#53">53</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
+<a class="jxr_linenumber" name="54" href="#54">54</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
+<a class="jxr_linenumber" name="55" href="#55">55</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
+<a class="jxr_linenumber" name="56" href="#56">56</a>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_comment">// Test getting or setting an element in the batch greater than the current number of events is illegal</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="59" href="#59">59</a> batch.get(1);
+<a class="jxr_linenumber" name="60" href="#60">60</a> fail();
+<a class="jxr_linenumber" name="61" href="#61">61</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
+<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
+<a class="jxr_linenumber" name="63" href="#63">63</a> }
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="65" href="#65">65</a> batch.set(1, <strong class="jxr_keyword">new</strong> PersistEvent());
+<a class="jxr_linenumber" name="66" href="#66">66</a> fail();
+<a class="jxr_linenumber" name="67" href="#67">67</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
+<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
+<a class="jxr_linenumber" name="69" href="#69">69</a> }
+<a class="jxr_linenumber" name="70" href="#70">70</a>
+<a class="jxr_linenumber" name="71" href="#71">71</a> <em class="jxr_comment">// Test when filling the batch with different types of events, that becomes full</em>
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < BATCH_SIZE; i++) {
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">if</strong> (i % 3 == 0) {
+<a class="jxr_linenumber" name="74" href="#74">74</a> batch.addTimestamp(ANY_ST, channel, monCtx);
+<a class="jxr_linenumber" name="75" href="#75">75</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (i % 3 == 1) {
+<a class="jxr_linenumber" name="76" href="#76">76</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
+<a class="jxr_linenumber" name="77" href="#77">77</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="78" href="#78">78</a> batch.addAbort(ANY_ST, false, channel, monCtx);
+<a class="jxr_linenumber" name="79" href="#79">79</a> }
+<a class="jxr_linenumber" name="80" href="#80">80</a> }
+<a class="jxr_linenumber" name="81" href="#81">81</a> assertFalse(batch.isEmpty(), <span class="jxr_string">"Batch should contain elements"</span>);
+<a class="jxr_linenumber" name="82" href="#82">82</a> assertTrue(batch.isFull(), <span class="jxr_string">"Batch should be full"</span>);
+<a class="jxr_linenumber" name="83" href="#83">83</a> assertEquals(batch.getNumEvents(), BATCH_SIZE, <span class="jxr_string">"Num events should be "</span> + BATCH_SIZE);
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_comment">// Test an exception is thrown when batch is full and a new element is going to be added</em>
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="87" href="#87">87</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
+<a class="jxr_linenumber" name="88" href="#88">88</a> fail(<span class="jxr_string">"Should throw an IllegalStateException"</span>);
+<a class="jxr_linenumber" name="89" href="#89">89</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException e) {
+<a class="jxr_linenumber" name="90" href="#90">90</a> assertEquals(e.getMessage(), <span class="jxr_string">"batch is full"</span>, <span class="jxr_string">"message returned doesn't match"</span>);
+<a class="jxr_linenumber" name="91" href="#91">91</a> LOG.debug(<span class="jxr_string">"IllegalStateException catch properly"</span>);
+<a class="jxr_linenumber" name="92" href="#92">92</a> }
+<a class="jxr_linenumber" name="93" href="#93">93</a> assertTrue(batch.isFull(), <span class="jxr_string">"Batch shouldn't be empty"</span>);
+<a class="jxr_linenumber" name="94" href="#94">94</a>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_comment">// Check the first 3 events and the last one correspond to the filling done above</em>
+<a class="jxr_linenumber" name="96" href="#96">96</a> assertTrue(batch.get(0).getType().equals(PersistEvent.Type.TIMESTAMP));
+<a class="jxr_linenumber" name="97" href="#97">97</a> assertTrue(batch.get(1).getType().equals(PersistEvent.Type.COMMIT));
+<a class="jxr_linenumber" name="98" href="#98">98</a> assertTrue(batch.get(2).getType().equals(PersistEvent.Type.ABORT));
+<a class="jxr_linenumber" name="99" href="#99">99</a>
+<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_comment">// Set a new value for last element in Batch and check we obtain the right result</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> batch.decreaseNumEvents();
+<a class="jxr_linenumber" name="102" href="#102">102</a> assertEquals(batch.getNumEvents(), BATCH_SIZE - 1, <span class="jxr_string">"Num events should be "</span> + (BATCH_SIZE - 1));
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="104" href="#104">104</a> batch.get(BATCH_SIZE - 1);
+<a class="jxr_linenumber" name="105" href="#105">105</a> fail();
+<a class="jxr_linenumber" name="106" href="#106">106</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
+<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
+<a class="jxr_linenumber" name="108" href="#108">108</a> }
<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_comment">// Set a new value for last element in Batch and check we obtain the right result</em>
-<a class="jxr_linenumber" name="111" href="#111">111</a> batch.decreaseNumEvents();
-<a class="jxr_linenumber" name="112" href="#112">112</a> assertEquals(batch.getNumEvents(), BATCH_SIZE - 1, <span class="jxr_string">"Num events should be "</span> + (BATCH_SIZE - 1));
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="114" href="#114">114</a> batch.get(BATCH_SIZE - 1);
-<a class="jxr_linenumber" name="115" href="#115">115</a> fail();
-<a class="jxr_linenumber" name="116" href="#116">116</a> } <strong class="jxr_keyword">catch</strong> (IllegalStateException ex) {
-<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment">// Expected, as we can not access elements in the batch greater than the current number of events</em>
-<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> <em class="jxr_comment">// Re-check that batch is NOT full</em>
-<a class="jxr_linenumber" name="121" href="#121">121</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
-<a class="jxr_linenumber" name="122" href="#122">122</a>
-<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// Clear the batch and goes back to its initial state</em>
-<a class="jxr_linenumber" name="124" href="#124">124</a> batch.clear();
-<a class="jxr_linenumber" name="125" href="#125">125</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
-<a class="jxr_linenumber" name="126" href="#126">126</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
-<a class="jxr_linenumber" name="128" href="#128">128</a>
-<a class="jxr_linenumber" name="129" href="#129">129</a> }
-<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a> @Test(timeOut = 10_000)
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBatchFactoryFunctionality() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="133" href="#133">133</a>
-<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_comment">// Component to test</em>
-<a class="jxr_linenumber" name="135" href="#135">135</a> Batch.BatchFactory factory = <strong class="jxr_keyword">new</strong> Batch.BatchFactory(BATCH_SIZE);
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_comment">// Re-check that batch is NOT full</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
+<a class="jxr_linenumber" name="112" href="#112">112</a>
+<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_comment">// Clear the batch and goes back to its initial state</em>
+<a class="jxr_linenumber" name="114" href="#114">114</a> batch.clear();
+<a class="jxr_linenumber" name="115" href="#115">115</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
+<a class="jxr_linenumber" name="116" href="#116">116</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
+<a class="jxr_linenumber" name="117" href="#117">117</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
+<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>
+<a class="jxr_linenumber" name="121" href="#121">121</a> @Test(timeOut = 10_000)
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBatchFactoryFunctionality() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="123" href="#123">123</a>
+<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment">// Component to test</em>
+<a class="jxr_linenumber" name="125" href="#125">125</a> Batch.BatchFactory factory = <strong class="jxr_keyword">new</strong> Batch.BatchFactory(BATCH_SIZE);
+<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 the factory creates a new batch properly...</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> Batch batch = factory.create();
+<a class="jxr_linenumber" name="129" href="#129">129</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
+<a class="jxr_linenumber" name="130" href="#130">130</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
+<a class="jxr_linenumber" name="131" href="#131">131</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
+<a class="jxr_linenumber" name="132" href="#132">132</a>
+<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// ...and is wrapped in to a pooled object</em>
+<a class="jxr_linenumber" name="134" href="#134">134</a> PooledObject<Batch> pooledBatch = factory.wrap(batch);
+<a class="jxr_linenumber" name="135" href="#135">135</a> assertEquals(pooledBatch.getObject(), batch);
<a class="jxr_linenumber" name="136" href="#136">136</a>
-<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment">// Check the factory creates a new batch properly...</em>
-<a class="jxr_linenumber" name="138" href="#138">138</a> Batch batch = factory.create();
-<a class="jxr_linenumber" name="139" href="#139">139</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should be empty"</span>);
-<a class="jxr_linenumber" name="140" href="#140">140</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch shouldn't be full"</span>);
-<a class="jxr_linenumber" name="141" href="#141">141</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
-<a class="jxr_linenumber" name="142" href="#142">142</a>
-<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_comment">// ...and is wrapped in to a pooled object</em>
-<a class="jxr_linenumber" name="144" href="#144">144</a> PooledObject<Batch> pooledBatch = factory.wrap(batch);
-<a class="jxr_linenumber" name="145" href="#145">145</a> assertEquals(pooledBatch.getObject(), batch);
-<a class="jxr_linenumber" name="146" href="#146">146</a>
-<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// Put some elements in the batch...</em>
-<a class="jxr_linenumber" name="148" href="#148">148</a> batch.addTimestamp(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="149" href="#149">149</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
-<a class="jxr_linenumber" name="150" href="#150">150</a> batch.addCommitRetry(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="151" href="#151">151</a> batch.addAbort(ANY_ST, channel, monCtx);
-<a class="jxr_linenumber" name="152" href="#152">152</a> assertFalse(batch.isEmpty(), <span class="jxr_string">"Batch should contain elements"</span>);
-<a class="jxr_linenumber" name="153" href="#153">153</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch should NOT be full"</span>);
-<a class="jxr_linenumber" name="154" href="#154">154</a> assertEquals(batch.getNumEvents(), 4, <span class="jxr_string">"Num events should be 4"</span>);
-<a class="jxr_linenumber" name="155" href="#155">155</a>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment">// ... and passivate the object through the factory. It should reset the state of the batch</em>
-<a class="jxr_linenumber" name="157" href="#157">157</a> factory.passivateObject(pooledBatch);
-<a class="jxr_linenumber" name="158" href="#158">158</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should NOT contain elements"</span>);
-<a class="jxr_linenumber" name="159" href="#159">159</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch should NOT be full"</span>);
-<a class="jxr_linenumber" name="160" href="#160">160</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
-<a class="jxr_linenumber" name="161" href="#161">161</a>
-<a class="jxr_linenumber" name="162" href="#162">162</a> }
-<a class="jxr_linenumber" name="163" href="#163">163</a>
-<a class="jxr_linenumber" name="164" href="#164">164</a> }
+<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_comment">// Put some elements in the batch...</em>
+<a class="jxr_linenumber" name="138" href="#138">138</a> batch.addTimestamp(ANY_ST, channel, monCtx);
+<a class="jxr_linenumber" name="139" href="#139">139</a> batch.addCommit(ANY_ST, ANY_CT, channel, monCtx);
+<a class="jxr_linenumber" name="140" href="#140">140</a> batch.addAbort(ANY_ST, false, channel, monCtx);
+<a class="jxr_linenumber" name="141" href="#141">141</a> assertFalse(batch.isEmpty(), <span class="jxr_string">"Batch should contain elements"</span>);
+<a class="jxr_linenumber" name="142" href="#142">142</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch should NOT be full"</span>);
+<a class="jxr_linenumber" name="143" href="#143">143</a> assertEquals(batch.getNumEvents(), 3, <span class="jxr_string">"Num events should be 3"</span>);
+<a class="jxr_linenumber" name="144" href="#144">144</a>
+<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// ... and passivate the object through the factory. It should reset the state of the batch</em>
+<a class="jxr_linenumber" name="146" href="#146">146</a> factory.passivateObject(pooledBatch);
+<a class="jxr_linenumber" name="147" href="#147">147</a> assertTrue(batch.isEmpty(), <span class="jxr_string">"Batch should NOT contain elements"</span>);
+<a class="jxr_linenumber" name="148" href="#148">148</a> assertFalse(batch.isFull(), <span class="jxr_string">"Batch should NOT be full"</span>);
+<a class="jxr_linenumber" name="149" href="#149">149</a> assertEquals(batch.getNumEvents(), 0, <span class="jxr_string">"Num events should be 0"</span>);
+<a class="jxr_linenumber" name="150" href="#150">150</a>
+<a class="jxr_linenumber" name="151" href="#151">151</a> }
+<a class="jxr_linenumber" name="152" href="#152">152</a>
+<a class="jxr_linenumber" name="153" href="#153">153</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>