diff --git src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java index b2b7cce..88c78a4 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java @@ -19,8 +19,6 @@ */ package org.apache.hadoop.hbase.regionserver; -import com.google.common.collect.ImmutableList; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -45,6 +43,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; +import com.google.common.collect.ImmutableList; + /** * Test the {@link SplitTransaction} class against an HRegion (as opposed to * running cluster). @@ -212,12 +212,9 @@ public class TestSplitTransaction { GOOD_SPLIT_ROW)); assertTrue(Bytes.equals(this.parent.getEndKey(), daughters.getSecond().getEndKey())); - // Count rows. + // Count rows. daughters are already open int daughtersRowCount = 0; - for (HRegion r: daughters) { - // Open so can count its content. - HRegion openRegion = HRegion.openHRegion(this.testdir, r.getRegionInfo(), - r.getTableDesc(), r.getLog(), r.getConf()); + for (HRegion openRegion: daughters) { try { int count = countRows(openRegion); assertTrue(count > 0 && count != rowcount); @@ -268,12 +265,9 @@ public class TestSplitTransaction { // Now retry the split but do not throw an exception this time. assertTrue(st.prepare()); PairOfSameType daughters = st.execute(mockServer, null); - // Count rows. + // Count rows. daughters are already open int daughtersRowCount = 0; - for (HRegion r: daughters) { - // Open so can count its content. - HRegion openRegion = HRegion.openHRegion(this.testdir, r.getRegionInfo(), - r.getTableDesc(), r.getLog(), r.getConf()); + for (HRegion openRegion: daughters) { try { int count = countRows(openRegion); assertTrue(count > 0 && count != rowcount);