http://git-wip-us.apache.org/repos/asf/storm/blob/1fd1e17f/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java index dfaa77a..8d0c5e0 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java +++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java @@ -16,66 +16,36 @@ * 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 SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPageInfo, SupervisorPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorPageInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorPageInfo"); private static final org.apache.thrift.protocol.TField SUPERVISOR_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_summaries", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField WORKER_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_summaries", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new SupervisorPageInfoStandardSchemeFactory()); - schemes.put(TupleScheme.class, new SupervisorPageInfoTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorPageInfoStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorPageInfoTupleSchemeFactory(); - private List<SupervisorSummary> supervisor_summaries; // optional - private List<WorkerSummary> worker_summaries; // optional + private java.util.List<SupervisorSummary> supervisor_summaries; // optional + private java.util.List<WorkerSummary> worker_summaries; // 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 { SUPERVISOR_SUMMARIES((short)1, "supervisor_summaries"), WORKER_SUMMARIES((short)2, "worker_summaries"); - 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); } } @@ -100,21 +70,21 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag */ 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; } @@ -123,23 +93,23 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments private static final _Fields optionals[] = {_Fields.SUPERVISOR_SUMMARIES,_Fields.WORKER_SUMMARIES}; - 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_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("supervisor_summaries", 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, SupervisorSummary.class)))); tmpMap.put(_Fields.WORKER_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("worker_summaries", 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, WorkerSummary.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorPageInfo.class, metaDataMap); } @@ -151,14 +121,14 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag */ public SupervisorPageInfo(SupervisorPageInfo other) { if (other.is_set_supervisor_summaries()) { - List<SupervisorSummary> __this__supervisor_summaries = new ArrayList<SupervisorSummary>(other.supervisor_summaries.size()); + java.util.List<SupervisorSummary> __this__supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(other.supervisor_summaries.size()); for (SupervisorSummary other_element : other.supervisor_summaries) { __this__supervisor_summaries.add(new SupervisorSummary(other_element)); } this.supervisor_summaries = __this__supervisor_summaries; } if (other.is_set_worker_summaries()) { - List<WorkerSummary> __this__worker_summaries = new ArrayList<WorkerSummary>(other.worker_summaries.size()); + java.util.List<WorkerSummary> __this__worker_summaries = new java.util.ArrayList<WorkerSummary>(other.worker_summaries.size()); for (WorkerSummary other_element : other.worker_summaries) { __this__worker_summaries.add(new WorkerSummary(other_element)); } @@ -186,16 +156,16 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag public void add_to_supervisor_summaries(SupervisorSummary elem) { if (this.supervisor_summaries == null) { - this.supervisor_summaries = new ArrayList<SupervisorSummary>(); + this.supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(); } this.supervisor_summaries.add(elem); } - public List<SupervisorSummary> get_supervisor_summaries() { + public java.util.List<SupervisorSummary> get_supervisor_summaries() { return this.supervisor_summaries; } - public void set_supervisor_summaries(List<SupervisorSummary> supervisor_summaries) { + public void set_supervisor_summaries(java.util.List<SupervisorSummary> supervisor_summaries) { this.supervisor_summaries = supervisor_summaries; } @@ -224,16 +194,16 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag public void add_to_worker_summaries(WorkerSummary elem) { if (this.worker_summaries == null) { - this.worker_summaries = new ArrayList<WorkerSummary>(); + this.worker_summaries = new java.util.ArrayList<WorkerSummary>(); } this.worker_summaries.add(elem); } - public List<WorkerSummary> get_worker_summaries() { + public java.util.List<WorkerSummary> get_worker_summaries() { return this.worker_summaries; } - public void set_worker_summaries(List<WorkerSummary> worker_summaries) { + public void set_worker_summaries(java.util.List<WorkerSummary> worker_summaries) { this.worker_summaries = worker_summaries; } @@ -252,13 +222,13 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case SUPERVISOR_SUMMARIES: if (value == null) { unset_supervisor_summaries(); } else { - set_supervisor_summaries((List<SupervisorSummary>)value); + set_supervisor_summaries((java.util.List<SupervisorSummary>)value); } break; @@ -266,14 +236,14 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag if (value == null) { unset_worker_summaries(); } else { - set_worker_summaries((List<WorkerSummary>)value); + set_worker_summaries((java.util.List<WorkerSummary>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUPERVISOR_SUMMARIES: return get_supervisor_summaries(); @@ -282,13 +252,13 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag return get_worker_summaries(); } - 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) { @@ -297,11 +267,11 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag case WORKER_SUMMARIES: return is_set_worker_summaries(); } - 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 SupervisorPageInfo) @@ -312,6 +282,8 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag public boolean equals(SupervisorPageInfo that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_supervisor_summaries = true && this.is_set_supervisor_summaries(); boolean that_present_supervisor_summaries = true && that.is_set_supervisor_summaries(); @@ -336,19 +308,17 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_supervisor_summaries = true && (is_set_supervisor_summaries()); - list.add(present_supervisor_summaries); - if (present_supervisor_summaries) - list.add(supervisor_summaries); + hashCode = hashCode * 8191 + ((is_set_supervisor_summaries()) ? 131071 : 524287); + if (is_set_supervisor_summaries()) + hashCode = hashCode * 8191 + supervisor_summaries.hashCode(); - boolean present_worker_summaries = true && (is_set_worker_summaries()); - list.add(present_worker_summaries); - if (present_worker_summaries) - list.add(worker_summaries); + hashCode = hashCode * 8191 + ((is_set_worker_summaries()) ? 131071 : 524287); + if (is_set_worker_summaries()) + hashCode = hashCode * 8191 + worker_summaries.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -359,7 +329,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_supervisor_summaries()).compareTo(other.is_set_supervisor_summaries()); + lastComparison = java.lang.Boolean.valueOf(is_set_supervisor_summaries()).compareTo(other.is_set_supervisor_summaries()); if (lastComparison != 0) { return lastComparison; } @@ -369,7 +339,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_worker_summaries()).compareTo(other.is_set_worker_summaries()); + lastComparison = java.lang.Boolean.valueOf(is_set_worker_summaries()).compareTo(other.is_set_worker_summaries()); if (lastComparison != 0) { return lastComparison; } @@ -387,16 +357,16 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } 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("SupervisorPageInfo("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("SupervisorPageInfo("); boolean first = true; if (is_set_supervisor_summaries()) { @@ -435,7 +405,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } } - 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) { @@ -443,13 +413,13 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } } - private static class SupervisorPageInfoStandardSchemeFactory implements SchemeFactory { + private static class SupervisorPageInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorPageInfoStandardScheme getScheme() { return new SupervisorPageInfoStandardScheme(); } } - private static class SupervisorPageInfoStandardScheme extends StandardScheme<SupervisorPageInfo> { + private static class SupervisorPageInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorPageInfo> { public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorPageInfo struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -465,7 +435,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list466 = iprot.readListBegin(); - struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list466.size); + struct.supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(_list466.size); SupervisorSummary _elem467; for (int _i468 = 0; _i468 < _list466.size; ++_i468) { @@ -484,7 +454,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list469 = iprot.readListBegin(); - struct.worker_summaries = new ArrayList<WorkerSummary>(_list469.size); + struct.worker_summaries = new java.util.ArrayList<WorkerSummary>(_list469.size); WorkerSummary _elem470; for (int _i471 = 0; _i471 < _list469.size; ++_i471) { @@ -546,18 +516,18 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } - private static class SupervisorPageInfoTupleSchemeFactory implements SchemeFactory { + private static class SupervisorPageInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorPageInfoTupleScheme getScheme() { return new SupervisorPageInfoTupleScheme(); } } - private static class SupervisorPageInfoTupleScheme extends TupleScheme<SupervisorPageInfo> { + private static class SupervisorPageInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorPageInfo> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo 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_summaries()) { optionals.set(0); } @@ -587,12 +557,12 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag @Override public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo 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 _list476 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list476.size); + struct.supervisor_summaries = new java.util.ArrayList<SupervisorSummary>(_list476.size); SupervisorSummary _elem477; for (int _i478 = 0; _i478 < _list476.size; ++_i478) { @@ -606,7 +576,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag if (incoming.get(1)) { { org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.worker_summaries = new ArrayList<WorkerSummary>(_list479.size); + struct.worker_summaries = new java.util.ArrayList<WorkerSummary>(_list479.size); WorkerSummary _elem480; for (int _i481 = 0; _i481 < _list479.size; ++_i481) { @@ -620,5 +590,8 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag } } + 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/SupervisorSummary.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java index 049ebea..8de602d 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java +++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.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 SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary"); @@ -67,19 +40,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm private static final org.apache.thrift.protocol.TField FRAGMENTED_MEM_FIELD_DESC = new org.apache.thrift.protocol.TField("fragmented_mem", org.apache.thrift.protocol.TType.DOUBLE, (short)10); private static final org.apache.thrift.protocol.TField FRAGMENTED_CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("fragmented_cpu", org.apache.thrift.protocol.TType.DOUBLE, (short)11); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new SupervisorSummaryStandardSchemeFactory()); - schemes.put(TupleScheme.class, new SupervisorSummaryTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorSummaryStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorSummaryTupleSchemeFactory(); - private String host; // required + private java.lang.String host; // required private int uptime_secs; // required private int num_workers; // required private int num_used_workers; // required - private String supervisor_id; // required - private String version; // optional - private Map<String,Double> total_resources; // optional + private java.lang.String supervisor_id; // required + private java.lang.String version; // optional + private java.util.Map<java.lang.String,java.lang.Double> total_resources; // optional private double used_mem; // optional private double used_cpu; // optional private double fragmented_mem; // optional @@ -99,10 +69,10 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm FRAGMENTED_MEM((short)10, "fragmented_mem"), FRAGMENTED_CPU((short)11, "fragmented_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); } } @@ -145,21 +115,21 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm */ 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; } @@ -168,7 +138,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -183,9 +153,9 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm private static final int __FRAGMENTED_CPU_ISSET_ID = 6; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.VERSION,_Fields.TOTAL_RESOURCES,_Fields.USED_MEM,_Fields.USED_CPU,_Fields.FRAGMENTED_MEM,_Fields.FRAGMENTED_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.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -210,7 +180,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); tmpMap.put(_Fields.FRAGMENTED_CPU, new org.apache.thrift.meta_data.FieldMetaData("fragmented_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(SupervisorSummary.class, metaDataMap); } @@ -220,11 +190,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public SupervisorSummary( - String host, + java.lang.String host, int uptime_secs, int num_workers, int num_used_workers, - String supervisor_id) + java.lang.String supervisor_id) { this(); this.host = host; @@ -255,7 +225,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm this.version = other.version; } if (other.is_set_total_resources()) { - Map<String,Double> __this__total_resources = new HashMap<String,Double>(other.total_resources); + java.util.Map<java.lang.String,java.lang.Double> __this__total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(other.total_resources); this.total_resources = __this__total_resources; } this.used_mem = other.used_mem; @@ -291,11 +261,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm this.fragmented_cpu = 0.0; } - 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; } @@ -324,16 +294,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } 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 int get_num_workers() { @@ -346,16 +316,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_num_workers() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); } /** Returns true if field num_workers is set (has been assigned a value) and false otherwise */ public boolean is_set_num_workers() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); } public void set_num_workers_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value); } public int get_num_used_workers() { @@ -368,23 +338,23 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_num_used_workers() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID); } /** Returns true if field num_used_workers is set (has been assigned a value) and false otherwise */ public boolean is_set_num_used_workers() { - return EncodingUtils.testBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID); } public void set_num_used_workers_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value); } - 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; } @@ -403,11 +373,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } } - public String get_version() { + public java.lang.String get_version() { return this.version; } - public void set_version(String version) { + public void set_version(java.lang.String version) { this.version = version; } @@ -430,18 +400,18 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return (this.total_resources == null) ? 0 : this.total_resources.size(); } - public void put_to_total_resources(String key, double val) { + public void put_to_total_resources(java.lang.String key, double val) { if (this.total_resources == null) { - this.total_resources = new HashMap<String,Double>(); + this.total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(); } this.total_resources.put(key, val); } - public Map<String,Double> get_total_resources() { + public java.util.Map<java.lang.String,java.lang.Double> get_total_resources() { return this.total_resources; } - public void set_total_resources(Map<String,Double> total_resources) { + public void set_total_resources(java.util.Map<java.lang.String,java.lang.Double> total_resources) { this.total_resources = total_resources; } @@ -470,16 +440,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_used_mem() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USED_MEM_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_MEM_ISSET_ID); } /** Returns true if field used_mem is set (has been assigned a value) and false otherwise */ public boolean is_set_used_mem() { - return EncodingUtils.testBit(__isset_bitfield, __USED_MEM_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_MEM_ISSET_ID); } public void set_used_mem_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USED_MEM_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_MEM_ISSET_ID, value); } public double get_used_cpu() { @@ -492,16 +462,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_used_cpu() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USED_CPU_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USED_CPU_ISSET_ID); } /** Returns true if field used_cpu is set (has been assigned a value) and false otherwise */ public boolean is_set_used_cpu() { - return EncodingUtils.testBit(__isset_bitfield, __USED_CPU_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USED_CPU_ISSET_ID); } public void set_used_cpu_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USED_CPU_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USED_CPU_ISSET_ID, value); } public double get_fragmented_mem() { @@ -514,16 +484,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_fragmented_mem() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID); } /** Returns true if field fragmented_mem is set (has been assigned a value) and false otherwise */ public boolean is_set_fragmented_mem() { - return EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID); } public void set_fragmented_mem_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_MEM_ISSET_ID, value); } public double get_fragmented_cpu() { @@ -536,25 +506,25 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } public void unset_fragmented_cpu() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID); } /** Returns true if field fragmented_cpu is set (has been assigned a value) and false otherwise */ public boolean is_set_fragmented_cpu() { - return EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID); } public void set_fragmented_cpu_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FRAGMENTED_CPU_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case HOST: if (value == null) { unset_host(); } else { - set_host((String)value); + set_host((java.lang.String)value); } break; @@ -562,7 +532,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_uptime_secs(); } else { - set_uptime_secs((Integer)value); + set_uptime_secs((java.lang.Integer)value); } break; @@ -570,7 +540,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_num_workers(); } else { - set_num_workers((Integer)value); + set_num_workers((java.lang.Integer)value); } break; @@ -578,7 +548,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_num_used_workers(); } else { - set_num_used_workers((Integer)value); + set_num_used_workers((java.lang.Integer)value); } break; @@ -586,7 +556,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_supervisor_id(); } else { - set_supervisor_id((String)value); + set_supervisor_id((java.lang.String)value); } break; @@ -594,7 +564,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_version(); } else { - set_version((String)value); + set_version((java.lang.String)value); } break; @@ -602,7 +572,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_total_resources(); } else { - set_total_resources((Map<String,Double>)value); + set_total_resources((java.util.Map<java.lang.String,java.lang.Double>)value); } break; @@ -610,7 +580,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_used_mem(); } else { - set_used_mem((Double)value); + set_used_mem((java.lang.Double)value); } break; @@ -618,7 +588,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_used_cpu(); } else { - set_used_cpu((Double)value); + set_used_cpu((java.lang.Double)value); } break; @@ -626,7 +596,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_fragmented_mem(); } else { - set_fragmented_mem((Double)value); + set_fragmented_mem((java.lang.Double)value); } break; @@ -634,14 +604,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (value == null) { unset_fragmented_cpu(); } else { - set_fragmented_cpu((Double)value); + set_fragmented_cpu((java.lang.Double)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case HOST: return get_host(); @@ -677,13 +647,13 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return get_fragmented_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) { @@ -710,11 +680,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm case FRAGMENTED_CPU: return is_set_fragmented_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 SupervisorSummary) @@ -725,6 +695,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm public boolean equals(SupervisorSummary that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_host = true && this.is_set_host(); boolean that_present_host = true && that.is_set_host(); @@ -830,64 +802,47 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); - - boolean present_host = true && (is_set_host()); - list.add(present_host); - if (present_host) - list.add(host); - - boolean present_uptime_secs = true; - list.add(present_uptime_secs); - if (present_uptime_secs) - list.add(uptime_secs); - - boolean present_num_workers = true; - list.add(present_num_workers); - if (present_num_workers) - list.add(num_workers); - - boolean present_num_used_workers = true; - list.add(present_num_used_workers); - if (present_num_used_workers) - list.add(num_used_workers); - - boolean present_supervisor_id = true && (is_set_supervisor_id()); - list.add(present_supervisor_id); - if (present_supervisor_id) - list.add(supervisor_id); - - boolean present_version = true && (is_set_version()); - list.add(present_version); - if (present_version) - list.add(version); - - boolean present_total_resources = true && (is_set_total_resources()); - list.add(present_total_resources); - if (present_total_resources) - list.add(total_resources); - - boolean present_used_mem = true && (is_set_used_mem()); - list.add(present_used_mem); - if (present_used_mem) - list.add(used_mem); - - boolean present_used_cpu = true && (is_set_used_cpu()); - list.add(present_used_cpu); - if (present_used_cpu) - list.add(used_cpu); - - boolean present_fragmented_mem = true && (is_set_fragmented_mem()); - list.add(present_fragmented_mem); - if (present_fragmented_mem) - list.add(fragmented_mem); - - boolean present_fragmented_cpu = true && (is_set_fragmented_cpu()); - list.add(present_fragmented_cpu); - if (present_fragmented_cpu) - list.add(fragmented_cpu); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((is_set_host()) ? 131071 : 524287); + if (is_set_host()) + hashCode = hashCode * 8191 + host.hashCode(); + + hashCode = hashCode * 8191 + uptime_secs; + + hashCode = hashCode * 8191 + num_workers; + + hashCode = hashCode * 8191 + num_used_workers; + + 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_version()) ? 131071 : 524287); + if (is_set_version()) + hashCode = hashCode * 8191 + version.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_total_resources()) ? 131071 : 524287); + if (is_set_total_resources()) + hashCode = hashCode * 8191 + total_resources.hashCode(); + + hashCode = hashCode * 8191 + ((is_set_used_mem()) ? 131071 : 524287); + if (is_set_used_mem()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(used_mem); + + hashCode = hashCode * 8191 + ((is_set_used_cpu()) ? 131071 : 524287); + if (is_set_used_cpu()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(used_cpu); + + hashCode = hashCode * 8191 + ((is_set_fragmented_mem()) ? 131071 : 524287); + if (is_set_fragmented_mem()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fragmented_mem); + + hashCode = hashCode * 8191 + ((is_set_fragmented_cpu()) ? 131071 : 524287); + if (is_set_fragmented_cpu()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fragmented_cpu); + + return hashCode; } @Override @@ -898,7 +853,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm int lastComparison = 0; - 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; } @@ -908,7 +863,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm 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; } @@ -918,7 +873,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers()); if (lastComparison != 0) { return lastComparison; } @@ -928,7 +883,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_used_workers()).compareTo(other.is_set_num_used_workers()); + lastComparison = java.lang.Boolean.valueOf(is_set_num_used_workers()).compareTo(other.is_set_num_used_workers()); if (lastComparison != 0) { return lastComparison; } @@ -938,7 +893,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - 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; } @@ -948,7 +903,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_version()).compareTo(other.is_set_version()); + lastComparison = java.lang.Boolean.valueOf(is_set_version()).compareTo(other.is_set_version()); if (lastComparison != 0) { return lastComparison; } @@ -958,7 +913,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_total_resources()).compareTo(other.is_set_total_resources()); + lastComparison = java.lang.Boolean.valueOf(is_set_total_resources()).compareTo(other.is_set_total_resources()); if (lastComparison != 0) { return lastComparison; } @@ -968,7 +923,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_used_mem()).compareTo(other.is_set_used_mem()); + lastComparison = java.lang.Boolean.valueOf(is_set_used_mem()).compareTo(other.is_set_used_mem()); if (lastComparison != 0) { return lastComparison; } @@ -978,7 +933,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_used_cpu()).compareTo(other.is_set_used_cpu()); + lastComparison = java.lang.Boolean.valueOf(is_set_used_cpu()).compareTo(other.is_set_used_cpu()); if (lastComparison != 0) { return lastComparison; } @@ -988,7 +943,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_fragmented_mem()).compareTo(other.is_set_fragmented_mem()); + lastComparison = java.lang.Boolean.valueOf(is_set_fragmented_mem()).compareTo(other.is_set_fragmented_mem()); if (lastComparison != 0) { return lastComparison; } @@ -998,7 +953,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_fragmented_cpu()).compareTo(other.is_set_fragmented_cpu()); + lastComparison = java.lang.Boolean.valueOf(is_set_fragmented_cpu()).compareTo(other.is_set_fragmented_cpu()); if (lastComparison != 0) { return lastComparison; } @@ -1016,16 +971,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } 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("SupervisorSummary("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("SupervisorSummary("); boolean first = true; sb.append("host:"); @@ -1136,7 +1091,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } } - 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; @@ -1146,13 +1101,13 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } } - private static class SupervisorSummaryStandardSchemeFactory implements SchemeFactory { + private static class SupervisorSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorSummaryStandardScheme getScheme() { return new SupervisorSummaryStandardScheme(); } } - private static class SupervisorSummaryStandardScheme extends StandardScheme<SupervisorSummary> { + private static class SupervisorSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorSummary> { public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1216,8 +1171,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map126 = iprot.readMapBegin(); - struct.total_resources = new HashMap<String,Double>(2*_map126.size); - String _key127; + struct.total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map126.size); + java.lang.String _key127; double _val128; for (int _i129 = 0; _i129 < _map126.size; ++_i129) { @@ -1308,7 +1263,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm oprot.writeFieldBegin(TOTAL_RESOURCES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.total_resources.size())); - for (Map.Entry<String, Double> _iter130 : struct.total_resources.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter130 : struct.total_resources.entrySet()) { oprot.writeString(_iter130.getKey()); oprot.writeDouble(_iter130.getValue()); @@ -1344,23 +1299,23 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } - private static class SupervisorSummaryTupleSchemeFactory implements SchemeFactory { + private static class SupervisorSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorSummaryTupleScheme getScheme() { return new SupervisorSummaryTupleScheme(); } } - private static class SupervisorSummaryTupleScheme extends TupleScheme<SupervisorSummary> { + private static class SupervisorSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorSummary> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary 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.host); oprot.writeI32(struct.uptime_secs); oprot.writeI32(struct.num_workers); oprot.writeI32(struct.num_used_workers); oprot.writeString(struct.supervisor_id); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.is_set_version()) { optionals.set(0); } @@ -1386,7 +1341,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (struct.is_set_total_resources()) { { oprot.writeI32(struct.total_resources.size()); - for (Map.Entry<String, Double> _iter131 : struct.total_resources.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.Double> _iter131 : struct.total_resources.entrySet()) { oprot.writeString(_iter131.getKey()); oprot.writeDouble(_iter131.getValue()); @@ -1409,7 +1364,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm @Override public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.host = iprot.readString(); struct.set_host_isSet(true); struct.uptime_secs = iprot.readI32(); @@ -1420,7 +1375,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm struct.set_num_used_workers_isSet(true); struct.supervisor_id = iprot.readString(); struct.set_supervisor_id_isSet(true); - BitSet incoming = iprot.readBitSet(6); + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.version = iprot.readString(); struct.set_version_isSet(true); @@ -1428,8 +1383,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (incoming.get(1)) { { org.apache.thrift.protocol.TMap _map132 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - struct.total_resources = new HashMap<String,Double>(2*_map132.size); - String _key133; + struct.total_resources = new java.util.HashMap<java.lang.String,java.lang.Double>(2*_map132.size); + java.lang.String _key133; double _val134; for (int _i135 = 0; _i135 < _map132.size; ++_i135) { @@ -1459,5 +1414,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } } + 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/SupervisorWorkerHeartbeat.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java index 0d5c65f..caa12af 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.java +++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorWorkerHeartbeat.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 SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<SupervisorWorkerHeartbeat, SupervisorWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkerHeartbeat> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorWorkerHeartbeat"); @@ -59,14 +32,11 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)2); private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)3); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new SupervisorWorkerHeartbeatStandardSchemeFactory()); - schemes.put(TupleScheme.class, new SupervisorWorkerHeartbeatTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SupervisorWorkerHeartbeatStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SupervisorWorkerHeartbeatTupleSchemeFactory(); - private String storm_id; // required - private List<ExecutorInfo> executors; // required + private java.lang.String storm_id; // required + private java.util.List<ExecutorInfo> executors; // required private int time_secs; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -75,10 +45,10 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv EXECUTORS((short)2, "executors"), TIME_SECS((short)3, "time_secs"); - 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); } } @@ -105,21 +75,21 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv */ 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; } @@ -128,7 +98,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -136,9 +106,9 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv // isset id assignments private static final int __TIME_SECS_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.STORM_ID, new org.apache.thrift.meta_data.FieldMetaData("storm_id", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -146,7 +116,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class)))); tmpMap.put(_Fields.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorWorkerHeartbeat.class, metaDataMap); } @@ -154,8 +124,8 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } public SupervisorWorkerHeartbeat( - String storm_id, - List<ExecutorInfo> executors, + java.lang.String storm_id, + java.util.List<ExecutorInfo> executors, int time_secs) { this(); @@ -174,7 +144,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv this.storm_id = other.storm_id; } if (other.is_set_executors()) { - List<ExecutorInfo> __this__executors = new ArrayList<ExecutorInfo>(other.executors.size()); + java.util.List<ExecutorInfo> __this__executors = new java.util.ArrayList<ExecutorInfo>(other.executors.size()); for (ExecutorInfo other_element : other.executors) { __this__executors.add(new ExecutorInfo(other_element)); } @@ -195,11 +165,11 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv this.time_secs = 0; } - public String get_storm_id() { + public java.lang.String get_storm_id() { return this.storm_id; } - public void set_storm_id(String storm_id) { + public void set_storm_id(java.lang.String storm_id) { this.storm_id = storm_id; } @@ -228,16 +198,16 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv public void add_to_executors(ExecutorInfo elem) { if (this.executors == null) { - this.executors = new ArrayList<ExecutorInfo>(); + this.executors = new java.util.ArrayList<ExecutorInfo>(); } this.executors.add(elem); } - public List<ExecutorInfo> get_executors() { + public java.util.List<ExecutorInfo> get_executors() { return this.executors; } - public void set_executors(List<ExecutorInfo> executors) { + public void set_executors(java.util.List<ExecutorInfo> executors) { this.executors = executors; } @@ -266,25 +236,25 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } 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 void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case STORM_ID: if (value == null) { unset_storm_id(); } else { - set_storm_id((String)value); + set_storm_id((java.lang.String)value); } break; @@ -292,7 +262,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv if (value == null) { unset_executors(); } else { - set_executors((List<ExecutorInfo>)value); + set_executors((java.util.List<ExecutorInfo>)value); } break; @@ -300,14 +270,14 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv if (value == null) { unset_time_secs(); } else { - set_time_secs((Integer)value); + set_time_secs((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case STORM_ID: return get_storm_id(); @@ -319,13 +289,13 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv return get_time_secs(); } - 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) { @@ -336,11 +306,11 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv case TIME_SECS: return is_set_time_secs(); } - 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 SupervisorWorkerHeartbeat) @@ -351,6 +321,8 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv public boolean equals(SupervisorWorkerHeartbeat that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_storm_id = true && this.is_set_storm_id(); boolean that_present_storm_id = true && that.is_set_storm_id(); @@ -384,24 +356,19 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - boolean present_storm_id = true && (is_set_storm_id()); - list.add(present_storm_id); - if (present_storm_id) - list.add(storm_id); + hashCode = hashCode * 8191 + ((is_set_storm_id()) ? 131071 : 524287); + if (is_set_storm_id()) + hashCode = hashCode * 8191 + storm_id.hashCode(); - boolean present_executors = true && (is_set_executors()); - list.add(present_executors); - if (present_executors) - list.add(executors); + hashCode = hashCode * 8191 + ((is_set_executors()) ? 131071 : 524287); + if (is_set_executors()) + hashCode = hashCode * 8191 + executors.hashCode(); - boolean present_time_secs = true; - list.add(present_time_secs); - if (present_time_secs) - list.add(time_secs); + hashCode = hashCode * 8191 + time_secs; - return list.hashCode(); + return hashCode; } @Override @@ -412,7 +379,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv int lastComparison = 0; - lastComparison = Boolean.valueOf(is_set_storm_id()).compareTo(other.is_set_storm_id()); + lastComparison = java.lang.Boolean.valueOf(is_set_storm_id()).compareTo(other.is_set_storm_id()); if (lastComparison != 0) { return lastComparison; } @@ -422,7 +389,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors()); + lastComparison = java.lang.Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors()); if (lastComparison != 0) { return lastComparison; } @@ -432,7 +399,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv 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; } @@ -450,16 +417,16 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } 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("SupervisorWorkerHeartbeat("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("SupervisorWorkerHeartbeat("); boolean first = true; sb.append("storm_id:"); @@ -510,7 +477,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } } - 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; @@ -520,13 +487,13 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } } - private static class SupervisorWorkerHeartbeatStandardSchemeFactory implements SchemeFactory { + private static class SupervisorWorkerHeartbeatStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorWorkerHeartbeatStandardScheme getScheme() { return new SupervisorWorkerHeartbeatStandardScheme(); } } - private static class SupervisorWorkerHeartbeatStandardScheme extends StandardScheme<SupervisorWorkerHeartbeat> { + private static class SupervisorWorkerHeartbeatStandardScheme extends org.apache.thrift.scheme.StandardScheme<SupervisorWorkerHeartbeat> { public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorWorkerHeartbeat struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -550,7 +517,7 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list870 = iprot.readListBegin(); - struct.executors = new ArrayList<ExecutorInfo>(_list870.size); + struct.executors = new java.util.ArrayList<ExecutorInfo>(_list870.size); ExecutorInfo _elem871; for (int _i872 = 0; _i872 < _list870.size; ++_i872) { @@ -612,17 +579,17 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } - private static class SupervisorWorkerHeartbeatTupleSchemeFactory implements SchemeFactory { + private static class SupervisorWorkerHeartbeatTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public SupervisorWorkerHeartbeatTupleScheme getScheme() { return new SupervisorWorkerHeartbeatTupleScheme(); } } - private static class SupervisorWorkerHeartbeatTupleScheme extends TupleScheme<SupervisorWorkerHeartbeat> { + private static class SupervisorWorkerHeartbeatTupleScheme extends org.apache.thrift.scheme.TupleScheme<SupervisorWorkerHeartbeat> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeat 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.storm_id); { oprot.writeI32(struct.executors.size()); @@ -636,12 +603,12 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv @Override public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkerHeartbeat struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.storm_id = iprot.readString(); struct.set_storm_id_isSet(true); { org.apache.thrift.protocol.TList _list875 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList<ExecutorInfo>(_list875.size); + struct.executors = new java.util.ArrayList<ExecutorInfo>(_list875.size); ExecutorInfo _elem876; for (int _i877 = 0; _i877 < _list875.size; ++_i877) { @@ -656,5 +623,8 @@ public class SupervisorWorkerHeartbeat implements org.apache.thrift.TBase<Superv } } + 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(); + } }
