You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/07/27 19:14:01 UTC

svn commit: r798223 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java

Author: stack
Date: Mon Jul 27 17:14:01 2009
New Revision: 798223

URL: http://svn.apache.org/viewvc?rev=798223&view=rev
Log:
HBASE-1709 Thrift getRowWithColumns doesn't accept column-family only

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=798223&r1=798222&r2=798223&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Jul 27 17:14:01 2009
@@ -286,6 +286,7 @@
                scan can't specify stopRow (Clint Morgan via Stack)
    HBASE-1693  NPE close_region ".META." in shell
    HBASE-1706  META row with missing HRI breaks UI
+   HBASE-1709  Thrift getRowWithColumns doesn't accept column-family only
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

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=798223&r1=798222&r2=798223&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 Mon Jul 27 17:14:01 2009
@@ -346,7 +346,11 @@
         Get get = new Get(row);
         for(byte [] column : columnArr) {
           byte [][] famAndQf = KeyValue.parseColumn(column);
-          get.addColumn(famAndQf[0], famAndQf[1]);
+          if (famAndQf[1] == null || famAndQf[1].length == 0) {
+              get.addFamily(famAndQf[0]);
+          } else {
+              get.addColumn(famAndQf[0], famAndQf[1]);
+          }
         }
         get.setTimeRange(Long.MIN_VALUE, timestamp);
         Result result = table.get(get);