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

HBASE-1836 test of indexed hbase broken 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@814714 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-09-14 16:00:37 +00:00
parent 4479b081ab
commit 57b8b91af9
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

@ -21,6 +21,7 @@ Release 0.21.0 - Unreleased
HBASE-1740 ICV has a subtle race condition only visible under high load
HBASE-1808 [stargate] fix how columns are specified for scanners
HBASE-1828 CompareFilters are broken from client-side
HBASE-1836 test of indexed hbase broken
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

8
src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
View File

@ -260,9 +260,11 @@ class IndexedRegion extends TransactionalRegion {
if (result == null || result.raw() == null) {
return currentColumnValues;
}
for(KeyValue kv : result.list()) {
currentColumnValues.put(kv.getColumn(), kv.getValue());
List<KeyValue> list = result.list();
if (list != null) {
for(KeyValue kv : result.list()) {
currentColumnValues.put(kv.getColumn(), kv.getValue());
}
}
return currentColumnValues;
}

2
src/java/org/apache/hadoop/hbase/client/Result.java
View File

@ -139,7 +139,7 @@ public class Result implements Writable {
if(this.kvs == null) {
readFields();
}
return Arrays.asList(sorted());
return isEmpty()? null: Arrays.asList(sorted());
}
/**