You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/31 02:07:13 UTC
[14/20] storm git commit: STORM-2497: Let Supervisor enforce memory
and add in support for shared memory regions
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
index e3114fb..6992819 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
@@ -1171,15 +1171,15 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
case 4: // COMPONENT_EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map674 = iprot.readMapBegin();
- struct.component_executors = new HashMap<String,Integer>(2*_map674.size);
- String _key675;
- int _val676;
- for (int _i677 = 0; _i677 < _map674.size; ++_i677)
+ org.apache.thrift.protocol.TMap _map712 = iprot.readMapBegin();
+ struct.component_executors = new HashMap<String,Integer>(2*_map712.size);
+ String _key713;
+ int _val714;
+ for (int _i715 = 0; _i715 < _map712.size; ++_i715)
{
- _key675 = iprot.readString();
- _val676 = iprot.readI32();
- struct.component_executors.put(_key675, _val676);
+ _key713 = iprot.readString();
+ _val714 = iprot.readI32();
+ struct.component_executors.put(_key713, _val714);
}
iprot.readMapEnd();
}
@@ -1224,16 +1224,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
case 9: // COMPONENT_DEBUG
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map678 = iprot.readMapBegin();
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map678.size);
- String _key679;
- DebugOptions _val680;
- for (int _i681 = 0; _i681 < _map678.size; ++_i681)
+ org.apache.thrift.protocol.TMap _map716 = iprot.readMapBegin();
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map716.size);
+ String _key717;
+ DebugOptions _val718;
+ for (int _i719 = 0; _i719 < _map716.size; ++_i719)
{
- _key679 = iprot.readString();
- _val680 = new DebugOptions();
- _val680.read(iprot);
- struct.component_debug.put(_key679, _val680);
+ _key717 = iprot.readString();
+ _val718 = new DebugOptions();
+ _val718.read(iprot);
+ struct.component_debug.put(_key717, _val718);
}
iprot.readMapEnd();
}
@@ -1281,10 +1281,10 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
oprot.writeFieldBegin(COMPONENT_EXECUTORS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.component_executors.size()));
- for (Map.Entry<String, Integer> _iter682 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter720 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter682.getKey());
- oprot.writeI32(_iter682.getValue());
+ oprot.writeString(_iter720.getKey());
+ oprot.writeI32(_iter720.getValue());
}
oprot.writeMapEnd();
}
@@ -1322,10 +1322,10 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
oprot.writeFieldBegin(COMPONENT_DEBUG_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.component_debug.size()));
- for (Map.Entry<String, DebugOptions> _iter683 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter721 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter683.getKey());
- _iter683.getValue().write(oprot);
+ oprot.writeString(_iter721.getKey());
+ _iter721.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1385,10 +1385,10 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
if (struct.is_set_component_executors()) {
{
oprot.writeI32(struct.component_executors.size());
- for (Map.Entry<String, Integer> _iter684 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter722 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter684.getKey());
- oprot.writeI32(_iter684.getValue());
+ oprot.writeString(_iter722.getKey());
+ oprot.writeI32(_iter722.getValue());
}
}
}
@@ -1407,10 +1407,10 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
if (struct.is_set_component_debug()) {
{
oprot.writeI32(struct.component_debug.size());
- for (Map.Entry<String, DebugOptions> _iter685 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter723 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter685.getKey());
- _iter685.getValue().write(oprot);
+ oprot.writeString(_iter723.getKey());
+ _iter723.getValue().write(oprot);
}
}
}
@@ -1431,15 +1431,15 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map686 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.component_executors = new HashMap<String,Integer>(2*_map686.size);
- String _key687;
- int _val688;
- for (int _i689 = 0; _i689 < _map686.size; ++_i689)
+ org.apache.thrift.protocol.TMap _map724 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.component_executors = new HashMap<String,Integer>(2*_map724.size);
+ String _key725;
+ int _val726;
+ for (int _i727 = 0; _i727 < _map724.size; ++_i727)
{
- _key687 = iprot.readString();
- _val688 = iprot.readI32();
- struct.component_executors.put(_key687, _val688);
+ _key725 = iprot.readString();
+ _val726 = iprot.readI32();
+ struct.component_executors.put(_key725, _val726);
}
}
struct.set_component_executors_isSet(true);
@@ -1463,16 +1463,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TMap _map690 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map690.size);
- String _key691;
- DebugOptions _val692;
- for (int _i693 = 0; _i693 < _map690.size; ++_i693)
+ org.apache.thrift.protocol.TMap _map728 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map728.size);
+ String _key729;
+ DebugOptions _val730;
+ for (int _i731 = 0; _i731 < _map728.size; ++_i731)
{
- _key691 = iprot.readString();
- _val692 = new DebugOptions();
- _val692.read(iprot);
- struct.component_debug.put(_key691, _val692);
+ _key729 = iprot.readString();
+ _val730 = new DebugOptions();
+ _val730.read(iprot);
+ struct.component_debug.put(_key729, _val730);
}
}
struct.set_component_debug_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
index 6241d7b..7594220 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormTopology.java
@@ -63,6 +63,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
private static final org.apache.thrift.protocol.TField DEPENDENCY_ARTIFACTS_FIELD_DESC = new org.apache.thrift.protocol.TField("dependency_artifacts", org.apache.thrift.protocol.TType.LIST, (short)6);
private static final org.apache.thrift.protocol.TField STORM_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_version", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField JDK_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("jdk_version", org.apache.thrift.protocol.TType.STRING, (short)8);
+ private static final org.apache.thrift.protocol.TField COMPONENT_TO_SHARED_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("component_to_shared_memory", org.apache.thrift.protocol.TType.MAP, (short)9);
+ private static final org.apache.thrift.protocol.TField SHARED_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("shared_memory", org.apache.thrift.protocol.TType.MAP, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -78,6 +80,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
private List<String> dependency_artifacts; // optional
private String storm_version; // optional
private String jdk_version; // optional
+ private Map<String,Set<String>> component_to_shared_memory; // optional
+ private Map<String,SharedMemory> shared_memory; // 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 {
@@ -88,7 +92,9 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
DEPENDENCY_JARS((short)5, "dependency_jars"),
DEPENDENCY_ARTIFACTS((short)6, "dependency_artifacts"),
STORM_VERSION((short)7, "storm_version"),
- JDK_VERSION((short)8, "jdk_version");
+ JDK_VERSION((short)8, "jdk_version"),
+ COMPONENT_TO_SHARED_MEMORY((short)9, "component_to_shared_memory"),
+ SHARED_MEMORY((short)10, "shared_memory");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -119,6 +125,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return STORM_VERSION;
case 8: // JDK_VERSION
return JDK_VERSION;
+ case 9: // COMPONENT_TO_SHARED_MEMORY
+ return COMPONENT_TO_SHARED_MEMORY;
+ case 10: // SHARED_MEMORY
+ return SHARED_MEMORY;
default:
return null;
}
@@ -159,7 +169,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.WORKER_HOOKS,_Fields.DEPENDENCY_JARS,_Fields.DEPENDENCY_ARTIFACTS,_Fields.STORM_VERSION,_Fields.JDK_VERSION};
+ private static final _Fields optionals[] = {_Fields.WORKER_HOOKS,_Fields.DEPENDENCY_JARS,_Fields.DEPENDENCY_ARTIFACTS,_Fields.STORM_VERSION,_Fields.JDK_VERSION,_Fields.COMPONENT_TO_SHARED_MEMORY,_Fields.SHARED_MEMORY};
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);
@@ -188,6 +198,15 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.JDK_VERSION, new org.apache.thrift.meta_data.FieldMetaData("jdk_version", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.COMPONENT_TO_SHARED_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("component_to_shared_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))));
+ tmpMap.put(_Fields.SHARED_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("shared_memory", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SharedMemory.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap);
}
@@ -273,6 +292,36 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
if (other.is_set_jdk_version()) {
this.jdk_version = other.jdk_version;
}
+ if (other.is_set_component_to_shared_memory()) {
+ Map<String,Set<String>> __this__component_to_shared_memory = new HashMap<String,Set<String>>(other.component_to_shared_memory.size());
+ for (Map.Entry<String, Set<String>> other_element : other.component_to_shared_memory.entrySet()) {
+
+ String other_element_key = other_element.getKey();
+ Set<String> other_element_value = other_element.getValue();
+
+ String __this__component_to_shared_memory_copy_key = other_element_key;
+
+ Set<String> __this__component_to_shared_memory_copy_value = new HashSet<String>(other_element_value);
+
+ __this__component_to_shared_memory.put(__this__component_to_shared_memory_copy_key, __this__component_to_shared_memory_copy_value);
+ }
+ this.component_to_shared_memory = __this__component_to_shared_memory;
+ }
+ if (other.is_set_shared_memory()) {
+ Map<String,SharedMemory> __this__shared_memory = new HashMap<String,SharedMemory>(other.shared_memory.size());
+ for (Map.Entry<String, SharedMemory> other_element : other.shared_memory.entrySet()) {
+
+ String other_element_key = other_element.getKey();
+ SharedMemory other_element_value = other_element.getValue();
+
+ String __this__shared_memory_copy_key = other_element_key;
+
+ SharedMemory __this__shared_memory_copy_value = new SharedMemory(other_element_value);
+
+ __this__shared_memory.put(__this__shared_memory_copy_key, __this__shared_memory_copy_value);
+ }
+ this.shared_memory = __this__shared_memory;
+ }
}
public StormTopology deepCopy() {
@@ -289,6 +338,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
this.dependency_artifacts = null;
this.storm_version = null;
this.jdk_version = null;
+ this.component_to_shared_memory = null;
+ this.shared_memory = null;
}
public int get_spouts_size() {
@@ -553,6 +604,74 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
}
+ public int get_component_to_shared_memory_size() {
+ return (this.component_to_shared_memory == null) ? 0 : this.component_to_shared_memory.size();
+ }
+
+ public void put_to_component_to_shared_memory(String key, Set<String> val) {
+ if (this.component_to_shared_memory == null) {
+ this.component_to_shared_memory = new HashMap<String,Set<String>>();
+ }
+ this.component_to_shared_memory.put(key, val);
+ }
+
+ public Map<String,Set<String>> get_component_to_shared_memory() {
+ return this.component_to_shared_memory;
+ }
+
+ public void set_component_to_shared_memory(Map<String,Set<String>> component_to_shared_memory) {
+ this.component_to_shared_memory = component_to_shared_memory;
+ }
+
+ public void unset_component_to_shared_memory() {
+ this.component_to_shared_memory = null;
+ }
+
+ /** Returns true if field component_to_shared_memory is set (has been assigned a value) and false otherwise */
+ public boolean is_set_component_to_shared_memory() {
+ return this.component_to_shared_memory != null;
+ }
+
+ public void set_component_to_shared_memory_isSet(boolean value) {
+ if (!value) {
+ this.component_to_shared_memory = null;
+ }
+ }
+
+ public int get_shared_memory_size() {
+ return (this.shared_memory == null) ? 0 : this.shared_memory.size();
+ }
+
+ public void put_to_shared_memory(String key, SharedMemory val) {
+ if (this.shared_memory == null) {
+ this.shared_memory = new HashMap<String,SharedMemory>();
+ }
+ this.shared_memory.put(key, val);
+ }
+
+ public Map<String,SharedMemory> get_shared_memory() {
+ return this.shared_memory;
+ }
+
+ public void set_shared_memory(Map<String,SharedMemory> shared_memory) {
+ this.shared_memory = shared_memory;
+ }
+
+ public void unset_shared_memory() {
+ this.shared_memory = null;
+ }
+
+ /** Returns true if field shared_memory is set (has been assigned a value) and false otherwise */
+ public boolean is_set_shared_memory() {
+ return this.shared_memory != null;
+ }
+
+ public void set_shared_memory_isSet(boolean value) {
+ if (!value) {
+ this.shared_memory = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SPOUTS:
@@ -619,6 +738,22 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
break;
+ case COMPONENT_TO_SHARED_MEMORY:
+ if (value == null) {
+ unset_component_to_shared_memory();
+ } else {
+ set_component_to_shared_memory((Map<String,Set<String>>)value);
+ }
+ break;
+
+ case SHARED_MEMORY:
+ if (value == null) {
+ unset_shared_memory();
+ } else {
+ set_shared_memory((Map<String,SharedMemory>)value);
+ }
+ break;
+
}
}
@@ -648,6 +783,12 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
case JDK_VERSION:
return get_jdk_version();
+ case COMPONENT_TO_SHARED_MEMORY:
+ return get_component_to_shared_memory();
+
+ case SHARED_MEMORY:
+ return get_shared_memory();
+
}
throw new IllegalStateException();
}
@@ -675,6 +816,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return is_set_storm_version();
case JDK_VERSION:
return is_set_jdk_version();
+ case COMPONENT_TO_SHARED_MEMORY:
+ return is_set_component_to_shared_memory();
+ case SHARED_MEMORY:
+ return is_set_shared_memory();
}
throw new IllegalStateException();
}
@@ -764,6 +909,24 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return false;
}
+ boolean this_present_component_to_shared_memory = true && this.is_set_component_to_shared_memory();
+ boolean that_present_component_to_shared_memory = true && that.is_set_component_to_shared_memory();
+ if (this_present_component_to_shared_memory || that_present_component_to_shared_memory) {
+ if (!(this_present_component_to_shared_memory && that_present_component_to_shared_memory))
+ return false;
+ if (!this.component_to_shared_memory.equals(that.component_to_shared_memory))
+ return false;
+ }
+
+ boolean this_present_shared_memory = true && this.is_set_shared_memory();
+ boolean that_present_shared_memory = true && that.is_set_shared_memory();
+ if (this_present_shared_memory || that_present_shared_memory) {
+ if (!(this_present_shared_memory && that_present_shared_memory))
+ return false;
+ if (!this.shared_memory.equals(that.shared_memory))
+ return false;
+ }
+
return true;
}
@@ -811,6 +974,16 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
if (present_jdk_version)
list.add(jdk_version);
+ boolean present_component_to_shared_memory = true && (is_set_component_to_shared_memory());
+ list.add(present_component_to_shared_memory);
+ if (present_component_to_shared_memory)
+ list.add(component_to_shared_memory);
+
+ boolean present_shared_memory = true && (is_set_shared_memory());
+ list.add(present_shared_memory);
+ if (present_shared_memory)
+ list.add(shared_memory);
+
return list.hashCode();
}
@@ -902,6 +1075,26 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_component_to_shared_memory()).compareTo(other.is_set_component_to_shared_memory());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_component_to_shared_memory()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_to_shared_memory, other.component_to_shared_memory);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_shared_memory()).compareTo(other.is_set_shared_memory());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_shared_memory()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.shared_memory, other.shared_memory);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -995,6 +1188,26 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
first = false;
}
+ if (is_set_component_to_shared_memory()) {
+ if (!first) sb.append(", ");
+ sb.append("component_to_shared_memory:");
+ if (this.component_to_shared_memory == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.component_to_shared_memory);
+ }
+ first = false;
+ }
+ if (is_set_shared_memory()) {
+ if (!first) sb.append(", ");
+ sb.append("shared_memory:");
+ if (this.shared_memory == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.shared_memory);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1183,6 +1396,57 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 9: // COMPONENT_TO_SHARED_MEMORY
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
+ struct.component_to_shared_memory = new HashMap<String,Set<String>>(2*_map65.size);
+ String _key66;
+ Set<String> _val67;
+ for (int _i68 = 0; _i68 < _map65.size; ++_i68)
+ {
+ _key66 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TSet _set69 = iprot.readSetBegin();
+ _val67 = new HashSet<String>(2*_set69.size);
+ String _elem70;
+ for (int _i71 = 0; _i71 < _set69.size; ++_i71)
+ {
+ _elem70 = iprot.readString();
+ _val67.add(_elem70);
+ }
+ iprot.readSetEnd();
+ }
+ struct.component_to_shared_memory.put(_key66, _val67);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_component_to_shared_memory_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 10: // SHARED_MEMORY
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin();
+ struct.shared_memory = new HashMap<String,SharedMemory>(2*_map72.size);
+ String _key73;
+ SharedMemory _val74;
+ for (int _i75 = 0; _i75 < _map72.size; ++_i75)
+ {
+ _key73 = iprot.readString();
+ _val74 = new SharedMemory();
+ _val74.read(iprot);
+ struct.shared_memory.put(_key73, _val74);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_shared_memory_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1200,10 +1464,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(SPOUTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.spouts.size()));
- for (Map.Entry<String, SpoutSpec> _iter65 : struct.spouts.entrySet())
+ for (Map.Entry<String, SpoutSpec> _iter76 : struct.spouts.entrySet())
{
- oprot.writeString(_iter65.getKey());
- _iter65.getValue().write(oprot);
+ oprot.writeString(_iter76.getKey());
+ _iter76.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1213,10 +1477,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(BOLTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.bolts.size()));
- for (Map.Entry<String, Bolt> _iter66 : struct.bolts.entrySet())
+ for (Map.Entry<String, Bolt> _iter77 : struct.bolts.entrySet())
{
- oprot.writeString(_iter66.getKey());
- _iter66.getValue().write(oprot);
+ oprot.writeString(_iter77.getKey());
+ _iter77.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1226,10 +1490,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.state_spouts.size()));
- for (Map.Entry<String, StateSpoutSpec> _iter67 : struct.state_spouts.entrySet())
+ for (Map.Entry<String, StateSpoutSpec> _iter78 : struct.state_spouts.entrySet())
{
- oprot.writeString(_iter67.getKey());
- _iter67.getValue().write(oprot);
+ oprot.writeString(_iter78.getKey());
+ _iter78.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1240,9 +1504,9 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(WORKER_HOOKS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.worker_hooks.size()));
- for (ByteBuffer _iter68 : struct.worker_hooks)
+ for (ByteBuffer _iter79 : struct.worker_hooks)
{
- oprot.writeBinary(_iter68);
+ oprot.writeBinary(_iter79);
}
oprot.writeListEnd();
}
@@ -1254,9 +1518,9 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(DEPENDENCY_JARS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.dependency_jars.size()));
- for (String _iter69 : struct.dependency_jars)
+ for (String _iter80 : struct.dependency_jars)
{
- oprot.writeString(_iter69);
+ oprot.writeString(_iter80);
}
oprot.writeListEnd();
}
@@ -1268,9 +1532,9 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldBegin(DEPENDENCY_ARTIFACTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.dependency_artifacts.size()));
- for (String _iter70 : struct.dependency_artifacts)
+ for (String _iter81 : struct.dependency_artifacts)
{
- oprot.writeString(_iter70);
+ oprot.writeString(_iter81);
}
oprot.writeListEnd();
}
@@ -1291,6 +1555,43 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
oprot.writeFieldEnd();
}
}
+ if (struct.component_to_shared_memory != null) {
+ if (struct.is_set_component_to_shared_memory()) {
+ oprot.writeFieldBegin(COMPONENT_TO_SHARED_MEMORY_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, struct.component_to_shared_memory.size()));
+ for (Map.Entry<String, Set<String>> _iter82 : struct.component_to_shared_memory.entrySet())
+ {
+ oprot.writeString(_iter82.getKey());
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, _iter82.getValue().size()));
+ for (String _iter83 : _iter82.getValue())
+ {
+ oprot.writeString(_iter83);
+ }
+ oprot.writeSetEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.shared_memory != null) {
+ if (struct.is_set_shared_memory()) {
+ oprot.writeFieldBegin(SHARED_MEMORY_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.shared_memory.size()));
+ for (Map.Entry<String, SharedMemory> _iter84 : struct.shared_memory.entrySet())
+ {
+ oprot.writeString(_iter84.getKey());
+ _iter84.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1310,26 +1611,26 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.spouts.size());
- for (Map.Entry<String, SpoutSpec> _iter71 : struct.spouts.entrySet())
+ for (Map.Entry<String, SpoutSpec> _iter85 : struct.spouts.entrySet())
{
- oprot.writeString(_iter71.getKey());
- _iter71.getValue().write(oprot);
+ oprot.writeString(_iter85.getKey());
+ _iter85.getValue().write(oprot);
}
}
{
oprot.writeI32(struct.bolts.size());
- for (Map.Entry<String, Bolt> _iter72 : struct.bolts.entrySet())
+ for (Map.Entry<String, Bolt> _iter86 : struct.bolts.entrySet())
{
- oprot.writeString(_iter72.getKey());
- _iter72.getValue().write(oprot);
+ oprot.writeString(_iter86.getKey());
+ _iter86.getValue().write(oprot);
}
}
{
oprot.writeI32(struct.state_spouts.size());
- for (Map.Entry<String, StateSpoutSpec> _iter73 : struct.state_spouts.entrySet())
+ for (Map.Entry<String, StateSpoutSpec> _iter87 : struct.state_spouts.entrySet())
{
- oprot.writeString(_iter73.getKey());
- _iter73.getValue().write(oprot);
+ oprot.writeString(_iter87.getKey());
+ _iter87.getValue().write(oprot);
}
}
BitSet optionals = new BitSet();
@@ -1348,31 +1649,37 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
if (struct.is_set_jdk_version()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.is_set_component_to_shared_memory()) {
+ optionals.set(5);
+ }
+ if (struct.is_set_shared_memory()) {
+ optionals.set(6);
+ }
+ oprot.writeBitSet(optionals, 7);
if (struct.is_set_worker_hooks()) {
{
oprot.writeI32(struct.worker_hooks.size());
- for (ByteBuffer _iter74 : struct.worker_hooks)
+ for (ByteBuffer _iter88 : struct.worker_hooks)
{
- oprot.writeBinary(_iter74);
+ oprot.writeBinary(_iter88);
}
}
}
if (struct.is_set_dependency_jars()) {
{
oprot.writeI32(struct.dependency_jars.size());
- for (String _iter75 : struct.dependency_jars)
+ for (String _iter89 : struct.dependency_jars)
{
- oprot.writeString(_iter75);
+ oprot.writeString(_iter89);
}
}
}
if (struct.is_set_dependency_artifacts()) {
{
oprot.writeI32(struct.dependency_artifacts.size());
- for (String _iter76 : struct.dependency_artifacts)
+ for (String _iter90 : struct.dependency_artifacts)
{
- oprot.writeString(_iter76);
+ oprot.writeString(_iter90);
}
}
}
@@ -1382,89 +1689,115 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
if (struct.is_set_jdk_version()) {
oprot.writeString(struct.jdk_version);
}
+ if (struct.is_set_component_to_shared_memory()) {
+ {
+ oprot.writeI32(struct.component_to_shared_memory.size());
+ for (Map.Entry<String, Set<String>> _iter91 : struct.component_to_shared_memory.entrySet())
+ {
+ oprot.writeString(_iter91.getKey());
+ {
+ oprot.writeI32(_iter91.getValue().size());
+ for (String _iter92 : _iter91.getValue())
+ {
+ oprot.writeString(_iter92);
+ }
+ }
+ }
+ }
+ }
+ if (struct.is_set_shared_memory()) {
+ {
+ oprot.writeI32(struct.shared_memory.size());
+ for (Map.Entry<String, SharedMemory> _iter93 : struct.shared_memory.entrySet())
+ {
+ oprot.writeString(_iter93.getKey());
+ _iter93.getValue().write(oprot);
+ }
+ }
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map77 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.spouts = new HashMap<String,SpoutSpec>(2*_map77.size);
- String _key78;
- SpoutSpec _val79;
- for (int _i80 = 0; _i80 < _map77.size; ++_i80)
+ org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.spouts = new HashMap<String,SpoutSpec>(2*_map94.size);
+ String _key95;
+ SpoutSpec _val96;
+ for (int _i97 = 0; _i97 < _map94.size; ++_i97)
{
- _key78 = iprot.readString();
- _val79 = new SpoutSpec();
- _val79.read(iprot);
- struct.spouts.put(_key78, _val79);
+ _key95 = iprot.readString();
+ _val96 = new SpoutSpec();
+ _val96.read(iprot);
+ struct.spouts.put(_key95, _val96);
}
}
struct.set_spouts_isSet(true);
{
- org.apache.thrift.protocol.TMap _map81 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.bolts = new HashMap<String,Bolt>(2*_map81.size);
- String _key82;
- Bolt _val83;
- for (int _i84 = 0; _i84 < _map81.size; ++_i84)
+ org.apache.thrift.protocol.TMap _map98 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.bolts = new HashMap<String,Bolt>(2*_map98.size);
+ String _key99;
+ Bolt _val100;
+ for (int _i101 = 0; _i101 < _map98.size; ++_i101)
{
- _key82 = iprot.readString();
- _val83 = new Bolt();
- _val83.read(iprot);
- struct.bolts.put(_key82, _val83);
+ _key99 = iprot.readString();
+ _val100 = new Bolt();
+ _val100.read(iprot);
+ struct.bolts.put(_key99, _val100);
}
}
struct.set_bolts_isSet(true);
{
- org.apache.thrift.protocol.TMap _map85 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.state_spouts = new HashMap<String,StateSpoutSpec>(2*_map85.size);
- String _key86;
- StateSpoutSpec _val87;
- for (int _i88 = 0; _i88 < _map85.size; ++_i88)
+ org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.state_spouts = new HashMap<String,StateSpoutSpec>(2*_map102.size);
+ String _key103;
+ StateSpoutSpec _val104;
+ for (int _i105 = 0; _i105 < _map102.size; ++_i105)
{
- _key86 = iprot.readString();
- _val87 = new StateSpoutSpec();
- _val87.read(iprot);
- struct.state_spouts.put(_key86, _val87);
+ _key103 = iprot.readString();
+ _val104 = new StateSpoutSpec();
+ _val104.read(iprot);
+ struct.state_spouts.put(_key103, _val104);
}
}
struct.set_state_spouts_isSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list89 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.worker_hooks = new ArrayList<ByteBuffer>(_list89.size);
- ByteBuffer _elem90;
- for (int _i91 = 0; _i91 < _list89.size; ++_i91)
+ org.apache.thrift.protocol.TList _list106 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.worker_hooks = new ArrayList<ByteBuffer>(_list106.size);
+ ByteBuffer _elem107;
+ for (int _i108 = 0; _i108 < _list106.size; ++_i108)
{
- _elem90 = iprot.readBinary();
- struct.worker_hooks.add(_elem90);
+ _elem107 = iprot.readBinary();
+ struct.worker_hooks.add(_elem107);
}
}
struct.set_worker_hooks_isSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list92 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.dependency_jars = new ArrayList<String>(_list92.size);
- String _elem93;
- for (int _i94 = 0; _i94 < _list92.size; ++_i94)
+ org.apache.thrift.protocol.TList _list109 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.dependency_jars = new ArrayList<String>(_list109.size);
+ String _elem110;
+ for (int _i111 = 0; _i111 < _list109.size; ++_i111)
{
- _elem93 = iprot.readString();
- struct.dependency_jars.add(_elem93);
+ _elem110 = iprot.readString();
+ struct.dependency_jars.add(_elem110);
}
}
struct.set_dependency_jars_isSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list95 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.dependency_artifacts = new ArrayList<String>(_list95.size);
- String _elem96;
- for (int _i97 = 0; _i97 < _list95.size; ++_i97)
+ org.apache.thrift.protocol.TList _list112 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.dependency_artifacts = new ArrayList<String>(_list112.size);
+ String _elem113;
+ for (int _i114 = 0; _i114 < _list112.size; ++_i114)
{
- _elem96 = iprot.readString();
- struct.dependency_artifacts.add(_elem96);
+ _elem113 = iprot.readString();
+ struct.dependency_artifacts.add(_elem113);
}
}
struct.set_dependency_artifacts_isSet(true);
@@ -1477,6 +1810,46 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
struct.jdk_version = iprot.readString();
struct.set_jdk_version_isSet(true);
}
+ if (incoming.get(5)) {
+ {
+ org.apache.thrift.protocol.TMap _map115 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, iprot.readI32());
+ struct.component_to_shared_memory = new HashMap<String,Set<String>>(2*_map115.size);
+ String _key116;
+ Set<String> _val117;
+ for (int _i118 = 0; _i118 < _map115.size; ++_i118)
+ {
+ _key116 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TSet _set119 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ _val117 = new HashSet<String>(2*_set119.size);
+ String _elem120;
+ for (int _i121 = 0; _i121 < _set119.size; ++_i121)
+ {
+ _elem120 = iprot.readString();
+ _val117.add(_elem120);
+ }
+ }
+ struct.component_to_shared_memory.put(_key116, _val117);
+ }
+ }
+ struct.set_component_to_shared_memory_isSet(true);
+ }
+ if (incoming.get(6)) {
+ {
+ org.apache.thrift.protocol.TMap _map122 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.shared_memory = new HashMap<String,SharedMemory>(2*_map122.size);
+ String _key123;
+ SharedMemory _val124;
+ for (int _i125 = 0; _i125 < _map122.size; ++_i125)
+ {
+ _key123 = iprot.readString();
+ _val124 = new SharedMemory();
+ _val124.read(iprot);
+ struct.shared_memory.put(_key123, _val124);
+ }
+ }
+ struct.set_shared_memory_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
index 44003c2..d19bac4 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
@@ -1085,13 +1085,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case 4: // USED_PORTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list574 = iprot.readListBegin();
- struct.used_ports = new ArrayList<Long>(_list574.size);
- long _elem575;
- for (int _i576 = 0; _i576 < _list574.size; ++_i576)
+ org.apache.thrift.protocol.TList _list602 = iprot.readListBegin();
+ struct.used_ports = new ArrayList<Long>(_list602.size);
+ long _elem603;
+ for (int _i604 = 0; _i604 < _list602.size; ++_i604)
{
- _elem575 = iprot.readI64();
- struct.used_ports.add(_elem575);
+ _elem603 = iprot.readI64();
+ struct.used_ports.add(_elem603);
}
iprot.readListEnd();
}
@@ -1103,13 +1103,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case 5: // META
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list577 = iprot.readListBegin();
- struct.meta = new ArrayList<Long>(_list577.size);
- long _elem578;
- for (int _i579 = 0; _i579 < _list577.size; ++_i579)
+ org.apache.thrift.protocol.TList _list605 = iprot.readListBegin();
+ struct.meta = new ArrayList<Long>(_list605.size);
+ long _elem606;
+ for (int _i607 = 0; _i607 < _list605.size; ++_i607)
{
- _elem578 = iprot.readI64();
- struct.meta.add(_elem578);
+ _elem606 = iprot.readI64();
+ struct.meta.add(_elem606);
}
iprot.readListEnd();
}
@@ -1121,15 +1121,15 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case 6: // SCHEDULER_META
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map580 = iprot.readMapBegin();
- struct.scheduler_meta = new HashMap<String,String>(2*_map580.size);
- String _key581;
- String _val582;
- for (int _i583 = 0; _i583 < _map580.size; ++_i583)
+ org.apache.thrift.protocol.TMap _map608 = iprot.readMapBegin();
+ struct.scheduler_meta = new HashMap<String,String>(2*_map608.size);
+ String _key609;
+ String _val610;
+ for (int _i611 = 0; _i611 < _map608.size; ++_i611)
{
- _key581 = iprot.readString();
- _val582 = iprot.readString();
- struct.scheduler_meta.put(_key581, _val582);
+ _key609 = iprot.readString();
+ _val610 = iprot.readString();
+ struct.scheduler_meta.put(_key609, _val610);
}
iprot.readMapEnd();
}
@@ -1157,15 +1157,15 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case 9: // RESOURCES_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map584 = iprot.readMapBegin();
- struct.resources_map = new HashMap<String,Double>(2*_map584.size);
- String _key585;
- double _val586;
- for (int _i587 = 0; _i587 < _map584.size; ++_i587)
+ org.apache.thrift.protocol.TMap _map612 = iprot.readMapBegin();
+ struct.resources_map = new HashMap<String,Double>(2*_map612.size);
+ String _key613;
+ double _val614;
+ for (int _i615 = 0; _i615 < _map612.size; ++_i615)
{
- _key585 = iprot.readString();
- _val586 = iprot.readDouble();
- struct.resources_map.put(_key585, _val586);
+ _key613 = iprot.readString();
+ _val614 = iprot.readDouble();
+ struct.resources_map.put(_key613, _val614);
}
iprot.readMapEnd();
}
@@ -1207,9 +1207,9 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
oprot.writeFieldBegin(USED_PORTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.used_ports.size()));
- for (long _iter588 : struct.used_ports)
+ for (long _iter616 : struct.used_ports)
{
- oprot.writeI64(_iter588);
+ oprot.writeI64(_iter616);
}
oprot.writeListEnd();
}
@@ -1221,9 +1221,9 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
oprot.writeFieldBegin(META_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.meta.size()));
- for (long _iter589 : struct.meta)
+ for (long _iter617 : struct.meta)
{
- oprot.writeI64(_iter589);
+ oprot.writeI64(_iter617);
}
oprot.writeListEnd();
}
@@ -1235,10 +1235,10 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
oprot.writeFieldBegin(SCHEDULER_META_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.scheduler_meta.size()));
- for (Map.Entry<String, String> _iter590 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter618 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter590.getKey());
- oprot.writeString(_iter590.getValue());
+ oprot.writeString(_iter618.getKey());
+ oprot.writeString(_iter618.getValue());
}
oprot.writeMapEnd();
}
@@ -1262,10 +1262,10 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
oprot.writeFieldBegin(RESOURCES_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.resources_map.size()));
- for (Map.Entry<String, Double> _iter591 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter619 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter591.getKey());
- oprot.writeDouble(_iter591.getValue());
+ oprot.writeString(_iter619.getKey());
+ oprot.writeDouble(_iter619.getValue());
}
oprot.writeMapEnd();
}
@@ -1320,28 +1320,28 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
if (struct.is_set_used_ports()) {
{
oprot.writeI32(struct.used_ports.size());
- for (long _iter592 : struct.used_ports)
+ for (long _iter620 : struct.used_ports)
{
- oprot.writeI64(_iter592);
+ oprot.writeI64(_iter620);
}
}
}
if (struct.is_set_meta()) {
{
oprot.writeI32(struct.meta.size());
- for (long _iter593 : struct.meta)
+ for (long _iter621 : struct.meta)
{
- oprot.writeI64(_iter593);
+ oprot.writeI64(_iter621);
}
}
}
if (struct.is_set_scheduler_meta()) {
{
oprot.writeI32(struct.scheduler_meta.size());
- for (Map.Entry<String, String> _iter594 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter622 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter594.getKey());
- oprot.writeString(_iter594.getValue());
+ oprot.writeString(_iter622.getKey());
+ oprot.writeString(_iter622.getValue());
}
}
}
@@ -1354,10 +1354,10 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
if (struct.is_set_resources_map()) {
{
oprot.writeI32(struct.resources_map.size());
- for (Map.Entry<String, Double> _iter595 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter623 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter595.getKey());
- oprot.writeDouble(_iter595.getValue());
+ oprot.writeString(_iter623.getKey());
+ oprot.writeDouble(_iter623.getValue());
}
}
}
@@ -1377,41 +1377,41 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list596 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.used_ports = new ArrayList<Long>(_list596.size);
- long _elem597;
- for (int _i598 = 0; _i598 < _list596.size; ++_i598)
+ org.apache.thrift.protocol.TList _list624 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.used_ports = new ArrayList<Long>(_list624.size);
+ long _elem625;
+ for (int _i626 = 0; _i626 < _list624.size; ++_i626)
{
- _elem597 = iprot.readI64();
- struct.used_ports.add(_elem597);
+ _elem625 = iprot.readI64();
+ struct.used_ports.add(_elem625);
}
}
struct.set_used_ports_isSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list599 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.meta = new ArrayList<Long>(_list599.size);
- long _elem600;
- for (int _i601 = 0; _i601 < _list599.size; ++_i601)
+ org.apache.thrift.protocol.TList _list627 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.meta = new ArrayList<Long>(_list627.size);
+ long _elem628;
+ for (int _i629 = 0; _i629 < _list627.size; ++_i629)
{
- _elem600 = iprot.readI64();
- struct.meta.add(_elem600);
+ _elem628 = iprot.readI64();
+ struct.meta.add(_elem628);
}
}
struct.set_meta_isSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map602 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.scheduler_meta = new HashMap<String,String>(2*_map602.size);
- String _key603;
- String _val604;
- for (int _i605 = 0; _i605 < _map602.size; ++_i605)
+ org.apache.thrift.protocol.TMap _map630 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.scheduler_meta = new HashMap<String,String>(2*_map630.size);
+ String _key631;
+ String _val632;
+ for (int _i633 = 0; _i633 < _map630.size; ++_i633)
{
- _key603 = iprot.readString();
- _val604 = iprot.readString();
- struct.scheduler_meta.put(_key603, _val604);
+ _key631 = iprot.readString();
+ _val632 = iprot.readString();
+ struct.scheduler_meta.put(_key631, _val632);
}
}
struct.set_scheduler_meta_isSet(true);
@@ -1426,15 +1426,15 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
}
if (incoming.get(6)) {
{
- org.apache.thrift.protocol.TMap _map606 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
- struct.resources_map = new HashMap<String,Double>(2*_map606.size);
- String _key607;
- double _val608;
- for (int _i609 = 0; _i609 < _map606.size; ++_i609)
+ org.apache.thrift.protocol.TMap _map634 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ struct.resources_map = new HashMap<String,Double>(2*_map634.size);
+ String _key635;
+ double _val636;
+ for (int _i637 = 0; _i637 < _map634.size; ++_i637)
{
- _key607 = iprot.readString();
- _val608 = iprot.readDouble();
- struct.resources_map.put(_key607, _val608);
+ _key635 = iprot.readString();
+ _val636 = iprot.readDouble();
+ struct.resources_map.put(_key635, _val636);
}
}
struct.set_resources_map_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
index c6bafd9..dfaa77a 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
@@ -464,14 +464,14 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
case 1: // SUPERVISOR_SUMMARIES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list438 = iprot.readListBegin();
- struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list438.size);
- SupervisorSummary _elem439;
- for (int _i440 = 0; _i440 < _list438.size; ++_i440)
+ org.apache.thrift.protocol.TList _list466 = iprot.readListBegin();
+ struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list466.size);
+ SupervisorSummary _elem467;
+ for (int _i468 = 0; _i468 < _list466.size; ++_i468)
{
- _elem439 = new SupervisorSummary();
- _elem439.read(iprot);
- struct.supervisor_summaries.add(_elem439);
+ _elem467 = new SupervisorSummary();
+ _elem467.read(iprot);
+ struct.supervisor_summaries.add(_elem467);
}
iprot.readListEnd();
}
@@ -483,14 +483,14 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
case 2: // WORKER_SUMMARIES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list441 = iprot.readListBegin();
- struct.worker_summaries = new ArrayList<WorkerSummary>(_list441.size);
- WorkerSummary _elem442;
- for (int _i443 = 0; _i443 < _list441.size; ++_i443)
+ org.apache.thrift.protocol.TList _list469 = iprot.readListBegin();
+ struct.worker_summaries = new ArrayList<WorkerSummary>(_list469.size);
+ WorkerSummary _elem470;
+ for (int _i471 = 0; _i471 < _list469.size; ++_i471)
{
- _elem442 = new WorkerSummary();
- _elem442.read(iprot);
- struct.worker_summaries.add(_elem442);
+ _elem470 = new WorkerSummary();
+ _elem470.read(iprot);
+ struct.worker_summaries.add(_elem470);
}
iprot.readListEnd();
}
@@ -517,9 +517,9 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
oprot.writeFieldBegin(SUPERVISOR_SUMMARIES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisor_summaries.size()));
- for (SupervisorSummary _iter444 : struct.supervisor_summaries)
+ for (SupervisorSummary _iter472 : struct.supervisor_summaries)
{
- _iter444.write(oprot);
+ _iter472.write(oprot);
}
oprot.writeListEnd();
}
@@ -531,9 +531,9 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
oprot.writeFieldBegin(WORKER_SUMMARIES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.worker_summaries.size()));
- for (WorkerSummary _iter445 : struct.worker_summaries)
+ for (WorkerSummary _iter473 : struct.worker_summaries)
{
- _iter445.write(oprot);
+ _iter473.write(oprot);
}
oprot.writeListEnd();
}
@@ -568,18 +568,18 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
if (struct.is_set_supervisor_summaries()) {
{
oprot.writeI32(struct.supervisor_summaries.size());
- for (SupervisorSummary _iter446 : struct.supervisor_summaries)
+ for (SupervisorSummary _iter474 : struct.supervisor_summaries)
{
- _iter446.write(oprot);
+ _iter474.write(oprot);
}
}
}
if (struct.is_set_worker_summaries()) {
{
oprot.writeI32(struct.worker_summaries.size());
- for (WorkerSummary _iter447 : struct.worker_summaries)
+ for (WorkerSummary _iter475 : struct.worker_summaries)
{
- _iter447.write(oprot);
+ _iter475.write(oprot);
}
}
}
@@ -591,28 +591,28 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list448 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list448.size);
- SupervisorSummary _elem449;
- for (int _i450 = 0; _i450 < _list448.size; ++_i450)
+ org.apache.thrift.protocol.TList _list476 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list476.size);
+ SupervisorSummary _elem477;
+ for (int _i478 = 0; _i478 < _list476.size; ++_i478)
{
- _elem449 = new SupervisorSummary();
- _elem449.read(iprot);
- struct.supervisor_summaries.add(_elem449);
+ _elem477 = new SupervisorSummary();
+ _elem477.read(iprot);
+ struct.supervisor_summaries.add(_elem477);
}
}
struct.set_supervisor_summaries_isSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list451 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.worker_summaries = new ArrayList<WorkerSummary>(_list451.size);
- WorkerSummary _elem452;
- for (int _i453 = 0; _i453 < _list451.size; ++_i453)
+ org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.worker_summaries = new ArrayList<WorkerSummary>(_list479.size);
+ WorkerSummary _elem480;
+ for (int _i481 = 0; _i481 < _list479.size; ++_i481)
{
- _elem452 = new WorkerSummary();
- _elem452.read(iprot);
- struct.worker_summaries.add(_elem452);
+ _elem480 = new WorkerSummary();
+ _elem480.read(iprot);
+ struct.worker_summaries.add(_elem480);
}
}
struct.set_worker_summaries_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
index bd7d7a4..64eafeb 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorSummary.java
@@ -1063,15 +1063,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
case 7: // TOTAL_RESOURCES
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map98 = iprot.readMapBegin();
- struct.total_resources = new HashMap<String,Double>(2*_map98.size);
- String _key99;
- double _val100;
- for (int _i101 = 0; _i101 < _map98.size; ++_i101)
+ org.apache.thrift.protocol.TMap _map126 = iprot.readMapBegin();
+ struct.total_resources = new HashMap<String,Double>(2*_map126.size);
+ String _key127;
+ double _val128;
+ for (int _i129 = 0; _i129 < _map126.size; ++_i129)
{
- _key99 = iprot.readString();
- _val100 = iprot.readDouble();
- struct.total_resources.put(_key99, _val100);
+ _key127 = iprot.readString();
+ _val128 = iprot.readDouble();
+ struct.total_resources.put(_key127, _val128);
}
iprot.readMapEnd();
}
@@ -1140,10 +1140,10 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeFieldBegin(TOTAL_RESOURCES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.total_resources.size()));
- for (Map.Entry<String, Double> _iter102 : struct.total_resources.entrySet())
+ for (Map.Entry<String, Double> _iter130 : struct.total_resources.entrySet())
{
- oprot.writeString(_iter102.getKey());
- oprot.writeDouble(_iter102.getValue());
+ oprot.writeString(_iter130.getKey());
+ oprot.writeDouble(_iter130.getValue());
}
oprot.writeMapEnd();
}
@@ -1202,10 +1202,10 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
if (struct.is_set_total_resources()) {
{
oprot.writeI32(struct.total_resources.size());
- for (Map.Entry<String, Double> _iter103 : struct.total_resources.entrySet())
+ for (Map.Entry<String, Double> _iter131 : struct.total_resources.entrySet())
{
- oprot.writeString(_iter103.getKey());
- oprot.writeDouble(_iter103.getValue());
+ oprot.writeString(_iter131.getKey());
+ oprot.writeDouble(_iter131.getValue());
}
}
}
@@ -1237,15 +1237,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TMap _map104 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
- struct.total_resources = new HashMap<String,Double>(2*_map104.size);
- String _key105;
- double _val106;
- for (int _i107 = 0; _i107 < _map104.size; ++_i107)
+ org.apache.thrift.protocol.TMap _map132 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ struct.total_resources = new HashMap<String,Double>(2*_map132.size);
+ String _key133;
+ double _val134;
+ for (int _i135 = 0; _i135 < _map132.size; ++_i135)
{
- _key105 = iprot.readString();
- _val106 = iprot.readDouble();
- struct.total_resources.put(_key105, _val106);
+ _key133 = iprot.readString();
+ _val134 = iprot.readDouble();
+ struct.total_resources.put(_key133, _val134);
}
}
struct.set_total_resources_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
index 5e774e2..58cf9bb 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
@@ -364,13 +364,13 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
case 1: // TOPO_IDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list784 = iprot.readListBegin();
- struct.topo_ids = new ArrayList<String>(_list784.size);
- String _elem785;
- for (int _i786 = 0; _i786 < _list784.size; ++_i786)
+ org.apache.thrift.protocol.TList _list822 = iprot.readListBegin();
+ struct.topo_ids = new ArrayList<String>(_list822.size);
+ String _elem823;
+ for (int _i824 = 0; _i824 < _list822.size; ++_i824)
{
- _elem785 = iprot.readString();
- struct.topo_ids.add(_elem785);
+ _elem823 = iprot.readString();
+ struct.topo_ids.add(_elem823);
}
iprot.readListEnd();
}
@@ -396,9 +396,9 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
oprot.writeFieldBegin(TOPO_IDS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.topo_ids.size()));
- for (String _iter787 : struct.topo_ids)
+ for (String _iter825 : struct.topo_ids)
{
- oprot.writeString(_iter787);
+ oprot.writeString(_iter825);
}
oprot.writeListEnd();
}
@@ -429,9 +429,9 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
if (struct.is_set_topo_ids()) {
{
oprot.writeI32(struct.topo_ids.size());
- for (String _iter788 : struct.topo_ids)
+ for (String _iter826 : struct.topo_ids)
{
- oprot.writeString(_iter788);
+ oprot.writeString(_iter826);
}
}
}
@@ -443,13 +443,13 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list789 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.topo_ids = new ArrayList<String>(_list789.size);
- String _elem790;
- for (int _i791 = 0; _i791 < _list789.size; ++_i791)
+ org.apache.thrift.protocol.TList _list827 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.topo_ids = new ArrayList<String>(_list827.size);
+ String _elem828;
+ for (int _i829 = 0; _i829 < _list827.size; ++_i829)
{
- _elem790 = iprot.readString();
- struct.topo_ids.add(_elem790);
+ _elem828 = iprot.readString();
+ struct.topo_ids.add(_elem828);
}
}
struct.set_topo_ids_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/b4d33955/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
index 622bd81..9b4baa6 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyInfo.java
@@ -1731,14 +1731,14 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
case 4: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list332 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorSummary>(_list332.size);
- ExecutorSummary _elem333;
- for (int _i334 = 0; _i334 < _list332.size; ++_i334)
+ org.apache.thrift.protocol.TList _list360 = iprot.readListBegin();
+ struct.executors = new ArrayList<ExecutorSummary>(_list360.size);
+ ExecutorSummary _elem361;
+ for (int _i362 = 0; _i362 < _list360.size; ++_i362)
{
- _elem333 = new ExecutorSummary();
- _elem333.read(iprot);
- struct.executors.add(_elem333);
+ _elem361 = new ExecutorSummary();
+ _elem361.read(iprot);
+ struct.executors.add(_elem361);
}
iprot.readListEnd();
}
@@ -1758,26 +1758,26 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
case 6: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map335 = iprot.readMapBegin();
- struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map335.size);
- String _key336;
- List<ErrorInfo> _val337;
- for (int _i338 = 0; _i338 < _map335.size; ++_i338)
+ org.apache.thrift.protocol.TMap _map363 = iprot.readMapBegin();
+ struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map363.size);
+ String _key364;
+ List<ErrorInfo> _val365;
+ for (int _i366 = 0; _i366 < _map363.size; ++_i366)
{
- _key336 = iprot.readString();
+ _key364 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list339 = iprot.readListBegin();
- _val337 = new ArrayList<ErrorInfo>(_list339.size);
- ErrorInfo _elem340;
- for (int _i341 = 0; _i341 < _list339.size; ++_i341)
+ org.apache.thrift.protocol.TList _list367 = iprot.readListBegin();
+ _val365 = new ArrayList<ErrorInfo>(_list367.size);
+ ErrorInfo _elem368;
+ for (int _i369 = 0; _i369 < _list367.size; ++_i369)
{
- _elem340 = new ErrorInfo();
- _elem340.read(iprot);
- _val337.add(_elem340);
+ _elem368 = new ErrorInfo();
+ _elem368.read(iprot);
+ _val365.add(_elem368);
}
iprot.readListEnd();
}
- struct.errors.put(_key336, _val337);
+ struct.errors.put(_key364, _val365);
}
iprot.readMapEnd();
}
@@ -1789,16 +1789,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
case 7: // COMPONENT_DEBUG
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map342 = iprot.readMapBegin();
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map342.size);
- String _key343;
- DebugOptions _val344;
- for (int _i345 = 0; _i345 < _map342.size; ++_i345)
+ org.apache.thrift.protocol.TMap _map370 = iprot.readMapBegin();
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map370.size);
+ String _key371;
+ DebugOptions _val372;
+ for (int _i373 = 0; _i373 < _map370.size; ++_i373)
{
- _key343 = iprot.readString();
- _val344 = new DebugOptions();
- _val344.read(iprot);
- struct.component_debug.put(_key343, _val344);
+ _key371 = iprot.readString();
+ _val372 = new DebugOptions();
+ _val372.read(iprot);
+ struct.component_debug.put(_key371, _val372);
}
iprot.readMapEnd();
}
@@ -1917,9 +1917,9 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorSummary _iter346 : struct.executors)
+ for (ExecutorSummary _iter374 : struct.executors)
{
- _iter346.write(oprot);
+ _iter374.write(oprot);
}
oprot.writeListEnd();
}
@@ -1934,14 +1934,14 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
oprot.writeFieldBegin(ERRORS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.errors.size()));
- for (Map.Entry<String, List<ErrorInfo>> _iter347 : struct.errors.entrySet())
+ for (Map.Entry<String, List<ErrorInfo>> _iter375 : struct.errors.entrySet())
{
- oprot.writeString(_iter347.getKey());
+ oprot.writeString(_iter375.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter347.getValue().size()));
- for (ErrorInfo _iter348 : _iter347.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter375.getValue().size()));
+ for (ErrorInfo _iter376 : _iter375.getValue())
{
- _iter348.write(oprot);
+ _iter376.write(oprot);
}
oprot.writeListEnd();
}
@@ -1955,10 +1955,10 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
oprot.writeFieldBegin(COMPONENT_DEBUG_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.component_debug.size()));
- for (Map.Entry<String, DebugOptions> _iter349 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter377 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter349.getKey());
- _iter349.getValue().write(oprot);
+ oprot.writeString(_iter377.getKey());
+ _iter377.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -2043,22 +2043,22 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
oprot.writeI32(struct.uptime_secs);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorSummary _iter350 : struct.executors)
+ for (ExecutorSummary _iter378 : struct.executors)
{
- _iter350.write(oprot);
+ _iter378.write(oprot);
}
}
oprot.writeString(struct.status);
{
oprot.writeI32(struct.errors.size());
- for (Map.Entry<String, List<ErrorInfo>> _iter351 : struct.errors.entrySet())
+ for (Map.Entry<String, List<ErrorInfo>> _iter379 : struct.errors.entrySet())
{
- oprot.writeString(_iter351.getKey());
+ oprot.writeString(_iter379.getKey());
{
- oprot.writeI32(_iter351.getValue().size());
- for (ErrorInfo _iter352 : _iter351.getValue())
+ oprot.writeI32(_iter379.getValue().size());
+ for (ErrorInfo _iter380 : _iter379.getValue())
{
- _iter352.write(oprot);
+ _iter380.write(oprot);
}
}
}
@@ -2101,10 +2101,10 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
if (struct.is_set_component_debug()) {
{
oprot.writeI32(struct.component_debug.size());
- for (Map.Entry<String, DebugOptions> _iter353 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter381 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter353.getKey());
- _iter353.getValue().write(oprot);
+ oprot.writeString(_iter381.getKey());
+ _iter381.getValue().write(oprot);
}
}
}
@@ -2150,55 +2150,55 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
struct.uptime_secs = iprot.readI32();
struct.set_uptime_secs_isSet(true);
{
- org.apache.thrift.protocol.TList _list354 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorSummary>(_list354.size);
- ExecutorSummary _elem355;
- for (int _i356 = 0; _i356 < _list354.size; ++_i356)
+ org.apache.thrift.protocol.TList _list382 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.executors = new ArrayList<ExecutorSummary>(_list382.size);
+ ExecutorSummary _elem383;
+ for (int _i384 = 0; _i384 < _list382.size; ++_i384)
{
- _elem355 = new ExecutorSummary();
- _elem355.read(iprot);
- struct.executors.add(_elem355);
+ _elem383 = new ExecutorSummary();
+ _elem383.read(iprot);
+ struct.executors.add(_elem383);
}
}
struct.set_executors_isSet(true);
struct.status = iprot.readString();
struct.set_status_isSet(true);
{
- org.apache.thrift.protocol.TMap _map357 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
- struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map357.size);
- String _key358;
- List<ErrorInfo> _val359;
- for (int _i360 = 0; _i360 < _map357.size; ++_i360)
+ org.apache.thrift.protocol.TMap _map385 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map385.size);
+ String _key386;
+ List<ErrorInfo> _val387;
+ for (int _i388 = 0; _i388 < _map385.size; ++_i388)
{
- _key358 = iprot.readString();
+ _key386 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list361 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val359 = new ArrayList<ErrorInfo>(_list361.size);
- ErrorInfo _elem362;
- for (int _i363 = 0; _i363 < _list361.size; ++_i363)
+ org.apache.thrift.protocol.TList _list389 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val387 = new ArrayList<ErrorInfo>(_list389.size);
+ ErrorInfo _elem390;
+ for (int _i391 = 0; _i391 < _list389.size; ++_i391)
{
- _elem362 = new ErrorInfo();
- _elem362.read(iprot);
- _val359.add(_elem362);
+ _elem390 = new ErrorInfo();
+ _elem390.read(iprot);
+ _val387.add(_elem390);
}
}
- struct.errors.put(_key358, _val359);
+ struct.errors.put(_key386, _val387);
}
}
struct.set_errors_isSet(true);
BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map364 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map364.size);
- String _key365;
- DebugOptions _val366;
- for (int _i367 = 0; _i367 < _map364.size; ++_i367)
+ org.apache.thrift.protocol.TMap _map392 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map392.size);
+ String _key393;
+ DebugOptions _val394;
+ for (int _i395 = 0; _i395 < _map392.size; ++_i395)
{
- _key365 = iprot.readString();
- _val366 = new DebugOptions();
- _val366.read(iprot);
- struct.component_debug.put(_key365, _val366);
+ _key393 = iprot.readString();
+ _val394 = new DebugOptions();
+ _val394.read(iprot);
+ struct.component_debug.put(_key393, _val394);
}
}
struct.set_component_debug_isSet(true);