http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java index 31c02a1..2530abf 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java +++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerSummary.java @@ -16,42 +16,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -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"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, WorkerSummary._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerSummary> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerSummary"); @@ -71,19 +44,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor private static final org.apache.thrift.protocol.TField ASSIGNED_MEMOFFHEAP_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_memoffheap", org.apache.thrift.protocol.TType.DOUBLE, (short)525); private static final org.apache.thrift.protocol.TField ASSIGNED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("assigned_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)526); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new WorkerSummaryStandardSchemeFactory()); - schemes.put(TupleScheme.class, new WorkerSummaryTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerSummaryStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerSummaryTupleSchemeFactory(); - private String supervisor_id; // optional - private String host; // optional + private java.lang.String supervisor_id; // optional + private java.lang.String host; // optional private int port; // optional - private String topology_id; // optional - private String topology_name; // optional + private java.lang.String topology_id; // optional + private java.lang.String topology_name; // optional private int num_executors; // optional - private Map<String,Long> component_to_num_tasks; // optional + private java.util.Map<java.lang.String,java.lang.Long> component_to_num_tasks; // optional private int time_secs; // optional private int uptime_secs; // optional private double requested_memonheap; // optional @@ -111,10 +81,10 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor ASSIGNED_MEMOFFHEAP((short)525, "assigned_memoffheap"), ASSIGNED_CPU((short)526, "assigned_cpu"); - 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); } } @@ -165,21 +135,21 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor */ 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; } @@ -188,7 +158,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -206,9 +176,9 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor private static final int __ASSIGNED_CPU_ISSET_ID = 9; private short __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.SUPERVISOR_ID,_Fields.HOST,_Fields.PORT,_Fields.TOPOLOGY_ID,_Fields.TOPOLOGY_NAME,_Fields.NUM_EXECUTORS,_Fields.COMPONENT_TO_NUM_TASKS,_Fields.TIME_SECS,_Fields.UPTIME_SECS,_Fields.REQUESTED_MEMONHEAP,_Fields.REQUESTED_MEMOFFHEAP,_Fields.REQUESTED_CPU,_Fields.ASSIGNED_MEMONHEAP,_Fields.ASSIGNED_MEMOFFHEAP,_Fields.ASSIGNED_CPU}; - 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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -241,7 +211,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); tmpMap.put(_Fields.ASSIGNED_CPU, new org.apache.thrift.meta_data.FieldMetaData("assigned_cpu", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerSummary.class, metaDataMap); } @@ -268,7 +238,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } this.num_executors = other.num_executors; if (other.is_set_component_to_num_tasks()) { - Map<String,Long> __this__component_to_num_tasks = new HashMap<String,Long>(other.component_to_num_tasks); + java.util.Map<java.lang.String,java.lang.Long> __this__component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(other.component_to_num_tasks); this.component_to_num_tasks = __this__component_to_num_tasks; } this.time_secs = other.time_secs; @@ -314,11 +284,11 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor this.assigned_cpu = 0.0; } - public String get_supervisor_id() { + public java.lang.String get_supervisor_id() { return this.supervisor_id; } - public void set_supervisor_id(String supervisor_id) { + public void set_supervisor_id(java.lang.String supervisor_id) { this.supervisor_id = supervisor_id; } @@ -337,11 +307,11 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } } - public String get_host() { + public java.lang.String get_host() { return this.host; } - public void set_host(String host) { + public void set_host(java.lang.String host) { this.host = host; } @@ -370,23 +340,23 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_port() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID); } /** Returns true if field port is set (has been assigned a value) and false otherwise */ public boolean is_set_port() { - return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID); } public void set_port_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value); } - public String get_topology_id() { + public java.lang.String get_topology_id() { return this.topology_id; } - public void set_topology_id(String topology_id) { + public void set_topology_id(java.lang.String topology_id) { this.topology_id = topology_id; } @@ -405,11 +375,11 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } } - public String get_topology_name() { + public java.lang.String get_topology_name() { return this.topology_name; } - public void set_topology_name(String topology_name) { + public void set_topology_name(java.lang.String topology_name) { this.topology_name = topology_name; } @@ -438,34 +408,34 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_num_executors() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); } /** Returns true if field num_executors is set (has been assigned a value) and false otherwise */ public boolean is_set_num_executors() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID); } public void set_num_executors_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value); } public int get_component_to_num_tasks_size() { return (this.component_to_num_tasks == null) ? 0 : this.component_to_num_tasks.size(); } - public void put_to_component_to_num_tasks(String key, long val) { + public void put_to_component_to_num_tasks(java.lang.String key, long val) { if (this.component_to_num_tasks == null) { - this.component_to_num_tasks = new HashMap<String,Long>(); + this.component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(); } this.component_to_num_tasks.put(key, val); } - public Map<String,Long> get_component_to_num_tasks() { + public java.util.Map<java.lang.String,java.lang.Long> get_component_to_num_tasks() { return this.component_to_num_tasks; } - public void set_component_to_num_tasks(Map<String,Long> component_to_num_tasks) { + public void set_component_to_num_tasks(java.util.Map<java.lang.String,java.lang.Long> component_to_num_tasks) { this.component_to_num_tasks = component_to_num_tasks; } @@ -494,16 +464,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_time_secs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID); } /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */ public boolean is_set_time_secs() { - return EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID); } public void set_time_secs_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value); } public int get_uptime_secs() { @@ -516,16 +486,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_uptime_secs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID); } /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */ public boolean is_set_uptime_secs() { - return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID); } public void set_uptime_secs_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value); } public double get_requested_memonheap() { @@ -538,16 +508,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_requested_memonheap() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID); } /** Returns true if field requested_memonheap is set (has been assigned a value) and false otherwise */ public boolean is_set_requested_memonheap() { - return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID); } public void set_requested_memonheap_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMONHEAP_ISSET_ID, value); } public double get_requested_memoffheap() { @@ -560,16 +530,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_requested_memoffheap() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID); } /** Returns true if field requested_memoffheap is set (has been assigned a value) and false otherwise */ public boolean is_set_requested_memoffheap() { - return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID); } public void set_requested_memoffheap_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_MEMOFFHEAP_ISSET_ID, value); } public double get_requested_cpu() { @@ -582,16 +552,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_requested_cpu() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID); } /** Returns true if field requested_cpu is set (has been assigned a value) and false otherwise */ public boolean is_set_requested_cpu() { - return EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID); } public void set_requested_cpu_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __REQUESTED_CPU_ISSET_ID, value); } public double get_assigned_memonheap() { @@ -604,16 +574,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_assigned_memonheap() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID); } /** Returns true if field assigned_memonheap is set (has been assigned a value) and false otherwise */ public boolean is_set_assigned_memonheap() { - return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID); } public void set_assigned_memonheap_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMONHEAP_ISSET_ID, value); } public double get_assigned_memoffheap() { @@ -626,16 +596,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_assigned_memoffheap() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID); } /** Returns true if field assigned_memoffheap is set (has been assigned a value) and false otherwise */ public boolean is_set_assigned_memoffheap() { - return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID); } public void set_assigned_memoffheap_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_MEMOFFHEAP_ISSET_ID, value); } public double get_assigned_cpu() { @@ -648,25 +618,25 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } public void unset_assigned_cpu() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID); } /** Returns true if field assigned_cpu is set (has been assigned a value) and false otherwise */ public boolean is_set_assigned_cpu() { - return EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID); } public void set_assigned_cpu_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ASSIGNED_CPU_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SUPERVISOR_ID: if (value == null) { unset_supervisor_id(); } else { - set_supervisor_id((String)value); + set_supervisor_id((java.lang.String)value); } break; @@ -674,7 +644,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_host(); } else { - set_host((String)value); + set_host((java.lang.String)value); } break; @@ -682,7 +652,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_port(); } else { - set_port((Integer)value); + set_port((java.lang.Integer)value); } break; @@ -690,7 +660,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_topology_id(); } else { - set_topology_id((String)value); + set_topology_id((java.lang.String)value); } break; @@ -698,7 +668,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_topology_name(); } else { - set_topology_name((String)value); + set_topology_name((java.lang.String)value); } break; @@ -706,7 +676,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_num_executors(); } else { - set_num_executors((Integer)value); + set_num_executors((java.lang.Integer)value); } break; @@ -714,7 +684,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_component_to_num_tasks(); } else { - set_component_to_num_tasks((Map<String,Long>)value); + set_component_to_num_tasks((java.util.Map<java.lang.String,java.lang.Long>)value); } break; @@ -722,7 +692,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_time_secs(); } else { - set_time_secs((Integer)value); + set_time_secs((java.lang.Integer)value); } break; @@ -730,7 +700,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_uptime_secs(); } else { - set_uptime_secs((Integer)value); + set_uptime_secs((java.lang.Integer)value); } break; @@ -738,7 +708,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_requested_memonheap(); } else { - set_requested_memonheap((Double)value); + set_requested_memonheap((java.lang.Double)value); } break; @@ -746,7 +716,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_requested_memoffheap(); } else { - set_requested_memoffheap((Double)value); + set_requested_memoffheap((java.lang.Double)value); } break; @@ -754,7 +724,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_requested_cpu(); } else { - set_requested_cpu((Double)value); + set_requested_cpu((java.lang.Double)value); } break; @@ -762,7 +732,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_assigned_memonheap(); } else { - set_assigned_memonheap((Double)value); + set_assigned_memonheap((java.lang.Double)value); } break; @@ -770,7 +740,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_assigned_memoffheap(); } else { - set_assigned_memoffheap((Double)value); + set_assigned_memoffheap((java.lang.Double)value); } break; @@ -778,14 +748,14 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (value == null) { unset_assigned_cpu(); } else { - set_assigned_cpu((Double)value); + set_assigned_cpu((java.lang.Double)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUPERVISOR_ID: return get_supervisor_id(); @@ -833,13 +803,13 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return get_assigned_cpu(); } - 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) { @@ -874,11 +844,11 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor case ASSIGNED_CPU: return is_set_assigned_cpu(); } - 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 WorkerSummary) @@ -889,6 +859,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor public boolean equals(WorkerSummary that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_supervisor_id = true && this.is_set_supervisor_id(); boolean that_present_supervisor_id = true && that.is_set_supervisor_id(); @@ -1030,84 +1002,69 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_supervisor_id = true && (is_set_supervisor_id()); - list.add(present_supervisor_id); - if (present_supervisor_id) - list.add(supervisor_id); - - boolean present_host = true && (is_set_host()); - list.add(present_host); - if (present_host) - list.add(host); - - boolean present_port = true && (is_set_port()); - list.add(present_port); - if (present_port) - list.add(port); - - boolean present_topology_id = true && (is_set_topology_id()); - list.add(present_topology_id); - if (present_topology_id) - list.add(topology_id); - - boolean present_topology_name = true && (is_set_topology_name()); - list.add(present_topology_name); - if (present_topology_name) - list.add(topology_name); - - boolean present_num_executors = true && (is_set_num_executors()); - list.add(present_num_executors); - if (present_num_executors) - list.add(num_executors); - - boolean present_component_to_num_tasks = true && (is_set_component_to_num_tasks()); - list.add(present_component_to_num_tasks); - if (present_component_to_num_tasks) - list.add(component_to_num_tasks); - - boolean present_time_secs = true && (is_set_time_secs()); - list.add(present_time_secs); - if (present_time_secs) - list.add(time_secs); - - boolean present_uptime_secs = true && (is_set_uptime_secs()); - list.add(present_uptime_secs); - if (present_uptime_secs) - list.add(uptime_secs); - - boolean present_requested_memonheap = true && (is_set_requested_memonheap()); - list.add(present_requested_memonheap); - if (present_requested_memonheap) - list.add(requested_memonheap); - - boolean present_requested_memoffheap = true && (is_set_requested_memoffheap()); - list.add(present_requested_memoffheap); - if (present_requested_memoffheap) - list.add(requested_memoffheap); - - boolean present_requested_cpu = true && (is_set_requested_cpu()); - list.add(present_requested_cpu); - if (present_requested_cpu) - list.add(requested_cpu); - - boolean present_assigned_memonheap = true && (is_set_assigned_memonheap()); - list.add(present_assigned_memonheap); - if (present_assigned_memonheap) - list.add(assigned_memonheap); - - boolean present_assigned_memoffheap = true && (is_set_assigned_memoffheap()); - list.add(present_assigned_memoffheap); - if (present_assigned_memoffheap) - list.add(assigned_memoffheap); - - boolean present_assigned_cpu = true && (is_set_assigned_cpu()); - list.add(present_assigned_cpu); - if (present_assigned_cpu) - list.add(assigned_cpu); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((is_set_supervisor_id()) ? 131071 : 524287); + if (is_set_supervisor_id()) + hashCode = hashCode * 8191 + supervisor_id.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_host()) ? 131071 : 524287); + if (is_set_host()) + hashCode = hashCode * 8191 + host.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_port()) ? 131071 : 524287); + if (is_set_port()) + hashCode = hashCode * 8191 + port; + + hashCode = hashCode * 8191 + ((is_set_topology_id()) ? 131071 : 524287); + if (is_set_topology_id()) + hashCode = hashCode * 8191 + topology_id.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_topology_name()) ? 131071 : 524287); + if (is_set_topology_name()) + hashCode = hashCode * 8191 + topology_name.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_num_executors()) ? 131071 : 524287); + if (is_set_num_executors()) + hashCode = hashCode * 8191 + num_executors; + + hashCode = hashCode * 8191 + ((is_set_component_to_num_tasks()) ? 131071 : 524287); + if (is_set_component_to_num_tasks()) + hashCode = hashCode * 8191 + component_to_num_tasks.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_time_secs()) ? 131071 : 524287); + if (is_set_time_secs()) + hashCode = hashCode * 8191 + time_secs; + + hashCode = hashCode * 8191 + ((is_set_uptime_secs()) ? 131071 : 524287); + if (is_set_uptime_secs()) + hashCode = hashCode * 8191 + uptime_secs; + + hashCode = hashCode * 8191 + ((is_set_requested_memonheap()) ? 131071 : 524287); + if (is_set_requested_memonheap()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memonheap); + + hashCode = hashCode * 8191 + ((is_set_requested_memoffheap()) ? 131071 : 524287); + if (is_set_requested_memoffheap()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_memoffheap); + + hashCode = hashCode * 8191 + ((is_set_requested_cpu()) ? 131071 : 524287); + if (is_set_requested_cpu()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(requested_cpu); + + hashCode = hashCode * 8191 + ((is_set_assigned_memonheap()) ? 131071 : 524287); + if (is_set_assigned_memonheap()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memonheap); + + hashCode = hashCode * 8191 + ((is_set_assigned_memoffheap()) ? 131071 : 524287); + if (is_set_assigned_memoffheap()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_memoffheap); + + hashCode = hashCode * 8191 + ((is_set_assigned_cpu()) ? 131071 : 524287); + if (is_set_assigned_cpu()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(assigned_cpu); + + return hashCode; } @Override @@ -1118,7 +1075,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id()); if (lastComparison != 0) { return lastComparison; } @@ -1128,7 +1085,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host()); + lastComparison = java.lang.Boolean.valueOf(is_set_host()).compareTo(other.is_set_host()); if (lastComparison != 0) { return lastComparison; } @@ -1138,7 +1095,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_port()).compareTo(other.is_set_port()); + lastComparison = java.lang.Boolean.valueOf(is_set_port()).compareTo(other.is_set_port()); if (lastComparison != 0) { return lastComparison; } @@ -1148,7 +1105,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id()); if (lastComparison != 0) { return lastComparison; } @@ -1158,7 +1115,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topology_name()).compareTo(other.is_set_topology_name()); + lastComparison = java.lang.Boolean.valueOf(is_set_topology_name()).compareTo(other.is_set_topology_name()); if (lastComparison != 0) { return lastComparison; } @@ -1168,7 +1125,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors()); if (lastComparison != 0) { return lastComparison; } @@ -1178,7 +1135,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_component_to_num_tasks()).compareTo(other.is_set_component_to_num_tasks()); + lastComparison = java.lang.Boolean.valueOf(is_set_component_to_num_tasks()).compareTo(other.is_set_component_to_num_tasks()); if (lastComparison != 0) { return lastComparison; } @@ -1188,7 +1145,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs()); + lastComparison = java.lang.Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs()); if (lastComparison != 0) { return lastComparison; } @@ -1198,7 +1155,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs()); + lastComparison = java.lang.Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs()); if (lastComparison != 0) { return lastComparison; } @@ -1208,7 +1165,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_requested_memonheap()).compareTo(other.is_set_requested_memonheap()); + lastComparison = java.lang.Boolean.valueOf(is_set_requested_memonheap()).compareTo(other.is_set_requested_memonheap()); if (lastComparison != 0) { return lastComparison; } @@ -1218,7 +1175,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_requested_memoffheap()).compareTo(other.is_set_requested_memoffheap()); + lastComparison = java.lang.Boolean.valueOf(is_set_requested_memoffheap()).compareTo(other.is_set_requested_memoffheap()); if (lastComparison != 0) { return lastComparison; } @@ -1228,7 +1185,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_requested_cpu()).compareTo(other.is_set_requested_cpu()); + lastComparison = java.lang.Boolean.valueOf(is_set_requested_cpu()).compareTo(other.is_set_requested_cpu()); if (lastComparison != 0) { return lastComparison; } @@ -1238,7 +1195,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_assigned_memonheap()).compareTo(other.is_set_assigned_memonheap()); + lastComparison = java.lang.Boolean.valueOf(is_set_assigned_memonheap()).compareTo(other.is_set_assigned_memonheap()); if (lastComparison != 0) { return lastComparison; } @@ -1248,7 +1205,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_assigned_memoffheap()).compareTo(other.is_set_assigned_memoffheap()); + lastComparison = java.lang.Boolean.valueOf(is_set_assigned_memoffheap()).compareTo(other.is_set_assigned_memoffheap()); if (lastComparison != 0) { return lastComparison; } @@ -1258,7 +1215,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_assigned_cpu()).compareTo(other.is_set_assigned_cpu()); + lastComparison = java.lang.Boolean.valueOf(is_set_assigned_cpu()).compareTo(other.is_set_assigned_cpu()); if (lastComparison != 0) { return lastComparison; } @@ -1276,16 +1233,16 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } 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("WorkerSummary("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkerSummary("); boolean first = true; if (is_set_supervisor_id()) { @@ -1414,7 +1371,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } } - 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; @@ -1424,13 +1381,13 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } } - private static class WorkerSummaryStandardSchemeFactory implements SchemeFactory { + private static class WorkerSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerSummaryStandardScheme getScheme() { return new WorkerSummaryStandardScheme(); } } - private static class WorkerSummaryStandardScheme extends StandardScheme<WorkerSummary> { + private static class WorkerSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerSummary> { public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerSummary struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1494,8 +1451,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map456 = iprot.readMapBegin(); - struct.component_to_num_tasks = new HashMap<String,Long>(2*_map456.size); - String _key457; + struct.component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map456.size); + java.lang.String _key457; long _val458; for (int _i459 = 0; _i459 < _map456.size; ++_i459) { @@ -1630,7 +1587,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor oprot.writeFieldBegin(COMPONENT_TO_NUM_TASKS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.component_to_num_tasks.size())); - for (Map.Entry<String, Long> _iter460 : struct.component_to_num_tasks.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter460 : struct.component_to_num_tasks.entrySet()) { oprot.writeString(_iter460.getKey()); oprot.writeI64(_iter460.getValue()); @@ -1686,18 +1643,18 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } - private static class WorkerSummaryTupleSchemeFactory implements SchemeFactory { + private static class WorkerSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerSummaryTupleScheme getScheme() { return new WorkerSummaryTupleScheme(); } } - private static class WorkerSummaryTupleScheme extends TupleScheme<WorkerSummary> { + private static class WorkerSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerSummary> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, WorkerSummary 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.is_set_supervisor_id()) { optionals.set(0); } @@ -1765,7 +1722,7 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (struct.is_set_component_to_num_tasks()) { { oprot.writeI32(struct.component_to_num_tasks.size()); - for (Map.Entry<String, Long> _iter461 : struct.component_to_num_tasks.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Long> _iter461 : struct.component_to_num_tasks.entrySet()) { oprot.writeString(_iter461.getKey()); oprot.writeI64(_iter461.getValue()); @@ -1800,8 +1757,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor @Override public void read(org.apache.thrift.protocol.TProtocol prot, WorkerSummary struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.supervisor_id = iprot.readString(); struct.set_supervisor_id_isSet(true); @@ -1829,8 +1786,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor if (incoming.get(6)) { { org.apache.thrift.protocol.TMap _map462 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.component_to_num_tasks = new HashMap<String,Long>(2*_map462.size); - String _key463; + struct.component_to_num_tasks = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map462.size); + java.lang.String _key463; long _val464; for (int _i465 = 0; _i465 < _map462.size; ++_i465) { @@ -1876,5 +1833,8 @@ public class WorkerSummary implements org.apache.thrift.TBase<WorkerSummary, Wor } } + 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(); + } }
http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java index 917efbd..b578783 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java +++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerToken.java @@ -16,42 +16,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -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"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerToken._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerToken> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerToken"); @@ -59,15 +32,12 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT private static final org.apache.thrift.protocol.TField INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("info", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField SIGNATURE_FIELD_DESC = new org.apache.thrift.protocol.TField("signature", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new WorkerTokenStandardSchemeFactory()); - schemes.put(TupleScheme.class, new WorkerTokenTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenTupleSchemeFactory(); private WorkerTokenServiceType serviceType; // required - private ByteBuffer info; // required - private ByteBuffer signature; // required + private java.nio.ByteBuffer info; // required + private java.nio.ByteBuffer signature; // 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 { @@ -79,10 +49,10 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT INFO((short)2, "info"), SIGNATURE((short)3, "signature"); - 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 WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT */ 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,22 +102,22 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT 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.SERVICE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("serviceType", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, WorkerTokenServiceType.class))); tmpMap.put(_Fields.INFO, new org.apache.thrift.meta_data.FieldMetaData("info", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); tmpMap.put(_Fields.SIGNATURE, new org.apache.thrift.meta_data.FieldMetaData("signature", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkerToken.class, metaDataMap); } @@ -156,8 +126,8 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT public WorkerToken( WorkerTokenServiceType serviceType, - ByteBuffer info, - ByteBuffer signature) + java.nio.ByteBuffer info, + java.nio.ByteBuffer signature) { this(); this.serviceType = serviceType; @@ -227,15 +197,15 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT return info == null ? null : info.array(); } - public ByteBuffer buffer_for_info() { + public java.nio.ByteBuffer buffer_for_info() { return org.apache.thrift.TBaseHelper.copyBinary(info); } public void set_info(byte[] info) { - this.info = info == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(info, info.length)); + this.info = info == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(info.clone()); } - public void set_info(ByteBuffer info) { + public void set_info(java.nio.ByteBuffer info) { this.info = org.apache.thrift.TBaseHelper.copyBinary(info); } @@ -259,15 +229,15 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT return signature == null ? null : signature.array(); } - public ByteBuffer buffer_for_signature() { + public java.nio.ByteBuffer buffer_for_signature() { return org.apache.thrift.TBaseHelper.copyBinary(signature); } public void set_signature(byte[] signature) { - this.signature = signature == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(signature, signature.length)); + this.signature = signature == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(signature.clone()); } - public void set_signature(ByteBuffer signature) { + public void set_signature(java.nio.ByteBuffer signature) { this.signature = org.apache.thrift.TBaseHelper.copyBinary(signature); } @@ -286,7 +256,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SERVICE_TYPE: if (value == null) { @@ -300,7 +270,11 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT if (value == null) { unset_info(); } else { - set_info((ByteBuffer)value); + if (value instanceof byte[]) { + set_info((byte[])value); + } else { + set_info((java.nio.ByteBuffer)value); + } } break; @@ -308,14 +282,18 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT if (value == null) { unset_signature(); } else { - set_signature((ByteBuffer)value); + if (value instanceof byte[]) { + set_signature((byte[])value); + } else { + set_signature((java.nio.ByteBuffer)value); + } } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SERVICE_TYPE: return get_serviceType(); @@ -327,13 +305,13 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT return get_signature(); } - 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) { @@ -344,11 +322,11 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT case SIGNATURE: return is_set_signature(); } - 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 WorkerToken) @@ -359,6 +337,8 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT public boolean equals(WorkerToken that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_serviceType = true && this.is_set_serviceType(); boolean that_present_serviceType = true && that.is_set_serviceType(); @@ -392,24 +372,21 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_serviceType = true && (is_set_serviceType()); - list.add(present_serviceType); - if (present_serviceType) - list.add(serviceType.getValue()); + hashCode = hashCode * 8191 + ((is_set_serviceType()) ? 131071 : 524287); + if (is_set_serviceType()) + hashCode = hashCode * 8191 + serviceType.getValue(); - boolean present_info = true && (is_set_info()); - list.add(present_info); - if (present_info) - list.add(info); + hashCode = hashCode * 8191 + ((is_set_info()) ? 131071 : 524287); + if (is_set_info()) + hashCode = hashCode * 8191 + info.hashCode(); - boolean present_signature = true && (is_set_signature()); - list.add(present_signature); - if (present_signature) - list.add(signature); + hashCode = hashCode * 8191 + ((is_set_signature()) ? 131071 : 524287); + if (is_set_signature()) + hashCode = hashCode * 8191 + signature.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -420,7 +397,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_serviceType()).compareTo(other.is_set_serviceType()); + lastComparison = java.lang.Boolean.valueOf(is_set_serviceType()).compareTo(other.is_set_serviceType()); if (lastComparison != 0) { return lastComparison; } @@ -430,7 +407,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_info()).compareTo(other.is_set_info()); + lastComparison = java.lang.Boolean.valueOf(is_set_info()).compareTo(other.is_set_info()); if (lastComparison != 0) { return lastComparison; } @@ -440,7 +417,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_signature()).compareTo(other.is_set_signature()); + lastComparison = java.lang.Boolean.valueOf(is_set_signature()).compareTo(other.is_set_signature()); if (lastComparison != 0) { return lastComparison; } @@ -458,16 +435,16 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } 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("WorkerToken("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkerToken("); boolean first = true; sb.append("serviceType:"); @@ -522,7 +499,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } } - 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) { @@ -530,13 +507,13 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } } - private static class WorkerTokenStandardSchemeFactory implements SchemeFactory { + private static class WorkerTokenStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerTokenStandardScheme getScheme() { return new WorkerTokenStandardScheme(); } } - private static class WorkerTokenStandardScheme extends StandardScheme<WorkerToken> { + private static class WorkerTokenStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerToken> { public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerToken struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -606,17 +583,17 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } - private static class WorkerTokenTupleSchemeFactory implements SchemeFactory { + private static class WorkerTokenTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerTokenTupleScheme getScheme() { return new WorkerTokenTupleScheme(); } } - private static class WorkerTokenTupleScheme extends TupleScheme<WorkerToken> { + private static class WorkerTokenTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerToken> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, WorkerToken struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeI32(struct.serviceType.getValue()); oprot.writeBinary(struct.info); oprot.writeBinary(struct.signature); @@ -624,7 +601,7 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT @Override public void read(org.apache.thrift.protocol.TProtocol prot, WorkerToken struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.serviceType = org.apache.storm.generated.WorkerTokenServiceType.findByValue(iprot.readI32()); struct.set_serviceType_isSet(true); struct.info = iprot.readBinary(); @@ -634,5 +611,8 @@ public class WorkerToken implements org.apache.thrift.TBase<WorkerToken, WorkerT } } + 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(); + } } http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java index 7d876ae..292f734 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java +++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenInfo.java @@ -16,42 +16,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.storm.generated; -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"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) [email protected](value = "Autogenerated by Thrift Compiler (0.11.0)") public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, WorkerTokenInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WorkerTokenInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkerTokenInfo"); @@ -60,14 +33,11 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, private static final org.apache.thrift.protocol.TField SECRET_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("secretVersion", org.apache.thrift.protocol.TType.I64, (short)3); private static final org.apache.thrift.protocol.TField EXPIRATION_TIME_MILLIS_FIELD_DESC = new org.apache.thrift.protocol.TField("expirationTimeMillis", org.apache.thrift.protocol.TType.I64, (short)4); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new WorkerTokenInfoStandardSchemeFactory()); - schemes.put(TupleScheme.class, new WorkerTokenInfoTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkerTokenInfoStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkerTokenInfoTupleSchemeFactory(); - private String userName; // required - private String topologyId; // required + private java.lang.String userName; // required + private java.lang.String topologyId; // required private long secretVersion; // required private long expirationTimeMillis; // required @@ -78,10 +48,10 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, SECRET_VERSION((short)3, "secretVersion"), EXPIRATION_TIME_MILLIS((short)4, "expirationTimeMillis"); - 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); } } @@ -110,21 +80,21 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, */ 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; } @@ -133,7 +103,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -142,9 +112,9 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, private static final int __SECRETVERSION_ISSET_ID = 0; private static final int __EXPIRATIONTIMEMILLIS_ISSET_ID = 1; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topologyId", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -153,7 +123,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.EXPIRATION_TIME_MILLIS, new org.apache.thrift.meta_data.FieldMetaData("expirationTimeMillis", org.apache.thrift.TFieldRequirementType.REQUIRED, 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(WorkerTokenInfo.class, metaDataMap); } @@ -161,8 +131,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } public WorkerTokenInfo( - String userName, - String topologyId, + java.lang.String userName, + java.lang.String topologyId, long secretVersion, long expirationTimeMillis) { @@ -204,11 +174,11 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, this.expirationTimeMillis = 0; } - public String get_userName() { + public java.lang.String get_userName() { return this.userName; } - public void set_userName(String userName) { + public void set_userName(java.lang.String userName) { this.userName = userName; } @@ -227,11 +197,11 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } } - public String get_topologyId() { + public java.lang.String get_topologyId() { return this.topologyId; } - public void set_topologyId(String topologyId) { + public void set_topologyId(java.lang.String topologyId) { this.topologyId = topologyId; } @@ -260,16 +230,16 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } public void unset_secretVersion() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SECRETVERSION_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SECRETVERSION_ISSET_ID); } /** Returns true if field secretVersion is set (has been assigned a value) and false otherwise */ public boolean is_set_secretVersion() { - return EncodingUtils.testBit(__isset_bitfield, __SECRETVERSION_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SECRETVERSION_ISSET_ID); } public void set_secretVersion_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SECRETVERSION_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SECRETVERSION_ISSET_ID, value); } public long get_expirationTimeMillis() { @@ -282,25 +252,25 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } public void unset_expirationTimeMillis() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID); } /** Returns true if field expirationTimeMillis is set (has been assigned a value) and false otherwise */ public boolean is_set_expirationTimeMillis() { - return EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID); } public void set_expirationTimeMillis_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRATIONTIMEMILLIS_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case USER_NAME: if (value == null) { unset_userName(); } else { - set_userName((String)value); + set_userName((java.lang.String)value); } break; @@ -308,7 +278,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, if (value == null) { unset_topologyId(); } else { - set_topologyId((String)value); + set_topologyId((java.lang.String)value); } break; @@ -316,7 +286,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, if (value == null) { unset_secretVersion(); } else { - set_secretVersion((Long)value); + set_secretVersion((java.lang.Long)value); } break; @@ -324,14 +294,14 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, if (value == null) { unset_expirationTimeMillis(); } else { - set_expirationTimeMillis((Long)value); + set_expirationTimeMillis((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case USER_NAME: return get_userName(); @@ -346,13 +316,13 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, return get_expirationTimeMillis(); } - 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) { @@ -365,11 +335,11 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, case EXPIRATION_TIME_MILLIS: return is_set_expirationTimeMillis(); } - 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 WorkerTokenInfo) @@ -380,6 +350,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, public boolean equals(WorkerTokenInfo that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_userName = true && this.is_set_userName(); boolean that_present_userName = true && that.is_set_userName(); @@ -422,29 +394,21 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_userName = true && (is_set_userName()); - list.add(present_userName); - if (present_userName) - list.add(userName); + hashCode = hashCode * 8191 + ((is_set_userName()) ? 131071 : 524287); + if (is_set_userName()) + hashCode = hashCode * 8191 + userName.hashCode(); - boolean present_topologyId = true && (is_set_topologyId()); - list.add(present_topologyId); - if (present_topologyId) - list.add(topologyId); + hashCode = hashCode * 8191 + ((is_set_topologyId()) ? 131071 : 524287); + if (is_set_topologyId()) + hashCode = hashCode * 8191 + topologyId.hashCode(); - boolean present_secretVersion = true; - list.add(present_secretVersion); - if (present_secretVersion) - list.add(secretVersion); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(secretVersion); - boolean present_expirationTimeMillis = true; - list.add(present_expirationTimeMillis); - if (present_expirationTimeMillis) - list.add(expirationTimeMillis); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expirationTimeMillis); - return list.hashCode(); + return hashCode; } @Override @@ -455,7 +419,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_userName()).compareTo(other.is_set_userName()); + lastComparison = java.lang.Boolean.valueOf(is_set_userName()).compareTo(other.is_set_userName()); if (lastComparison != 0) { return lastComparison; } @@ -465,7 +429,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_topologyId()).compareTo(other.is_set_topologyId()); + lastComparison = java.lang.Boolean.valueOf(is_set_topologyId()).compareTo(other.is_set_topologyId()); if (lastComparison != 0) { return lastComparison; } @@ -475,7 +439,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_secretVersion()).compareTo(other.is_set_secretVersion()); + lastComparison = java.lang.Boolean.valueOf(is_set_secretVersion()).compareTo(other.is_set_secretVersion()); if (lastComparison != 0) { return lastComparison; } @@ -485,7 +449,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_expirationTimeMillis()).compareTo(other.is_set_expirationTimeMillis()); + lastComparison = java.lang.Boolean.valueOf(is_set_expirationTimeMillis()).compareTo(other.is_set_expirationTimeMillis()); if (lastComparison != 0) { return lastComparison; } @@ -503,16 +467,16 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } 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("WorkerTokenInfo("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkerTokenInfo("); boolean first = true; sb.append("userName:"); @@ -571,7 +535,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } } - 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; @@ -581,13 +545,13 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } } - private static class WorkerTokenInfoStandardSchemeFactory implements SchemeFactory { + private static class WorkerTokenInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerTokenInfoStandardScheme getScheme() { return new WorkerTokenInfoStandardScheme(); } } - private static class WorkerTokenInfoStandardScheme extends StandardScheme<WorkerTokenInfo> { + private static class WorkerTokenInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkerTokenInfo> { public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerTokenInfo struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -666,17 +630,17 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } - private static class WorkerTokenInfoTupleSchemeFactory implements SchemeFactory { + private static class WorkerTokenInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public WorkerTokenInfoTupleScheme getScheme() { return new WorkerTokenInfoTupleScheme(); } } - private static class WorkerTokenInfoTupleScheme extends TupleScheme<WorkerTokenInfo> { + private static class WorkerTokenInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkerTokenInfo> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, WorkerTokenInfo struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeString(struct.userName); oprot.writeString(struct.topologyId); oprot.writeI64(struct.secretVersion); @@ -685,7 +649,7 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, @Override public void read(org.apache.thrift.protocol.TProtocol prot, WorkerTokenInfo struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.userName = iprot.readString(); struct.set_userName_isSet(true); struct.topologyId = iprot.readString(); @@ -697,5 +661,8 @@ public class WorkerTokenInfo implements org.apache.thrift.TBase<WorkerTokenInfo, } } + 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(); + } } http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java index 3602c97..38ba3b6 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java +++ b/storm-client/src/jvm/org/apache/storm/generated/WorkerTokenServiceType.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.11.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -24,10 +24,6 @@ package org.apache.storm.generated; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - public enum WorkerTokenServiceType implements org.apache.thrift.TEnum { NIMBUS(0), DRPC(1),
