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

HABSE-1036 HBASE-1028 broke Thrift 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@721509 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2008-11-28 14:41:53 +00:00
parent b23d150686
commit 87b6cb8880
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -151,6 +151,7 @@ Release 0.19.0 - Unreleased
(Andrzej Bialecki via Stack) (Andrzej Bialecki via Stack)
HBASE-625 Metrics support for cluster load history: emissions and graphs HBASE-625 Metrics support for cluster load history: emissions and graphs
HBASE-883 Secondary indexes (Clint Morgan via Andrew Purtell) HBASE-883 Secondary indexes (Clint Morgan via Andrew Purtell)
HABSE-1036 HBASE-1028 broke Thrift
OPTIMIZATIONS OPTIMIZATIONS
HBASE-748 Add an efficient way to batch update many rows HBASE-748 Add an efficient way to batch update many rows

3
src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
View File

@ -104,6 +104,9 @@ public class ThriftUtilities {
*/ */
static public TRowResult rowResultFromHBase(RowResult in) { static public TRowResult rowResultFromHBase(RowResult in) {
TRowResult result = new TRowResult(); TRowResult result = new TRowResult();
if(in == null) {
return null;
}
result.row = in.getRow(); result.row = in.getRow();
result.columns = new TreeMap<byte[], TCell>(Bytes.BYTES_COMPARATOR); result.columns = new TreeMap<byte[], TCell>(Bytes.BYTES_COMPARATOR);
for (Map.Entry<byte[], Cell> entry : in.entrySet()){ for (Map.Entry<byte[], Cell> entry : in.entrySet()){

4
src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java
View File

@ -166,7 +166,7 @@ public class TestThriftServer extends HBaseClusterTestCase {
failed2 = true; failed2 = true;
} }
assertTrue(failed2); assertTrue(failed2);
assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0); assertNull(handler.getRow(tableAname, rowBname));
// Teardown // Teardown
handler.disableTable(tableAname); handler.disableTable(tableAname);
@ -231,7 +231,7 @@ public class TestThriftServer extends HBaseClusterTestCase {
} }
assertTrue(failed); assertTrue(failed);
assertTrue(Bytes.equals(handler.get(tableAname, rowAname, columnBname).value, valueCname)); assertTrue(Bytes.equals(handler.get(tableAname, rowAname, columnBname).value, valueCname));
assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0); assertNull(handler.getRow(tableAname, rowBname));
// Teardown // Teardown
handler.disableTable(tableAname); handler.disableTable(tableAname);