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:40 UTC
[12/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/CompactionStrategyConfig.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
index e8f7f88..03c0688 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
@@ -15,66 +15,36 @@
* 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 CompactionStrategyConfig implements org.apache.thrift.TBase<CompactionStrategyConfig, CompactionStrategyConfig._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStrategyConfig> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionStrategyConfig");
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)1);
private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.MAP, (short)2);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new CompactionStrategyConfigStandardSchemeFactory());
- schemes.put(TupleScheme.class, new CompactionStrategyConfigTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CompactionStrategyConfigStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CompactionStrategyConfigTupleSchemeFactory();
- public String className; // required
- public Map<String,String> options; // required
+ public java.lang.String className; // required
+ public java.util.Map<java.lang.String,java.lang.String> options; // 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 {
CLASS_NAME((short)1, "className"),
OPTIONS((short)2, "options");
- 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 CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
*/
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,22 +92,22 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- 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.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.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT,
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(CompactionStrategyConfig.class, metaDataMap);
}
@@ -145,8 +115,8 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
public CompactionStrategyConfig(
- String className,
- Map<String,String> options)
+ java.lang.String className,
+ java.util.Map<java.lang.String,java.lang.String> options)
{
this();
this.className = className;
@@ -161,7 +131,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
this.className = other.className;
}
if (other.isSetOptions()) {
- Map<String,String> __this__options = new HashMap<String,String>(other.options);
+ java.util.Map<java.lang.String,java.lang.String> __this__options = new java.util.HashMap<java.lang.String,java.lang.String>(other.options);
this.options = __this__options;
}
}
@@ -176,11 +146,11 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
this.options = null;
}
- public String getClassName() {
+ public java.lang.String getClassName() {
return this.className;
}
- public CompactionStrategyConfig setClassName(String className) {
+ public CompactionStrategyConfig setClassName(java.lang.String className) {
this.className = className;
return this;
}
@@ -204,18 +174,18 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
return (this.options == null) ? 0 : this.options.size();
}
- public void putToOptions(String key, String val) {
+ public void putToOptions(java.lang.String key, java.lang.String val) {
if (this.options == null) {
- this.options = new HashMap<String,String>();
+ this.options = new java.util.HashMap<java.lang.String,java.lang.String>();
}
this.options.put(key, val);
}
- public Map<String,String> getOptions() {
+ public java.util.Map<java.lang.String,java.lang.String> getOptions() {
return this.options;
}
- public CompactionStrategyConfig setOptions(Map<String,String> options) {
+ public CompactionStrategyConfig setOptions(java.util.Map<java.lang.String,java.lang.String> options) {
this.options = options;
return this;
}
@@ -235,13 +205,13 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CLASS_NAME:
if (value == null) {
unsetClassName();
} else {
- setClassName((String)value);
+ setClassName((java.lang.String)value);
}
break;
@@ -249,14 +219,14 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
if (value == null) {
unsetOptions();
} else {
- setOptions((Map<String,String>)value);
+ setOptions((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 CLASS_NAME:
return getClassName();
@@ -265,13 +235,13 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
return getOptions();
}
- 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) {
@@ -280,11 +250,11 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
case OPTIONS:
return isSetOptions();
}
- 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 CompactionStrategyConfig)
@@ -295,6 +265,8 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
public boolean equals(CompactionStrategyConfig that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_className = true && this.isSetClassName();
boolean that_present_className = true && that.isSetClassName();
@@ -319,19 +291,17 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- 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_options = true && (isSetOptions());
- list.add(present_options);
- if (present_options)
- list.add(options);
+ hashCode = hashCode * 8191 + ((isSetOptions()) ? 131071 : 524287);
+ if (isSetOptions())
+ hashCode = hashCode * 8191 + options.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -342,7 +312,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+ lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -352,7 +322,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
+ lastComparison = java.lang.Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
if (lastComparison != 0) {
return lastComparison;
}
@@ -370,16 +340,16 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
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("CompactionStrategyConfig(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("CompactionStrategyConfig(");
boolean first = true;
sb.append("className:");
@@ -414,7 +384,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
}
- 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 {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -422,13 +392,13 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
}
- private static class CompactionStrategyConfigStandardSchemeFactory implements SchemeFactory {
+ private static class CompactionStrategyConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CompactionStrategyConfigStandardScheme getScheme() {
return new CompactionStrategyConfigStandardScheme();
}
}
- private static class CompactionStrategyConfigStandardScheme extends StandardScheme<CompactionStrategyConfig> {
+ private static class CompactionStrategyConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<CompactionStrategyConfig> {
public void read(org.apache.thrift.protocol.TProtocol iprot, CompactionStrategyConfig struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -452,9 +422,9 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map154 = iprot.readMapBegin();
- struct.options = new HashMap<String,String>(2*_map154.size);
- String _key155;
- String _val156;
+ struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map154.size);
+ java.lang.String _key155;
+ java.lang.String _val156;
for (int _i157 = 0; _i157 < _map154.size; ++_i157)
{
_key155 = iprot.readString();
@@ -492,7 +462,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.options.size()));
- for (Map.Entry<String, String> _iter158 : struct.options.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter158 : struct.options.entrySet())
{
oprot.writeString(_iter158.getKey());
oprot.writeString(_iter158.getValue());
@@ -507,18 +477,18 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
- private static class CompactionStrategyConfigTupleSchemeFactory implements SchemeFactory {
+ private static class CompactionStrategyConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CompactionStrategyConfigTupleScheme getScheme() {
return new CompactionStrategyConfigTupleScheme();
}
}
- private static class CompactionStrategyConfigTupleScheme extends TupleScheme<CompactionStrategyConfig> {
+ private static class CompactionStrategyConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<CompactionStrategyConfig> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, CompactionStrategyConfig 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.isSetClassName()) {
optionals.set(0);
}
@@ -532,7 +502,7 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
if (struct.isSetOptions()) {
{
oprot.writeI32(struct.options.size());
- for (Map.Entry<String, String> _iter159 : struct.options.entrySet())
+ for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter159 : struct.options.entrySet())
{
oprot.writeString(_iter159.getKey());
oprot.writeString(_iter159.getValue());
@@ -543,8 +513,8 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, CompactionStrategyConfig 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.className = iprot.readString();
struct.setClassNameIsSet(true);
@@ -552,9 +522,9 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
if (incoming.get(1)) {
{
org.apache.thrift.protocol.TMap _map160 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.options = new HashMap<String,String>(2*_map160.size);
- String _key161;
- String _val162;
+ struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map160.size);
+ java.lang.String _key161;
+ java.lang.String _val162;
for (int _i163 = 0; _i163 < _map160.size; ++_i163)
{
_key161 = iprot.readString();
@@ -567,5 +537,9 @@ public class CompactionStrategyConfig implements org.apache.thrift.TBase<Compact
}
}
+ 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/CompactionType.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
index d561796..da93702 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.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 CompactionType implements org.apache.thrift.TEnum {
+public enum CompactionType implements org.apache.thrift.TEnum {
MINOR(0),
MERGE(1),
MAJOR(2),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index d946a87..ac4aef4 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.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 Condition implements org.apache.thrift.TBase<Condition, Condition._Fields>, java.io.Serializable, Cloneable, Comparable<Condition> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Condition");
@@ -59,16 +32,13 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.LIST, (short)4);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ConditionStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ConditionTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ConditionStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ConditionTupleSchemeFactory();
public Column column; // required
public long timestamp; // optional
- public ByteBuffer value; // optional
- public List<IteratorSetting> iterators; // optional
+ public java.nio.ByteBuffer value; // optional
+ public java.util.List<IteratorSetting> iterators; // optional
/** 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 Condition implements org.apache.thrift.TBase<Condition, Condition._
VALUE((short)3, "value"),
ITERATORS((short)4, "iterators");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -109,21 +79,21 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
*/
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 Condition implements org.apache.thrift.TBase<Condition, Condition._
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -141,9 +111,9 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
private static final int __TIMESTAMP_ISSET_ID = 0;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.VALUE,_Fields.ITERATORS};
- 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.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Column.class)));
tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -153,7 +123,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
tmpMap.put(_Fields.ITERATORS, new org.apache.thrift.meta_data.FieldMetaData("iterators", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IteratorSetting.class))));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Condition.class, metaDataMap);
}
@@ -180,7 +150,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value);
}
if (other.isSetIterators()) {
- List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size());
+ java.util.List<IteratorSetting> __this__iterators = new java.util.ArrayList<IteratorSetting>(other.iterators.size());
for (IteratorSetting other_element : other.iterators) {
__this__iterators.add(new IteratorSetting(other_element));
}
@@ -236,16 +206,16 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
public void unsetTimestamp() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
/** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
public boolean isSetTimestamp() {
- return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
public void setTimestampIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
}
public byte[] getValue() {
@@ -253,16 +223,16 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
return value == null ? null : value.array();
}
- public ByteBuffer bufferForValue() {
+ public java.nio.ByteBuffer bufferForValue() {
return org.apache.thrift.TBaseHelper.copyBinary(value);
}
public Condition setValue(byte[] value) {
- this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
+ this.value = value == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(value.clone());
return this;
}
- public Condition setValue(ByteBuffer value) {
+ public Condition setValue(java.nio.ByteBuffer value) {
this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
return this;
}
@@ -292,16 +262,16 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
public void addToIterators(IteratorSetting elem) {
if (this.iterators == null) {
- this.iterators = new ArrayList<IteratorSetting>();
+ this.iterators = new java.util.ArrayList<IteratorSetting>();
}
this.iterators.add(elem);
}
- public List<IteratorSetting> getIterators() {
+ public java.util.List<IteratorSetting> getIterators() {
return this.iterators;
}
- public Condition setIterators(List<IteratorSetting> iterators) {
+ public Condition setIterators(java.util.List<IteratorSetting> iterators) {
this.iterators = iterators;
return this;
}
@@ -321,7 +291,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case COLUMN:
if (value == null) {
@@ -335,7 +305,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
if (value == null) {
unsetTimestamp();
} else {
- setTimestamp((Long)value);
+ setTimestamp((java.lang.Long)value);
}
break;
@@ -343,7 +313,11 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
if (value == null) {
unsetValue();
} else {
- setValue((ByteBuffer)value);
+ if (value instanceof byte[]) {
+ setValue((byte[])value);
+ } else {
+ setValue((java.nio.ByteBuffer)value);
+ }
}
break;
@@ -351,14 +325,14 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
if (value == null) {
unsetIterators();
} else {
- setIterators((List<IteratorSetting>)value);
+ setIterators((java.util.List<IteratorSetting>)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case COLUMN:
return getColumn();
@@ -373,13 +347,13 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
return getIterators();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
- throw new IllegalArgumentException();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -392,11 +366,11 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
case ITERATORS:
return isSetIterators();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof Condition)
@@ -407,6 +381,8 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
public boolean equals(Condition that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_column = true && this.isSetColumn();
boolean that_present_column = true && that.isSetColumn();
@@ -449,29 +425,25 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_column = true && (isSetColumn());
- list.add(present_column);
- if (present_column)
- list.add(column);
+ hashCode = hashCode * 8191 + ((isSetColumn()) ? 131071 : 524287);
+ if (isSetColumn())
+ hashCode = hashCode * 8191 + column.hashCode();
- boolean present_timestamp = true && (isSetTimestamp());
- list.add(present_timestamp);
- if (present_timestamp)
- list.add(timestamp);
+ hashCode = hashCode * 8191 + ((isSetTimestamp()) ? 131071 : 524287);
+ if (isSetTimestamp())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timestamp);
- boolean present_value = true && (isSetValue());
- list.add(present_value);
- if (present_value)
- list.add(value);
+ hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+ if (isSetValue())
+ hashCode = hashCode * 8191 + value.hashCode();
- boolean present_iterators = true && (isSetIterators());
- list.add(present_iterators);
- if (present_iterators)
- list.add(iterators);
+ hashCode = hashCode * 8191 + ((isSetIterators()) ? 131071 : 524287);
+ if (isSetIterators())
+ hashCode = hashCode * 8191 + iterators.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -482,7 +454,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
+ lastComparison = java.lang.Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
if (lastComparison != 0) {
return lastComparison;
}
@@ -492,7 +464,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+ lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
@@ -502,7 +474,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+ lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
@@ -512,7 +484,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
+ lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
if (lastComparison != 0) {
return lastComparison;
}
@@ -530,16 +502,16 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
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("Condition(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("Condition(");
boolean first = true;
sb.append("column:");
@@ -595,7 +567,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
}
- 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;
@@ -605,13 +577,13 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
}
- private static class ConditionStandardSchemeFactory implements SchemeFactory {
+ private static class ConditionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionStandardScheme getScheme() {
return new ConditionStandardScheme();
}
}
- private static class ConditionStandardScheme extends StandardScheme<Condition> {
+ private static class ConditionStandardScheme extends org.apache.thrift.scheme.StandardScheme<Condition> {
public void read(org.apache.thrift.protocol.TProtocol iprot, Condition struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -652,7 +624,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list82 = iprot.readListBegin();
- struct.iterators = new ArrayList<IteratorSetting>(_list82.size);
+ struct.iterators = new java.util.ArrayList<IteratorSetting>(_list82.size);
IteratorSetting _elem83;
for (int _i84 = 0; _i84 < _list82.size; ++_i84)
{
@@ -719,18 +691,18 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
- private static class ConditionTupleSchemeFactory implements SchemeFactory {
+ private static class ConditionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionTupleScheme getScheme() {
return new ConditionTupleScheme();
}
}
- private static class ConditionTupleScheme extends TupleScheme<Condition> {
+ private static class ConditionTupleScheme extends org.apache.thrift.scheme.TupleScheme<Condition> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, Condition 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.isSetColumn()) {
optionals.set(0);
}
@@ -766,8 +738,8 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Condition 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.column = new Column();
struct.column.read(iprot);
@@ -784,7 +756,7 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
if (incoming.get(3)) {
{
org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.iterators = new ArrayList<IteratorSetting>(_list87.size);
+ struct.iterators = new java.util.ArrayList<IteratorSetting>(_list87.size);
IteratorSetting _elem88;
for (int _i89 = 0; _i89 < _list87.size; ++_i89)
{
@@ -798,5 +770,9 @@ public class Condition implements org.apache.thrift.TBase<Condition, Condition._
}
}
+ 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/ConditionalStatus.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index c8626a5..6e5c1c3 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.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 ConditionalStatus implements org.apache.thrift.TEnum {
+public enum ConditionalStatus implements org.apache.thrift.TEnum {
ACCEPTED(0),
REJECTED(1),
VIOLATED(2),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index 07f1338..a573685 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
@@ -15,66 +15,36 @@
* 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 ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUpdates, ConditionalUpdates._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalUpdates> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalUpdates");
private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("conditions", org.apache.thrift.protocol.TType.LIST, (short)2);
private static final org.apache.thrift.protocol.TField UPDATES_FIELD_DESC = new org.apache.thrift.protocol.TField("updates", org.apache.thrift.protocol.TType.LIST, (short)3);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ConditionalUpdatesStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ConditionalUpdatesTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ConditionalUpdatesStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ConditionalUpdatesTupleSchemeFactory();
- public List<Condition> conditions; // required
- public List<ColumnUpdate> updates; // required
+ public java.util.List<Condition> conditions; // required
+ public java.util.List<ColumnUpdate> updates; // 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 {
CONDITIONS((short)2, "conditions"),
UPDATES((short)3, "updates");
- 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 ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
*/
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,22 +92,22 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.CONDITIONS, new org.apache.thrift.meta_data.FieldMetaData("conditions", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Condition.class))));
tmpMap.put(_Fields.UPDATES, new org.apache.thrift.meta_data.FieldMetaData("updates", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnUpdate.class))));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ConditionalUpdates.class, metaDataMap);
}
@@ -145,8 +115,8 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
public ConditionalUpdates(
- List<Condition> conditions,
- List<ColumnUpdate> updates)
+ java.util.List<Condition> conditions,
+ java.util.List<ColumnUpdate> updates)
{
this();
this.conditions = conditions;
@@ -158,14 +128,14 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
*/
public ConditionalUpdates(ConditionalUpdates other) {
if (other.isSetConditions()) {
- List<Condition> __this__conditions = new ArrayList<Condition>(other.conditions.size());
+ java.util.List<Condition> __this__conditions = new java.util.ArrayList<Condition>(other.conditions.size());
for (Condition other_element : other.conditions) {
__this__conditions.add(new Condition(other_element));
}
this.conditions = __this__conditions;
}
if (other.isSetUpdates()) {
- List<ColumnUpdate> __this__updates = new ArrayList<ColumnUpdate>(other.updates.size());
+ java.util.List<ColumnUpdate> __this__updates = new java.util.ArrayList<ColumnUpdate>(other.updates.size());
for (ColumnUpdate other_element : other.updates) {
__this__updates.add(new ColumnUpdate(other_element));
}
@@ -193,16 +163,16 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
public void addToConditions(Condition elem) {
if (this.conditions == null) {
- this.conditions = new ArrayList<Condition>();
+ this.conditions = new java.util.ArrayList<Condition>();
}
this.conditions.add(elem);
}
- public List<Condition> getConditions() {
+ public java.util.List<Condition> getConditions() {
return this.conditions;
}
- public ConditionalUpdates setConditions(List<Condition> conditions) {
+ public ConditionalUpdates setConditions(java.util.List<Condition> conditions) {
this.conditions = conditions;
return this;
}
@@ -232,16 +202,16 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
public void addToUpdates(ColumnUpdate elem) {
if (this.updates == null) {
- this.updates = new ArrayList<ColumnUpdate>();
+ this.updates = new java.util.ArrayList<ColumnUpdate>();
}
this.updates.add(elem);
}
- public List<ColumnUpdate> getUpdates() {
+ public java.util.List<ColumnUpdate> getUpdates() {
return this.updates;
}
- public ConditionalUpdates setUpdates(List<ColumnUpdate> updates) {
+ public ConditionalUpdates setUpdates(java.util.List<ColumnUpdate> updates) {
this.updates = updates;
return this;
}
@@ -261,13 +231,13 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case CONDITIONS:
if (value == null) {
unsetConditions();
} else {
- setConditions((List<Condition>)value);
+ setConditions((java.util.List<Condition>)value);
}
break;
@@ -275,14 +245,14 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
if (value == null) {
unsetUpdates();
} else {
- setUpdates((List<ColumnUpdate>)value);
+ setUpdates((java.util.List<ColumnUpdate>)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case CONDITIONS:
return getConditions();
@@ -291,13 +261,13 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
return getUpdates();
}
- 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) {
@@ -306,11 +276,11 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
case UPDATES:
return isSetUpdates();
}
- 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 ConditionalUpdates)
@@ -321,6 +291,8 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
public boolean equals(ConditionalUpdates that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_conditions = true && this.isSetConditions();
boolean that_present_conditions = true && that.isSetConditions();
@@ -345,19 +317,17 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_conditions = true && (isSetConditions());
- list.add(present_conditions);
- if (present_conditions)
- list.add(conditions);
+ hashCode = hashCode * 8191 + ((isSetConditions()) ? 131071 : 524287);
+ if (isSetConditions())
+ hashCode = hashCode * 8191 + conditions.hashCode();
- boolean present_updates = true && (isSetUpdates());
- list.add(present_updates);
- if (present_updates)
- list.add(updates);
+ hashCode = hashCode * 8191 + ((isSetUpdates()) ? 131071 : 524287);
+ if (isSetUpdates())
+ hashCode = hashCode * 8191 + updates.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -368,7 +338,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
+ lastComparison = java.lang.Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
if (lastComparison != 0) {
return lastComparison;
}
@@ -378,7 +348,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUpdates()).compareTo(other.isSetUpdates());
+ lastComparison = java.lang.Boolean.valueOf(isSetUpdates()).compareTo(other.isSetUpdates());
if (lastComparison != 0) {
return lastComparison;
}
@@ -396,16 +366,16 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
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("ConditionalUpdates(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("ConditionalUpdates(");
boolean first = true;
sb.append("conditions:");
@@ -440,7 +410,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
}
- 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 {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -448,13 +418,13 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
}
- private static class ConditionalUpdatesStandardSchemeFactory implements SchemeFactory {
+ private static class ConditionalUpdatesStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionalUpdatesStandardScheme getScheme() {
return new ConditionalUpdatesStandardScheme();
}
}
- private static class ConditionalUpdatesStandardScheme extends StandardScheme<ConditionalUpdates> {
+ private static class ConditionalUpdatesStandardScheme extends org.apache.thrift.scheme.StandardScheme<ConditionalUpdates> {
public void read(org.apache.thrift.protocol.TProtocol iprot, ConditionalUpdates struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -470,7 +440,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list90 = iprot.readListBegin();
- struct.conditions = new ArrayList<Condition>(_list90.size);
+ struct.conditions = new java.util.ArrayList<Condition>(_list90.size);
Condition _elem91;
for (int _i92 = 0; _i92 < _list90.size; ++_i92)
{
@@ -489,7 +459,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list93 = iprot.readListBegin();
- struct.updates = new ArrayList<ColumnUpdate>(_list93.size);
+ struct.updates = new java.util.ArrayList<ColumnUpdate>(_list93.size);
ColumnUpdate _elem94;
for (int _i95 = 0; _i95 < _list93.size; ++_i95)
{
@@ -549,18 +519,18 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
- private static class ConditionalUpdatesTupleSchemeFactory implements SchemeFactory {
+ private static class ConditionalUpdatesTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public ConditionalUpdatesTupleScheme getScheme() {
return new ConditionalUpdatesTupleScheme();
}
}
- private static class ConditionalUpdatesTupleScheme extends TupleScheme<ConditionalUpdates> {
+ private static class ConditionalUpdatesTupleScheme extends org.apache.thrift.scheme.TupleScheme<ConditionalUpdates> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, ConditionalUpdates struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetConditions()) {
optionals.set(0);
}
@@ -590,12 +560,12 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ConditionalUpdates 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 _list100 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.conditions = new ArrayList<Condition>(_list100.size);
+ struct.conditions = new java.util.ArrayList<Condition>(_list100.size);
Condition _elem101;
for (int _i102 = 0; _i102 < _list100.size; ++_i102)
{
@@ -609,7 +579,7 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
if (incoming.get(1)) {
{
org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.updates = new ArrayList<ColumnUpdate>(_list103.size);
+ struct.updates = new java.util.ArrayList<ColumnUpdate>(_list103.size);
ColumnUpdate _elem104;
for (int _i105 = 0; _i105 < _list103.size; ++_i105)
{
@@ -623,5 +593,9 @@ public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUp
}
}
+ 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() {}
}