Author: stack
Date: Mon Sep 14 16:00:37 2009
New Revision: 814714
URL: http://svn.apache.org/viewvc?rev=814714&view=rev
Log:
HBASE-1836 test of indexed hbase broken
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=814714&r1=814713&r2=814714&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Sep 14 16:00:37 2009
@@ -21,6 +21,7 @@
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
Modified:
hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java?rev=814714&r1=814713&r2=814714&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
(original)
+++
hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegion.java
Mon Sep 14 16:00:37 2009
@@ -260,9 +260,11 @@
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;
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java?rev=814714&r1=814713&r2=814714&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Result.java Mon
Sep 14 16:00:37 2009
@@ -139,7 +139,7 @@
if(this.kvs == null) {
readFields();
}
- return Arrays.asList(sorted());
+ return isEmpty()? null: Arrays.asList(sorted());
}
/**
