Author: stack
Date: Fri Sep 4 04:57:26 2009
New Revision: 811220
URL: http://svn.apache.org/viewvc?rev=811220&view=rev
Log:
HBASE-1779 ThriftServer logged error if getVer() result is empty
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=811220&r1=811219&r2=811220&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Sep 4 04:57:26 2009
@@ -11,6 +11,7 @@
HBASE-1698 Review documentation for o.a.h.h.mapreduce
HBASE-1798 [Regression] Unable to delete a row in the future
HBASE-1790 filters are not working correctly (HBASE-1710 HBASE-1807 too)
+ HBASE-1779 ThriftServer logged error if getVer() result is empty
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java?rev=811220&r1=811219&r2=811220&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Fri Sep 4 04:57:26 2009
@@ -278,9 +278,11 @@
get.setMaxVersions(numVersions);
Result result = table.get(get);
List<Cell> cells = new ArrayList<Cell>();
- for(KeyValue kv : result.sorted()) {
- cells.add(new Cell(kv.getValue(), kv.getTimestamp()));
- }
+ if ( ! result.isEmpty() ) {
+ for(KeyValue kv : result.sorted()) {
+ cells.add(new Cell(kv.getValue(), kv.getTimestamp()));
+ }
+ }
return ThriftUtilities.cellFromHBase(cells.toArray(new Cell[0]));
} catch (IOException e) {
throw new IOError(e.getMessage());
@@ -304,12 +306,14 @@
get.setTimeRange(Long.MIN_VALUE, timestamp);
get.setMaxVersions(numVersions);
Result result = table.get(get);
- List<Cell> cells = new ArrayList<Cell>();
- KeyValue [] kvs = result.sorted();
- if (kvs != null) {
- for(KeyValue kv : kvs) {
- cells.add(new Cell(kv.getValue(), kv.getTimestamp()));
- }
+ List<Cell> cells = new ArrayList<Cell>();
+ if ( ! result.isEmpty() ) {
+ KeyValue [] kvs = result.sorted();
+ if (kvs != null) {
+ for(KeyValue kv : kvs) {
+ cells.add(new Cell(kv.getValue(), kv.getTimestamp()));
+ }
+ }
}
return ThriftUtilities.cellFromHBase(cells.toArray(new Cell[0]));
} catch (IOException e) {
