Author: stack
Date: Wed Jun 1 22:10:15 2011
New Revision: 1130322
URL: http://svn.apache.org/viewvc?rev=1130322&view=rev
Log:
HBASE-2556 Add convenience method to HBaseAdmin to get a collection of
HRegionInfo objects for each table; fix some formatting
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1130322&r1=1130321&r2=1130322&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Wed Jun 1 22:10:15 2011
@@ -1249,20 +1249,18 @@ public class HBaseAdmin implements Abort
* @return Ordered list of {@link HRegionInfo}. *
* @throws IOException
*/
- public List<HRegionInfo> getTableRegions(final byte[] tableName) throws
IOException
- {
- CatalogTracker ct = getCatalogTracker();
- List<HRegionInfo> Regions;
- try {
- Regions = MetaReader.getTableRegions(ct, tableName, true);
- } finally {
- cleanupCatalogTracker(ct);
- }
-
- return Regions;
+ public List<HRegionInfo> getTableRegions(final byte[] tableName)
+ throws IOException {
+ CatalogTracker ct = getCatalogTracker();
+ List<HRegionInfo> Regions;
+ try {
+ Regions = MetaReader.getTableRegions(ct, tableName, true);
+ } finally {
+ cleanupCatalogTracker(ct);
+ }
+ return Regions;
}
-
public void close() throws IOException {
if (this.connection != null) {
this.connection.close();
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java?rev=1130322&r1=1130321&r2=1130322&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
Wed Jun 1 22:10:15 2011
@@ -100,7 +100,6 @@ public class TestThriftServer extends HB
handler.deleteTable(tableAname);
}
-
/**
* Tests adding a series of Mutations and BatchMutations, including a
* delete mutation. Also tests data retrieval, and getting back multiple
@@ -311,7 +310,6 @@ public class TestThriftServer extends HB
handler.disableTable(tableAname);
handler.deleteTable(tableAname);
}
-
/**
* For HBASE-2556
@@ -321,16 +319,15 @@ public class TestThriftServer extends HB
*/
public void doTestGetTableRegions() throws Exception {
ThriftServer.HBaseHandler handler = new
ThriftServer.HBaseHandler(this.conf);
-
handler.createTable(tableAname, getColumnDescriptors());
- int RegionCount = handler.getTableRegions(tableAname).size();
+ int regionCount = handler.getTableRegions(tableAname).size();
assertEquals("empty table should have only 1 region, " +
- "but found " + RegionCount, RegionCount, 1);
+ "but found " + regionCount, regionCount, 1);
handler.disableTable(tableAname);
handler.deleteTable(tableAname);
- RegionCount = handler.getTableRegions(tableAname).size();
+ regionCount = handler.getTableRegions(tableAname).size();
assertEquals("non-existing table should have 0 region, " +
- "but found " + RegionCount, RegionCount, 0);
+ "but found " + regionCount, regionCount, 0);
}
/**
