Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class ThriftSecurityException extends Exception implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ThriftSecurityException extends TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSecurityException"); private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -369,6 +372,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -142,7 +145,7 @@ import org.slf4j.LoggerFactory; private static final int __FAIL_ISSET_ID = 5; private static final int __QUEUETIME_ISSET_ID = 6; private static final int __QUEUESUMDEV_ISSET_ID = 7; - private BitSet __isset_bit_vector = new BitSet(8); + private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -202,8 +205,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public ActionStats(ActionStats other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.status = other.status; this.elapsed = other.elapsed; this.num = other.num; @@ -249,16 +251,16 @@ import org.slf4j.LoggerFactory; } public void unsetStatus() { - __isset_bit_vector.clear(__STATUS_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STATUS_ISSET_ID); } /** Returns true if field status is set (has been assigned a value) and false otherwise */ public boolean isSetStatus() { - return __isset_bit_vector.get(__STATUS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __STATUS_ISSET_ID); } public void setStatusIsSet(boolean value) { - __isset_bit_vector.set(__STATUS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STATUS_ISSET_ID, value); } public double getElapsed() { @@ -272,16 +274,16 @@ import org.slf4j.LoggerFactory; } public void unsetElapsed() { - __isset_bit_vector.clear(__ELAPSED_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ELAPSED_ISSET_ID); } /** Returns true if field elapsed is set (has been assigned a value) and false otherwise */ public boolean isSetElapsed() { - return __isset_bit_vector.get(__ELAPSED_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __ELAPSED_ISSET_ID); } public void setElapsedIsSet(boolean value) { - __isset_bit_vector.set(__ELAPSED_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ELAPSED_ISSET_ID, value); } public int getNum() { @@ -295,16 +297,16 @@ import org.slf4j.LoggerFactory; } public void unsetNum() { - __isset_bit_vector.clear(__NUM_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_ISSET_ID); } /** Returns true if field num is set (has been assigned a value) and false otherwise */ public boolean isSetNum() { - return __isset_bit_vector.get(__NUM_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM_ISSET_ID); } public void setNumIsSet(boolean value) { - __isset_bit_vector.set(__NUM_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_ISSET_ID, value); } public long getCount() { @@ -318,16 +320,16 @@ import org.slf4j.LoggerFactory; } public void unsetCount() { - __isset_bit_vector.clear(__COUNT_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COUNT_ISSET_ID); } /** Returns true if field count is set (has been assigned a value) and false otherwise */ public boolean isSetCount() { - return __isset_bit_vector.get(__COUNT_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __COUNT_ISSET_ID); } public void setCountIsSet(boolean value) { - __isset_bit_vector.set(__COUNT_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COUNT_ISSET_ID, value); } public double getSumDev() { @@ -341,16 +343,16 @@ import org.slf4j.LoggerFactory; } public void unsetSumDev() { - __isset_bit_vector.clear(__SUMDEV_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUMDEV_ISSET_ID); } /** Returns true if field sumDev is set (has been assigned a value) and false otherwise */ public boolean isSetSumDev() { - return __isset_bit_vector.get(__SUMDEV_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SUMDEV_ISSET_ID); } public void setSumDevIsSet(boolean value) { - __isset_bit_vector.set(__SUMDEV_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUMDEV_ISSET_ID, value); } public int getFail() { @@ -364,16 +366,16 @@ import org.slf4j.LoggerFactory; } public void unsetFail() { - __isset_bit_vector.clear(__FAIL_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FAIL_ISSET_ID); } /** Returns true if field fail is set (has been assigned a value) and false otherwise */ public boolean isSetFail() { - return __isset_bit_vector.get(__FAIL_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __FAIL_ISSET_ID); } public void setFailIsSet(boolean value) { - __isset_bit_vector.set(__FAIL_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FAIL_ISSET_ID, value); } public double getQueueTime() { @@ -387,16 +389,16 @@ import org.slf4j.LoggerFactory; } public void unsetQueueTime() { - __isset_bit_vector.clear(__QUEUETIME_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUEUETIME_ISSET_ID); } /** Returns true if field queueTime is set (has been assigned a value) and false otherwise */ public boolean isSetQueueTime() { - return __isset_bit_vector.get(__QUEUETIME_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __QUEUETIME_ISSET_ID); } public void setQueueTimeIsSet(boolean value) { - __isset_bit_vector.set(__QUEUETIME_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUEUETIME_ISSET_ID, value); } public double getQueueSumDev() { @@ -410,16 +412,16 @@ import org.slf4j.LoggerFactory; } public void unsetQueueSumDev() { - __isset_bit_vector.clear(__QUEUESUMDEV_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID); } /** Returns true if field queueSumDev is set (has been assigned a value) and false otherwise */ public boolean isSetQueueSumDev() { - return __isset_bit_vector.get(__QUEUESUMDEV_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID); } public void setQueueSumDevIsSet(boolean value) { - __isset_bit_vector.set(__QUEUESUMDEV_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUEUESUMDEV_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -786,6 +788,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -799,7 +802,7 @@ import org.slf4j.LoggerFactory; 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); + __isset_bitfield = 0; 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); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -167,7 +170,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __AGE_ISSET_ID = 0; private static final int __IDLETIME_ISSET_ID = 1; - private BitSet __isset_bit_vector = new BitSet(2); + private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -239,8 +242,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public ActiveScan(ActiveScan other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetClient()) { this.client = other.client; } @@ -407,16 +409,16 @@ import org.slf4j.LoggerFactory; } public void unsetAge() { - __isset_bit_vector.clear(__AGE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AGE_ISSET_ID); } /** Returns true if field age is set (has been assigned a value) and false otherwise */ public boolean isSetAge() { - return __isset_bit_vector.get(__AGE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __AGE_ISSET_ID); } public void setAgeIsSet(boolean value) { - __isset_bit_vector.set(__AGE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AGE_ISSET_ID, value); } public long getIdleTime() { @@ -430,16 +432,16 @@ import org.slf4j.LoggerFactory; } public void unsetIdleTime() { - __isset_bit_vector.clear(__IDLETIME_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __IDLETIME_ISSET_ID); } /** Returns true if field idleTime is set (has been assigned a value) and false otherwise */ public boolean isSetIdleTime() { - return __isset_bit_vector.get(__IDLETIME_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __IDLETIME_ISSET_ID); } public void setIdleTimeIsSet(boolean value) { - __isset_bit_vector.set(__IDLETIME_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __IDLETIME_ISSET_ID, value); } /** @@ -1151,6 +1153,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -1164,7 +1170,7 @@ import org.slf4j.LoggerFactory; 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); + __isset_bitfield = 0; 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); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class ConstraintViolationException extends Exception implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConstraintViolationException"); private static final org.apache.thrift.protocol.TField VIOLATION_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("violationSummaries", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -296,6 +299,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -296,6 +299,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class NoSuchScanIDException extends Exception implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class NoSuchScanIDException extends TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchScanIDException"); @@ -194,6 +197,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -27,7 +30,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class NotServingTabletException extends Exception implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings("all") public class NotServingTabletException extends TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotServingTabletException"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -276,6 +279,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (extent != null) { + extent.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java Mon Oct 29 15:22:24 2012 @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.8.0) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -115,7 +118,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __PRIORITY_ISSET_ID = 0; - private BitSet __isset_bit_vector = new BitSet(1); + private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -154,8 +157,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public TIteratorSetting(TIteratorSetting other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.priority = other.priority; if (other.isSetName()) { this.name = other.name; @@ -204,16 +206,16 @@ import org.slf4j.LoggerFactory; } public void unsetPriority() { - __isset_bit_vector.clear(__PRIORITY_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRIORITY_ISSET_ID); } /** Returns true if field priority is set (has been assigned a value) and false otherwise */ public boolean isSetPriority() { - return __isset_bit_vector.get(__PRIORITY_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __PRIORITY_ISSET_ID); } public void setPriorityIsSet(boolean value) { - __isset_bit_vector.set(__PRIORITY_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRIORITY_ISSET_ID, value); } public String getName() { @@ -531,6 +533,7 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -544,7 +547,7 @@ import org.slf4j.LoggerFactory; 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); + __isset_bitfield = 0; 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); Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java ------------------------------------------------------------------------------ svn:eol-style = native