You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/10/05 23:00:59 UTC
[27/37] storm git commit: Merge remote-tracking branch
'apache/master' into storm-820-agg-stats-on-nimbus
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Credentials.java
index 0578d45,8484b18..b7d0ee6
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
@@@ -365,15 -365,15 +365,15 @@@
case 1: // CREDS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map442 = iprot.readMapBegin();
- struct.creds = new HashMap<String,String>(2*_map442.size);
- String _key443;
- String _val444;
- for (int _i445 = 0; _i445 < _map442.size; ++_i445)
- org.apache.thrift.protocol.TMap _map344 = iprot.readMapBegin();
- struct.creds = new HashMap<String,String>(2*_map344.size);
- String _key345;
- String _val346;
- for (int _i347 = 0; _i347 < _map344.size; ++_i347)
++ org.apache.thrift.protocol.TMap _map460 = iprot.readMapBegin();
++ struct.creds = new HashMap<String,String>(2*_map460.size);
++ String _key461;
++ String _val462;
++ for (int _i463 = 0; _i463 < _map460.size; ++_i463)
{
- _key443 = iprot.readString();
- _val444 = iprot.readString();
- struct.creds.put(_key443, _val444);
- _key345 = iprot.readString();
- _val346 = iprot.readString();
- struct.creds.put(_key345, _val346);
++ _key461 = iprot.readString();
++ _val462 = iprot.readString();
++ struct.creds.put(_key461, _val462);
}
iprot.readMapEnd();
}
@@@ -399,10 -399,10 +399,10 @@@
oprot.writeFieldBegin(CREDS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
- for (Map.Entry<String, String> _iter446 : struct.creds.entrySet())
- for (Map.Entry<String, String> _iter348 : struct.creds.entrySet())
++ for (Map.Entry<String, String> _iter464 : struct.creds.entrySet())
{
- oprot.writeString(_iter446.getKey());
- oprot.writeString(_iter446.getValue());
- oprot.writeString(_iter348.getKey());
- oprot.writeString(_iter348.getValue());
++ oprot.writeString(_iter464.getKey());
++ oprot.writeString(_iter464.getValue());
}
oprot.writeMapEnd();
}
@@@ -427,10 -427,10 +427,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.creds.size());
- for (Map.Entry<String, String> _iter447 : struct.creds.entrySet())
- for (Map.Entry<String, String> _iter349 : struct.creds.entrySet())
++ for (Map.Entry<String, String> _iter465 : struct.creds.entrySet())
{
- oprot.writeString(_iter447.getKey());
- oprot.writeString(_iter447.getValue());
- oprot.writeString(_iter349.getKey());
- oprot.writeString(_iter349.getValue());
++ oprot.writeString(_iter465.getKey());
++ oprot.writeString(_iter465.getValue());
}
}
}
@@@ -439,15 -439,15 +439,15 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map448 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.creds = new HashMap<String,String>(2*_map448.size);
- String _key449;
- String _val450;
- for (int _i451 = 0; _i451 < _map448.size; ++_i451)
- org.apache.thrift.protocol.TMap _map350 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.creds = new HashMap<String,String>(2*_map350.size);
- String _key351;
- String _val352;
- for (int _i353 = 0; _i353 < _map350.size; ++_i353)
++ org.apache.thrift.protocol.TMap _map466 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
++ struct.creds = new HashMap<String,String>(2*_map466.size);
++ String _key467;
++ String _val468;
++ for (int _i469 = 0; _i469 < _map466.size; ++_i469)
{
- _key449 = iprot.readString();
- _val450 = iprot.readString();
- struct.creds.put(_key449, _val450);
- _key351 = iprot.readString();
- _val352 = iprot.readString();
- struct.creds.put(_key351, _val352);
++ _key467 = iprot.readString();
++ _val468 = iprot.readString();
++ struct.creds.put(_key467, _val468);
}
}
struct.set_creds_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/DebugOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/DebugOptions.java
index 0000000,60c0e24..b45ab20
mode 000000,100644..100644
--- a/storm-core/src/jvm/backtype/storm/generated/DebugOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DebugOptions.java
@@@ -1,0 -1,506 +1,506 @@@
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ /**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+ package backtype.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.2)", date = "2015-8-24")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
+ public class DebugOptions implements org.apache.thrift.TBase<DebugOptions, DebugOptions._Fields>, java.io.Serializable, Cloneable, Comparable<DebugOptions> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DebugOptions");
+
+ private static final org.apache.thrift.protocol.TField ENABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("enable", org.apache.thrift.protocol.TType.BOOL, (short)1);
+ private static final org.apache.thrift.protocol.TField SAMPLINGPCT_FIELD_DESC = new org.apache.thrift.protocol.TField("samplingpct", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new DebugOptionsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new DebugOptionsTupleSchemeFactory());
+ }
+
+ private boolean enable; // optional
+ private double samplingpct; // 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 {
+ ENABLE((short)1, "enable"),
+ SAMPLINGPCT((short)2, "samplingpct");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // ENABLE
+ return ENABLE;
+ case 2: // SAMPLINGPCT
+ return SAMPLINGPCT;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new 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) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __ENABLE_ISSET_ID = 0;
+ private static final int __SAMPLINGPCT_ISSET_ID = 1;
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.ENABLE,_Fields.SAMPLINGPCT};
+ 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.ENABLE, new org.apache.thrift.meta_data.FieldMetaData("enable", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.SAMPLINGPCT, new org.apache.thrift.meta_data.FieldMetaData("samplingpct", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DebugOptions.class, metaDataMap);
+ }
+
+ public DebugOptions() {
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public DebugOptions(DebugOptions other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.enable = other.enable;
+ this.samplingpct = other.samplingpct;
+ }
+
+ public DebugOptions deepCopy() {
+ return new DebugOptions(this);
+ }
+
+ @Override
+ public void clear() {
+ set_enable_isSet(false);
+ this.enable = false;
+ set_samplingpct_isSet(false);
+ this.samplingpct = 0.0;
+ }
+
+ public boolean is_enable() {
+ return this.enable;
+ }
+
+ public void set_enable(boolean enable) {
+ this.enable = enable;
+ set_enable_isSet(true);
+ }
+
+ public void unset_enable() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENABLE_ISSET_ID);
+ }
+
+ /** Returns true if field enable is set (has been assigned a value) and false otherwise */
+ public boolean is_set_enable() {
+ return EncodingUtils.testBit(__isset_bitfield, __ENABLE_ISSET_ID);
+ }
+
+ public void set_enable_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENABLE_ISSET_ID, value);
+ }
+
+ public double get_samplingpct() {
+ return this.samplingpct;
+ }
+
+ public void set_samplingpct(double samplingpct) {
+ this.samplingpct = samplingpct;
+ set_samplingpct_isSet(true);
+ }
+
+ public void unset_samplingpct() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
+ }
+
+ /** Returns true if field samplingpct is set (has been assigned a value) and false otherwise */
+ public boolean is_set_samplingpct() {
+ return EncodingUtils.testBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID);
+ }
+
+ public void set_samplingpct_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SAMPLINGPCT_ISSET_ID, value);
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case ENABLE:
+ if (value == null) {
+ unset_enable();
+ } else {
+ set_enable((Boolean)value);
+ }
+ break;
+
+ case SAMPLINGPCT:
+ if (value == null) {
+ unset_samplingpct();
+ } else {
+ set_samplingpct((Double)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case ENABLE:
+ return Boolean.valueOf(is_enable());
+
+ case SAMPLINGPCT:
+ return Double.valueOf(get_samplingpct());
+
+ }
+ throw new 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();
+ }
+
+ switch (field) {
+ case ENABLE:
+ return is_set_enable();
+ case SAMPLINGPCT:
+ return is_set_samplingpct();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof DebugOptions)
+ return this.equals((DebugOptions)that);
+ return false;
+ }
+
+ public boolean equals(DebugOptions that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_enable = true && this.is_set_enable();
+ boolean that_present_enable = true && that.is_set_enable();
+ if (this_present_enable || that_present_enable) {
+ if (!(this_present_enable && that_present_enable))
+ return false;
+ if (this.enable != that.enable)
+ return false;
+ }
+
+ boolean this_present_samplingpct = true && this.is_set_samplingpct();
+ boolean that_present_samplingpct = true && that.is_set_samplingpct();
+ if (this_present_samplingpct || that_present_samplingpct) {
+ if (!(this_present_samplingpct && that_present_samplingpct))
+ return false;
+ if (this.samplingpct != that.samplingpct)
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_enable = true && (is_set_enable());
+ list.add(present_enable);
+ if (present_enable)
+ list.add(enable);
+
+ boolean present_samplingpct = true && (is_set_samplingpct());
+ list.add(present_samplingpct);
+ if (present_samplingpct)
+ list.add(samplingpct);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(DebugOptions other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_enable()).compareTo(other.is_set_enable());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_enable()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.enable, other.enable);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_samplingpct()).compareTo(other.is_set_samplingpct());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_samplingpct()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.samplingpct, other.samplingpct);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().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);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("DebugOptions(");
+ boolean first = true;
+
+ if (is_set_enable()) {
+ sb.append("enable:");
+ sb.append(this.enable);
+ first = false;
+ }
+ if (is_set_samplingpct()) {
+ if (!first) sb.append(", ");
+ sb.append("samplingpct:");
+ sb.append(this.samplingpct);
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, 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;
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class DebugOptionsStandardSchemeFactory implements SchemeFactory {
+ public DebugOptionsStandardScheme getScheme() {
+ return new DebugOptionsStandardScheme();
+ }
+ }
+
+ private static class DebugOptionsStandardScheme extends StandardScheme<DebugOptions> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DebugOptions struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // ENABLE
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.enable = iprot.readBool();
+ struct.set_enable_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // SAMPLINGPCT
+ if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
+ struct.samplingpct = iprot.readDouble();
+ struct.set_samplingpct_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, DebugOptions struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.is_set_enable()) {
+ oprot.writeFieldBegin(ENABLE_FIELD_DESC);
+ oprot.writeBool(struct.enable);
+ oprot.writeFieldEnd();
+ }
+ if (struct.is_set_samplingpct()) {
+ oprot.writeFieldBegin(SAMPLINGPCT_FIELD_DESC);
+ oprot.writeDouble(struct.samplingpct);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class DebugOptionsTupleSchemeFactory implements SchemeFactory {
+ public DebugOptionsTupleScheme getScheme() {
+ return new DebugOptionsTupleScheme();
+ }
+ }
+
+ private static class DebugOptionsTupleScheme extends TupleScheme<DebugOptions> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, DebugOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_enable()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_samplingpct()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_enable()) {
+ oprot.writeBool(struct.enable);
+ }
+ if (struct.is_set_samplingpct()) {
+ oprot.writeDouble(struct.samplingpct);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, DebugOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.enable = iprot.readBool();
+ struct.set_enable_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.samplingpct = iprot.readDouble();
+ struct.set_samplingpct_isSet(true);
+ }
+ }
+ }
+
+ }
+
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index 001fcff,58a7936..7c36e93
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@@ -51,7 -51,7 +51,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-3-5")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
index 1eee4f6,fd9740b..b7af5ca
--- a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers");
@@@ -365,15 -365,15 +365,15 @@@
case 1: // APPROVED_WORKERS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map570 = iprot.readMapBegin();
- struct.approved_workers = new HashMap<String,Integer>(2*_map570.size);
- String _key571;
- int _val572;
- for (int _i573 = 0; _i573 < _map570.size; ++_i573)
- org.apache.thrift.protocol.TMap _map482 = iprot.readMapBegin();
- struct.approved_workers = new HashMap<String,Integer>(2*_map482.size);
- String _key483;
- int _val484;
- for (int _i485 = 0; _i485 < _map482.size; ++_i485)
++ org.apache.thrift.protocol.TMap _map598 = iprot.readMapBegin();
++ struct.approved_workers = new HashMap<String,Integer>(2*_map598.size);
++ String _key599;
++ int _val600;
++ for (int _i601 = 0; _i601 < _map598.size; ++_i601)
{
- _key571 = iprot.readString();
- _val572 = iprot.readI32();
- struct.approved_workers.put(_key571, _val572);
- _key483 = iprot.readString();
- _val484 = iprot.readI32();
- struct.approved_workers.put(_key483, _val484);
++ _key599 = iprot.readString();
++ _val600 = iprot.readI32();
++ struct.approved_workers.put(_key599, _val600);
}
iprot.readMapEnd();
}
@@@ -399,10 -399,10 +399,10 @@@
oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size()));
- for (Map.Entry<String, Integer> _iter574 : struct.approved_workers.entrySet())
- for (Map.Entry<String, Integer> _iter486 : struct.approved_workers.entrySet())
++ for (Map.Entry<String, Integer> _iter602 : struct.approved_workers.entrySet())
{
- oprot.writeString(_iter574.getKey());
- oprot.writeI32(_iter574.getValue());
- oprot.writeString(_iter486.getKey());
- oprot.writeI32(_iter486.getValue());
++ oprot.writeString(_iter602.getKey());
++ oprot.writeI32(_iter602.getValue());
}
oprot.writeMapEnd();
}
@@@ -427,10 -427,10 +427,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.approved_workers.size());
- for (Map.Entry<String, Integer> _iter575 : struct.approved_workers.entrySet())
- for (Map.Entry<String, Integer> _iter487 : struct.approved_workers.entrySet())
++ for (Map.Entry<String, Integer> _iter603 : struct.approved_workers.entrySet())
{
- oprot.writeString(_iter575.getKey());
- oprot.writeI32(_iter575.getValue());
- oprot.writeString(_iter487.getKey());
- oprot.writeI32(_iter487.getValue());
++ oprot.writeString(_iter603.getKey());
++ oprot.writeI32(_iter603.getValue());
}
}
}
@@@ -439,15 -439,15 +439,15 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map576 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.approved_workers = new HashMap<String,Integer>(2*_map576.size);
- String _key577;
- int _val578;
- for (int _i579 = 0; _i579 < _map576.size; ++_i579)
- org.apache.thrift.protocol.TMap _map488 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.approved_workers = new HashMap<String,Integer>(2*_map488.size);
- String _key489;
- int _val490;
- for (int _i491 = 0; _i491 < _map488.size; ++_i491)
++ org.apache.thrift.protocol.TMap _map604 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
++ struct.approved_workers = new HashMap<String,Integer>(2*_map604.size);
++ String _key605;
++ int _val606;
++ for (int _i607 = 0; _i607 < _map604.size; ++_i607)
{
- _key577 = iprot.readString();
- _val578 = iprot.readI32();
- struct.approved_workers.put(_key577, _val578);
- _key489 = iprot.readString();
- _val490 = iprot.readI32();
- struct.approved_workers.put(_key489, _val490);
++ _key605 = iprot.readString();
++ _val606 = iprot.readI32();
++ struct.approved_workers.put(_key605, _val606);
}
}
struct.set_approved_workers_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
index 40f5a50,1d85cec..728a533
--- a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments");
@@@ -376,16 -376,16 +376,16 @@@
case 1: // ASSIGNMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map580 = iprot.readMapBegin();
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map580.size);
- int _key581;
- LocalAssignment _val582;
- for (int _i583 = 0; _i583 < _map580.size; ++_i583)
- org.apache.thrift.protocol.TMap _map492 = iprot.readMapBegin();
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map492.size);
- int _key493;
- LocalAssignment _val494;
- for (int _i495 = 0; _i495 < _map492.size; ++_i495)
++ org.apache.thrift.protocol.TMap _map608 = iprot.readMapBegin();
++ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map608.size);
++ int _key609;
++ LocalAssignment _val610;
++ for (int _i611 = 0; _i611 < _map608.size; ++_i611)
{
- _key581 = iprot.readI32();
- _val582 = new LocalAssignment();
- _val582.read(iprot);
- struct.assignments.put(_key581, _val582);
- _key493 = iprot.readI32();
- _val494 = new LocalAssignment();
- _val494.read(iprot);
- struct.assignments.put(_key493, _val494);
++ _key609 = iprot.readI32();
++ _val610 = new LocalAssignment();
++ _val610.read(iprot);
++ struct.assignments.put(_key609, _val610);
}
iprot.readMapEnd();
}
@@@ -411,10 -411,10 +411,10 @@@
oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size()));
- for (Map.Entry<Integer, LocalAssignment> _iter584 : struct.assignments.entrySet())
- for (Map.Entry<Integer, LocalAssignment> _iter496 : struct.assignments.entrySet())
++ for (Map.Entry<Integer, LocalAssignment> _iter612 : struct.assignments.entrySet())
{
- oprot.writeI32(_iter584.getKey());
- _iter584.getValue().write(oprot);
- oprot.writeI32(_iter496.getKey());
- _iter496.getValue().write(oprot);
++ oprot.writeI32(_iter612.getKey());
++ _iter612.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@@ -439,10 -439,10 +439,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.assignments.size());
- for (Map.Entry<Integer, LocalAssignment> _iter585 : struct.assignments.entrySet())
- for (Map.Entry<Integer, LocalAssignment> _iter497 : struct.assignments.entrySet())
++ for (Map.Entry<Integer, LocalAssignment> _iter613 : struct.assignments.entrySet())
{
- oprot.writeI32(_iter585.getKey());
- _iter585.getValue().write(oprot);
- oprot.writeI32(_iter497.getKey());
- _iter497.getValue().write(oprot);
++ oprot.writeI32(_iter613.getKey());
++ _iter613.getValue().write(oprot);
}
}
}
@@@ -451,16 -451,16 +451,16 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map586 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map586.size);
- int _key587;
- LocalAssignment _val588;
- for (int _i589 = 0; _i589 < _map586.size; ++_i589)
- org.apache.thrift.protocol.TMap _map498 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map498.size);
- int _key499;
- LocalAssignment _val500;
- for (int _i501 = 0; _i501 < _map498.size; ++_i501)
++ org.apache.thrift.protocol.TMap _map614 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map614.size);
++ int _key615;
++ LocalAssignment _val616;
++ for (int _i617 = 0; _i617 < _map614.size; ++_i617)
{
- _key587 = iprot.readI32();
- _val588 = new LocalAssignment();
- _val588.read(iprot);
- struct.assignments.put(_key587, _val588);
- _key499 = iprot.readI32();
- _val500 = new LocalAssignment();
- _val500.read(iprot);
- struct.assignments.put(_key499, _val500);
++ _key615 = iprot.readI32();
++ _val616 = new LocalAssignment();
++ _val616.read(iprot);
++ struct.assignments.put(_key615, _val616);
}
}
struct.set_assignments_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
index a473d50,98726cc..6c88563
--- a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat");
@@@ -638,14 -638,14 +638,14 @@@
case 3: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list590 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list590.size);
- ExecutorInfo _elem591;
- for (int _i592 = 0; _i592 < _list590.size; ++_i592)
- org.apache.thrift.protocol.TList _list502 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list502.size);
- ExecutorInfo _elem503;
- for (int _i504 = 0; _i504 < _list502.size; ++_i504)
++ org.apache.thrift.protocol.TList _list618 = iprot.readListBegin();
++ struct.executors = new ArrayList<ExecutorInfo>(_list618.size);
++ ExecutorInfo _elem619;
++ for (int _i620 = 0; _i620 < _list618.size; ++_i620)
{
- _elem591 = new ExecutorInfo();
- _elem591.read(iprot);
- struct.executors.add(_elem591);
- _elem503 = new ExecutorInfo();
- _elem503.read(iprot);
- struct.executors.add(_elem503);
++ _elem619 = new ExecutorInfo();
++ _elem619.read(iprot);
++ struct.executors.add(_elem619);
}
iprot.readListEnd();
}
@@@ -687,9 -687,9 +687,9 @@@
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorInfo _iter593 : struct.executors)
- for (ExecutorInfo _iter505 : struct.executors)
++ for (ExecutorInfo _iter621 : struct.executors)
{
- _iter593.write(oprot);
- _iter505.write(oprot);
++ _iter621.write(oprot);
}
oprot.writeListEnd();
}
@@@ -719,9 -719,9 +719,9 @@@
oprot.writeString(struct.topology_id);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorInfo _iter594 : struct.executors)
- for (ExecutorInfo _iter506 : struct.executors)
++ for (ExecutorInfo _iter622 : struct.executors)
{
- _iter594.write(oprot);
- _iter506.write(oprot);
++ _iter622.write(oprot);
}
}
oprot.writeI32(struct.port);
@@@ -735,14 -735,14 +735,14 @@@
struct.topology_id = iprot.readString();
struct.set_topology_id_isSet(true);
{
- org.apache.thrift.protocol.TList _list595 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list595.size);
- ExecutorInfo _elem596;
- for (int _i597 = 0; _i597 < _list595.size; ++_i597)
- org.apache.thrift.protocol.TList _list507 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list507.size);
- ExecutorInfo _elem508;
- for (int _i509 = 0; _i509 < _list507.size; ++_i509)
++ org.apache.thrift.protocol.TList _list623 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.executors = new ArrayList<ExecutorInfo>(_list623.size);
++ ExecutorInfo _elem624;
++ for (int _i625 = 0; _i625 < _list623.size; ++_i625)
{
- _elem596 = new ExecutorInfo();
- _elem596.read(iprot);
- struct.executors.add(_elem596);
- _elem508 = new ExecutorInfo();
- _elem508.read(iprot);
- struct.executors.add(_elem508);
++ _elem624 = new ExecutorInfo();
++ _elem624.read(iprot);
++ struct.executors.add(_elem624);
}
}
struct.set_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
index 97443d2,d985cba..65068bc
--- a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment");
@@@ -464,14 -464,14 +464,14 @@@
case 2: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list562 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list562.size);
- ExecutorInfo _elem563;
- for (int _i564 = 0; _i564 < _list562.size; ++_i564)
- org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list474.size);
- ExecutorInfo _elem475;
- for (int _i476 = 0; _i476 < _list474.size; ++_i476)
++ org.apache.thrift.protocol.TList _list590 = iprot.readListBegin();
++ struct.executors = new ArrayList<ExecutorInfo>(_list590.size);
++ ExecutorInfo _elem591;
++ for (int _i592 = 0; _i592 < _list590.size; ++_i592)
{
- _elem563 = new ExecutorInfo();
- _elem563.read(iprot);
- struct.executors.add(_elem563);
- _elem475 = new ExecutorInfo();
- _elem475.read(iprot);
- struct.executors.add(_elem475);
++ _elem591 = new ExecutorInfo();
++ _elem591.read(iprot);
++ struct.executors.add(_elem591);
}
iprot.readListEnd();
}
@@@ -502,9 -502,9 +502,9 @@@
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorInfo _iter565 : struct.executors)
- for (ExecutorInfo _iter477 : struct.executors)
++ for (ExecutorInfo _iter593 : struct.executors)
{
- _iter565.write(oprot);
- _iter477.write(oprot);
++ _iter593.write(oprot);
}
oprot.writeListEnd();
}
@@@ -530,9 -530,9 +530,9 @@@
oprot.writeString(struct.topology_id);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorInfo _iter566 : struct.executors)
- for (ExecutorInfo _iter478 : struct.executors)
++ for (ExecutorInfo _iter594 : struct.executors)
{
- _iter566.write(oprot);
- _iter478.write(oprot);
++ _iter594.write(oprot);
}
}
}
@@@ -543,14 -543,14 +543,14 @@@
struct.topology_id = iprot.readString();
struct.set_topology_id_isSet(true);
{
- org.apache.thrift.protocol.TList _list567 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list567.size);
- ExecutorInfo _elem568;
- for (int _i569 = 0; _i569 < _list567.size; ++_i569)
- org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list479.size);
- ExecutorInfo _elem480;
- for (int _i481 = 0; _i481 < _list479.size; ++_i481)
++ org.apache.thrift.protocol.TList _list595 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.executors = new ArrayList<ExecutorInfo>(_list595.size);
++ ExecutorInfo _elem596;
++ for (int _i597 = 0; _i597 < _list595.size; ++_i597)
{
- _elem568 = new ExecutorInfo();
- _elem568.read(iprot);
- struct.executors.add(_elem568);
- _elem480 = new ExecutorInfo();
- _elem480.read(iprot);
- struct.executors.add(_elem480);
++ _elem596 = new ExecutorInfo();
++ _elem596.read(iprot);
++ struct.executors.add(_elem596);
}
}
struct.set_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
index ddf8556,0ce2d7a..1589379
--- a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData");
@@@ -376,16 -376,16 +376,16 @@@
case 1: // SERIALIZED_PARTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map552 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map552.size);
- String _key553;
- ThriftSerializedObject _val554;
- for (int _i555 = 0; _i555 < _map552.size; ++_i555)
- org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map464.size);
- String _key465;
- ThriftSerializedObject _val466;
- for (int _i467 = 0; _i467 < _map464.size; ++_i467)
++ org.apache.thrift.protocol.TMap _map580 = iprot.readMapBegin();
++ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map580.size);
++ String _key581;
++ ThriftSerializedObject _val582;
++ for (int _i583 = 0; _i583 < _map580.size; ++_i583)
{
- _key553 = iprot.readString();
- _val554 = new ThriftSerializedObject();
- _val554.read(iprot);
- struct.serialized_parts.put(_key553, _val554);
- _key465 = iprot.readString();
- _val466 = new ThriftSerializedObject();
- _val466.read(iprot);
- struct.serialized_parts.put(_key465, _val466);
++ _key581 = iprot.readString();
++ _val582 = new ThriftSerializedObject();
++ _val582.read(iprot);
++ struct.serialized_parts.put(_key581, _val582);
}
iprot.readMapEnd();
}
@@@ -411,10 -411,10 +411,10 @@@
oprot.writeFieldBegin(SERIALIZED_PARTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.serialized_parts.size()));
- for (Map.Entry<String, ThriftSerializedObject> _iter556 : struct.serialized_parts.entrySet())
- for (Map.Entry<String, ThriftSerializedObject> _iter468 : struct.serialized_parts.entrySet())
++ for (Map.Entry<String, ThriftSerializedObject> _iter584 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter556.getKey());
- _iter556.getValue().write(oprot);
- oprot.writeString(_iter468.getKey());
- _iter468.getValue().write(oprot);
++ oprot.writeString(_iter584.getKey());
++ _iter584.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@@ -439,10 -439,10 +439,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.serialized_parts.size());
- for (Map.Entry<String, ThriftSerializedObject> _iter557 : struct.serialized_parts.entrySet())
- for (Map.Entry<String, ThriftSerializedObject> _iter469 : struct.serialized_parts.entrySet())
++ for (Map.Entry<String, ThriftSerializedObject> _iter585 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter557.getKey());
- _iter557.getValue().write(oprot);
- oprot.writeString(_iter469.getKey());
- _iter469.getValue().write(oprot);
++ oprot.writeString(_iter585.getKey());
++ _iter585.getValue().write(oprot);
}
}
}
@@@ -451,16 -451,16 +451,16 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map558 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map558.size);
- String _key559;
- ThriftSerializedObject _val560;
- for (int _i561 = 0; _i561 < _map558.size; ++_i561)
- org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map470.size);
- String _key471;
- ThriftSerializedObject _val472;
- for (int _i473 = 0; _i473 < _map470.size; ++_i473)
++ org.apache.thrift.protocol.TMap _map586 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map586.size);
++ String _key587;
++ ThriftSerializedObject _val588;
++ for (int _i589 = 0; _i589 < _map586.size; ++_i589)
{
- _key559 = iprot.readString();
- _val560 = new ThriftSerializedObject();
- _val560.read(iprot);
- struct.serialized_parts.put(_key559, _val560);
- _key471 = iprot.readString();
- _val472 = new ThriftSerializedObject();
- _val472.read(iprot);
- struct.serialized_parts.put(_key471, _val472);
++ _key587 = iprot.readString();
++ _val588 = new ThriftSerializedObject();
++ _val588.read(iprot);
++ struct.serialized_parts.put(_key587, _val588);
}
}
struct.set_serialized_parts_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index 207392e,3a5d5df..e54491c
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-24")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class Nimbus {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/NimbusSummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NimbusSummary.java
index 0000000,1d0f3fb..50c2332
mode 000000,100644..100644
--- a/storm-core/src/jvm/backtype/storm/generated/NimbusSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NimbusSummary.java
@@@ -1,0 -1,796 +1,796 @@@
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ /**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+ package backtype.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.2)", date = "2015-3-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
+ public class NimbusSummary implements org.apache.thrift.TBase<NimbusSummary, NimbusSummary._Fields>, java.io.Serializable, Cloneable, Comparable<NimbusSummary> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NimbusSummary");
+
+ 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 PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (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 IS_LEADER_FIELD_DESC = new org.apache.thrift.protocol.TField("isLeader", org.apache.thrift.protocol.TType.BOOL, (short)4);
+ private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)5);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new NimbusSummaryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new NimbusSummaryTupleSchemeFactory());
+ }
+
+ private String host; // required
+ private int port; // required
+ private int uptime_secs; // required
+ private boolean isLeader; // required
+ private String version; // 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"),
+ PORT((short)2, "port"),
+ UPTIME_SECS((short)3, "uptime_secs"),
+ IS_LEADER((short)4, "isLeader"),
+ VERSION((short)5, "version");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // HOST
+ return HOST;
+ case 2: // PORT
+ return PORT;
+ case 3: // UPTIME_SECS
+ return UPTIME_SECS;
+ case 4: // IS_LEADER
+ return IS_LEADER;
+ case 5: // VERSION
+ return VERSION;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new 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) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __PORT_ISSET_ID = 0;
+ private static final int __UPTIME_SECS_ISSET_ID = 1;
+ private static final int __ISLEADER_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.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.IS_LEADER, new org.apache.thrift.meta_data.FieldMetaData("isLeader", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NimbusSummary.class, metaDataMap);
+ }
+
+ public NimbusSummary() {
+ }
+
+ public NimbusSummary(
+ String host,
+ int port,
+ int uptime_secs,
+ boolean isLeader,
+ String version)
+ {
+ this();
+ this.host = host;
+ this.port = port;
+ set_port_isSet(true);
+ this.uptime_secs = uptime_secs;
+ set_uptime_secs_isSet(true);
+ this.isLeader = isLeader;
+ set_isLeader_isSet(true);
+ this.version = version;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public NimbusSummary(NimbusSummary other) {
+ __isset_bitfield = other.__isset_bitfield;
+ if (other.is_set_host()) {
+ this.host = other.host;
+ }
+ this.port = other.port;
+ this.uptime_secs = other.uptime_secs;
+ this.isLeader = other.isLeader;
+ if (other.is_set_version()) {
+ this.version = other.version;
+ }
+ }
+
+ public NimbusSummary deepCopy() {
+ return new NimbusSummary(this);
+ }
+
+ @Override
+ public void clear() {
+ this.host = null;
+ set_port_isSet(false);
+ this.port = 0;
+ set_uptime_secs_isSet(false);
+ this.uptime_secs = 0;
+ set_isLeader_isSet(false);
+ this.isLeader = false;
+ this.version = null;
+ }
+
+ public String get_host() {
+ return this.host;
+ }
+
+ public void set_host(String host) {
+ this.host = host;
+ }
+
+ public void unset_host() {
+ this.host = null;
+ }
+
+ /** Returns true if field host is set (has been assigned a value) and false otherwise */
+ public boolean is_set_host() {
+ return this.host != null;
+ }
+
+ public void set_host_isSet(boolean value) {
+ if (!value) {
+ this.host = null;
+ }
+ }
+
+ public int get_port() {
+ return this.port;
+ }
+
+ public void set_port(int port) {
+ this.port = port;
+ set_port_isSet(true);
+ }
+
+ public void unset_port() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+ }
+
+ /** Returns true if field port is set (has been assigned a value) and false otherwise */
+ public boolean is_set_port() {
+ return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+ }
+
+ public void set_port_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+ }
+
+ public int get_uptime_secs() {
+ return this.uptime_secs;
+ }
+
+ public void set_uptime_secs(int uptime_secs) {
+ this.uptime_secs = uptime_secs;
+ set_uptime_secs_isSet(true);
+ }
+
+ public void unset_uptime_secs() {
+ __isset_bitfield = 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);
+ }
+
+ public void set_uptime_secs_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+ }
+
+ public boolean is_isLeader() {
+ return this.isLeader;
+ }
+
+ public void set_isLeader(boolean isLeader) {
+ this.isLeader = isLeader;
+ set_isLeader_isSet(true);
+ }
+
+ public void unset_isLeader() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISLEADER_ISSET_ID);
+ }
+
+ /** Returns true if field isLeader is set (has been assigned a value) and false otherwise */
+ public boolean is_set_isLeader() {
+ return EncodingUtils.testBit(__isset_bitfield, __ISLEADER_ISSET_ID);
+ }
+
+ public void set_isLeader_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISLEADER_ISSET_ID, value);
+ }
+
+ public String get_version() {
+ return this.version;
+ }
+
+ public void set_version(String version) {
+ this.version = version;
+ }
+
+ public void unset_version() {
+ this.version = null;
+ }
+
+ /** Returns true if field version is set (has been assigned a value) and false otherwise */
+ public boolean is_set_version() {
+ return this.version != null;
+ }
+
+ public void set_version_isSet(boolean value) {
+ if (!value) {
+ this.version = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case HOST:
+ if (value == null) {
+ unset_host();
+ } else {
+ set_host((String)value);
+ }
+ break;
+
+ case PORT:
+ if (value == null) {
+ unset_port();
+ } else {
+ set_port((Integer)value);
+ }
+ break;
+
+ case UPTIME_SECS:
+ if (value == null) {
+ unset_uptime_secs();
+ } else {
+ set_uptime_secs((Integer)value);
+ }
+ break;
+
+ case IS_LEADER:
+ if (value == null) {
+ unset_isLeader();
+ } else {
+ set_isLeader((Boolean)value);
+ }
+ break;
+
+ case VERSION:
+ if (value == null) {
+ unset_version();
+ } else {
+ set_version((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case HOST:
+ return get_host();
+
+ case PORT:
+ return Integer.valueOf(get_port());
+
+ case UPTIME_SECS:
+ return Integer.valueOf(get_uptime_secs());
+
+ case IS_LEADER:
+ return Boolean.valueOf(is_isLeader());
+
+ case VERSION:
+ return get_version();
+
+ }
+ throw new 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();
+ }
+
+ switch (field) {
+ case HOST:
+ return is_set_host();
+ case PORT:
+ return is_set_port();
+ case UPTIME_SECS:
+ return is_set_uptime_secs();
+ case IS_LEADER:
+ return is_set_isLeader();
+ case VERSION:
+ return is_set_version();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof NimbusSummary)
+ return this.equals((NimbusSummary)that);
+ return false;
+ }
+
+ public boolean equals(NimbusSummary that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_host = true && this.is_set_host();
+ boolean that_present_host = true && that.is_set_host();
+ if (this_present_host || that_present_host) {
+ if (!(this_present_host && that_present_host))
+ return false;
+ if (!this.host.equals(that.host))
+ return false;
+ }
+
+ boolean this_present_port = true;
+ boolean that_present_port = true;
+ if (this_present_port || that_present_port) {
+ if (!(this_present_port && that_present_port))
+ return false;
+ if (this.port != that.port)
+ 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))
+ return false;
+ if (this.uptime_secs != that.uptime_secs)
+ return false;
+ }
+
+ boolean this_present_isLeader = true;
+ boolean that_present_isLeader = true;
+ if (this_present_isLeader || that_present_isLeader) {
+ if (!(this_present_isLeader && that_present_isLeader))
+ return false;
+ if (this.isLeader != that.isLeader)
+ return false;
+ }
+
+ boolean this_present_version = true && this.is_set_version();
+ boolean that_present_version = true && that.is_set_version();
+ if (this_present_version || that_present_version) {
+ if (!(this_present_version && that_present_version))
+ return false;
+ if (!this.version.equals(that.version))
+ return false;
+ }
+
+ return true;
+ }
+
+ @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_port = true;
+ list.add(present_port);
+ if (present_port)
+ list.add(port);
+
+ boolean present_uptime_secs = true;
+ list.add(present_uptime_secs);
+ if (present_uptime_secs)
+ list.add(uptime_secs);
+
+ boolean present_isLeader = true;
+ list.add(present_isLeader);
+ if (present_isLeader)
+ list.add(isLeader);
+
+ boolean present_version = true && (is_set_version());
+ list.add(present_version);
+ if (present_version)
+ list.add(version);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(NimbusSummary other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_host()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_port()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_uptime_secs()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_isLeader()).compareTo(other.is_set_isLeader());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_isLeader()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isLeader, other.isLeader);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_version()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().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);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("NimbusSummary(");
+ boolean first = true;
+
+ sb.append("host:");
+ if (this.host == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.host);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("port:");
+ sb.append(this.port);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("uptime_secs:");
+ sb.append(this.uptime_secs);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("isLeader:");
+ sb.append(this.isLeader);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("version:");
+ if (this.version == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.version);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_host()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'host' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_port()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' 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_isLeader()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'isLeader' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_version()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
+ }
+
+ // check for sub-struct validity
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, 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;
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class NimbusSummaryStandardSchemeFactory implements SchemeFactory {
+ public NimbusSummaryStandardScheme getScheme() {
+ return new NimbusSummaryStandardScheme();
+ }
+ }
+
+ private static class NimbusSummaryStandardScheme extends StandardScheme<NimbusSummary> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, NimbusSummary struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // HOST
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // PORT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.port = iprot.readI32();
+ struct.set_port_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);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // IS_LEADER
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isLeader = iprot.readBool();
+ struct.set_isLeader_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // VERSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, NimbusSummary struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.host != null) {
+ oprot.writeFieldBegin(HOST_FIELD_DESC);
+ oprot.writeString(struct.host);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(PORT_FIELD_DESC);
+ oprot.writeI32(struct.port);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(IS_LEADER_FIELD_DESC);
+ oprot.writeBool(struct.isLeader);
+ oprot.writeFieldEnd();
+ if (struct.version != null) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class NimbusSummaryTupleSchemeFactory implements SchemeFactory {
+ public NimbusSummaryTupleScheme getScheme() {
+ return new NimbusSummaryTupleScheme();
+ }
+ }
+
+ private static class NimbusSummaryTupleScheme extends TupleScheme<NimbusSummary> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, NimbusSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.host);
+ oprot.writeI32(struct.port);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeBool(struct.isLeader);
+ oprot.writeString(struct.version);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, NimbusSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ struct.port = iprot.readI32();
+ struct.set_port_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ struct.isLeader = iprot.readBool();
+ struct.set_isLeader_isSet(true);
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ }
+ }
+
+ }
+
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
index 83539ab,f272cd8..55ee3b0
--- a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
@@@ -51,7 -51,7 +51,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-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
@@@ -461,13 -461,13 +461,13 @@@
case 2: // PORT
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set478 = iprot.readSetBegin();
- struct.port = new HashSet<Long>(2*_set478.size);
- long _elem479;
- for (int _i480 = 0; _i480 < _set478.size; ++_i480)
- org.apache.thrift.protocol.TSet _set380 = iprot.readSetBegin();
- struct.port = new HashSet<Long>(2*_set380.size);
- long _elem381;
- for (int _i382 = 0; _i382 < _set380.size; ++_i382)
++ org.apache.thrift.protocol.TSet _set496 = iprot.readSetBegin();
++ struct.port = new HashSet<Long>(2*_set496.size);
++ long _elem497;
++ for (int _i498 = 0; _i498 < _set496.size; ++_i498)
{
- _elem479 = iprot.readI64();
- struct.port.add(_elem479);
- _elem381 = iprot.readI64();
- struct.port.add(_elem381);
++ _elem497 = iprot.readI64();
++ struct.port.add(_elem497);
}
iprot.readSetEnd();
}
@@@ -498,9 -498,9 +498,9 @@@
oprot.writeFieldBegin(PORT_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size()));
- for (long _iter481 : struct.port)
- for (long _iter383 : struct.port)
++ for (long _iter499 : struct.port)
{
- oprot.writeI64(_iter481);
- oprot.writeI64(_iter383);
++ oprot.writeI64(_iter499);
}
oprot.writeSetEnd();
}
@@@ -526,9 -526,9 +526,9 @@@
oprot.writeString(struct.node);
{
oprot.writeI32(struct.port.size());
- for (long _iter482 : struct.port)
- for (long _iter384 : struct.port)
++ for (long _iter500 : struct.port)
{
- oprot.writeI64(_iter482);
- oprot.writeI64(_iter384);
++ oprot.writeI64(_iter500);
}
}
}
@@@ -539,13 -539,13 +539,13 @@@
struct.node = iprot.readString();
struct.set_node_isSet(true);
{
- org.apache.thrift.protocol.TSet _set483 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.port = new HashSet<Long>(2*_set483.size);
- long _elem484;
- for (int _i485 = 0; _i485 < _set483.size; ++_i485)
- org.apache.thrift.protocol.TSet _set385 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.port = new HashSet<Long>(2*_set385.size);
- long _elem386;
- for (int _i387 = 0; _i387 < _set385.size; ++_i387)
++ org.apache.thrift.protocol.TSet _set501 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ struct.port = new HashSet<Long>(2*_set501.size);
++ long _elem502;
++ for (int _i503 = 0; _i503 < _set501.size; ++_i503)
{
- _elem484 = iprot.readI64();
- struct.port.add(_elem484);
- _elem386 = iprot.readI64();
- struct.port.add(_elem386);
++ _elem502 = iprot.readI64();
++ struct.port.add(_elem502);
}
}
struct.set_port_isSet(true);