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:
parent
b23d150686
commit
87b6cb8880
|
@ -151,6 +151,7 @@ Release 0.19.0 - Unreleased
|
|||
(Andrzej Bialecki via Stack)
|
||||
HBASE-625 Metrics support for cluster load history: emissions and graphs
|
||||
HBASE-883 Secondary indexes (Clint Morgan via Andrew Purtell)
|
||||
HABSE-1036 HBASE-1028 broke Thrift
|
||||
|
||||
OPTIMIZATIONS
|
||||
HBASE-748 Add an efficient way to batch update many rows
|
||||
|
|
|
@ -104,6 +104,9 @@ public class ThriftUtilities {
|
|||
*/
|
||||
static public TRowResult rowResultFromHBase(RowResult in) {
|
||||
TRowResult result = new TRowResult();
|
||||
if(in == null) {
|
||||
return null;
|
||||
}
|
||||
result.row = in.getRow();
|
||||
result.columns = new TreeMap<byte[], TCell>(Bytes.BYTES_COMPARATOR);
|
||||
for (Map.Entry<byte[], Cell> entry : in.entrySet()){
|
||||
|
|
|
@ -166,7 +166,7 @@ public class TestThriftServer extends HBaseClusterTestCase {
|
|||
failed2 = true;
|
||||
}
|
||||
assertTrue(failed2);
|
||||
assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0);
|
||||
assertNull(handler.getRow(tableAname, rowBname));
|
||||
|
||||
// Teardown
|
||||
handler.disableTable(tableAname);
|
||||
|
@ -231,7 +231,7 @@ public class TestThriftServer extends HBaseClusterTestCase {
|
|||
}
|
||||
assertTrue(failed);
|
||||
assertTrue(Bytes.equals(handler.get(tableAname, rowAname, columnBname).value, valueCname));
|
||||
assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0);
|
||||
assertNull(handler.getRow(tableAname, rowBname));
|
||||
|
||||
// Teardown
|
||||
handler.disableTable(tableAname);
|
||||
|
|
Loading…
Reference in New Issue