http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/SpoutSpec.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/SpoutSpec.java b/jstorm-core/src/main/java/backtype/storm/generated/SpoutSpec.java index 722fc54..065d187 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/SpoutSpec.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/SpoutSpec.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec"); @@ -337,11 +337,11 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -369,14 +369,14 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_spout_object()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'spout_object' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'spout_object' is unset! Struct:" + toString()); } if (!is_set_common()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'common' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -388,7 +388,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -396,7 +396,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -409,7 +409,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ private static class SpoutSpecStandardScheme extends StandardScheme<SpoutSpec> { - public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutSpec struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutSpec struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -446,7 +446,7 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutSpec struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutSpec struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -475,14 +475,14 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._ private static class SpoutSpecTupleScheme extends TupleScheme<SpoutSpec> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.spout_object.write(oprot); struct.common.write(oprot); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.spout_object = new ComponentObject(); struct.spout_object.read(iprot);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/StateSpoutSpec.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/StateSpoutSpec.java b/jstorm-core/src/main/java/backtype/storm/generated/StateSpoutSpec.java index 66cc735..ee1bc54 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/StateSpoutSpec.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/StateSpoutSpec.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec"); @@ -337,11 +337,11 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -369,14 +369,14 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_state_spout_object()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'state_spout_object' is unset! Struct:" + toString()); } if (!is_set_common()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'common' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -388,7 +388,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -396,7 +396,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -409,7 +409,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S private static class StateSpoutSpecStandardScheme extends StandardScheme<StateSpoutSpec> { - public void read(org.apache.thrift.protocol.TProtocol iprot, StateSpoutSpec struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, StateSpoutSpec struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -446,7 +446,7 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, StateSpoutSpec struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, StateSpoutSpec struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -475,14 +475,14 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S private static class StateSpoutSpecTupleScheme extends TupleScheme<StateSpoutSpec> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.state_spout_object.write(oprot); struct.common.write(oprot); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.state_spout_object = new ComponentObject(); struct.state_spout_object.read(iprot); http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/StormTopology.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/StormTopology.java b/jstorm-core/src/main/java/backtype/storm/generated/StormTopology.java index 205f73d..4358ab1 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/StormTopology.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/StormTopology.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology"); @@ -485,11 +485,11 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -525,18 +525,18 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_spouts()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'spouts' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'spouts' is unset! Struct:" + toString()); } if (!is_set_bolts()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'bolts' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'bolts' is unset! Struct:" + toString()); } if (!is_set_state_spouts()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -545,7 +545,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -553,7 +553,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -566,7 +566,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto private static class StormTopologyStandardScheme extends StandardScheme<StormTopology> { - public void read(org.apache.thrift.protocol.TProtocol iprot, StormTopology struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, StormTopology struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -648,7 +648,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, StormTopology struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, StormTopology struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -706,7 +706,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto private static class StormTopologyTupleScheme extends TupleScheme<StormTopology> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.spouts.size()); @@ -735,7 +735,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; { org.apache.thrift.protocol.TMap _map62 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/StreamInfo.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/StreamInfo.java b/jstorm-core/src/main/java/backtype/storm/generated/StreamInfo.java index abed2ea..b586ac2 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/StreamInfo.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/StreamInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo"); @@ -356,11 +356,11 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -384,14 +384,14 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_output_fields()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'output_fields' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'output_fields' is unset! Struct:" + toString()); } if (!is_set_direct()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'direct' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -400,7 +400,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -410,7 +410,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf // 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; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -423,7 +423,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf private static class StreamInfoStandardScheme extends StandardScheme<StreamInfo> { - public void read(org.apache.thrift.protocol.TProtocol iprot, StreamInfo struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, StreamInfo struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -468,7 +468,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, StreamInfo struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, StreamInfo struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -502,7 +502,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf private static class StreamInfoTupleScheme extends TupleScheme<StreamInfo> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.output_fields.size()); @@ -515,7 +515,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; { org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/SubmitOptions.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/SubmitOptions.java b/jstorm-core/src/main/java/backtype/storm/generated/SubmitOptions.java index b4343ab..4a265cb 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/SubmitOptions.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/SubmitOptions.java @@ -34,11 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions"); private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -47,6 +48,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub } private TopologyInitialStatus initial_status; // required + private Credentials creds; // 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 { @@ -54,7 +56,8 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub * * @see TopologyInitialStatus */ - INITIAL_STATUS((short)1, "initial_status"); + INITIAL_STATUS((short)1, "initial_status"), + CREDS((short)2, "creds"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -71,6 +74,8 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub switch(fieldId) { case 1: // INITIAL_STATUS return INITIAL_STATUS; + case 2: // CREDS + return CREDS; default: return null; } @@ -111,11 +116,14 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub } // isset id assignments + private static final _Fields optionals[] = {_Fields.CREDS}; public static final 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); tmpMap.put(_Fields.INITIAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("initial_status", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TopologyInitialStatus.class))); + tmpMap.put(_Fields.CREDS, new org.apache.thrift.meta_data.FieldMetaData("creds", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Credentials.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SubmitOptions.class, metaDataMap); } @@ -137,6 +145,9 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub if (other.is_set_initial_status()) { this.initial_status = other.initial_status; } + if (other.is_set_creds()) { + this.creds = new Credentials(other.creds); + } } public SubmitOptions deepCopy() { @@ -146,6 +157,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub @Override public void clear() { this.initial_status = null; + this.creds = null; } /** @@ -179,6 +191,29 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub } } + public Credentials get_creds() { + return this.creds; + } + + public void set_creds(Credentials creds) { + this.creds = creds; + } + + public void unset_creds() { + this.creds = null; + } + + /** Returns true if field creds is set (has been assigned a value) and false otherwise */ + public boolean is_set_creds() { + return this.creds != null; + } + + public void set_creds_isSet(boolean value) { + if (!value) { + this.creds = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case INITIAL_STATUS: @@ -189,6 +224,14 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub } break; + case CREDS: + if (value == null) { + unset_creds(); + } else { + set_creds((Credentials)value); + } + break; + } } @@ -197,6 +240,9 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub case INITIAL_STATUS: return get_initial_status(); + case CREDS: + return get_creds(); + } throw new IllegalStateException(); } @@ -210,6 +256,8 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub switch (field) { case INITIAL_STATUS: return is_set_initial_status(); + case CREDS: + return is_set_creds(); } throw new IllegalStateException(); } @@ -236,6 +284,15 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub return false; } + boolean this_present_creds = true && this.is_set_creds(); + boolean that_present_creds = true && that.is_set_creds(); + if (this_present_creds || that_present_creds) { + if (!(this_present_creds && that_present_creds)) + return false; + if (!this.creds.equals(that.creds)) + return false; + } + return true; } @@ -248,6 +305,11 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub if (present_initial_status) list.add(initial_status.getValue()); + boolean present_creds = true && (is_set_creds()); + list.add(present_creds); + if (present_creds) + list.add(creds); + return list.hashCode(); } @@ -269,6 +331,16 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_creds()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, other.creds); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -276,11 +348,11 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -296,23 +368,36 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub sb.append(this.initial_status); } first = false; + if (is_set_creds()) { + if (!first) sb.append(", "); + sb.append("creds:"); + if (this.creds == null) { + sb.append("null"); + } else { + sb.append(this.creds); + } + first = false; + } sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_initial_status()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'initial_status' is unset! Struct:" + toString()); } // check for sub-struct validity + if (creds != null) { + creds.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -320,7 +405,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -333,7 +418,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub private static class SubmitOptionsStandardScheme extends StandardScheme<SubmitOptions> { - public void read(org.apache.thrift.protocol.TProtocol iprot, SubmitOptions struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, SubmitOptions struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -351,6 +436,15 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // CREDS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.creds = new Credentials(); + struct.creds.read(iprot); + struct.set_creds_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -360,7 +454,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, SubmitOptions struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, SubmitOptions struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -369,6 +463,13 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub oprot.writeI32(struct.initial_status.getValue()); oprot.writeFieldEnd(); } + if (struct.creds != null) { + if (struct.is_set_creds()) { + oprot.writeFieldBegin(CREDS_FIELD_DESC); + struct.creds.write(oprot); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -384,16 +485,30 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub private static class SubmitOptionsTupleScheme extends TupleScheme<SubmitOptions> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeI32(struct.initial_status.getValue()); + BitSet optionals = new BitSet(); + if (struct.is_set_creds()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.is_set_creds()) { + struct.creds.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.initial_status = backtype.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32()); struct.set_initial_status_isSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.creds = new Credentials(); + struct.creds.read(iprot); + struct.set_creds_isSet(true); + } } } http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/SupervisorSummary.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/SupervisorSummary.java b/jstorm-core/src/main/java/backtype/storm/generated/SupervisorSummary.java index 903dab0..3be87b3 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/SupervisorSummary.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/SupervisorSummary.java @@ -34,15 +34,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") 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"); private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)4); - private static final org.apache.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_used_workers", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisorId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptimeSecs", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("numWorkers", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("numUsedWorkers", org.apache.thrift.protocol.TType.I32, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -51,18 +51,18 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } private String host; // required - private String supervisor_id; // required - private int uptime_secs; // required - private int num_workers; // required - private int num_used_workers; // required + private String supervisorId; // required + private int uptimeSecs; // required + private int numWorkers; // required + private int numUsedWorkers; // 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 { HOST((short)1, "host"), - SUPERVISOR_ID((short)2, "supervisor_id"), - UPTIME_SECS((short)3, "uptime_secs"), - NUM_WORKERS((short)4, "num_workers"), - NUM_USED_WORKERS((short)5, "num_used_workers"); + SUPERVISOR_ID((short)2, "supervisorId"), + UPTIME_SECS((short)3, "uptimeSecs"), + NUM_WORKERS((short)4, "numWorkers"), + NUM_USED_WORKERS((short)5, "numUsedWorkers"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -127,22 +127,22 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } // isset id assignments - private static final int __UPTIME_SECS_ISSET_ID = 0; - private static final int __NUM_WORKERS_ISSET_ID = 1; - private static final int __NUM_USED_WORKERS_ISSET_ID = 2; + private static final int __UPTIMESECS_ISSET_ID = 0; + private static final int __NUMWORKERS_ISSET_ID = 1; + private static final int __NUMUSEDWORKERS_ISSET_ID = 2; private byte __isset_bitfield = 0; public static final 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); 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.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisorId", 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, + tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptimeSecs", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.NUM_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("numWorkers", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("num_used_workers", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.NUM_USED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("numUsedWorkers", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap); @@ -153,20 +153,20 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm public SupervisorSummary( String host, - String supervisor_id, - int uptime_secs, - int num_workers, - int num_used_workers) + String supervisorId, + int uptimeSecs, + int numWorkers, + int numUsedWorkers) { this(); this.host = host; - this.supervisor_id = supervisor_id; - this.uptime_secs = uptime_secs; - set_uptime_secs_isSet(true); - this.num_workers = num_workers; - set_num_workers_isSet(true); - this.num_used_workers = num_used_workers; - set_num_used_workers_isSet(true); + this.supervisorId = supervisorId; + this.uptimeSecs = uptimeSecs; + set_uptimeSecs_isSet(true); + this.numWorkers = numWorkers; + set_numWorkers_isSet(true); + this.numUsedWorkers = numUsedWorkers; + set_numUsedWorkers_isSet(true); } /** @@ -177,12 +177,12 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (other.is_set_host()) { this.host = other.host; } - if (other.is_set_supervisor_id()) { - this.supervisor_id = other.supervisor_id; + if (other.is_set_supervisorId()) { + this.supervisorId = other.supervisorId; } - this.uptime_secs = other.uptime_secs; - this.num_workers = other.num_workers; - this.num_used_workers = other.num_used_workers; + this.uptimeSecs = other.uptimeSecs; + this.numWorkers = other.numWorkers; + this.numUsedWorkers = other.numUsedWorkers; } public SupervisorSummary deepCopy() { @@ -192,13 +192,13 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm @Override public void clear() { this.host = null; - this.supervisor_id = null; - set_uptime_secs_isSet(false); - this.uptime_secs = 0; - set_num_workers_isSet(false); - this.num_workers = 0; - set_num_used_workers_isSet(false); - this.num_used_workers = 0; + this.supervisorId = null; + set_uptimeSecs_isSet(false); + this.uptimeSecs = 0; + set_numWorkers_isSet(false); + this.numWorkers = 0; + set_numUsedWorkers_isSet(false); + this.numUsedWorkers = 0; } public String get_host() { @@ -224,93 +224,93 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } } - public String get_supervisor_id() { - return this.supervisor_id; + public String get_supervisorId() { + return this.supervisorId; } - public void set_supervisor_id(String supervisor_id) { - this.supervisor_id = supervisor_id; + public void set_supervisorId(String supervisorId) { + this.supervisorId = supervisorId; } - public void unset_supervisor_id() { - this.supervisor_id = null; + public void unset_supervisorId() { + this.supervisorId = null; } - /** Returns true if field supervisor_id is set (has been assigned a value) and false otherwise */ - public boolean is_set_supervisor_id() { - return this.supervisor_id != null; + /** Returns true if field supervisorId is set (has been assigned a value) and false otherwise */ + public boolean is_set_supervisorId() { + return this.supervisorId != null; } - public void set_supervisor_id_isSet(boolean value) { + public void set_supervisorId_isSet(boolean value) { if (!value) { - this.supervisor_id = null; + this.supervisorId = null; } } - public int get_uptime_secs() { - return this.uptime_secs; + public int get_uptimeSecs() { + return this.uptimeSecs; } - public void set_uptime_secs(int uptime_secs) { - this.uptime_secs = uptime_secs; - set_uptime_secs_isSet(true); + public void set_uptimeSecs(int uptimeSecs) { + this.uptimeSecs = uptimeSecs; + set_uptimeSecs_isSet(true); } - public void unset_uptime_secs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID); + public void unset_uptimeSecs() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPTIMESECS_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); + /** Returns true if field uptimeSecs is set (has been assigned a value) and false otherwise */ + public boolean is_set_uptimeSecs() { + return EncodingUtils.testBit(__isset_bitfield, __UPTIMESECS_ISSET_ID); } - public void set_uptime_secs_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value); + public void set_uptimeSecs_isSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIMESECS_ISSET_ID, value); } - public int get_num_workers() { - return this.num_workers; + public int get_numWorkers() { + return this.numWorkers; } - public void set_num_workers(int num_workers) { - this.num_workers = num_workers; - set_num_workers_isSet(true); + public void set_numWorkers(int numWorkers) { + this.numWorkers = numWorkers; + set_numWorkers_isSet(true); } - public void unset_num_workers() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID); + public void unset_numWorkers() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMWORKERS_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); + /** Returns true if field numWorkers is set (has been assigned a value) and false otherwise */ + public boolean is_set_numWorkers() { + return EncodingUtils.testBit(__isset_bitfield, __NUMWORKERS_ISSET_ID); } - public void set_num_workers_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value); + public void set_numWorkers_isSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMWORKERS_ISSET_ID, value); } - public int get_num_used_workers() { - return this.num_used_workers; + public int get_numUsedWorkers() { + return this.numUsedWorkers; } - public void set_num_used_workers(int num_used_workers) { - this.num_used_workers = num_used_workers; - set_num_used_workers_isSet(true); + public void set_numUsedWorkers(int numUsedWorkers) { + this.numUsedWorkers = numUsedWorkers; + set_numUsedWorkers_isSet(true); } - public void unset_num_used_workers() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID); + public void unset_numUsedWorkers() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMUSEDWORKERS_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); + /** Returns true if field numUsedWorkers is set (has been assigned a value) and false otherwise */ + public boolean is_set_numUsedWorkers() { + return EncodingUtils.testBit(__isset_bitfield, __NUMUSEDWORKERS_ISSET_ID); } - public void set_num_used_workers_isSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value); + public void set_numUsedWorkers_isSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMUSEDWORKERS_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -325,33 +325,33 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm case SUPERVISOR_ID: if (value == null) { - unset_supervisor_id(); + unset_supervisorId(); } else { - set_supervisor_id((String)value); + set_supervisorId((String)value); } break; case UPTIME_SECS: if (value == null) { - unset_uptime_secs(); + unset_uptimeSecs(); } else { - set_uptime_secs((Integer)value); + set_uptimeSecs((Integer)value); } break; case NUM_WORKERS: if (value == null) { - unset_num_workers(); + unset_numWorkers(); } else { - set_num_workers((Integer)value); + set_numWorkers((Integer)value); } break; case NUM_USED_WORKERS: if (value == null) { - unset_num_used_workers(); + unset_numUsedWorkers(); } else { - set_num_used_workers((Integer)value); + set_numUsedWorkers((Integer)value); } break; @@ -364,16 +364,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return get_host(); case SUPERVISOR_ID: - return get_supervisor_id(); + return get_supervisorId(); case UPTIME_SECS: - return Integer.valueOf(get_uptime_secs()); + return Integer.valueOf(get_uptimeSecs()); case NUM_WORKERS: - return Integer.valueOf(get_num_workers()); + return Integer.valueOf(get_numWorkers()); case NUM_USED_WORKERS: - return Integer.valueOf(get_num_used_workers()); + return Integer.valueOf(get_numUsedWorkers()); } throw new IllegalStateException(); @@ -389,13 +389,13 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm case HOST: return is_set_host(); case SUPERVISOR_ID: - return is_set_supervisor_id(); + return is_set_supervisorId(); case UPTIME_SECS: - return is_set_uptime_secs(); + return is_set_uptimeSecs(); case NUM_WORKERS: - return is_set_num_workers(); + return is_set_numWorkers(); case NUM_USED_WORKERS: - return is_set_num_used_workers(); + return is_set_numUsedWorkers(); } throw new IllegalStateException(); } @@ -422,39 +422,39 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return false; } - boolean this_present_supervisor_id = true && this.is_set_supervisor_id(); - boolean that_present_supervisor_id = true && that.is_set_supervisor_id(); - if (this_present_supervisor_id || that_present_supervisor_id) { - if (!(this_present_supervisor_id && that_present_supervisor_id)) + boolean this_present_supervisorId = true && this.is_set_supervisorId(); + boolean that_present_supervisorId = true && that.is_set_supervisorId(); + if (this_present_supervisorId || that_present_supervisorId) { + if (!(this_present_supervisorId && that_present_supervisorId)) return false; - if (!this.supervisor_id.equals(that.supervisor_id)) + if (!this.supervisorId.equals(that.supervisorId)) return false; } - boolean this_present_uptime_secs = true; - boolean that_present_uptime_secs = true; - if (this_present_uptime_secs || that_present_uptime_secs) { - if (!(this_present_uptime_secs && that_present_uptime_secs)) + boolean this_present_uptimeSecs = true; + boolean that_present_uptimeSecs = true; + if (this_present_uptimeSecs || that_present_uptimeSecs) { + if (!(this_present_uptimeSecs && that_present_uptimeSecs)) return false; - if (this.uptime_secs != that.uptime_secs) + if (this.uptimeSecs != that.uptimeSecs) return false; } - boolean this_present_num_workers = true; - boolean that_present_num_workers = true; - if (this_present_num_workers || that_present_num_workers) { - if (!(this_present_num_workers && that_present_num_workers)) + boolean this_present_numWorkers = true; + boolean that_present_numWorkers = true; + if (this_present_numWorkers || that_present_numWorkers) { + if (!(this_present_numWorkers && that_present_numWorkers)) return false; - if (this.num_workers != that.num_workers) + if (this.numWorkers != that.numWorkers) return false; } - boolean this_present_num_used_workers = true; - boolean that_present_num_used_workers = true; - if (this_present_num_used_workers || that_present_num_used_workers) { - if (!(this_present_num_used_workers && that_present_num_used_workers)) + boolean this_present_numUsedWorkers = true; + boolean that_present_numUsedWorkers = true; + if (this_present_numUsedWorkers || that_present_numUsedWorkers) { + if (!(this_present_numUsedWorkers && that_present_numUsedWorkers)) return false; - if (this.num_used_workers != that.num_used_workers) + if (this.numUsedWorkers != that.numUsedWorkers) return false; } @@ -470,25 +470,25 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm if (present_host) list.add(host); - boolean present_supervisor_id = true && (is_set_supervisor_id()); - list.add(present_supervisor_id); - if (present_supervisor_id) - list.add(supervisor_id); + boolean present_supervisorId = true && (is_set_supervisorId()); + list.add(present_supervisorId); + if (present_supervisorId) + list.add(supervisorId); - boolean present_uptime_secs = true; - list.add(present_uptime_secs); - if (present_uptime_secs) - list.add(uptime_secs); + boolean present_uptimeSecs = true; + list.add(present_uptimeSecs); + if (present_uptimeSecs) + list.add(uptimeSecs); - boolean present_num_workers = true; - list.add(present_num_workers); - if (present_num_workers) - list.add(num_workers); + boolean present_numWorkers = true; + list.add(present_numWorkers); + if (present_numWorkers) + list.add(numWorkers); - boolean present_num_used_workers = true; - list.add(present_num_used_workers); - if (present_num_used_workers) - list.add(num_used_workers); + boolean present_numUsedWorkers = true; + list.add(present_numUsedWorkers); + if (present_numUsedWorkers) + list.add(numUsedWorkers); return list.hashCode(); } @@ -511,42 +511,42 @@ 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 = Boolean.valueOf(is_set_supervisorId()).compareTo(other.is_set_supervisorId()); if (lastComparison != 0) { return lastComparison; } - if (is_set_supervisor_id()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id); + if (is_set_supervisorId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisorId, other.supervisorId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs()); + lastComparison = Boolean.valueOf(is_set_uptimeSecs()).compareTo(other.is_set_uptimeSecs()); if (lastComparison != 0) { return lastComparison; } - if (is_set_uptime_secs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs); + if (is_set_uptimeSecs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptimeSecs, other.uptimeSecs); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers()); + lastComparison = Boolean.valueOf(is_set_numWorkers()).compareTo(other.is_set_numWorkers()); if (lastComparison != 0) { return lastComparison; } - if (is_set_num_workers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers); + if (is_set_numWorkers()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numWorkers, other.numWorkers); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_num_used_workers()).compareTo(other.is_set_num_used_workers()); + lastComparison = Boolean.valueOf(is_set_numUsedWorkers()).compareTo(other.is_set_numUsedWorkers()); if (lastComparison != 0) { return lastComparison; } - if (is_set_num_used_workers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_used_workers, other.num_used_workers); + if (is_set_numUsedWorkers()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numUsedWorkers, other.numUsedWorkers); if (lastComparison != 0) { return lastComparison; } @@ -558,11 +558,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -579,49 +579,49 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm } first = false; if (!first) sb.append(", "); - sb.append("supervisor_id:"); - if (this.supervisor_id == null) { + sb.append("supervisorId:"); + if (this.supervisorId == null) { sb.append("null"); } else { - sb.append(this.supervisor_id); + sb.append(this.supervisorId); } first = false; if (!first) sb.append(", "); - sb.append("uptime_secs:"); - sb.append(this.uptime_secs); + sb.append("uptimeSecs:"); + sb.append(this.uptimeSecs); first = false; if (!first) sb.append(", "); - sb.append("num_workers:"); - sb.append(this.num_workers); + sb.append("numWorkers:"); + sb.append(this.numWorkers); first = false; if (!first) sb.append(", "); - sb.append("num_used_workers:"); - sb.append(this.num_used_workers); + sb.append("numUsedWorkers:"); + sb.append(this.numUsedWorkers); first = false; sb.append(")"); return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_host()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'host' is unset! Struct:" + toString()); } - if (!is_set_supervisor_id()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString()); + if (!is_set_supervisorId()) { + throw new TProtocolException("Required field 'supervisorId' is unset! Struct:" + toString()); } - if (!is_set_uptime_secs()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString()); + if (!is_set_uptimeSecs()) { + throw new TProtocolException("Required field 'uptimeSecs' is unset! Struct:" + toString()); } - if (!is_set_num_workers()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_workers' is unset! Struct:" + toString()); + if (!is_set_numWorkers()) { + throw new TProtocolException("Required field 'numWorkers' is unset! Struct:" + toString()); } - if (!is_set_num_used_workers()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'num_used_workers' is unset! Struct:" + toString()); + if (!is_set_numUsedWorkers()) { + throw new TProtocolException("Required field 'numUsedWorkers' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -630,7 +630,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -640,7 +640,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm // 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; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -653,7 +653,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm private static class SupervisorSummaryStandardScheme extends StandardScheme<SupervisorSummary> { - public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -673,32 +673,32 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm break; case 2: // SUPERVISOR_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.supervisor_id = iprot.readString(); - struct.set_supervisor_id_isSet(true); + struct.supervisorId = iprot.readString(); + struct.set_supervisorId_isSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // UPTIME_SECS if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.uptime_secs = iprot.readI32(); - struct.set_uptime_secs_isSet(true); + struct.uptimeSecs = iprot.readI32(); + struct.set_uptimeSecs_isSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // NUM_WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.num_workers = iprot.readI32(); - struct.set_num_workers_isSet(true); + struct.numWorkers = iprot.readI32(); + struct.set_numWorkers_isSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 5: // NUM_USED_WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.num_used_workers = iprot.readI32(); - struct.set_num_used_workers_isSet(true); + struct.numUsedWorkers = iprot.readI32(); + struct.set_numUsedWorkers_isSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -712,7 +712,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorSummary struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorSummary struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -721,19 +721,19 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm oprot.writeString(struct.host); oprot.writeFieldEnd(); } - if (struct.supervisor_id != null) { + if (struct.supervisorId != null) { oprot.writeFieldBegin(SUPERVISOR_ID_FIELD_DESC); - oprot.writeString(struct.supervisor_id); + oprot.writeString(struct.supervisorId); oprot.writeFieldEnd(); } oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC); - oprot.writeI32(struct.uptime_secs); + oprot.writeI32(struct.uptimeSecs); oprot.writeFieldEnd(); oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC); - oprot.writeI32(struct.num_workers); + oprot.writeI32(struct.numWorkers); oprot.writeFieldEnd(); oprot.writeFieldBegin(NUM_USED_WORKERS_FIELD_DESC); - oprot.writeI32(struct.num_used_workers); + oprot.writeI32(struct.numUsedWorkers); oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); @@ -750,28 +750,28 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm private static class SupervisorSummaryTupleScheme extends TupleScheme<SupervisorSummary> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeString(struct.host); - oprot.writeString(struct.supervisor_id); - oprot.writeI32(struct.uptime_secs); - oprot.writeI32(struct.num_workers); - oprot.writeI32(struct.num_used_workers); + oprot.writeString(struct.supervisorId); + oprot.writeI32(struct.uptimeSecs); + oprot.writeI32(struct.numWorkers); + oprot.writeI32(struct.numUsedWorkers); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.host = iprot.readString(); struct.set_host_isSet(true); - struct.supervisor_id = iprot.readString(); - struct.set_supervisor_id_isSet(true); - struct.uptime_secs = iprot.readI32(); - struct.set_uptime_secs_isSet(true); - struct.num_workers = iprot.readI32(); - struct.set_num_workers_isSet(true); - struct.num_used_workers = iprot.readI32(); - struct.set_num_used_workers_isSet(true); + struct.supervisorId = iprot.readString(); + struct.set_supervisorId_isSet(true); + struct.uptimeSecs = iprot.readI32(); + struct.set_uptimeSecs_isSet(true); + struct.numWorkers = iprot.readI32(); + struct.set_numWorkers_isSet(true); + struct.numUsedWorkers = iprot.readI32(); + struct.set_numUsedWorkers_isSet(true); } } http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/SupervisorWorkers.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/SupervisorWorkers.java b/jstorm-core/src/main/java/backtype/storm/generated/SupervisorWorkers.java index 93ec504..1735b75 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/SupervisorWorkers.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/SupervisorWorkers.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWorkers, SupervisorWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorWorkers> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorWorkers"); @@ -455,11 +455,11 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -495,18 +495,18 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_supervisor()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'supervisor' is unset! Struct:" + toString()); } if (!is_set_workers()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'workers' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'workers' is unset! Struct:" + toString()); } if (!is_set_workerMetric()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'workerMetric' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'workerMetric' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -518,7 +518,7 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -526,7 +526,7 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -539,7 +539,7 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork private static class SupervisorWorkersStandardScheme extends StandardScheme<SupervisorWorkers> { - public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorWorkers struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorWorkers struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -561,14 +561,14 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork case 2: // WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list196 = iprot.readListBegin(); - struct.workers = new ArrayList<WorkerSummary>(_list196.size); - WorkerSummary _elem197; - for (int _i198 = 0; _i198 < _list196.size; ++_i198) + org.apache.thrift.protocol.TList _list144 = iprot.readListBegin(); + struct.workers = new ArrayList<WorkerSummary>(_list144.size); + WorkerSummary _elem145; + for (int _i146 = 0; _i146 < _list144.size; ++_i146) { - _elem197 = new WorkerSummary(); - _elem197.read(iprot); - struct.workers.add(_elem197); + _elem145 = new WorkerSummary(); + _elem145.read(iprot); + struct.workers.add(_elem145); } iprot.readListEnd(); } @@ -580,16 +580,16 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork case 3: // WORKER_METRIC if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map199 = iprot.readMapBegin(); - struct.workerMetric = new HashMap<String,MetricInfo>(2*_map199.size); - String _key200; - MetricInfo _val201; - for (int _i202 = 0; _i202 < _map199.size; ++_i202) + org.apache.thrift.protocol.TMap _map147 = iprot.readMapBegin(); + struct.workerMetric = new HashMap<String,MetricInfo>(2*_map147.size); + String _key148; + MetricInfo _val149; + for (int _i150 = 0; _i150 < _map147.size; ++_i150) { - _key200 = iprot.readString(); - _val201 = new MetricInfo(); - _val201.read(iprot); - struct.workerMetric.put(_key200, _val201); + _key148 = iprot.readString(); + _val149 = new MetricInfo(); + _val149.read(iprot); + struct.workerMetric.put(_key148, _val149); } iprot.readMapEnd(); } @@ -607,7 +607,7 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorWorkers struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorWorkers struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -620,9 +620,9 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork oprot.writeFieldBegin(WORKERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.workers.size())); - for (WorkerSummary _iter203 : struct.workers) + for (WorkerSummary _iter151 : struct.workers) { - _iter203.write(oprot); + _iter151.write(oprot); } oprot.writeListEnd(); } @@ -632,10 +632,10 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork oprot.writeFieldBegin(WORKER_METRIC_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.workerMetric.size())); - for (Map.Entry<String, MetricInfo> _iter204 : struct.workerMetric.entrySet()) + for (Map.Entry<String, MetricInfo> _iter152 : struct.workerMetric.entrySet()) { - oprot.writeString(_iter204.getKey()); - _iter204.getValue().write(oprot); + oprot.writeString(_iter152.getKey()); + _iter152.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -656,55 +656,55 @@ public class SupervisorWorkers implements org.apache.thrift.TBase<SupervisorWork private static class SupervisorWorkersTupleScheme extends TupleScheme<SupervisorWorkers> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkers struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkers struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; struct.supervisor.write(oprot); { oprot.writeI32(struct.workers.size()); - for (WorkerSummary _iter205 : struct.workers) + for (WorkerSummary _iter153 : struct.workers) { - _iter205.write(oprot); + _iter153.write(oprot); } } { oprot.writeI32(struct.workerMetric.size()); - for (Map.Entry<String, MetricInfo> _iter206 : struct.workerMetric.entrySet()) + for (Map.Entry<String, MetricInfo> _iter154 : struct.workerMetric.entrySet()) { - oprot.writeString(_iter206.getKey()); - _iter206.getValue().write(oprot); + oprot.writeString(_iter154.getKey()); + _iter154.getValue().write(oprot); } } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkers struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorWorkers struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.supervisor = new SupervisorSummary(); struct.supervisor.read(iprot); struct.set_supervisor_isSet(true); { - org.apache.thrift.protocol.TList _list207 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.workers = new ArrayList<WorkerSummary>(_list207.size); - WorkerSummary _elem208; - for (int _i209 = 0; _i209 < _list207.size; ++_i209) + org.apache.thrift.protocol.TList _list155 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.workers = new ArrayList<WorkerSummary>(_list155.size); + WorkerSummary _elem156; + for (int _i157 = 0; _i157 < _list155.size; ++_i157) { - _elem208 = new WorkerSummary(); - _elem208.read(iprot); - struct.workers.add(_elem208); + _elem156 = new WorkerSummary(); + _elem156.read(iprot); + struct.workers.add(_elem156); } } struct.set_workers_isSet(true); { - org.apache.thrift.protocol.TMap _map210 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.workerMetric = new HashMap<String,MetricInfo>(2*_map210.size); - String _key211; - MetricInfo _val212; - for (int _i213 = 0; _i213 < _map210.size; ++_i213) + org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.workerMetric = new HashMap<String,MetricInfo>(2*_map158.size); + String _key159; + MetricInfo _val160; + for (int _i161 = 0; _i161 < _map158.size; ++_i161) { - _key211 = iprot.readString(); - _val212 = new MetricInfo(); - _val212.read(iprot); - struct.workerMetric.put(_key211, _val212); + _key159 = iprot.readString(); + _val160 = new MetricInfo(); + _val160.read(iprot); + struct.workerMetric.put(_key159, _val160); } } struct.set_workerMetric_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/TaskComponent.java ---------------------------------------------------------------------- diff --git a/jstorm-core/src/main/java/backtype/storm/generated/TaskComponent.java b/jstorm-core/src/main/java/backtype/storm/generated/TaskComponent.java index 53603fe..ac6cfc6 100644 --- a/jstorm-core/src/main/java/backtype/storm/generated/TaskComponent.java +++ b/jstorm-core/src/main/java/backtype/storm/generated/TaskComponent.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20") public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, TaskComponent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskComponent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskComponent"); @@ -339,11 +339,11 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException { schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException { schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @@ -367,14 +367,14 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields if (!is_set_taskId()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'taskId' is unset! Struct:" + toString()); } if (!is_set_component()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'component' is unset! Struct:" + toString()); + throw new TProtocolException("Required field 'component' is unset! Struct:" + toString()); } // check for sub-struct validity @@ -383,7 +383,7 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -393,7 +393,7 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas // 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; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { + } catch (TException te) { throw new java.io.IOException(te); } } @@ -406,7 +406,7 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas private static class TaskComponentStandardScheme extends StandardScheme<TaskComponent> { - public void read(org.apache.thrift.protocol.TProtocol iprot, TaskComponent struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, TaskComponent struct) throws TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -441,7 +441,7 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, TaskComponent struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, TaskComponent struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -468,14 +468,14 @@ public class TaskComponent implements org.apache.thrift.TBase<TaskComponent, Tas private static class TaskComponentTupleScheme extends TupleScheme<TaskComponent> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, TaskComponent struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, TaskComponent struct) throws TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeI32(struct.taskId); oprot.writeString(struct.component); } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, TaskComponent struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, TaskComponent struct) throws TException { TTupleProtocol iprot = (TTupleProtocol) prot; struct.taskId = iprot.readI32(); struct.set_taskId_isSet(true);
