Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8876 Addendum to HBASE-8774 Add BatchSize and Filter to Thrift2 - Add BatchSize Test 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1502255 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lars George 2013-07-11 16:00:00 +00:00
parent 68a5420e09
commit 4769fd0a6c
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java
View File

@ -32,18 +32,16 @@ import org.slf4j.LoggerFactory;
/** /**
* Used to perform Get operations on a single row. * Used to perform Get operations on a single row.
* *
* The scope can be further narrowed down by specifying a list of * The scope can be further narrowed down by specifying a list of
* columns or column families. * columns or column families.
* *
* To get everything for a row, instantiate a Get object with just the row to get. * To get everything for a row, instantiate a Get object with just the row to get.
* To further define the scope of what to get you can add a timestamp or time range * To further define the scope of what to get you can add a timestamp or time range
* with an optional maximum number of versions to return. * with an optional maximum number of versions to return.
* *
* If you specify a time range and a timestamp the range is ignored. * If you specify a time range and a timestamp the range is ignored.
* Timestamps on TColumns are ignored. * Timestamps on TColumns are ignored.
*
* TODO: Filter, Locks
*/ */
public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable { public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet");
@ -149,18 +147,18 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.REQUIRED, tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TColumn.class)))); new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TColumn.class))));
tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.TIME_RANGE, new org.apache.thrift.meta_data.FieldMetaData("timeRange", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.TIME_RANGE, new org.apache.thrift.meta_data.FieldMetaData("timeRange", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTimeRange.class))); new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTimeRange.class)));
tmpMap.put(_Fields.MAX_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("maxVersions", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.MAX_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("maxVersions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.FILTER_STRING, new org.apache.thrift.meta_data.FieldMetaData("filterString", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.FILTER_STRING, new org.apache.thrift.meta_data.FieldMetaData("filterString", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
metaDataMap = Collections.unmodifiableMap(tmpMap); metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TGet.class, metaDataMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TGet.class, metaDataMap);
@ -755,7 +753,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
while (true) while (true)
{ {
schemeField = iprot.readFieldBegin(); schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break; break;
} }
switch (schemeField.id) { switch (schemeField.id) {
@ -763,7 +761,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.row = iprot.readBinary(); struct.row = iprot.readBinary();
struct.setRowIsSet(true); struct.setRowIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -782,7 +780,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
iprot.readListEnd(); iprot.readListEnd();
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -790,7 +788,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I64) { if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.timestamp = iprot.readI64(); struct.timestamp = iprot.readI64();
struct.setTimestampIsSet(true); struct.setTimestampIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -799,7 +797,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
struct.timeRange = new TTimeRange(); struct.timeRange = new TTimeRange();
struct.timeRange.read(iprot); struct.timeRange.read(iprot);
struct.setTimeRangeIsSet(true); struct.setTimeRangeIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -807,7 +805,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.maxVersions = iprot.readI32(); struct.maxVersions = iprot.readI32();
struct.setMaxVersionsIsSet(true); struct.setMaxVersionsIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -815,7 +813,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.filterString = iprot.readBinary(); struct.filterString = iprot.readBinary();
struct.setFilterStringIsSet(true); struct.setFilterStringIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;

36
hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java
View File

@ -149,22 +149,22 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.STOP_ROW, new org.apache.thrift.meta_data.FieldMetaData("stopRow", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.STOP_ROW, new org.apache.thrift.meta_data.FieldMetaData("stopRow", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TColumn.class)))); new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TColumn.class))));
tmpMap.put(_Fields.CACHING, new org.apache.thrift.meta_data.FieldMetaData("caching", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.CACHING, new org.apache.thrift.meta_data.FieldMetaData("caching", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.MAX_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("maxVersions", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.MAX_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("maxVersions", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.TIME_RANGE, new org.apache.thrift.meta_data.FieldMetaData("timeRange", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.TIME_RANGE, new org.apache.thrift.meta_data.FieldMetaData("timeRange", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTimeRange.class))); new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTimeRange.class)));
tmpMap.put(_Fields.FILTER_STRING, new org.apache.thrift.meta_data.FieldMetaData("filterString", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.FILTER_STRING, new org.apache.thrift.meta_data.FieldMetaData("filterString", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.BATCH_SIZE, new org.apache.thrift.meta_data.FieldMetaData("batchSize", org.apache.thrift.TFieldRequirementType.OPTIONAL, tmpMap.put(_Fields.BATCH_SIZE, new org.apache.thrift.meta_data.FieldMetaData("batchSize", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap); metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap);
@ -898,7 +898,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
while (true) while (true)
{ {
schemeField = iprot.readFieldBegin(); schemeField = iprot.readFieldBegin();
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break; break;
} }
switch (schemeField.id) { switch (schemeField.id) {
@ -906,7 +906,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.startRow = iprot.readBinary(); struct.startRow = iprot.readBinary();
struct.setStartRowIsSet(true); struct.setStartRowIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -914,7 +914,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.stopRow = iprot.readBinary(); struct.stopRow = iprot.readBinary();
struct.setStopRowIsSet(true); struct.setStopRowIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -933,7 +933,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
iprot.readListEnd(); iprot.readListEnd();
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -941,7 +941,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.caching = iprot.readI32(); struct.caching = iprot.readI32();
struct.setCachingIsSet(true); struct.setCachingIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -949,7 +949,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.maxVersions = iprot.readI32(); struct.maxVersions = iprot.readI32();
struct.setMaxVersionsIsSet(true); struct.setMaxVersionsIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -958,7 +958,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
struct.timeRange = new TTimeRange(); struct.timeRange = new TTimeRange();
struct.timeRange.read(iprot); struct.timeRange.read(iprot);
struct.setTimeRangeIsSet(true); struct.setTimeRangeIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -966,7 +966,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.filterString = iprot.readBinary(); struct.filterString = iprot.readBinary();
struct.setFilterStringIsSet(true); struct.setFilterStringIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;
@ -974,7 +974,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.batchSize = iprot.readI32(); struct.batchSize = iprot.readI32();
struct.setBatchSizeIsSet(true); struct.setBatchSizeIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
} }
break; break;