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

HBASE-2657 TestTableResource is broken in trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@950714 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-06-02 18:47:58 +00:00
parent 5e56bdea4e
commit 0a7e9913a6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -370,6 +370,7 @@ Release 0.21.0 - Unreleased
HBASE-2654 Add additional maven repository temporarily to fetch Guava
HBASE-2560 Fix IllegalArgumentException when manually splitting table
from web UI
HBASE-2657 TestTableResource is broken in trunk
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

1
src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
View File

@ -123,7 +123,6 @@ import static org.apache.hadoop.hbase.util.FSUtils.recoverFileLease;
*/
public class HLog implements HConstants, Syncable {
static final Log LOG = LogFactory.getLog(HLog.class);
private static final String HLOG_DATFILE = "hlog.dat.";
public static final byte [] METAFAMILY = Bytes.toBytes("METAFAMILY");
static final byte [] METAROW = Bytes.toBytes("METAROW");
private final FileSystem fs;

9
src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
View File

@ -53,7 +53,8 @@ public class TestTableResource extends HBaseRESTClusterTestBase {
static final Log LOG = LogFactory.getLog(TestTableResource.class);
static String TABLE = "TestTableResource";
static String COLUMN = "test:";
static String COLUMN_FAMILY = "test";
static String COLUMN = COLUMN_FAMILY + ":qualifier";
static Map<HRegionInfo,HServerAddress> regionMap;
Client client;
@ -74,7 +75,7 @@ public class TestTableResource extends HBaseRESTClusterTestBase {
return;
}
HTableDescriptor htd = new HTableDescriptor(TABLE);
htd.addFamily(new HColumnDescriptor(COLUMN));
htd.addFamily(new HColumnDescriptor(COLUMN_FAMILY));
admin.createTable(htd);
HTable table = new HTable(conf, TABLE);
byte[] k = new byte[3];
@ -167,7 +168,9 @@ public class TestTableResource extends HBaseRESTClusterTestBase {
boolean found = false;
for (Map.Entry<HRegionInfo,HServerAddress> e: regionMap.entrySet()) {
HRegionInfo hri = e.getKey();
if (hri.getRegionNameAsString().equals(region.getName())) {
String hriRegionName = hri.getRegionNameAsString();
String regionName = region.getName();
if (hriRegionName.startsWith(regionName)) {
found = true;
byte[] startKey = hri.getStartKey();
byte[] endKey = hri.getEndKey();