hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject svn commit: r1352325 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest: RowResultGenerator.java ScannerResultGenerator.java
Date Wed, 20 Jun 2012 21:14:44 GMT
Author: apurtell
Date: Wed Jun 20 21:14:43 2012
New Revision: 1352325

URL: http://svn.apache.org/viewvc?rev=1352325&view=rev
Log:
HBASE-6244. [REST] Result generators do not need to query table schema

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java?rev=1352325&r1=1352324&r2=1352325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
Wed Jun 20 21:14:43 2012
@@ -30,14 +30,12 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.HTablePool;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
 
 @InterfaceAudience.Private
 public class RowResultGenerator extends ResultGenerator {
@@ -61,12 +59,6 @@ public class RowResultGenerator extends 
             get.addFamily(split[0]);
           }
         }
-      } else {
-        // rowspec does not explicitly specify columns, return them all
-        for (HColumnDescriptor family: 
-            table.getTableDescriptor().getFamilies()) {
-          get.addFamily(family.getName());
-        }
       }
       get.setTimeRange(rowspec.getStartTime(), rowspec.getEndTime());
       get.setMaxVersions(rowspec.getMaxVersions());

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java?rev=1352325&r1=1352324&r2=1352325&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
Wed Jun 20 21:14:43 2012
@@ -26,7 +26,6 @@ import java.util.Iterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.UnknownScannerException;
 import org.apache.hadoop.hbase.client.HTableInterface;
@@ -80,11 +79,6 @@ public class ScannerResultGenerator exte
             scan.addFamily(split[0]);
           }
         }
-      } else {
-        for (HColumnDescriptor family: 
-            table.getTableDescriptor().getFamilies()) {
-          scan.addFamily(family.getName());
-        }
       }
       scan.setTimeRange(rowspec.getStartTime(), rowspec.getEndTime());          
       scan.setMaxVersions(rowspec.getMaxVersions());



Mime
View raw message