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:29:39 UTC
[11/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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
index 16c78a3..cd3ce5d 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.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.proxy.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 ConditionalWriterOptions implements org.apache.thrift.TBase<ConditionalWriterOptions, ConditionalWriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalWriterOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalWriterOptions");
@@ -60,16 +33,13 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.SET, (short)4);
private static final org.apache.thrift.protocol.TField DURABILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("durability", org.apache.thrift.protocol.TType.I32, (short)5);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ConditionalWriterOptionsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ConditionalWriterOptionsTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ConditionalWriterOptionsStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ConditionalWriterOptionsTupleSchemeFactory();
public long maxMemory; // optional
public long timeoutMs; // optional
public int threads; // optional
- public Set<ByteBuffer> authorizations; // optional
+ public java.util.Set<java.nio.ByteBuffer> authorizations; // optional
/**
*
* @see Durability
@@ -88,10 +58,10 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
*/
DURABILITY((short)5, "durability");
- 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);
}
}
@@ -122,21 +92,21 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
*/
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;
}
@@ -145,7 +115,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -156,9 +126,9 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
private static final int __THREADS_ISSET_ID = 2;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.MAX_MEMORY,_Fields.TIMEOUT_MS,_Fields.THREADS,_Fields.AUTHORIZATIONS,_Fields.DURABILITY};
- 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.MAX_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("maxMemory", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.TIMEOUT_MS, new org.apache.thrift.meta_data.FieldMetaData("timeoutMs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -170,7 +140,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
tmpMap.put(_Fields.DURABILITY, new org.apache.thrift.meta_data.FieldMetaData("durability", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Durability.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ConditionalWriterOptions.class, metaDataMap);
}
@@ -186,7 +156,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
this.timeoutMs = other.timeoutMs;
this.threads = other.threads;
if (other.isSetAuthorizations()) {
- Set<ByteBuffer> __this__authorizations = new HashSet<ByteBuffer>(other.authorizations);
+ java.util.Set<java.nio.ByteBuffer> __this__authorizations = new java.util.HashSet<java.nio.ByteBuffer>(other.authorizations);
this.authorizations = __this__authorizations;
}
if (other.isSetDurability()) {
@@ -221,16 +191,16 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
public void unsetMaxMemory() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXMEMORY_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXMEMORY_ISSET_ID);
}
/** Returns true if field maxMemory is set (has been assigned a value) and false otherwise */
public boolean isSetMaxMemory() {
- return EncodingUtils.testBit(__isset_bitfield, __MAXMEMORY_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXMEMORY_ISSET_ID);
}
public void setMaxMemoryIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXMEMORY_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXMEMORY_ISSET_ID, value);
}
public long getTimeoutMs() {
@@ -244,16 +214,16 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
public void unsetTimeoutMs() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID);
}
/** Returns true if field timeoutMs is set (has been assigned a value) and false otherwise */
public boolean isSetTimeoutMs() {
- return EncodingUtils.testBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID);
}
public void setTimeoutMsIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMEOUTMS_ISSET_ID, value);
}
public int getThreads() {
@@ -267,38 +237,38 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
public void unsetThreads() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __THREADS_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __THREADS_ISSET_ID);
}
/** Returns true if field threads is set (has been assigned a value) and false otherwise */
public boolean isSetThreads() {
- return EncodingUtils.testBit(__isset_bitfield, __THREADS_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __THREADS_ISSET_ID);
}
public void setThreadsIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THREADS_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THREADS_ISSET_ID, value);
}
public int getAuthorizationsSize() {
return (this.authorizations == null) ? 0 : this.authorizations.size();
}
- public java.util.Iterator<ByteBuffer> getAuthorizationsIterator() {
+ public java.util.Iterator<java.nio.ByteBuffer> getAuthorizationsIterator() {
return (this.authorizations == null) ? null : this.authorizations.iterator();
}
- public void addToAuthorizations(ByteBuffer elem) {
+ public void addToAuthorizations(java.nio.ByteBuffer elem) {
if (this.authorizations == null) {
- this.authorizations = new HashSet<ByteBuffer>();
+ this.authorizations = new java.util.HashSet<java.nio.ByteBuffer>();
}
this.authorizations.add(elem);
}
- public Set<ByteBuffer> getAuthorizations() {
+ public java.util.Set<java.nio.ByteBuffer> getAuthorizations() {
return this.authorizations;
}
- public ConditionalWriterOptions setAuthorizations(Set<ByteBuffer> authorizations) {
+ public ConditionalWriterOptions setAuthorizations(java.util.Set<java.nio.ByteBuffer> authorizations) {
this.authorizations = authorizations;
return this;
}
@@ -350,13 +320,13 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case MAX_MEMORY:
if (value == null) {
unsetMaxMemory();
} else {
- setMaxMemory((Long)value);
+ setMaxMemory((java.lang.Long)value);
}
break;
@@ -364,7 +334,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (value == null) {
unsetTimeoutMs();
} else {
- setTimeoutMs((Long)value);
+ setTimeoutMs((java.lang.Long)value);
}
break;
@@ -372,7 +342,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (value == null) {
unsetThreads();
} else {
- setThreads((Integer)value);
+ setThreads((java.lang.Integer)value);
}
break;
@@ -380,7 +350,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (value == null) {
unsetAuthorizations();
} else {
- setAuthorizations((Set<ByteBuffer>)value);
+ setAuthorizations((java.util.Set<java.nio.ByteBuffer>)value);
}
break;
@@ -395,7 +365,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case MAX_MEMORY:
return getMaxMemory();
@@ -413,13 +383,13 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return getDurability();
}
- 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) {
@@ -434,11 +404,11 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
case DURABILITY:
return isSetDurability();
}
- 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 ConditionalWriterOptions)
@@ -449,6 +419,8 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
public boolean equals(ConditionalWriterOptions that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_maxMemory = true && this.isSetMaxMemory();
boolean that_present_maxMemory = true && that.isSetMaxMemory();
@@ -500,34 +472,29 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_maxMemory = true && (isSetMaxMemory());
- list.add(present_maxMemory);
- if (present_maxMemory)
- list.add(maxMemory);
+ hashCode = hashCode * 8191 + ((isSetMaxMemory()) ? 131071 : 524287);
+ if (isSetMaxMemory())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(maxMemory);
- boolean present_timeoutMs = true && (isSetTimeoutMs());
- list.add(present_timeoutMs);
- if (present_timeoutMs)
- list.add(timeoutMs);
+ hashCode = hashCode * 8191 + ((isSetTimeoutMs()) ? 131071 : 524287);
+ if (isSetTimeoutMs())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timeoutMs);
- boolean present_threads = true && (isSetThreads());
- list.add(present_threads);
- if (present_threads)
- list.add(threads);
+ hashCode = hashCode * 8191 + ((isSetThreads()) ? 131071 : 524287);
+ if (isSetThreads())
+ hashCode = hashCode * 8191 + threads;
- boolean present_authorizations = true && (isSetAuthorizations());
- list.add(present_authorizations);
- if (present_authorizations)
- list.add(authorizations);
+ hashCode = hashCode * 8191 + ((isSetAuthorizations()) ? 131071 : 524287);
+ if (isSetAuthorizations())
+ hashCode = hashCode * 8191 + authorizations.hashCode();
- boolean present_durability = true && (isSetDurability());
- list.add(present_durability);
- if (present_durability)
- list.add(durability.getValue());
+ hashCode = hashCode * 8191 + ((isSetDurability()) ? 131071 : 524287);
+ if (isSetDurability())
+ hashCode = hashCode * 8191 + durability.getValue();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -538,7 +505,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetMaxMemory()).compareTo(other.isSetMaxMemory());
+ lastComparison = java.lang.Boolean.valueOf(isSetMaxMemory()).compareTo(other.isSetMaxMemory());
if (lastComparison != 0) {
return lastComparison;
}
@@ -548,7 +515,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTimeoutMs()).compareTo(other.isSetTimeoutMs());
+ lastComparison = java.lang.Boolean.valueOf(isSetTimeoutMs()).compareTo(other.isSetTimeoutMs());
if (lastComparison != 0) {
return lastComparison;
}
@@ -558,7 +525,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads());
+ lastComparison = java.lang.Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads());
if (lastComparison != 0) {
return lastComparison;
}
@@ -568,7 +535,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+ lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
if (lastComparison != 0) {
return lastComparison;
}
@@ -578,7 +545,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
+ lastComparison = java.lang.Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
if (lastComparison != 0) {
return lastComparison;
}
@@ -596,16 +563,16 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
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("ConditionalWriterOptions(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("ConditionalWriterOptions(");
boolean first = true;
if (isSetMaxMemory()) {
@@ -662,7 +629,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
}
- 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;
@@ -672,13 +639,13 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
}
- private static class ConditionalWriterOptionsStandardSchemeFactory implements SchemeFactory {
+ private static class ConditionalWriterOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionalWriterOptionsStandardScheme getScheme() {
return new ConditionalWriterOptionsStandardScheme();
}
}
- private static class ConditionalWriterOptionsStandardScheme extends StandardScheme<ConditionalWriterOptions> {
+ private static class ConditionalWriterOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ConditionalWriterOptions> {
public void read(org.apache.thrift.protocol.TProtocol iprot, ConditionalWriterOptions struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -718,8 +685,8 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
org.apache.thrift.protocol.TSet _set106 = iprot.readSetBegin();
- struct.authorizations = new HashSet<ByteBuffer>(2*_set106.size);
- ByteBuffer _elem107;
+ struct.authorizations = new java.util.HashSet<java.nio.ByteBuffer>(2*_set106.size);
+ java.nio.ByteBuffer _elem107;
for (int _i108 = 0; _i108 < _set106.size; ++_i108)
{
_elem107 = iprot.readBinary();
@@ -775,7 +742,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
- for (ByteBuffer _iter109 : struct.authorizations)
+ for (java.nio.ByteBuffer _iter109 : struct.authorizations)
{
oprot.writeBinary(_iter109);
}
@@ -797,18 +764,18 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
- private static class ConditionalWriterOptionsTupleSchemeFactory implements SchemeFactory {
+ private static class ConditionalWriterOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionalWriterOptionsTupleScheme getScheme() {
return new ConditionalWriterOptionsTupleScheme();
}
}
- private static class ConditionalWriterOptionsTupleScheme extends TupleScheme<ConditionalWriterOptions> {
+ private static class ConditionalWriterOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ConditionalWriterOptions> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ConditionalWriterOptions 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.isSetMaxMemory()) {
optionals.set(0);
}
@@ -837,7 +804,7 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (struct.isSetAuthorizations()) {
{
oprot.writeI32(struct.authorizations.size());
- for (ByteBuffer _iter110 : struct.authorizations)
+ for (java.nio.ByteBuffer _iter110 : struct.authorizations)
{
oprot.writeBinary(_iter110);
}
@@ -850,8 +817,8 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ConditionalWriterOptions struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(5);
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
struct.maxMemory = iprot.readI64();
struct.setMaxMemoryIsSet(true);
@@ -867,8 +834,8 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
if (incoming.get(3)) {
{
org.apache.thrift.protocol.TSet _set111 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.authorizations = new HashSet<ByteBuffer>(2*_set111.size);
- ByteBuffer _elem112;
+ struct.authorizations = new java.util.HashSet<java.nio.ByteBuffer>(2*_set111.size);
+ java.nio.ByteBuffer _elem112;
for (int _i113 = 0; _i113 < _set111.size; ++_i113)
{
_elem112 = iprot.readBinary();
@@ -884,5 +851,9 @@ public class ConditionalWriterOptions implements org.apache.thrift.TBase<Conditi
}
}
+ 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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
index c49910f..f66a93c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
@@ -15,55 +15,25 @@
* 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.proxy.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 DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<DiskUsage> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DiskUsage");
private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1);
private static final org.apache.thrift.protocol.TField USAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("usage", org.apache.thrift.protocol.TType.I64, (short)2);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new DiskUsageStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DiskUsageTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DiskUsageStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DiskUsageTupleSchemeFactory();
- public List<String> tables; // required
+ public java.util.List<java.lang.String> tables; // required
public long usage; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -71,10 +41,10 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
TABLES((short)1, "tables"),
USAGE((short)2, "usage");
- 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 DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
*/
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 DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -130,15 +100,15 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
// isset id assignments
private static final int __USAGE_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.TABLES, new org.apache.thrift.meta_data.FieldMetaData("tables", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.USAGE, new org.apache.thrift.meta_data.FieldMetaData("usage", 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(DiskUsage.class, metaDataMap);
}
@@ -146,7 +116,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
public DiskUsage(
- List<String> tables,
+ java.util.List<java.lang.String> tables,
long usage)
{
this();
@@ -161,7 +131,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
public DiskUsage(DiskUsage other) {
__isset_bitfield = other.__isset_bitfield;
if (other.isSetTables()) {
- List<String> __this__tables = new ArrayList<String>(other.tables);
+ java.util.List<java.lang.String> __this__tables = new java.util.ArrayList<java.lang.String>(other.tables);
this.tables = __this__tables;
}
this.usage = other.usage;
@@ -182,22 +152,22 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
return (this.tables == null) ? 0 : this.tables.size();
}
- public java.util.Iterator<String> getTablesIterator() {
+ public java.util.Iterator<java.lang.String> getTablesIterator() {
return (this.tables == null) ? null : this.tables.iterator();
}
- public void addToTables(String elem) {
+ public void addToTables(java.lang.String elem) {
if (this.tables == null) {
- this.tables = new ArrayList<String>();
+ this.tables = new java.util.ArrayList<java.lang.String>();
}
this.tables.add(elem);
}
- public List<String> getTables() {
+ public java.util.List<java.lang.String> getTables() {
return this.tables;
}
- public DiskUsage setTables(List<String> tables) {
+ public DiskUsage setTables(java.util.List<java.lang.String> tables) {
this.tables = tables;
return this;
}
@@ -228,25 +198,25 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
public void unsetUsage() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USAGE_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USAGE_ISSET_ID);
}
/** Returns true if field usage is set (has been assigned a value) and false otherwise */
public boolean isSetUsage() {
- return EncodingUtils.testBit(__isset_bitfield, __USAGE_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USAGE_ISSET_ID);
}
public void setUsageIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USAGE_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USAGE_ISSET_ID, value);
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case TABLES:
if (value == null) {
unsetTables();
} else {
- setTables((List<String>)value);
+ setTables((java.util.List<java.lang.String>)value);
}
break;
@@ -254,14 +224,14 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
if (value == null) {
unsetUsage();
} else {
- setUsage((Long)value);
+ setUsage((java.lang.Long)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case TABLES:
return getTables();
@@ -270,13 +240,13 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
return getUsage();
}
- 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) {
@@ -285,11 +255,11 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
case USAGE:
return isSetUsage();
}
- 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 DiskUsage)
@@ -300,6 +270,8 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
public boolean equals(DiskUsage that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_tables = true && this.isSetTables();
boolean that_present_tables = true && that.isSetTables();
@@ -324,19 +296,15 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_tables = true && (isSetTables());
- list.add(present_tables);
- if (present_tables)
- list.add(tables);
+ hashCode = hashCode * 8191 + ((isSetTables()) ? 131071 : 524287);
+ if (isSetTables())
+ hashCode = hashCode * 8191 + tables.hashCode();
- boolean present_usage = true;
- list.add(present_usage);
- if (present_usage)
- list.add(usage);
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(usage);
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -347,7 +315,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetTables()).compareTo(other.isSetTables());
+ lastComparison = java.lang.Boolean.valueOf(isSetTables()).compareTo(other.isSetTables());
if (lastComparison != 0) {
return lastComparison;
}
@@ -357,7 +325,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUsage()).compareTo(other.isSetUsage());
+ lastComparison = java.lang.Boolean.valueOf(isSetUsage()).compareTo(other.isSetUsage());
if (lastComparison != 0) {
return lastComparison;
}
@@ -375,16 +343,16 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
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("DiskUsage(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("DiskUsage(");
boolean first = true;
sb.append("tables:");
@@ -415,7 +383,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
}
- 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;
@@ -425,13 +393,13 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
}
- private static class DiskUsageStandardSchemeFactory implements SchemeFactory {
+ private static class DiskUsageStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DiskUsageStandardScheme getScheme() {
return new DiskUsageStandardScheme();
}
}
- private static class DiskUsageStandardScheme extends StandardScheme<DiskUsage> {
+ private static class DiskUsageStandardScheme extends org.apache.thrift.scheme.StandardScheme<DiskUsage> {
public void read(org.apache.thrift.protocol.TProtocol iprot, DiskUsage struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -447,8 +415,8 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.tables = new ArrayList<String>(_list0.size);
- String _elem1;
+ struct.tables = new java.util.ArrayList<java.lang.String>(_list0.size);
+ java.lang.String _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{
_elem1 = iprot.readString();
@@ -488,7 +456,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
oprot.writeFieldBegin(TABLES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tables.size()));
- for (String _iter3 : struct.tables)
+ for (java.lang.String _iter3 : struct.tables)
{
oprot.writeString(_iter3);
}
@@ -505,18 +473,18 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
- private static class DiskUsageTupleSchemeFactory implements SchemeFactory {
+ private static class DiskUsageTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public DiskUsageTupleScheme getScheme() {
return new DiskUsageTupleScheme();
}
}
- private static class DiskUsageTupleScheme extends TupleScheme<DiskUsage> {
+ private static class DiskUsageTupleScheme extends org.apache.thrift.scheme.TupleScheme<DiskUsage> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DiskUsage 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.isSetTables()) {
optionals.set(0);
}
@@ -527,7 +495,7 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
if (struct.isSetTables()) {
{
oprot.writeI32(struct.tables.size());
- for (String _iter4 : struct.tables)
+ for (java.lang.String _iter4 : struct.tables)
{
oprot.writeString(_iter4);
}
@@ -540,13 +508,13 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DiskUsage 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)) {
{
org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.tables = new ArrayList<String>(_list5.size);
- String _elem6;
+ struct.tables = new java.util.ArrayList<java.lang.String>(_list5.size);
+ java.lang.String _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{
_elem6 = iprot.readString();
@@ -562,5 +530,9 @@ public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._
}
}
+ 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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
index daa16c8..8f685df 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
@@ -15,7 +15,7 @@
* 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
@@ -23,11 +23,8 @@
package org.apache.accumulo.proxy.thrift;
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-@SuppressWarnings({"unused"}) public enum Durability implements org.apache.thrift.TEnum {
+public enum Durability implements org.apache.thrift.TEnum {
DEFAULT(0),
NONE(1),
LOG(2),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
index 65408bd..8ab316f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
@@ -15,7 +15,7 @@
* 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
@@ -23,11 +23,8 @@
package org.apache.accumulo.proxy.thrift;
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-@SuppressWarnings({"unused"}) public enum IteratorScope implements org.apache.thrift.TEnum {
+public enum IteratorScope implements org.apache.thrift.TEnum {
MINC(0),
MAJC(1),
SCAN(2);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
index 826c46f..dec8c0a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.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.proxy.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 IteratorSetting implements org.apache.thrift.TBase<IteratorSetting, IteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorSetting> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorSetting");
@@ -59,16 +32,13 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
private static final org.apache.thrift.protocol.TField ITERATOR_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("iteratorClass", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("properties", org.apache.thrift.protocol.TType.MAP, (short)4);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new IteratorSettingStandardSchemeFactory());
- schemes.put(TupleScheme.class, new IteratorSettingTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new IteratorSettingStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new IteratorSettingTupleSchemeFactory();
public int priority; // required
- public String name; // required
- public String iteratorClass; // required
- public Map<String,String> properties; // required
+ public java.lang.String name; // required
+ public java.lang.String iteratorClass; // required
+ public java.util.Map<java.lang.String,java.lang.String> properties; // 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 {
@@ -77,10 +47,10 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
ITERATOR_CLASS((short)3, "iteratorClass"),
PROPERTIES((short)4, "properties");
- 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 IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
*/
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 IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -140,9 +110,9 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
// 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.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -153,7 +123,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
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(IteratorSetting.class, metaDataMap);
}
@@ -162,9 +132,9 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
public IteratorSetting(
int priority,
- String name,
- String iteratorClass,
- Map<String,String> properties)
+ java.lang.String name,
+ java.lang.String iteratorClass,
+ java.util.Map<java.lang.String,java.lang.String> properties)
{
this();
this.priority = priority;
@@ -187,7 +157,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
this.iteratorClass = other.iteratorClass;
}
if (other.isSetProperties()) {
- Map<String,String> __this__properties = new HashMap<String,String>(other.properties);
+ java.util.Map<java.lang.String,java.lang.String> __this__properties = new java.util.HashMap<java.lang.String,java.lang.String>(other.properties);
this.properties = __this__properties;
}
}
@@ -216,23 +186,23 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
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 getName() {
+ public java.lang.String getName() {
return this.name;
}
- public IteratorSetting setName(String name) {
+ public IteratorSetting setName(java.lang.String name) {
this.name = name;
return this;
}
@@ -252,11 +222,11 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
}
- public String getIteratorClass() {
+ public java.lang.String getIteratorClass() {
return this.iteratorClass;
}
- public IteratorSetting setIteratorClass(String iteratorClass) {
+ public IteratorSetting setIteratorClass(java.lang.String iteratorClass) {
this.iteratorClass = iteratorClass;
return this;
}
@@ -280,18 +250,18 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return (this.properties == null) ? 0 : this.properties.size();
}
- public void putToProperties(String key, String val) {
+ public void putToProperties(java.lang.String key, java.lang.String val) {
if (this.properties == null) {
- this.properties = new HashMap<String,String>();
+ this.properties = new java.util.HashMap<java.lang.String,java.lang.String>();
}
this.properties.put(key, val);
}
- public Map<String,String> getProperties() {
+ public java.util.Map<java.lang.String,java.lang.String> getProperties() {
return this.properties;
}
- public IteratorSetting setProperties(Map<String,String> properties) {
+ public IteratorSetting setProperties(java.util.Map<java.lang.String,java.lang.String> properties) {
this.properties = properties;
return this;
}
@@ -311,13 +281,13 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
}
- 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;
@@ -325,7 +295,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (value == null) {
unsetName();
} else {
- setName((String)value);
+ setName((java.lang.String)value);
}
break;
@@ -333,7 +303,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (value == null) {
unsetIteratorClass();
} else {
- setIteratorClass((String)value);
+ setIteratorClass((java.lang.String)value);
}
break;
@@ -341,14 +311,14 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (value == null) {
unsetProperties();
} else {
- setProperties((Map<String,String>)value);
+ setProperties((java.util.Map<java.lang.String,java.lang.String>)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case PRIORITY:
return getPriority();
@@ -363,13 +333,13 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return getProperties();
}
- 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) {
@@ -382,11 +352,11 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
case PROPERTIES:
return isSetProperties();
}
- 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 IteratorSetting)
@@ -397,6 +367,8 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
public boolean equals(IteratorSetting that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_priority = true;
boolean that_present_priority = true;
@@ -439,29 +411,23 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
@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_name = true && (isSetName());
- list.add(present_name);
- if (present_name)
- list.add(name);
+ hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
+ if (isSetName())
+ hashCode = hashCode * 8191 + name.hashCode();
- boolean present_iteratorClass = true && (isSetIteratorClass());
- list.add(present_iteratorClass);
- if (present_iteratorClass)
- list.add(iteratorClass);
+ hashCode = hashCode * 8191 + ((isSetIteratorClass()) ? 131071 : 524287);
+ if (isSetIteratorClass())
+ hashCode = hashCode * 8191 + iteratorClass.hashCode();
- boolean present_properties = true && (isSetProperties());
- list.add(present_properties);
- if (present_properties)
- list.add(properties);
+ hashCode = hashCode * 8191 + ((isSetProperties()) ? 131071 : 524287);
+ if (isSetProperties())
+ hashCode = hashCode * 8191 + properties.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -472,7 +438,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
+ lastComparison = java.lang.Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
if (lastComparison != 0) {
return lastComparison;
}
@@ -482,7 +448,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+ lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -492,7 +458,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetIteratorClass()).compareTo(other.isSetIteratorClass());
+ lastComparison = java.lang.Boolean.valueOf(isSetIteratorClass()).compareTo(other.isSetIteratorClass());
if (lastComparison != 0) {
return lastComparison;
}
@@ -502,7 +468,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetProperties()).compareTo(other.isSetProperties());
+ lastComparison = java.lang.Boolean.valueOf(isSetProperties()).compareTo(other.isSetProperties());
if (lastComparison != 0) {
return lastComparison;
}
@@ -520,16 +486,16 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
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("IteratorSetting(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("IteratorSetting(");
boolean first = true;
sb.append("priority:");
@@ -576,7 +542,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
}
- 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;
@@ -586,13 +552,13 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
}
- private static class IteratorSettingStandardSchemeFactory implements SchemeFactory {
+ private static class IteratorSettingStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public IteratorSettingStandardScheme getScheme() {
return new IteratorSettingStandardScheme();
}
}
- private static class IteratorSettingStandardScheme extends StandardScheme<IteratorSetting> {
+ private static class IteratorSettingStandardScheme extends org.apache.thrift.scheme.StandardScheme<IteratorSetting> {
public void read(org.apache.thrift.protocol.TProtocol iprot, IteratorSetting struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -632,9 +598,9 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
- struct.properties = new HashMap<String,String>(2*_map16.size);
- String _key17;
- String _val18;
+ struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map16.size);
+ java.lang.String _key17;
+ java.lang.String _val18;
for (int _i19 = 0; _i19 < _map16.size; ++_i19)
{
_key17 = iprot.readString();
@@ -680,7 +646,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size()));
- for (Map.Entry<String, String> _iter20 : struct.properties.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter20 : struct.properties.entrySet())
{
oprot.writeString(_iter20.getKey());
oprot.writeString(_iter20.getValue());
@@ -695,18 +661,18 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
- private static class IteratorSettingTupleSchemeFactory implements SchemeFactory {
+ private static class IteratorSettingTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public IteratorSettingTupleScheme getScheme() {
return new IteratorSettingTupleScheme();
}
}
- private static class IteratorSettingTupleScheme extends TupleScheme<IteratorSetting> {
+ private static class IteratorSettingTupleScheme extends org.apache.thrift.scheme.TupleScheme<IteratorSetting> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, IteratorSetting 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);
}
@@ -732,7 +698,7 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (struct.isSetProperties()) {
{
oprot.writeI32(struct.properties.size());
- for (Map.Entry<String, String> _iter21 : struct.properties.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter21 : struct.properties.entrySet())
{
oprot.writeString(_iter21.getKey());
oprot.writeString(_iter21.getValue());
@@ -743,8 +709,8 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, IteratorSetting 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.priority = iprot.readI32();
struct.setPriorityIsSet(true);
@@ -760,9 +726,9 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
if (incoming.get(3)) {
{
org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.properties = new HashMap<String,String>(2*_map22.size);
- String _key23;
- String _val24;
+ struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map22.size);
+ java.lang.String _key23;
+ java.lang.String _val24;
for (int _i25 = 0; _i25 < _map22.size; ++_i25)
{
_key23 = iprot.readString();
@@ -775,5 +741,9 @@ public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting,
}
}
+ 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() {}
}