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:04 UTC
[36/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/InitialMultiScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
index fd59d4b..b3573cc 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
@@ -15,53 +15,23 @@
* 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 InitialMultiScan implements org.apache.thrift.TBase<InitialMultiScan, InitialMultiScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialMultiScan> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialMultiScan");
private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scanID", org.apache.thrift.protocol.TType.I64, (short)1);
private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new InitialMultiScanStandardSchemeFactory());
- schemes.put(TupleScheme.class, new InitialMultiScanTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InitialMultiScanStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InitialMultiScanTupleSchemeFactory();
public long scanID; // required
public MultiScanResult result; // required
@@ -71,10 +41,10 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
SCAN_ID((short)1, "scanID"),
RESULT((short)2, "result");
- 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);
}
}
@@ -99,21 +69,21 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
*/
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;
}
@@ -122,7 +92,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -130,14 +100,14 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
// isset id assignments
private static final int __SCANID_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.SCAN_ID, new org.apache.thrift.meta_data.FieldMetaData("scanID", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "ScanID")));
tmpMap.put(_Fields.RESULT, new org.apache.thrift.meta_data.FieldMetaData("result", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MultiScanResult.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InitialMultiScan.class, metaDataMap);
}
@@ -187,16 +157,16 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
public void unsetScanID() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
}
/** Returns true if field scanID is set (has been assigned a value) and false otherwise */
public boolean isSetScanID() {
- return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
}
public void setScanIDIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
}
public MultiScanResult getResult() {
@@ -223,13 +193,13 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SCAN_ID:
if (value == null) {
unsetScanID();
} else {
- setScanID((Long)value);
+ setScanID((java.lang.Long)value);
}
break;
@@ -244,7 +214,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SCAN_ID:
return getScanID();
@@ -253,13 +223,13 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
return getResult();
}
- 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) {
@@ -268,11 +238,11 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
case RESULT:
return isSetResult();
}
- 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 InitialMultiScan)
@@ -283,6 +253,8 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
public boolean equals(InitialMultiScan that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_scanID = true;
boolean that_present_scanID = true;
@@ -307,19 +279,15 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_scanID = true;
- list.add(present_scanID);
- if (present_scanID)
- list.add(scanID);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(scanID);
- boolean present_result = true && (isSetResult());
- list.add(present_result);
- if (present_result)
- list.add(result);
+ hashCode = hashCode * 8191 + ((isSetResult()) ? 131071 : 524287);
+ if (isSetResult())
+ hashCode = hashCode * 8191 + result.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -330,7 +298,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+ lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
if (lastComparison != 0) {
return lastComparison;
}
@@ -340,7 +308,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
+ lastComparison = java.lang.Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
if (lastComparison != 0) {
return lastComparison;
}
@@ -358,16 +326,16 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
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("InitialMultiScan(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("InitialMultiScan(");
boolean first = true;
sb.append("scanID:");
@@ -401,7 +369,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
}
- 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;
@@ -411,13 +379,13 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
}
- private static class InitialMultiScanStandardSchemeFactory implements SchemeFactory {
+ private static class InitialMultiScanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public InitialMultiScanStandardScheme getScheme() {
return new InitialMultiScanStandardScheme();
}
}
- private static class InitialMultiScanStandardScheme extends StandardScheme<InitialMultiScan> {
+ private static class InitialMultiScanStandardScheme extends org.apache.thrift.scheme.StandardScheme<InitialMultiScan> {
public void read(org.apache.thrift.protocol.TProtocol iprot, InitialMultiScan struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -475,18 +443,18 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
- private static class InitialMultiScanTupleSchemeFactory implements SchemeFactory {
+ private static class InitialMultiScanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public InitialMultiScanTupleScheme getScheme() {
return new InitialMultiScanTupleScheme();
}
}
- private static class InitialMultiScanTupleScheme extends TupleScheme<InitialMultiScan> {
+ private static class InitialMultiScanTupleScheme extends org.apache.thrift.scheme.TupleScheme<InitialMultiScan> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, InitialMultiScan 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.isSetScanID()) {
optionals.set(0);
}
@@ -504,8 +472,8 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, InitialMultiScan struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
struct.scanID = iprot.readI64();
struct.setScanIDIsSet(true);
@@ -518,5 +486,9 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
}
}
+ 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/InitialScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
index 879bdcb..34e54c8 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
@@ -15,53 +15,23 @@
* 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 InitialScan implements org.apache.thrift.TBase<InitialScan, InitialScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialScan> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialScan");
private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scanID", org.apache.thrift.protocol.TType.I64, (short)1);
private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new InitialScanStandardSchemeFactory());
- schemes.put(TupleScheme.class, new InitialScanTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InitialScanStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InitialScanTupleSchemeFactory();
public long scanID; // required
public ScanResult result; // required
@@ -71,10 +41,10 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
SCAN_ID((short)1, "scanID"),
RESULT((short)2, "result");
- 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);
}
}
@@ -99,21 +69,21 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
*/
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;
}
@@ -122,7 +92,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -130,14 +100,14 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
// isset id assignments
private static final int __SCANID_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.SCAN_ID, new org.apache.thrift.meta_data.FieldMetaData("scanID", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "ScanID")));
tmpMap.put(_Fields.RESULT, new org.apache.thrift.meta_data.FieldMetaData("result", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ScanResult.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InitialScan.class, metaDataMap);
}
@@ -187,16 +157,16 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
public void unsetScanID() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
}
/** Returns true if field scanID is set (has been assigned a value) and false otherwise */
public boolean isSetScanID() {
- return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
}
public void setScanIDIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
}
public ScanResult getResult() {
@@ -223,13 +193,13 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case SCAN_ID:
if (value == null) {
unsetScanID();
} else {
- setScanID((Long)value);
+ setScanID((java.lang.Long)value);
}
break;
@@ -244,7 +214,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case SCAN_ID:
return getScanID();
@@ -253,13 +223,13 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
return getResult();
}
- 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) {
@@ -268,11 +238,11 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
case RESULT:
return isSetResult();
}
- 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 InitialScan)
@@ -283,6 +253,8 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
public boolean equals(InitialScan that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_scanID = true;
boolean that_present_scanID = true;
@@ -307,19 +279,15 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_scanID = true;
- list.add(present_scanID);
- if (present_scanID)
- list.add(scanID);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(scanID);
- boolean present_result = true && (isSetResult());
- list.add(present_result);
- if (present_result)
- list.add(result);
+ hashCode = hashCode * 8191 + ((isSetResult()) ? 131071 : 524287);
+ if (isSetResult())
+ hashCode = hashCode * 8191 + result.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -330,7 +298,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+ lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
if (lastComparison != 0) {
return lastComparison;
}
@@ -340,7 +308,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
+ lastComparison = java.lang.Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
if (lastComparison != 0) {
return lastComparison;
}
@@ -358,16 +326,16 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
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("InitialScan(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("InitialScan(");
boolean first = true;
sb.append("scanID:");
@@ -401,7 +369,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
}
- 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;
@@ -411,13 +379,13 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
}
- private static class InitialScanStandardSchemeFactory implements SchemeFactory {
+ private static class InitialScanStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public InitialScanStandardScheme getScheme() {
return new InitialScanStandardScheme();
}
}
- private static class InitialScanStandardScheme extends StandardScheme<InitialScan> {
+ private static class InitialScanStandardScheme extends org.apache.thrift.scheme.StandardScheme<InitialScan> {
public void read(org.apache.thrift.protocol.TProtocol iprot, InitialScan struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -475,18 +443,18 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
- private static class InitialScanTupleSchemeFactory implements SchemeFactory {
+ private static class InitialScanTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public InitialScanTupleScheme getScheme() {
return new InitialScanTupleScheme();
}
}
- private static class InitialScanTupleScheme extends TupleScheme<InitialScan> {
+ private static class InitialScanTupleScheme extends org.apache.thrift.scheme.TupleScheme<InitialScan> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, InitialScan 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.isSetScanID()) {
optionals.set(0);
}
@@ -504,8 +472,8 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, InitialScan struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
struct.scanID = iprot.readI64();
struct.setScanIDIsSet(true);
@@ -518,5 +486,9 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
}
}
+ 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/IterInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
index 3edc5d7..dcb2f68 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.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 IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fields>, java.io.Serializable, Cloneable, Comparable<IterInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IterInfo");
@@ -58,15 +31,12 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
private static final org.apache.thrift.protocol.TField CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("className", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ITER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("iterName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new IterInfoStandardSchemeFactory());
- schemes.put(TupleScheme.class, new IterInfoTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new IterInfoStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new IterInfoTupleSchemeFactory();
public int priority; // required
- public String className; // required
- public String iterName; // required
+ public java.lang.String className; // required
+ public java.lang.String iterName; // 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 {
@@ -74,10 +44,10 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
CLASS_NAME((short)2, "className"),
ITER_NAME((short)3, "iterName");
- 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 IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
*/
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 IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -135,16 +105,16 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
// isset id assignments
private static final int __PRIORITY_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.PRIORITY, new org.apache.thrift.meta_data.FieldMetaData("priority", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("className", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ITER_NAME, new org.apache.thrift.meta_data.FieldMetaData("iterName", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IterInfo.class, metaDataMap);
}
@@ -153,8 +123,8 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
public IterInfo(
int priority,
- String className,
- String iterName)
+ java.lang.String className,
+ java.lang.String iterName)
{
this();
this.priority = priority;
@@ -200,23 +170,23 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
public void unsetPriority() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRIORITY_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.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 EncodingUtils.testBit(__isset_bitfield, __PRIORITY_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PRIORITY_ISSET_ID);
}
public void setPriorityIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRIORITY_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PRIORITY_ISSET_ID, value);
}
- public String getClassName() {
+ public java.lang.String getClassName() {
return this.className;
}
- public IterInfo setClassName(String className) {
+ public IterInfo setClassName(java.lang.String className) {
this.className = className;
return this;
}
@@ -236,11 +206,11 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
}
- public String getIterName() {
+ public java.lang.String getIterName() {
return this.iterName;
}
- public IterInfo setIterName(String iterName) {
+ public IterInfo setIterName(java.lang.String iterName) {
this.iterName = iterName;
return this;
}
@@ -260,13 +230,13 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case PRIORITY:
if (value == null) {
unsetPriority();
} else {
- setPriority((Integer)value);
+ setPriority((java.lang.Integer)value);
}
break;
@@ -274,7 +244,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
if (value == null) {
unsetClassName();
} else {
- setClassName((String)value);
+ setClassName((java.lang.String)value);
}
break;
@@ -282,14 +252,14 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
if (value == null) {
unsetIterName();
} else {
- setIterName((String)value);
+ setIterName((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case PRIORITY:
return getPriority();
@@ -301,13 +271,13 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
return getIterName();
}
- 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 IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
case ITER_NAME:
return isSetIterName();
}
- 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 IterInfo)
@@ -333,6 +303,8 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
public boolean equals(IterInfo that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_priority = true;
boolean that_present_priority = true;
@@ -366,24 +338,19 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_priority = true;
- list.add(present_priority);
- if (present_priority)
- list.add(priority);
+ hashCode = hashCode * 8191 + priority;
- boolean present_className = true && (isSetClassName());
- list.add(present_className);
- if (present_className)
- list.add(className);
+ hashCode = hashCode * 8191 + ((isSetClassName()) ? 131071 : 524287);
+ if (isSetClassName())
+ hashCode = hashCode * 8191 + className.hashCode();
- boolean present_iterName = true && (isSetIterName());
- list.add(present_iterName);
- if (present_iterName)
- list.add(iterName);
+ hashCode = hashCode * 8191 + ((isSetIterName()) ? 131071 : 524287);
+ if (isSetIterName())
+ hashCode = hashCode * 8191 + iterName.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -394,7 +361,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
+ lastComparison = java.lang.Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
if (lastComparison != 0) {
return lastComparison;
}
@@ -404,7 +371,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+ lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -414,7 +381,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetIterName()).compareTo(other.isSetIterName());
+ lastComparison = java.lang.Boolean.valueOf(isSetIterName()).compareTo(other.isSetIterName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -432,16 +399,16 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
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("IterInfo(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("IterInfo(");
boolean first = true;
sb.append("priority:");
@@ -480,7 +447,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
}
- 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;
@@ -490,13 +457,13 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
}
- private static class IterInfoStandardSchemeFactory implements SchemeFactory {
+ private static class IterInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public IterInfoStandardScheme getScheme() {
return new IterInfoStandardScheme();
}
}
- private static class IterInfoStandardScheme extends StandardScheme<IterInfo> {
+ private static class IterInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<IterInfo> {
public void read(org.apache.thrift.protocol.TProtocol iprot, IterInfo struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -566,18 +533,18 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
- private static class IterInfoTupleSchemeFactory implements SchemeFactory {
+ private static class IterInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public IterInfoTupleScheme getScheme() {
return new IterInfoTupleScheme();
}
}
- private static class IterInfoTupleScheme extends TupleScheme<IterInfo> {
+ private static class IterInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<IterInfo> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, IterInfo 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.isSetPriority()) {
optionals.set(0);
}
@@ -601,8 +568,8 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, IterInfo 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.priority = iprot.readI32();
struct.setPriorityIsSet(true);
@@ -618,5 +585,9 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
}
}
+ 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/MapFileInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
index ab11e18..5b873f1 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
@@ -15,52 +15,22 @@
* 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 MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFileInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MapFileInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapFileInfo");
private static final org.apache.thrift.protocol.TField ESTIMATED_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("estimatedSize", org.apache.thrift.protocol.TType.I64, (short)1);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new MapFileInfoStandardSchemeFactory());
- schemes.put(TupleScheme.class, new MapFileInfoTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MapFileInfoStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MapFileInfoTupleSchemeFactory();
public long estimatedSize; // required
@@ -68,10 +38,10 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
ESTIMATED_SIZE((short)1, "estimatedSize");
- 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);
}
}
@@ -94,21 +64,21 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
*/
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;
}
@@ -117,7 +87,7 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -125,12 +95,12 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
// isset id assignments
private static final int __ESTIMATEDSIZE_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.ESTIMATED_SIZE, new org.apache.thrift.meta_data.FieldMetaData("estimatedSize", 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(MapFileInfo.class, metaDataMap);
}
@@ -174,55 +144,55 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
public void unsetEstimatedSize() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
}
/** Returns true if field estimatedSize is set (has been assigned a value) and false otherwise */
public boolean isSetEstimatedSize() {
- return EncodingUtils.testBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
}
public void setEstimatedSizeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID, value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case ESTIMATED_SIZE:
if (value == null) {
unsetEstimatedSize();
} else {
- setEstimatedSize((Long)value);
+ setEstimatedSize((java.lang.Long)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case ESTIMATED_SIZE:
return getEstimatedSize();
}
- 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) {
case ESTIMATED_SIZE:
return isSetEstimatedSize();
}
- 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 MapFileInfo)
@@ -233,6 +203,8 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
public boolean equals(MapFileInfo that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_estimatedSize = true;
boolean that_present_estimatedSize = true;
@@ -248,14 +220,11 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_estimatedSize = true;
- list.add(present_estimatedSize);
- if (present_estimatedSize)
- list.add(estimatedSize);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(estimatedSize);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -266,7 +235,7 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetEstimatedSize()).compareTo(other.isSetEstimatedSize());
+ lastComparison = java.lang.Boolean.valueOf(isSetEstimatedSize()).compareTo(other.isSetEstimatedSize());
if (lastComparison != 0) {
return lastComparison;
}
@@ -284,16 +253,16 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
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("MapFileInfo(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("MapFileInfo(");
boolean first = true;
sb.append("estimatedSize:");
@@ -316,7 +285,7 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
}
- 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;
@@ -326,13 +295,13 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
}
- private static class MapFileInfoStandardSchemeFactory implements SchemeFactory {
+ private static class MapFileInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public MapFileInfoStandardScheme getScheme() {
return new MapFileInfoStandardScheme();
}
}
- private static class MapFileInfoStandardScheme extends StandardScheme<MapFileInfo> {
+ private static class MapFileInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<MapFileInfo> {
public void read(org.apache.thrift.protocol.TProtocol iprot, MapFileInfo struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -376,18 +345,18 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
- private static class MapFileInfoTupleSchemeFactory implements SchemeFactory {
+ private static class MapFileInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public MapFileInfoTupleScheme getScheme() {
return new MapFileInfoTupleScheme();
}
}
- private static class MapFileInfoTupleScheme extends TupleScheme<MapFileInfo> {
+ private static class MapFileInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<MapFileInfo> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, MapFileInfo 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.isSetEstimatedSize()) {
optionals.set(0);
}
@@ -399,8 +368,8 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, MapFileInfo struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(1);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
struct.estimatedSize = iprot.readI64();
struct.setEstimatedSizeIsSet(true);
@@ -408,5 +377,9 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
}
}
+ 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() {}
}