diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java index 13ba23d..0634392 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java @@ -184,7 +184,7 @@ public class HRegionInfo implements Comparable { // by daughter regions. We USED to set this flag when we disabled a table // but now table state is kept up in zookeeper as of 0.90.0 HBase. private boolean offLine = false; - private long regionId = -1; + private Long regionId = new Long(-1); private transient byte [] regionName = HConstants.EMPTY_BYTE_ARRAY; private boolean split = false; private byte [] startKey = HConstants.EMPTY_BYTE_ARRAY; @@ -580,7 +580,7 @@ public class HRegionInfo implements Comparable { } /** @return the regionId */ - public long getRegionId(){ + public Long getRegionId(){ return regionId; } diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index 2563a4b..62a26d1 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -485,7 +485,7 @@ class AsyncProcess { protected boolean canTakeOperation(HRegionLocation loc, Map regionsIncluded, Map serversIncluded) { - long regionId = loc.getRegionInfo().getRegionId(); + Long regionId = loc.getRegionInfo().getRegionId(); Boolean regionPrevious = regionsIncluded.get(regionId); if (regionPrevious != null) { diff --git hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java index 8fe5c98..eaabb89 100644 --- hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java +++ hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java @@ -185,7 +185,7 @@ public class TestTableResource { new InetSocketAddress(serverName.getHostname(), serverName.getPort()); String location = sa.getHostName() + ":" + Integer.valueOf(sa.getPort()); - assertEquals(hri.getRegionId(), region.getId()); + assertEquals(hri.getRegionId(), new Long(region.getId())); assertTrue(Bytes.equals(startKey, region.getStartKey())); assertTrue(Bytes.equals(endKey, region.getEndKey())); assertEquals(location, region.getLocation());