You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2012/06/20 23:15:05 UTC
svn commit: r1352327 - in
/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest:
RowResultGenerator.java ScannerResultGenerator.java
Author: apurtell
Date: Wed Jun 20 21:15:04 2012
New Revision: 1352327
URL: http://svn.apache.org/viewvc?rev=1352327&view=rev
Log:
HBASE-6244. [REST] Result generators do not need to query table schema
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java?rev=1352327&r1=1352326&r2=1352327&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java Wed Jun 20 21:15:04 2012
@@ -28,7 +28,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.util.StringUtils;
-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;
@@ -58,12 +57,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/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java?rev=1352327&r1=1352326&r2=1352327&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java Wed Jun 20 21:15:04 2012
@@ -25,7 +25,6 @@ import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-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;
@@ -78,11 +77,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());