Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -30,7 +30,7 @@ public class IOError extends Exception i private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); - public String message; + public String message; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -29,7 +29,7 @@ public class IllegalArgument extends Exc private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); - public String message; + public String message; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -30,9 +30,9 @@ public class Mutation implements org.apa private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3); - public boolean isDelete; - public ByteBuffer column; - public ByteBuffer value; + public boolean isDelete; // required + public ByteBuffer column; // required + public ByteBuffer value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -282,7 +282,7 @@ public class Mutation implements org.apa public Object getFieldValue(_Fields field) { switch (field) { case IS_DELETE: - return new Boolean(isIsDelete()); + return Boolean.valueOf(isIsDelete()); case COLUMN: return getColumn(); Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -32,8 +32,8 @@ public class TCell implements org.apache private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)2); - public ByteBuffer value; - public long timestamp; + public ByteBuffer value; // required + public long timestamp; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -231,7 +231,7 @@ public class TCell implements org.apache return getValue(); case TIMESTAMP: - return new Long(getTimestamp()); + return Long.valueOf(getTimestamp()); } throw new IllegalStateException(); Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -32,11 +32,11 @@ public class TRegionInfo implements org. private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.BYTE, (short)5); - public ByteBuffer startKey; - public ByteBuffer endKey; - public long id; - public ByteBuffer name; - public byte version; + public ByteBuffer startKey; // required + public ByteBuffer endKey; // required + public long id; // required + public ByteBuffer name; // required + public byte version; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -386,13 +386,13 @@ public class TRegionInfo implements org. return getEndKey(); case ID: - return new Long(getId()); + return Long.valueOf(getId()); case NAME: return getName(); case VERSION: - return new Byte(getVersion()); + return Byte.valueOf(getVersion()); } throw new IllegalStateException(); Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -29,8 +29,8 @@ public class TRowResult implements org.a private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.MAP, (short)2); - public ByteBuffer row; - public Map<ByteBuffer,TCell> columns; + public ByteBuffer row; // required + public Map<ByteBuffer,TCell> columns; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -369,8 +369,8 @@ public class TRowResult implements org.a this.columns = new HashMap<ByteBuffer,TCell>(2*_map4.size); for (int _i5 = 0; _i5 < _map4.size; ++_i5) { - ByteBuffer _key6; - TCell _val7; + ByteBuffer _key6; // required + TCell _val7; // required _key6 = iprot.readBinary(); _val7 = new TCell(); _val7.read(iprot); Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java?rev=1166455&r1=1166454&r2=1166455&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java Wed Sep 7 22:44:45 2011 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -20,34 +20,28 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.*; -import org.apache.thrift.async.*; -import org.apache.thrift.meta_data.*; -import org.apache.thrift.transport.*; -import org.apache.thrift.protocol.*; - /** * A Scan object is used to specify scanner parameters when opening a scanner. */ -public class TScan implements TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("TScan"); +public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TScan"); - private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)1); - private static final TField STOP_ROW_FIELD_DESC = new TField("stopRow", TType.STRING, (short)2); - private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); - private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)4); - private static final TField CACHING_FIELD_DESC = new TField("caching", TType.I32, (short)5); - private static final TField FILTER_STRING_FIELD_DESC = new TField("filterString", TType.STRING, (short)6); - - public ByteBuffer startRow; - public ByteBuffer stopRow; - public long timestamp; - public List<ByteBuffer> columns; - public int caching; - public ByteBuffer filterString; + private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField STOP_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("stopRow", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); + private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)4); + private static final org.apache.thrift.protocol.TField CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("caching", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField FILTER_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("filterString", org.apache.thrift.protocol.TType.STRING, (short)6); + + public ByteBuffer startRow; // required + public ByteBuffer stopRow; // required + public long timestamp; // required + public List<ByteBuffer> columns; // required + public int caching; // required + public ByteBuffer filterString; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { START_ROW((short)1, "startRow"), STOP_ROW((short)2, "stopRow"), TIMESTAMP((short)3, "timestamp"), @@ -124,24 +118,24 @@ public class TScan implements TBase<TSca private static final int __CACHING_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.STOP_ROW, new FieldMetaData("stopRow", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.I64))); - tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.OPTIONAL, - new ListMetaData(TType.LIST, - new FieldValueMetaData(TType.STRING , "Text")))); - tmpMap.put(_Fields.CACHING, new FieldMetaData("caching", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.I32))); - tmpMap.put(_Fields.FILTER_STRING, new FieldMetaData("filterString", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.STRING , "Text"))); + 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, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + 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 , "Text"))); + 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))); + 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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + 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))); + 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 , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap); } public TScan() { @@ -170,7 +164,7 @@ public class TScan implements TBase<TSca this.caching = other.caching; if (other.isSetFilterString()) { this.filterString = other.filterString; - } + } } public TScan deepCopy() { @@ -190,16 +184,16 @@ public class TScan implements TBase<TSca } public byte[] getStartRow() { - setStartRow(TBaseHelper.rightSize(startRow)); - return startRow.array(); + setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); + return startRow == null ? null : startRow.array(); } - public ByteBuffer BufferForStartRow() { + public ByteBuffer bufferForStartRow() { return startRow; } public TScan setStartRow(byte[] startRow) { - setStartRow(ByteBuffer.wrap(startRow)); + setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); return this; } @@ -212,7 +206,7 @@ public class TScan implements TBase<TSca this.startRow = null; } - /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -224,16 +218,16 @@ public class TScan implements TBase<TSca } public byte[] getStopRow() { - setStopRow(TBaseHelper.rightSize(stopRow)); - return stopRow.array(); + setStopRow(org.apache.thrift.TBaseHelper.rightSize(stopRow)); + return stopRow == null ? null : stopRow.array(); } - public ByteBuffer BufferForStopRow() { + public ByteBuffer bufferForStopRow() { return stopRow; } public TScan setStopRow(byte[] stopRow) { - setStopRow(ByteBuffer.wrap(stopRow)); + setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); return this; } @@ -246,7 +240,7 @@ public class TScan implements TBase<TSca this.stopRow = null; } - /** Returns true if field stopRow is set (has been asigned a value) and false otherwise */ + /** Returns true if field stopRow is set (has been assigned a value) and false otherwise */ public boolean isSetStopRow() { return this.stopRow != null; } @@ -271,7 +265,7 @@ public class TScan implements TBase<TSca __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -308,7 +302,7 @@ public class TScan implements TBase<TSca this.columns = null; } - /** Returns true if field columns is set (has been asigned a value) and false otherwise */ + /** Returns true if field columns is set (has been assigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -333,7 +327,7 @@ public class TScan implements TBase<TSca __isset_bit_vector.clear(__CACHING_ISSET_ID); } - /** Returns true if field caching is set (has been asigned a value) and false otherwise */ + /** Returns true if field caching is set (has been assigned a value) and false otherwise */ public boolean isSetCaching() { return __isset_bit_vector.get(__CACHING_ISSET_ID); } @@ -343,16 +337,16 @@ public class TScan implements TBase<TSca } public byte[] getFilterString() { - setFilterString(TBaseHelper.rightSize(filterString)); - return filterString.array(); + setFilterString(org.apache.thrift.TBaseHelper.rightSize(filterString)); + return filterString == null ? null : filterString.array(); } - public ByteBuffer BufferForFilterString() { + public ByteBuffer bufferForFilterString() { return filterString; } public TScan setFilterString(byte[] filterString) { - setFilterString(ByteBuffer.wrap(filterString)); + setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString)); return this; } @@ -365,7 +359,7 @@ public class TScan implements TBase<TSca this.filterString = null; } - /** Returns true if field filterString is set (has been asigned a value) and false otherwise */ + /** Returns true if field filterString is set (has been assigned a value) and false otherwise */ public boolean isSetFilterString() { return this.filterString != null; } @@ -423,10 +417,10 @@ public class TScan implements TBase<TSca unsetFilterString(); } else { setFilterString((ByteBuffer)value); - } + } break; - } + } } public Object getFieldValue(_Fields field) { @@ -438,13 +432,13 @@ public class TScan implements TBase<TSca return getStopRow(); case TIMESTAMP: - return new Long(getTimestamp()); + return Long.valueOf(getTimestamp()); case COLUMNS: return getColumns(); case CACHING: - return new Integer(getCaching()); + return Integer.valueOf(getCaching()); case FILTER_STRING: return getFilterString(); @@ -453,7 +447,7 @@ public class TScan implements TBase<TSca throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -564,7 +558,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetStartRow()) { - lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -574,7 +568,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetStopRow()) { - lastComparison = TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); if (lastComparison != 0) { return lastComparison; } @@ -584,7 +578,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetTimestamp()) { - lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -594,7 +588,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetColumns()) { - lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -604,7 +598,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetCaching()) { - lastComparison = TBaseHelper.compareTo(this.caching, typedOther.caching); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching); if (lastComparison != 0) { return lastComparison; } @@ -614,7 +608,7 @@ public class TScan implements TBase<TSca return lastComparison; } if (isSetFilterString()) { - lastComparison = TBaseHelper.compareTo(this.filterString, typedOther.filterString); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); if (lastComparison != 0) { return lastComparison; } @@ -626,72 +620,72 @@ public class TScan implements TBase<TSca return _Fields.findByThriftId(fieldId); } - public void read(TProtocol iprot) throws TException { - TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // START_ROW - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.startRow = iprot.readBinary(); } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // STOP_ROW - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.stopRow = iprot.readBinary(); } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == TType.I64) { + if (field.type == org.apache.thrift.protocol.TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // COLUMNS - if (field.type == TType.LIST) { + if (field.type == org.apache.thrift.protocol.TType.LIST) { { - TList _list9 = iprot.readListBegin(); + org.apache.thrift.protocol.TList _list9 = iprot.readListBegin(); this.columns = new ArrayList<ByteBuffer>(_list9.size); for (int _i10 = 0; _i10 < _list9.size; ++_i10) { - ByteBuffer _elem11; + ByteBuffer _elem11; // required _elem11 = iprot.readBinary(); this.columns.add(_elem11); } iprot.readListEnd(); } } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // CACHING - if (field.type == TType.I32) { + if (field.type == org.apache.thrift.protocol.TType.I32) { this.caching = iprot.readI32(); setCachingIsSet(true); } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 6: // FILTER_STRING - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.filterString = iprot.readBinary(); } else { - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -701,7 +695,7 @@ public class TScan implements TBase<TSca validate(); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -728,7 +722,7 @@ public class TScan implements TBase<TSca if (isSetColumns()) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); for (ByteBuffer _iter12 : this.columns) { oprot.writeBinary(_iter12); @@ -814,9 +808,27 @@ public class TScan implements TBase<TSca return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bit_vector = new BitSet(1); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } + } + +}
