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

HBASE-939 NPE in HStoreKey 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@706348 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-10-20 17:43:54 +00:00
parent 5e3815484c
commit fd5543190c
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -35,6 +35,7 @@ Release 0.19.0 - Unreleased
they are using HTable they are using HTable
With J-D's one line patch, test cases now appear to work and With J-D's one line patch, test cases now appear to work and
PerformanceEvaluation works as before. PerformanceEvaluation works as before.
HBASE-939 NPE in HStoreKey
IMPROVEMENTS IMPROVEMENTS
HBASE-901 Add a limit to key length, check key and value length on client side HBASE-901 Add a limit to key length, check key and value length on client side

5
src/java/org/apache/hadoop/hbase/HStoreKey.java
View File

@ -351,6 +351,11 @@ public class HStoreKey implements WritableComparable {
static int compareTo(final HRegionInfo hri, final HStoreKey left, static int compareTo(final HRegionInfo hri, final HStoreKey left,
final HStoreKey right) { final HStoreKey right) {
// We can be passed null
if (left == null && right == null) return 0;
if (left == null) return -1;
if (right == null) return 1;
int result = compareTwoRowKeys(hri, left.getRow(), right.getRow()); int result = compareTwoRowKeys(hri, left.getRow(), right.getRow());
if (result != 0) { if (result != 0) {
return result; return result;

5
src/test/org/apache/hadoop/hbase/TestCompare.java
View File

@ -51,6 +51,11 @@ public class TestCompare extends TestCase {
nocolumn = new HStoreKey(a, HConstants.LATEST_TIMESTAMP); nocolumn = new HStoreKey(a, HConstants.LATEST_TIMESTAMP);
withcolumn = new HStoreKey(a, a, timestamp); withcolumn = new HStoreKey(a, a, timestamp);
assertTrue(nocolumn.compareTo(withcolumn) < 0); assertTrue(nocolumn.compareTo(withcolumn) < 0);
// Test null keys.
HStoreKey normal = new HStoreKey("a", "b");
assertTrue(normal.compareTo(null) > 0);
assertTrue(HStoreKey.compareTo(null, null, null) == 0);
assertTrue(HStoreKey.compareTo(null, null, normal) < 0);
} }
/** /**