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

Remove changes prematurely committed -- fixes that were for hbck tool and that broek the HBaseAdmin tests 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1030780 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-11-04 00:33:55 +00:00
parent 19d629a0be
commit 10b67e001a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
View File

@ -96,8 +96,7 @@ public class MetaScanner {
// if row is not null, we want to use the startKey of the row's region as // if row is not null, we want to use the startKey of the row's region as
// the startRow for the meta scan. // the startRow for the meta scan.
byte[] startRow; byte[] startRow;
// row could be non-null but empty -- the HConstants.EMPTY_START_ROW if (row != null) {
if (row != null && row.length > 0) {
// Scan starting at a particular row in a particular table // Scan starting at a particular row in a particular table
assert tableName != null; assert tableName != null;
byte[] searchRow = byte[] searchRow =
@ -122,9 +121,7 @@ public class MetaScanner {
byte[] rowBefore = regionInfo.getStartKey(); byte[] rowBefore = regionInfo.getStartKey();
startRow = HRegionInfo.createRegionName(tableName, rowBefore, startRow = HRegionInfo.createRegionName(tableName, rowBefore,
HConstants.ZEROES, false); HConstants.ZEROES, false);
} else if (row == null || } else if (tableName == null || tableName.length == 0) {
(row != null && Bytes.equals(HConstants.EMPTY_START_ROW, row)) ||
(tableName == null || tableName.length == 0)) {
// Full META scan // Full META scan
startRow = HConstants.EMPTY_START_ROW; startRow = HConstants.EMPTY_START_ROW;
} else { } else {