You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/02/09 19:30:02 UTC
[34/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes
from 0.10.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
index 2a4e131..6fec05b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
@@ -15,42 +15,15 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.accumulo.core.data.thrift;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class TCondition implements org.apache.thrift.TBase<TCondition, TCondition._Fields>, java.io.Serializable, Cloneable, Comparable<TCondition> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCondition");
@@ -62,19 +35,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
private static final org.apache.thrift.protocol.TField VAL_FIELD_DESC = new org.apache.thrift.protocol.TField("val", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TConditionStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TConditionTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TConditionStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TConditionTupleSchemeFactory();
- public ByteBuffer cf; // required
- public ByteBuffer cq; // required
- public ByteBuffer cv; // required
+ public java.nio.ByteBuffer cf; // required
+ public java.nio.ByteBuffer cq; // required
+ public java.nio.ByteBuffer cv; // required
public long ts; // required
public boolean hasTimestamp; // required
- public ByteBuffer val; // required
- public ByteBuffer iterators; // required
+ public java.nio.ByteBuffer val; // required
+ public java.nio.ByteBuffer iterators; // 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 {
@@ -86,10 +56,10 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
VAL((short)6, "val"),
ITERATORS((short)7, "iterators");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -124,21 +94,21 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
- public static _Fields findByName(String name) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -147,7 +117,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -156,9 +126,9 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
private static final int __TS_ISSET_ID = 0;
private static final int __HASTIMESTAMP_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.CF, new org.apache.thrift.meta_data.FieldMetaData("cf", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.CQ, new org.apache.thrift.meta_data.FieldMetaData("cq", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -173,7 +143,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.ITERATORS, new org.apache.thrift.meta_data.FieldMetaData("iterators", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCondition.class, metaDataMap);
}
@@ -181,13 +151,13 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
public TCondition(
- ByteBuffer cf,
- ByteBuffer cq,
- ByteBuffer cv,
+ java.nio.ByteBuffer cf,
+ java.nio.ByteBuffer cq,
+ java.nio.ByteBuffer cv,
long ts,
boolean hasTimestamp,
- ByteBuffer val,
- ByteBuffer iterators)
+ java.nio.ByteBuffer val,
+ java.nio.ByteBuffer iterators)
{
this();
this.cf = org.apache.thrift.TBaseHelper.copyBinary(cf);
@@ -247,16 +217,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return cf == null ? null : cf.array();
}
- public ByteBuffer bufferForCf() {
+ public java.nio.ByteBuffer bufferForCf() {
return org.apache.thrift.TBaseHelper.copyBinary(cf);
}
public TCondition setCf(byte[] cf) {
- this.cf = cf == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cf, cf.length));
+ this.cf = cf == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(cf.clone());
return this;
}
- public TCondition setCf(ByteBuffer cf) {
+ public TCondition setCf(java.nio.ByteBuffer cf) {
this.cf = org.apache.thrift.TBaseHelper.copyBinary(cf);
return this;
}
@@ -281,16 +251,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return cq == null ? null : cq.array();
}
- public ByteBuffer bufferForCq() {
+ public java.nio.ByteBuffer bufferForCq() {
return org.apache.thrift.TBaseHelper.copyBinary(cq);
}
public TCondition setCq(byte[] cq) {
- this.cq = cq == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cq, cq.length));
+ this.cq = cq == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(cq.clone());
return this;
}
- public TCondition setCq(ByteBuffer cq) {
+ public TCondition setCq(java.nio.ByteBuffer cq) {
this.cq = org.apache.thrift.TBaseHelper.copyBinary(cq);
return this;
}
@@ -315,16 +285,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return cv == null ? null : cv.array();
}
- public ByteBuffer bufferForCv() {
+ public java.nio.ByteBuffer bufferForCv() {
return org.apache.thrift.TBaseHelper.copyBinary(cv);
}
public TCondition setCv(byte[] cv) {
- this.cv = cv == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cv, cv.length));
+ this.cv = cv == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(cv.clone());
return this;
}
- public TCondition setCv(ByteBuffer cv) {
+ public TCondition setCv(java.nio.ByteBuffer cv) {
this.cv = org.apache.thrift.TBaseHelper.copyBinary(cv);
return this;
}
@@ -355,16 +325,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
public void unsetTs() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TS_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TS_ISSET_ID);
}
/** Returns true if field ts is set (has been assigned a value) and false otherwise */
public boolean isSetTs() {
- return EncodingUtils.testBit(__isset_bitfield, __TS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TS_ISSET_ID);
}
public void setTsIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TS_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TS_ISSET_ID, value);
}
public boolean isHasTimestamp() {
@@ -378,16 +348,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
public void unsetHasTimestamp() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID);
}
/** Returns true if field hasTimestamp is set (has been assigned a value) and false otherwise */
public boolean isSetHasTimestamp() {
- return EncodingUtils.testBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID);
}
public void setHasTimestampIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASTIMESTAMP_ISSET_ID, value);
}
public byte[] getVal() {
@@ -395,16 +365,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return val == null ? null : val.array();
}
- public ByteBuffer bufferForVal() {
+ public java.nio.ByteBuffer bufferForVal() {
return org.apache.thrift.TBaseHelper.copyBinary(val);
}
public TCondition setVal(byte[] val) {
- this.val = val == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(val, val.length));
+ this.val = val == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(val.clone());
return this;
}
- public TCondition setVal(ByteBuffer val) {
+ public TCondition setVal(java.nio.ByteBuffer val) {
this.val = org.apache.thrift.TBaseHelper.copyBinary(val);
return this;
}
@@ -429,16 +399,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return iterators == null ? null : iterators.array();
}
- public ByteBuffer bufferForIterators() {
+ public java.nio.ByteBuffer bufferForIterators() {
return org.apache.thrift.TBaseHelper.copyBinary(iterators);
}
public TCondition setIterators(byte[] iterators) {
- this.iterators = iterators == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(iterators, iterators.length));
+ this.iterators = iterators == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(iterators.clone());
return this;
}
- public TCondition setIterators(ByteBuffer iterators) {
+ public TCondition setIterators(java.nio.ByteBuffer iterators) {
this.iterators = org.apache.thrift.TBaseHelper.copyBinary(iterators);
return this;
}
@@ -458,13 +428,17 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CF:
if (value == null) {
unsetCf();
} else {
- setCf((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setCf((byte[])value);
+ } else {
+ setCf((java.nio.ByteBuffer)value);
+ }
}
break;
@@ -472,7 +446,11 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetCq();
} else {
- setCq((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setCq((byte[])value);
+ } else {
+ setCq((java.nio.ByteBuffer)value);
+ }
}
break;
@@ -480,7 +458,11 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetCv();
} else {
- setCv((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setCv((byte[])value);
+ } else {
+ setCv((java.nio.ByteBuffer)value);
+ }
}
break;
@@ -488,7 +470,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetTs();
} else {
- setTs((Long)value);
+ setTs((java.lang.Long)value);
}
break;
@@ -496,7 +478,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetHasTimestamp();
} else {
- setHasTimestamp((Boolean)value);
+ setHasTimestamp((java.lang.Boolean)value);
}
break;
@@ -504,7 +486,11 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetVal();
} else {
- setVal((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setVal((byte[])value);
+ } else {
+ setVal((java.nio.ByteBuffer)value);
+ }
}
break;
@@ -512,14 +498,18 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
if (value == null) {
unsetIterators();
} else {
- setIterators((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setIterators((byte[])value);
+ } else {
+ setIterators((java.nio.ByteBuffer)value);
+ }
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case CF:
return getCf();
@@ -543,13 +533,13 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return getIterators();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** 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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -568,11 +558,11 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
case ITERATORS:
return isSetIterators();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof TCondition)
@@ -583,6 +573,8 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
public boolean equals(TCondition that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_cf = true && this.isSetCf();
boolean that_present_cf = true && that.isSetCf();
@@ -652,44 +644,33 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_cf = true && (isSetCf());
- list.add(present_cf);
- if (present_cf)
- list.add(cf);
+ hashCode = hashCode * 8191 + ((isSetCf()) ? 131071 : 524287);
+ if (isSetCf())
+ hashCode = hashCode * 8191 + cf.hashCode();
- boolean present_cq = true && (isSetCq());
- list.add(present_cq);
- if (present_cq)
- list.add(cq);
+ hashCode = hashCode * 8191 + ((isSetCq()) ? 131071 : 524287);
+ if (isSetCq())
+ hashCode = hashCode * 8191 + cq.hashCode();
- boolean present_cv = true && (isSetCv());
- list.add(present_cv);
- if (present_cv)
- list.add(cv);
+ hashCode = hashCode * 8191 + ((isSetCv()) ? 131071 : 524287);
+ if (isSetCv())
+ hashCode = hashCode * 8191 + cv.hashCode();
- boolean present_ts = true;
- list.add(present_ts);
- if (present_ts)
- list.add(ts);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(ts);
- boolean present_hasTimestamp = true;
- list.add(present_hasTimestamp);
- if (present_hasTimestamp)
- list.add(hasTimestamp);
+ hashCode = hashCode * 8191 + ((hasTimestamp) ? 131071 : 524287);
- boolean present_val = true && (isSetVal());
- list.add(present_val);
- if (present_val)
- list.add(val);
+ hashCode = hashCode * 8191 + ((isSetVal()) ? 131071 : 524287);
+ if (isSetVal())
+ hashCode = hashCode * 8191 + val.hashCode();
- boolean present_iterators = true && (isSetIterators());
- list.add(present_iterators);
- if (present_iterators)
- list.add(iterators);
+ hashCode = hashCode * 8191 + ((isSetIterators()) ? 131071 : 524287);
+ if (isSetIterators())
+ hashCode = hashCode * 8191 + iterators.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -700,7 +681,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetCf()).compareTo(other.isSetCf());
+ lastComparison = java.lang.Boolean.valueOf(isSetCf()).compareTo(other.isSetCf());
if (lastComparison != 0) {
return lastComparison;
}
@@ -710,7 +691,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCq()).compareTo(other.isSetCq());
+ lastComparison = java.lang.Boolean.valueOf(isSetCq()).compareTo(other.isSetCq());
if (lastComparison != 0) {
return lastComparison;
}
@@ -720,7 +701,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCv()).compareTo(other.isSetCv());
+ lastComparison = java.lang.Boolean.valueOf(isSetCv()).compareTo(other.isSetCv());
if (lastComparison != 0) {
return lastComparison;
}
@@ -730,7 +711,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTs()).compareTo(other.isSetTs());
+ lastComparison = java.lang.Boolean.valueOf(isSetTs()).compareTo(other.isSetTs());
if (lastComparison != 0) {
return lastComparison;
}
@@ -740,7 +721,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetHasTimestamp()).compareTo(other.isSetHasTimestamp());
+ lastComparison = java.lang.Boolean.valueOf(isSetHasTimestamp()).compareTo(other.isSetHasTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
@@ -750,7 +731,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetVal()).compareTo(other.isSetVal());
+ lastComparison = java.lang.Boolean.valueOf(isSetVal()).compareTo(other.isSetVal());
if (lastComparison != 0) {
return lastComparison;
}
@@ -760,7 +741,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
+ lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
if (lastComparison != 0) {
return lastComparison;
}
@@ -778,16 +759,16 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("TCondition(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("TCondition(");
boolean first = true;
sb.append("cf:");
@@ -854,7 +835,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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_bitfield = 0;
@@ -864,13 +845,13 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
}
- private static class TConditionStandardSchemeFactory implements SchemeFactory {
+ private static class TConditionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionStandardScheme getScheme() {
return new TConditionStandardScheme();
}
}
- private static class TConditionStandardScheme extends StandardScheme<TCondition> {
+ private static class TConditionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TCondition> {
public void read(org.apache.thrift.protocol.TProtocol iprot, TCondition struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -990,18 +971,18 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
- private static class TConditionTupleSchemeFactory implements SchemeFactory {
+ private static class TConditionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionTupleScheme getScheme() {
return new TConditionTupleScheme();
}
}
- private static class TConditionTupleScheme extends TupleScheme<TCondition> {
+ private static class TConditionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TCondition> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, TCondition struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetCf()) {
optionals.set(0);
}
@@ -1049,8 +1030,8 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TCondition struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(7);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
struct.cf = iprot.readBinary();
struct.setCfIsSet(true);
@@ -1082,5 +1063,9 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
+ private static void unusedMethod() {}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
index 98b9e97..86dbb9a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
@@ -15,42 +15,15 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.accumulo.core.data.thrift;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class TConditionalMutation implements org.apache.thrift.TBase<TConditionalMutation, TConditionalMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalMutation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalMutation");
@@ -58,13 +31,10 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
private static final org.apache.thrift.protocol.TField MUTATION_FIELD_DESC = new org.apache.thrift.protocol.TField("mutation", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)3);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TConditionalMutationStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TConditionalMutationTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TConditionalMutationStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TConditionalMutationTupleSchemeFactory();
- public List<TCondition> conditions; // required
+ public java.util.List<TCondition> conditions; // required
public TMutation mutation; // required
public long id; // required
@@ -74,10 +44,10 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
MUTATION((short)2, "mutation"),
ID((short)3, "id");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -104,21 +74,21 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
- public static _Fields findByName(String name) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -127,7 +97,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -135,9 +105,9 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
// isset id assignments
private static final int __ID_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.CONDITIONS, new org.apache.thrift.meta_data.FieldMetaData("conditions", org.apache.thrift.TFieldRequirementType.DEFAULT,
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, TCondition.class))));
@@ -145,7 +115,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TMutation.class)));
tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TConditionalMutation.class, metaDataMap);
}
@@ -153,7 +123,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
public TConditionalMutation(
- List<TCondition> conditions,
+ java.util.List<TCondition> conditions,
TMutation mutation,
long id)
{
@@ -170,7 +140,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
public TConditionalMutation(TConditionalMutation other) {
__isset_bitfield = other.__isset_bitfield;
if (other.isSetConditions()) {
- List<TCondition> __this__conditions = new ArrayList<TCondition>(other.conditions.size());
+ java.util.List<TCondition> __this__conditions = new java.util.ArrayList<TCondition>(other.conditions.size());
for (TCondition other_element : other.conditions) {
__this__conditions.add(new TCondition(other_element));
}
@@ -204,16 +174,16 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
public void addToConditions(TCondition elem) {
if (this.conditions == null) {
- this.conditions = new ArrayList<TCondition>();
+ this.conditions = new java.util.ArrayList<TCondition>();
}
this.conditions.add(elem);
}
- public List<TCondition> getConditions() {
+ public java.util.List<TCondition> getConditions() {
return this.conditions;
}
- public TConditionalMutation setConditions(List<TCondition> conditions) {
+ public TConditionalMutation setConditions(java.util.List<TCondition> conditions) {
this.conditions = conditions;
return this;
}
@@ -268,25 +238,25 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
public void unsetId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
}
/** Returns true if field id is set (has been assigned a value) and false otherwise */
public boolean isSetId() {
- return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
}
public void setIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CONDITIONS:
if (value == null) {
unsetConditions();
} else {
- setConditions((List<TCondition>)value);
+ setConditions((java.util.List<TCondition>)value);
}
break;
@@ -302,14 +272,14 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
if (value == null) {
unsetId();
} else {
- setId((Long)value);
+ setId((java.lang.Long)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case CONDITIONS:
return getConditions();
@@ -321,13 +291,13 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
return getId();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** 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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -338,11 +308,11 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
case ID:
return isSetId();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof TConditionalMutation)
@@ -353,6 +323,8 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
public boolean equals(TConditionalMutation that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_conditions = true && this.isSetConditions();
boolean that_present_conditions = true && that.isSetConditions();
@@ -386,24 +358,19 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_conditions = true && (isSetConditions());
- list.add(present_conditions);
- if (present_conditions)
- list.add(conditions);
+ hashCode = hashCode * 8191 + ((isSetConditions()) ? 131071 : 524287);
+ if (isSetConditions())
+ hashCode = hashCode * 8191 + conditions.hashCode();
- boolean present_mutation = true && (isSetMutation());
- list.add(present_mutation);
- if (present_mutation)
- list.add(mutation);
+ hashCode = hashCode * 8191 + ((isSetMutation()) ? 131071 : 524287);
+ if (isSetMutation())
+ hashCode = hashCode * 8191 + mutation.hashCode();
- boolean present_id = true;
- list.add(present_id);
- if (present_id)
- list.add(id);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(id);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -414,7 +381,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
+ lastComparison = java.lang.Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
if (lastComparison != 0) {
return lastComparison;
}
@@ -424,7 +391,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetMutation()).compareTo(other.isSetMutation());
+ lastComparison = java.lang.Boolean.valueOf(isSetMutation()).compareTo(other.isSetMutation());
if (lastComparison != 0) {
return lastComparison;
}
@@ -434,7 +401,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
+ lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -452,16 +419,16 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("TConditionalMutation(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("TConditionalMutation(");
boolean first = true;
sb.append("conditions:");
@@ -503,7 +470,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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_bitfield = 0;
@@ -513,13 +480,13 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
}
- private static class TConditionalMutationStandardSchemeFactory implements SchemeFactory {
+ private static class TConditionalMutationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionalMutationStandardScheme getScheme() {
return new TConditionalMutationStandardScheme();
}
}
- private static class TConditionalMutationStandardScheme extends StandardScheme<TConditionalMutation> {
+ private static class TConditionalMutationStandardScheme extends org.apache.thrift.scheme.StandardScheme<TConditionalMutation> {
public void read(org.apache.thrift.protocol.TProtocol iprot, TConditionalMutation struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -535,7 +502,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
- struct.conditions = new ArrayList<TCondition>(_list86.size);
+ struct.conditions = new java.util.ArrayList<TCondition>(_list86.size);
TCondition _elem87;
for (int _i88 = 0; _i88 < _list86.size; ++_i88)
{
@@ -608,18 +575,18 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
- private static class TConditionalMutationTupleSchemeFactory implements SchemeFactory {
+ private static class TConditionalMutationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionalMutationTupleScheme getScheme() {
return new TConditionalMutationTupleScheme();
}
}
- private static class TConditionalMutationTupleScheme extends TupleScheme<TConditionalMutation> {
+ private static class TConditionalMutationTupleScheme extends org.apache.thrift.scheme.TupleScheme<TConditionalMutation> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, TConditionalMutation struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetConditions()) {
optionals.set(0);
}
@@ -649,12 +616,12 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TConditionalMutation struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(3);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.conditions = new ArrayList<TCondition>(_list91.size);
+ struct.conditions = new java.util.ArrayList<TCondition>(_list91.size);
TCondition _elem92;
for (int _i93 = 0; _i93 < _list91.size; ++_i93)
{
@@ -677,5 +644,9 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
+ private static void unusedMethod() {}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
index 8bab8cb..aea4732 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
@@ -15,42 +15,15 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.accumulo.core.data.thrift;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class TConditionalSession implements org.apache.thrift.TBase<TConditionalSession, TConditionalSession._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalSession> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalSession");
@@ -58,14 +31,11 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
private static final org.apache.thrift.protocol.TField TSERVER_LOCK_FIELD_DESC = new org.apache.thrift.protocol.TField("tserverLock", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField TTL_FIELD_DESC = new org.apache.thrift.protocol.TField("ttl", org.apache.thrift.protocol.TType.I64, (short)3);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TConditionalSessionStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TConditionalSessionTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TConditionalSessionStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TConditionalSessionTupleSchemeFactory();
public long sessionId; // required
- public String tserverLock; // required
+ public java.lang.String tserverLock; // required
public long ttl; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -74,10 +44,10 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
TSERVER_LOCK((short)2, "tserverLock"),
TTL((short)3, "ttl");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -104,21 +74,21 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
- public static _Fields findByName(String name) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -127,7 +97,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -136,16 +106,16 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
private static final int __SESSIONID_ISSET_ID = 0;
private static final int __TTL_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.TSERVER_LOCK, new org.apache.thrift.meta_data.FieldMetaData("tserverLock", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TTL, new org.apache.thrift.meta_data.FieldMetaData("ttl", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TConditionalSession.class, metaDataMap);
}
@@ -154,7 +124,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
public TConditionalSession(
long sessionId,
- String tserverLock,
+ java.lang.String tserverLock,
long ttl)
{
this();
@@ -201,23 +171,23 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
public void unsetSessionId() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SESSIONID_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SESSIONID_ISSET_ID);
}
/** Returns true if field sessionId is set (has been assigned a value) and false otherwise */
public boolean isSetSessionId() {
- return EncodingUtils.testBit(__isset_bitfield, __SESSIONID_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SESSIONID_ISSET_ID);
}
public void setSessionIdIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SESSIONID_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SESSIONID_ISSET_ID, value);
}
- public String getTserverLock() {
+ public java.lang.String getTserverLock() {
return this.tserverLock;
}
- public TConditionalSession setTserverLock(String tserverLock) {
+ public TConditionalSession setTserverLock(java.lang.String tserverLock) {
this.tserverLock = tserverLock;
return this;
}
@@ -248,25 +218,25 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
public void unsetTtl() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TTL_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TTL_ISSET_ID);
}
/** Returns true if field ttl is set (has been assigned a value) and false otherwise */
public boolean isSetTtl() {
- return EncodingUtils.testBit(__isset_bitfield, __TTL_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TTL_ISSET_ID);
}
public void setTtlIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TTL_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TTL_ISSET_ID, value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SESSION_ID:
if (value == null) {
unsetSessionId();
} else {
- setSessionId((Long)value);
+ setSessionId((java.lang.Long)value);
}
break;
@@ -274,7 +244,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
if (value == null) {
unsetTserverLock();
} else {
- setTserverLock((String)value);
+ setTserverLock((java.lang.String)value);
}
break;
@@ -282,14 +252,14 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
if (value == null) {
unsetTtl();
} else {
- setTtl((Long)value);
+ setTtl((java.lang.Long)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SESSION_ID:
return getSessionId();
@@ -301,13 +271,13 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
return getTtl();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** 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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -318,11 +288,11 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
case TTL:
return isSetTtl();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof TConditionalSession)
@@ -333,6 +303,8 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
public boolean equals(TConditionalSession that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_sessionId = true;
boolean that_present_sessionId = true;
@@ -366,24 +338,17 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_sessionId = true;
- list.add(present_sessionId);
- if (present_sessionId)
- list.add(sessionId);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(sessionId);
- boolean present_tserverLock = true && (isSetTserverLock());
- list.add(present_tserverLock);
- if (present_tserverLock)
- list.add(tserverLock);
+ hashCode = hashCode * 8191 + ((isSetTserverLock()) ? 131071 : 524287);
+ if (isSetTserverLock())
+ hashCode = hashCode * 8191 + tserverLock.hashCode();
- boolean present_ttl = true;
- list.add(present_ttl);
- if (present_ttl)
- list.add(ttl);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(ttl);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -394,7 +359,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+ lastComparison = java.lang.Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -404,7 +369,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTserverLock()).compareTo(other.isSetTserverLock());
+ lastComparison = java.lang.Boolean.valueOf(isSetTserverLock()).compareTo(other.isSetTserverLock());
if (lastComparison != 0) {
return lastComparison;
}
@@ -414,7 +379,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTtl()).compareTo(other.isSetTtl());
+ lastComparison = java.lang.Boolean.valueOf(isSetTtl()).compareTo(other.isSetTtl());
if (lastComparison != 0) {
return lastComparison;
}
@@ -432,16 +397,16 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("TConditionalSession(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("TConditionalSession(");
boolean first = true;
sb.append("sessionId:");
@@ -476,7 +441,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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_bitfield = 0;
@@ -486,13 +451,13 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
}
- private static class TConditionalSessionStandardSchemeFactory implements SchemeFactory {
+ private static class TConditionalSessionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionalSessionStandardScheme getScheme() {
return new TConditionalSessionStandardScheme();
}
}
- private static class TConditionalSessionStandardScheme extends StandardScheme<TConditionalSession> {
+ private static class TConditionalSessionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TConditionalSession> {
public void read(org.apache.thrift.protocol.TProtocol iprot, TConditionalSession struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -560,18 +525,18 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
- private static class TConditionalSessionTupleSchemeFactory implements SchemeFactory {
+ private static class TConditionalSessionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConditionalSessionTupleScheme getScheme() {
return new TConditionalSessionTupleScheme();
}
}
- private static class TConditionalSessionTupleScheme extends TupleScheme<TConditionalSession> {
+ private static class TConditionalSessionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TConditionalSession> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, TConditionalSession struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetSessionId()) {
optionals.set(0);
}
@@ -595,8 +560,8 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TConditionalSession struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(3);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
struct.sessionId = iprot.readI64();
struct.setSessionIdIsSet(true);
@@ -612,5 +577,9 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
+ private static void unusedMethod() {}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
index 824fb5f..e351b19 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
@@ -15,42 +15,15 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.accumulo.core.data.thrift;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
public class TConstraintViolationSummary implements org.apache.thrift.TBase<TConstraintViolationSummary, TConstraintViolationSummary._Fields>, java.io.Serializable, Cloneable, Comparable<TConstraintViolationSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConstraintViolationSummary");
@@ -59,15 +32,12 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
private static final org.apache.thrift.protocol.TField VIOLATION_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("violationDescription", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField NUMBER_OF_VIOLATING_MUTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("numberOfViolatingMutations", org.apache.thrift.protocol.TType.I64, (short)4);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TConstraintViolationSummaryStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TConstraintViolationSummaryTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TConstraintViolationSummaryStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TConstraintViolationSummaryTupleSchemeFactory();
- public String constrainClass; // required
+ public java.lang.String constrainClass; // required
public short violationCode; // required
- public String violationDescription; // required
+ public java.lang.String violationDescription; // required
public long numberOfViolatingMutations; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -77,10 +47,10 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
VIOLATION_DESCRIPTION((short)3, "violationDescription"),
NUMBER_OF_VIOLATING_MUTATIONS((short)4, "numberOfViolatingMutations");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -109,21 +79,21 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
- public static _Fields findByName(String name) {
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -132,7 +102,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -141,9 +111,9 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
private static final int __VIOLATIONCODE_ISSET_ID = 0;
private static final int __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.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);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.CONSTRAIN_CLASS, new org.apache.thrift.meta_data.FieldMetaData("constrainClass", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.VIOLATION_CODE, new org.apache.thrift.meta_data.FieldMetaData("violationCode", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -152,7 +122,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.NUMBER_OF_VIOLATING_MUTATIONS, new org.apache.thrift.meta_data.FieldMetaData("numberOfViolatingMutations", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TConstraintViolationSummary.class, metaDataMap);
}
@@ -160,9 +130,9 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
public TConstraintViolationSummary(
- String constrainClass,
+ java.lang.String constrainClass,
short violationCode,
- String violationDescription,
+ java.lang.String violationDescription,
long numberOfViolatingMutations)
{
this();
@@ -203,11 +173,11 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
this.numberOfViolatingMutations = 0;
}
- public String getConstrainClass() {
+ public java.lang.String getConstrainClass() {
return this.constrainClass;
}
- public TConstraintViolationSummary setConstrainClass(String constrainClass) {
+ public TConstraintViolationSummary setConstrainClass(java.lang.String constrainClass) {
this.constrainClass = constrainClass;
return this;
}
@@ -238,23 +208,23 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
public void unsetViolationCode() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
}
/** Returns true if field violationCode is set (has been assigned a value) and false otherwise */
public boolean isSetViolationCode() {
- return EncodingUtils.testBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
}
public void setViolationCodeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID, value);
}
- public String getViolationDescription() {
+ public java.lang.String getViolationDescription() {
return this.violationDescription;
}
- public TConstraintViolationSummary setViolationDescription(String violationDescription) {
+ public TConstraintViolationSummary setViolationDescription(java.lang.String violationDescription) {
this.violationDescription = violationDescription;
return this;
}
@@ -285,25 +255,25 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
public void unsetNumberOfViolatingMutations() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
}
/** Returns true if field numberOfViolatingMutations is set (has been assigned a value) and false otherwise */
public boolean isSetNumberOfViolatingMutations() {
- return EncodingUtils.testBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
}
public void setNumberOfViolatingMutationsIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID, value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CONSTRAIN_CLASS:
if (value == null) {
unsetConstrainClass();
} else {
- setConstrainClass((String)value);
+ setConstrainClass((java.lang.String)value);
}
break;
@@ -311,7 +281,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
if (value == null) {
unsetViolationCode();
} else {
- setViolationCode((Short)value);
+ setViolationCode((java.lang.Short)value);
}
break;
@@ -319,7 +289,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
if (value == null) {
unsetViolationDescription();
} else {
- setViolationDescription((String)value);
+ setViolationDescription((java.lang.String)value);
}
break;
@@ -327,14 +297,14 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
if (value == null) {
unsetNumberOfViolatingMutations();
} else {
- setNumberOfViolatingMutations((Long)value);
+ setNumberOfViolatingMutations((java.lang.Long)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case CONSTRAIN_CLASS:
return getConstrainClass();
@@ -349,13 +319,13 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
return getNumberOfViolatingMutations();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** 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();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -368,11 +338,11 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
case NUMBER_OF_VIOLATING_MUTATIONS:
return isSetNumberOfViolatingMutations();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof TConstraintViolationSummary)
@@ -383,6 +353,8 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
public boolean equals(TConstraintViolationSummary that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_constrainClass = true && this.isSetConstrainClass();
boolean that_present_constrainClass = true && that.isSetConstrainClass();
@@ -425,29 +397,21 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_constrainClass = true && (isSetConstrainClass());
- list.add(present_constrainClass);
- if (present_constrainClass)
- list.add(constrainClass);
+ hashCode = hashCode * 8191 + ((isSetConstrainClass()) ? 131071 : 524287);
+ if (isSetConstrainClass())
+ hashCode = hashCode * 8191 + constrainClass.hashCode();
- boolean present_violationCode = true;
- list.add(present_violationCode);
- if (present_violationCode)
- list.add(violationCode);
+ hashCode = hashCode * 8191 + violationCode;
- boolean present_violationDescription = true && (isSetViolationDescription());
- list.add(present_violationDescription);
- if (present_violationDescription)
- list.add(violationDescription);
+ hashCode = hashCode * 8191 + ((isSetViolationDescription()) ? 131071 : 524287);
+ if (isSetViolationDescription())
+ hashCode = hashCode * 8191 + violationDescription.hashCode();
- boolean present_numberOfViolatingMutations = true;
- list.add(present_numberOfViolatingMutations);
- if (present_numberOfViolatingMutations)
- list.add(numberOfViolatingMutations);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(numberOfViolatingMutations);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -458,7 +422,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetConstrainClass()).compareTo(other.isSetConstrainClass());
+ lastComparison = java.lang.Boolean.valueOf(isSetConstrainClass()).compareTo(other.isSetConstrainClass());
if (lastComparison != 0) {
return lastComparison;
}
@@ -468,7 +432,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetViolationCode()).compareTo(other.isSetViolationCode());
+ lastComparison = java.lang.Boolean.valueOf(isSetViolationCode()).compareTo(other.isSetViolationCode());
if (lastComparison != 0) {
return lastComparison;
}
@@ -478,7 +442,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetViolationDescription()).compareTo(other.isSetViolationDescription());
+ lastComparison = java.lang.Boolean.valueOf(isSetViolationDescription()).compareTo(other.isSetViolationDescription());
if (lastComparison != 0) {
return lastComparison;
}
@@ -488,7 +452,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetNumberOfViolatingMutations()).compareTo(other.isSetNumberOfViolatingMutations());
+ lastComparison = java.lang.Boolean.valueOf(isSetNumberOfViolatingMutations()).compareTo(other.isSetNumberOfViolatingMutations());
if (lastComparison != 0) {
return lastComparison;
}
@@ -506,16 +470,16 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ scheme(iprot).read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ scheme(oprot).write(oprot, this);
}
@Override
- public String toString() {
- StringBuilder sb = new StringBuilder("TConstraintViolationSummary(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("TConstraintViolationSummary(");
boolean first = true;
sb.append("constrainClass:");
@@ -558,7 +522,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
}
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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_bitfield = 0;
@@ -568,13 +532,13 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
}
- private static class TConstraintViolationSummaryStandardSchemeFactory implements SchemeFactory {
+ private static class TConstraintViolationSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConstraintViolationSummaryStandardScheme getScheme() {
return new TConstraintViolationSummaryStandardScheme();
}
}
- private static class TConstraintViolationSummaryStandardScheme extends StandardScheme<TConstraintViolationSummary> {
+ private static class TConstraintViolationSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<TConstraintViolationSummary> {
public void read(org.apache.thrift.protocol.TProtocol iprot, TConstraintViolationSummary struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -655,18 +619,18 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
- private static class TConstraintViolationSummaryTupleSchemeFactory implements SchemeFactory {
+ private static class TConstraintViolationSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public TConstraintViolationSummaryTupleScheme getScheme() {
return new TConstraintViolationSummaryTupleScheme();
}
}
- private static class TConstraintViolationSummaryTupleScheme extends TupleScheme<TConstraintViolationSummary> {
+ private static class TConstraintViolationSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<TConstraintViolationSummary> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, TConstraintViolationSummary struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetConstrainClass()) {
optionals.set(0);
}
@@ -696,8 +660,8 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, TConstraintViolationSummary struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(4);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.constrainClass = iprot.readString();
struct.setConstrainClassIsSet(true);
@@ -717,5 +681,9 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
}
}
+ private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+ return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+ }
+ private static void unusedMethod() {}
}