HBASE-6244. [REST] Result generators do not need to query table schema
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1352325 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
145c4d2583
commit
3ec92cc8b1
|
@ -30,14 +30,12 @@ import org.apache.commons.logging.LogFactory;
|
|||
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 ResultGenerator {
|
|||
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());
|
||||
|
|
|
@ -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 extends ResultGenerator {
|
|||
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());
|
||||
|
|
Loading…
Reference in New Issue