Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4604 hbase.client.TestHTablePool could start a single cluster instead of one per method 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1186997 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-10-20 19:13:40 +00:00
parent 94e4322937
commit 0b65addae7
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -643,6 +643,8 @@ Release 0.92.0 - Unreleased
HBASE-3581 hbase rpc should send size of response HBASE-3581 hbase rpc should send size of response
HBASE-4585 Avoid seek operation when current kv is deleted(Liyin Tang) HBASE-4585 Avoid seek operation when current kv is deleted(Liyin Tang)
HBASE-4486 Improve Javadoc for HTableDescriptor (Akash Ashok) HBASE-4486 Improve Javadoc for HTableDescriptor (Akash Ashok)
HBASE-4604 hbase.client.TestHTablePool could start a single
cluster instead of one per method (nkeywal)
TASKS TASKS

28
src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
View File

@ -31,25 +31,31 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.PoolMap.PoolType; import org.apache.hadoop.hbase.util.PoolMap.PoolType;
import org.junit.Test; import org.junit.*;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
/** /**
* Tests HTablePool. * Tests HTablePool.
*/ */
@RunWith(Suite.class)
@Suite.SuiteClasses({TestHTablePool.TestHTableReusablePool.class, TestHTablePool.TestHTableThreadLocalPool.class})
public class TestHTablePool { public class TestHTablePool {
private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private final static byte[] TABLENAME = Bytes.toBytes("TestHTablePool"); private final static byte[] TABLENAME = Bytes.toBytes("TestHTablePool");
public abstract static class TestHTablePoolType extends TestCase { @BeforeClass
protected void setUp() throws Exception { public static void setUpBeforeClass() throws Exception {
TEST_UTIL.startMiniCluster(1); TEST_UTIL.startMiniCluster(1);
TEST_UTIL.createTable(TABLENAME, HConstants.CATALOG_FAMILY); TEST_UTIL.createTable(TABLENAME, HConstants.CATALOG_FAMILY);
} }
protected void tearDown() throws IOException { @AfterClass
public static void tearDownAfterClass() throws IOException {
TEST_UTIL.shutdownMiniCluster(); TEST_UTIL.shutdownMiniCluster();
} }
public abstract static class TestHTablePoolType extends TestCase {
protected abstract PoolType getPoolType(); protected abstract PoolType getPoolType();
@Test @Test
@ -95,7 +101,11 @@ public class TestHTablePool {
public void testTablesWithDifferentNames() throws IOException { public void testTablesWithDifferentNames() throws IOException {
HTablePool pool = new HTablePool(TEST_UTIL.getConfiguration(), HTablePool pool = new HTablePool(TEST_UTIL.getConfiguration(),
Integer.MAX_VALUE, getPoolType()); Integer.MAX_VALUE, getPoolType());
byte[] otherTable = Bytes.toBytes("OtherTable"); // We add the class to the table name as the HBase cluster is reused
// during the tests: this gives naming unicity.
byte[] otherTable = Bytes.toBytes(
"OtherTable_" + getClass().getSimpleName()
);
TEST_UTIL.createTable(otherTable, HConstants.CATALOG_FAMILY); TEST_UTIL.createTable(otherTable, HConstants.CATALOG_FAMILY);
// Request a table from an empty pool // Request a table from an empty pool
@ -341,12 +351,4 @@ public class TestHTablePool {
pool.getCurrentPoolSize(Bytes.toString(TABLENAME))); pool.getCurrentPoolSize(Bytes.toString(TABLENAME)));
} }
} }
public static junit.framework.Test suite() {
TestSuite suite = new TestSuite();
suite.addTestSuite(TestHTableReusablePool.class);
suite.addTestSuite(TestHTableThreadLocalPool.class);
return suite;
}
} }