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 2016/08/23 08:03:00 UTC
[4/9] storm git commit: STORM-2016 Topology submission improvement:
support adding local jars and maven artifacts on submission
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/SpoutStats.java b/storm-core/src/jvm/org/apache/storm/generated/SpoutStats.java
index ac8c3e0..b1384f6 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/org/apache/storm/generated/SpoutStats.java
@@ -602,27 +602,27 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
case 1: // ACKED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map216 = iprot.readMapBegin();
- struct.acked = new HashMap<String,Map<String,Long>>(2*_map216.size);
- String _key217;
- Map<String,Long> _val218;
- for (int _i219 = 0; _i219 < _map216.size; ++_i219)
+ org.apache.thrift.protocol.TMap _map232 = iprot.readMapBegin();
+ struct.acked = new HashMap<String,Map<String,Long>>(2*_map232.size);
+ String _key233;
+ Map<String,Long> _val234;
+ for (int _i235 = 0; _i235 < _map232.size; ++_i235)
{
- _key217 = iprot.readString();
+ _key233 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map220 = iprot.readMapBegin();
- _val218 = new HashMap<String,Long>(2*_map220.size);
- String _key221;
- long _val222;
- for (int _i223 = 0; _i223 < _map220.size; ++_i223)
+ org.apache.thrift.protocol.TMap _map236 = iprot.readMapBegin();
+ _val234 = new HashMap<String,Long>(2*_map236.size);
+ String _key237;
+ long _val238;
+ for (int _i239 = 0; _i239 < _map236.size; ++_i239)
{
- _key221 = iprot.readString();
- _val222 = iprot.readI64();
- _val218.put(_key221, _val222);
+ _key237 = iprot.readString();
+ _val238 = iprot.readI64();
+ _val234.put(_key237, _val238);
}
iprot.readMapEnd();
}
- struct.acked.put(_key217, _val218);
+ struct.acked.put(_key233, _val234);
}
iprot.readMapEnd();
}
@@ -634,27 +634,27 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
case 2: // FAILED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map224 = iprot.readMapBegin();
- struct.failed = new HashMap<String,Map<String,Long>>(2*_map224.size);
- String _key225;
- Map<String,Long> _val226;
- for (int _i227 = 0; _i227 < _map224.size; ++_i227)
+ org.apache.thrift.protocol.TMap _map240 = iprot.readMapBegin();
+ struct.failed = new HashMap<String,Map<String,Long>>(2*_map240.size);
+ String _key241;
+ Map<String,Long> _val242;
+ for (int _i243 = 0; _i243 < _map240.size; ++_i243)
{
- _key225 = iprot.readString();
+ _key241 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map228 = iprot.readMapBegin();
- _val226 = new HashMap<String,Long>(2*_map228.size);
- String _key229;
- long _val230;
- for (int _i231 = 0; _i231 < _map228.size; ++_i231)
+ org.apache.thrift.protocol.TMap _map244 = iprot.readMapBegin();
+ _val242 = new HashMap<String,Long>(2*_map244.size);
+ String _key245;
+ long _val246;
+ for (int _i247 = 0; _i247 < _map244.size; ++_i247)
{
- _key229 = iprot.readString();
- _val230 = iprot.readI64();
- _val226.put(_key229, _val230);
+ _key245 = iprot.readString();
+ _val246 = iprot.readI64();
+ _val242.put(_key245, _val246);
}
iprot.readMapEnd();
}
- struct.failed.put(_key225, _val226);
+ struct.failed.put(_key241, _val242);
}
iprot.readMapEnd();
}
@@ -666,27 +666,27 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
case 3: // COMPLETE_MS_AVG
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map232 = iprot.readMapBegin();
- struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map232.size);
- String _key233;
- Map<String,Double> _val234;
- for (int _i235 = 0; _i235 < _map232.size; ++_i235)
+ org.apache.thrift.protocol.TMap _map248 = iprot.readMapBegin();
+ struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map248.size);
+ String _key249;
+ Map<String,Double> _val250;
+ for (int _i251 = 0; _i251 < _map248.size; ++_i251)
{
- _key233 = iprot.readString();
+ _key249 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map236 = iprot.readMapBegin();
- _val234 = new HashMap<String,Double>(2*_map236.size);
- String _key237;
- double _val238;
- for (int _i239 = 0; _i239 < _map236.size; ++_i239)
+ org.apache.thrift.protocol.TMap _map252 = iprot.readMapBegin();
+ _val250 = new HashMap<String,Double>(2*_map252.size);
+ String _key253;
+ double _val254;
+ for (int _i255 = 0; _i255 < _map252.size; ++_i255)
{
- _key237 = iprot.readString();
- _val238 = iprot.readDouble();
- _val234.put(_key237, _val238);
+ _key253 = iprot.readString();
+ _val254 = iprot.readDouble();
+ _val250.put(_key253, _val254);
}
iprot.readMapEnd();
}
- struct.complete_ms_avg.put(_key233, _val234);
+ struct.complete_ms_avg.put(_key249, _val250);
}
iprot.readMapEnd();
}
@@ -712,15 +712,15 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
oprot.writeFieldBegin(ACKED_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size()));
- for (Map.Entry<String, Map<String,Long>> _iter240 : struct.acked.entrySet())
+ for (Map.Entry<String, Map<String,Long>> _iter256 : struct.acked.entrySet())
{
- oprot.writeString(_iter240.getKey());
+ oprot.writeString(_iter256.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter240.getValue().size()));
- for (Map.Entry<String, Long> _iter241 : _iter240.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter256.getValue().size()));
+ for (Map.Entry<String, Long> _iter257 : _iter256.getValue().entrySet())
{
- oprot.writeString(_iter241.getKey());
- oprot.writeI64(_iter241.getValue());
+ oprot.writeString(_iter257.getKey());
+ oprot.writeI64(_iter257.getValue());
}
oprot.writeMapEnd();
}
@@ -733,15 +733,15 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
oprot.writeFieldBegin(FAILED_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size()));
- for (Map.Entry<String, Map<String,Long>> _iter242 : struct.failed.entrySet())
+ for (Map.Entry<String, Map<String,Long>> _iter258 : struct.failed.entrySet())
{
- oprot.writeString(_iter242.getKey());
+ oprot.writeString(_iter258.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter242.getValue().size()));
- for (Map.Entry<String, Long> _iter243 : _iter242.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter258.getValue().size()));
+ for (Map.Entry<String, Long> _iter259 : _iter258.getValue().entrySet())
{
- oprot.writeString(_iter243.getKey());
- oprot.writeI64(_iter243.getValue());
+ oprot.writeString(_iter259.getKey());
+ oprot.writeI64(_iter259.getValue());
}
oprot.writeMapEnd();
}
@@ -754,15 +754,15 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.complete_ms_avg.size()));
- for (Map.Entry<String, Map<String,Double>> _iter244 : struct.complete_ms_avg.entrySet())
+ for (Map.Entry<String, Map<String,Double>> _iter260 : struct.complete_ms_avg.entrySet())
{
- oprot.writeString(_iter244.getKey());
+ oprot.writeString(_iter260.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter244.getValue().size()));
- for (Map.Entry<String, Double> _iter245 : _iter244.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter260.getValue().size()));
+ for (Map.Entry<String, Double> _iter261 : _iter260.getValue().entrySet())
{
- oprot.writeString(_iter245.getKey());
- oprot.writeDouble(_iter245.getValue());
+ oprot.writeString(_iter261.getKey());
+ oprot.writeDouble(_iter261.getValue());
}
oprot.writeMapEnd();
}
@@ -790,45 +790,45 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.acked.size());
- for (Map.Entry<String, Map<String,Long>> _iter246 : struct.acked.entrySet())
+ for (Map.Entry<String, Map<String,Long>> _iter262 : struct.acked.entrySet())
{
- oprot.writeString(_iter246.getKey());
+ oprot.writeString(_iter262.getKey());
{
- oprot.writeI32(_iter246.getValue().size());
- for (Map.Entry<String, Long> _iter247 : _iter246.getValue().entrySet())
+ oprot.writeI32(_iter262.getValue().size());
+ for (Map.Entry<String, Long> _iter263 : _iter262.getValue().entrySet())
{
- oprot.writeString(_iter247.getKey());
- oprot.writeI64(_iter247.getValue());
+ oprot.writeString(_iter263.getKey());
+ oprot.writeI64(_iter263.getValue());
}
}
}
}
{
oprot.writeI32(struct.failed.size());
- for (Map.Entry<String, Map<String,Long>> _iter248 : struct.failed.entrySet())
+ for (Map.Entry<String, Map<String,Long>> _iter264 : struct.failed.entrySet())
{
- oprot.writeString(_iter248.getKey());
+ oprot.writeString(_iter264.getKey());
{
- oprot.writeI32(_iter248.getValue().size());
- for (Map.Entry<String, Long> _iter249 : _iter248.getValue().entrySet())
+ oprot.writeI32(_iter264.getValue().size());
+ for (Map.Entry<String, Long> _iter265 : _iter264.getValue().entrySet())
{
- oprot.writeString(_iter249.getKey());
- oprot.writeI64(_iter249.getValue());
+ oprot.writeString(_iter265.getKey());
+ oprot.writeI64(_iter265.getValue());
}
}
}
}
{
oprot.writeI32(struct.complete_ms_avg.size());
- for (Map.Entry<String, Map<String,Double>> _iter250 : struct.complete_ms_avg.entrySet())
+ for (Map.Entry<String, Map<String,Double>> _iter266 : struct.complete_ms_avg.entrySet())
{
- oprot.writeString(_iter250.getKey());
+ oprot.writeString(_iter266.getKey());
{
- oprot.writeI32(_iter250.getValue().size());
- for (Map.Entry<String, Double> _iter251 : _iter250.getValue().entrySet())
+ oprot.writeI32(_iter266.getValue().size());
+ for (Map.Entry<String, Double> _iter267 : _iter266.getValue().entrySet())
{
- oprot.writeString(_iter251.getKey());
- oprot.writeDouble(_iter251.getValue());
+ oprot.writeString(_iter267.getKey());
+ oprot.writeDouble(_iter267.getValue());
}
}
}
@@ -839,74 +839,74 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
public void read(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map252 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.acked = new HashMap<String,Map<String,Long>>(2*_map252.size);
- String _key253;
- Map<String,Long> _val254;
- for (int _i255 = 0; _i255 < _map252.size; ++_i255)
+ org.apache.thrift.protocol.TMap _map268 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.acked = new HashMap<String,Map<String,Long>>(2*_map268.size);
+ String _key269;
+ Map<String,Long> _val270;
+ for (int _i271 = 0; _i271 < _map268.size; ++_i271)
{
- _key253 = iprot.readString();
+ _key269 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map256 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
- _val254 = new HashMap<String,Long>(2*_map256.size);
- String _key257;
- long _val258;
- for (int _i259 = 0; _i259 < _map256.size; ++_i259)
+ org.apache.thrift.protocol.TMap _map272 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val270 = new HashMap<String,Long>(2*_map272.size);
+ String _key273;
+ long _val274;
+ for (int _i275 = 0; _i275 < _map272.size; ++_i275)
{
- _key257 = iprot.readString();
- _val258 = iprot.readI64();
- _val254.put(_key257, _val258);
+ _key273 = iprot.readString();
+ _val274 = iprot.readI64();
+ _val270.put(_key273, _val274);
}
}
- struct.acked.put(_key253, _val254);
+ struct.acked.put(_key269, _val270);
}
}
struct.set_acked_isSet(true);
{
- org.apache.thrift.protocol.TMap _map260 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.failed = new HashMap<String,Map<String,Long>>(2*_map260.size);
- String _key261;
- Map<String,Long> _val262;
- for (int _i263 = 0; _i263 < _map260.size; ++_i263)
+ org.apache.thrift.protocol.TMap _map276 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.failed = new HashMap<String,Map<String,Long>>(2*_map276.size);
+ String _key277;
+ Map<String,Long> _val278;
+ for (int _i279 = 0; _i279 < _map276.size; ++_i279)
{
- _key261 = iprot.readString();
+ _key277 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map264 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
- _val262 = new HashMap<String,Long>(2*_map264.size);
- String _key265;
- long _val266;
- for (int _i267 = 0; _i267 < _map264.size; ++_i267)
+ org.apache.thrift.protocol.TMap _map280 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val278 = new HashMap<String,Long>(2*_map280.size);
+ String _key281;
+ long _val282;
+ for (int _i283 = 0; _i283 < _map280.size; ++_i283)
{
- _key265 = iprot.readString();
- _val266 = iprot.readI64();
- _val262.put(_key265, _val266);
+ _key281 = iprot.readString();
+ _val282 = iprot.readI64();
+ _val278.put(_key281, _val282);
}
}
- struct.failed.put(_key261, _val262);
+ struct.failed.put(_key277, _val278);
}
}
struct.set_failed_isSet(true);
{
- org.apache.thrift.protocol.TMap _map268 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map268.size);
- String _key269;
- Map<String,Double> _val270;
- for (int _i271 = 0; _i271 < _map268.size; ++_i271)
+ org.apache.thrift.protocol.TMap _map284 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map284.size);
+ String _key285;
+ Map<String,Double> _val286;
+ for (int _i287 = 0; _i287 < _map284.size; ++_i287)
{
- _key269 = iprot.readString();
+ _key285 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map272 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
- _val270 = new HashMap<String,Double>(2*_map272.size);
- String _key273;
- double _val274;
- for (int _i275 = 0; _i275 < _map272.size; ++_i275)
+ org.apache.thrift.protocol.TMap _map288 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ _val286 = new HashMap<String,Double>(2*_map288.size);
+ String _key289;
+ double _val290;
+ for (int _i291 = 0; _i291 < _map288.size; ++_i291)
{
- _key273 = iprot.readString();
- _val274 = iprot.readDouble();
- _val270.put(_key273, _val274);
+ _key289 = iprot.readString();
+ _val290 = iprot.readDouble();
+ _val286.put(_key289, _val290);
}
}
- struct.complete_ms_avg.put(_key269, _val270);
+ struct.complete_ms_avg.put(_key285, _val286);
}
}
struct.set_complete_ms_avg_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/StormBase.java b/storm-core/src/jvm/org/apache/storm/generated/StormBase.java
index ba4b792..92d7eb4 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/StormBase.java
+++ b/storm-core/src/jvm/org/apache/storm/generated/StormBase.java
@@ -1090,15 +1090,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 _map638 = iprot.readMapBegin();
- struct.component_executors = new HashMap<String,Integer>(2*_map638.size);
- String _key639;
- int _val640;
- for (int _i641 = 0; _i641 < _map638.size; ++_i641)
+ org.apache.thrift.protocol.TMap _map654 = iprot.readMapBegin();
+ struct.component_executors = new HashMap<String,Integer>(2*_map654.size);
+ String _key655;
+ int _val656;
+ for (int _i657 = 0; _i657 < _map654.size; ++_i657)
{
- _key639 = iprot.readString();
- _val640 = iprot.readI32();
- struct.component_executors.put(_key639, _val640);
+ _key655 = iprot.readString();
+ _val656 = iprot.readI32();
+ struct.component_executors.put(_key655, _val656);
}
iprot.readMapEnd();
}
@@ -1143,16 +1143,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 _map642 = iprot.readMapBegin();
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map642.size);
- String _key643;
- DebugOptions _val644;
- for (int _i645 = 0; _i645 < _map642.size; ++_i645)
+ org.apache.thrift.protocol.TMap _map658 = iprot.readMapBegin();
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map658.size);
+ String _key659;
+ DebugOptions _val660;
+ for (int _i661 = 0; _i661 < _map658.size; ++_i661)
{
- _key643 = iprot.readString();
- _val644 = new DebugOptions();
- _val644.read(iprot);
- struct.component_debug.put(_key643, _val644);
+ _key659 = iprot.readString();
+ _val660 = new DebugOptions();
+ _val660.read(iprot);
+ struct.component_debug.put(_key659, _val660);
}
iprot.readMapEnd();
}
@@ -1192,10 +1192,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> _iter646 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter662 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter646.getKey());
- oprot.writeI32(_iter646.getValue());
+ oprot.writeString(_iter662.getKey());
+ oprot.writeI32(_iter662.getValue());
}
oprot.writeMapEnd();
}
@@ -1233,10 +1233,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> _iter647 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter663 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter647.getKey());
- _iter647.getValue().write(oprot);
+ oprot.writeString(_iter663.getKey());
+ _iter663.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1286,10 +1286,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> _iter648 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter664 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter648.getKey());
- oprot.writeI32(_iter648.getValue());
+ oprot.writeString(_iter664.getKey());
+ oprot.writeI32(_iter664.getValue());
}
}
}
@@ -1308,10 +1308,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> _iter649 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter665 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter649.getKey());
- _iter649.getValue().write(oprot);
+ oprot.writeString(_iter665.getKey());
+ _iter665.getValue().write(oprot);
}
}
}
@@ -1329,15 +1329,15 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map650 = 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*_map650.size);
- String _key651;
- int _val652;
- for (int _i653 = 0; _i653 < _map650.size; ++_i653)
+ org.apache.thrift.protocol.TMap _map666 = 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*_map666.size);
+ String _key667;
+ int _val668;
+ for (int _i669 = 0; _i669 < _map666.size; ++_i669)
{
- _key651 = iprot.readString();
- _val652 = iprot.readI32();
- struct.component_executors.put(_key651, _val652);
+ _key667 = iprot.readString();
+ _val668 = iprot.readI32();
+ struct.component_executors.put(_key667, _val668);
}
}
struct.set_component_executors_isSet(true);
@@ -1361,16 +1361,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TMap _map654 = 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*_map654.size);
- String _key655;
- DebugOptions _val656;
- for (int _i657 = 0; _i657 < _map654.size; ++_i657)
+ org.apache.thrift.protocol.TMap _map670 = 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*_map670.size);
+ String _key671;
+ DebugOptions _val672;
+ for (int _i673 = 0; _i673 < _map670.size; ++_i673)
{
- _key655 = iprot.readString();
- _val656 = new DebugOptions();
- _val656.read(iprot);
- struct.component_debug.put(_key655, _val656);
+ _key671 = iprot.readString();
+ _val672 = new DebugOptions();
+ _val672.read(iprot);
+ struct.component_debug.put(_key671, _val672);
}
}
struct.set_component_debug_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/StormTopology.java b/storm-core/src/jvm/org/apache/storm/generated/StormTopology.java
index d003b52..caec6c6 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/org/apache/storm/generated/StormTopology.java
@@ -59,6 +59,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
private static final org.apache.thrift.protocol.TField BOLTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bolts", org.apache.thrift.protocol.TType.MAP, (short)2);
private static final org.apache.thrift.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spouts", org.apache.thrift.protocol.TType.MAP, (short)3);
private static final org.apache.thrift.protocol.TField WORKER_HOOKS_FIELD_DESC = new org.apache.thrift.protocol.TField("worker_hooks", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField DEPENDENCY_JARS_FIELD_DESC = new org.apache.thrift.protocol.TField("dependency_jars", org.apache.thrift.protocol.TType.LIST, (short)5);
+ 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -70,13 +72,17 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
private Map<String,Bolt> bolts; // required
private Map<String,StateSpoutSpec> state_spouts; // required
private List<ByteBuffer> worker_hooks; // optional
+ private List<String> dependency_jars; // optional
+ private List<String> dependency_artifacts; // 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 {
SPOUTS((short)1, "spouts"),
BOLTS((short)2, "bolts"),
STATE_SPOUTS((short)3, "state_spouts"),
- WORKER_HOOKS((short)4, "worker_hooks");
+ WORKER_HOOKS((short)4, "worker_hooks"),
+ DEPENDENCY_JARS((short)5, "dependency_jars"),
+ DEPENDENCY_ARTIFACTS((short)6, "dependency_artifacts");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -99,6 +105,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return STATE_SPOUTS;
case 4: // WORKER_HOOKS
return WORKER_HOOKS;
+ case 5: // DEPENDENCY_JARS
+ return DEPENDENCY_JARS;
+ case 6: // DEPENDENCY_ARTIFACTS
+ return DEPENDENCY_ARTIFACTS;
default:
return null;
}
@@ -139,7 +149,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.WORKER_HOOKS};
+ private static final _Fields optionals[] = {_Fields.WORKER_HOOKS,_Fields.DEPENDENCY_JARS,_Fields.DEPENDENCY_ARTIFACTS};
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);
@@ -158,6 +168,12 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
tmpMap.put(_Fields.WORKER_HOOKS, new org.apache.thrift.meta_data.FieldMetaData("worker_hooks", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
+ tmpMap.put(_Fields.DEPENDENCY_JARS, new org.apache.thrift.meta_data.FieldMetaData("dependency_jars", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.DEPENDENCY_ARTIFACTS, new org.apache.thrift.meta_data.FieldMetaData("dependency_artifacts", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StormTopology.class, metaDataMap);
}
@@ -229,6 +245,14 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
List<ByteBuffer> __this__worker_hooks = new ArrayList<ByteBuffer>(other.worker_hooks);
this.worker_hooks = __this__worker_hooks;
}
+ if (other.is_set_dependency_jars()) {
+ List<String> __this__dependency_jars = new ArrayList<String>(other.dependency_jars);
+ this.dependency_jars = __this__dependency_jars;
+ }
+ if (other.is_set_dependency_artifacts()) {
+ List<String> __this__dependency_artifacts = new ArrayList<String>(other.dependency_artifacts);
+ this.dependency_artifacts = __this__dependency_artifacts;
+ }
}
public StormTopology deepCopy() {
@@ -241,6 +265,8 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
this.bolts = null;
this.state_spouts = null;
this.worker_hooks = null;
+ this.dependency_jars = null;
+ this.dependency_artifacts = null;
}
public int get_spouts_size() {
@@ -383,6 +409,82 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
}
+ public int get_dependency_jars_size() {
+ return (this.dependency_jars == null) ? 0 : this.dependency_jars.size();
+ }
+
+ public java.util.Iterator<String> get_dependency_jars_iterator() {
+ return (this.dependency_jars == null) ? null : this.dependency_jars.iterator();
+ }
+
+ public void add_to_dependency_jars(String elem) {
+ if (this.dependency_jars == null) {
+ this.dependency_jars = new ArrayList<String>();
+ }
+ this.dependency_jars.add(elem);
+ }
+
+ public List<String> get_dependency_jars() {
+ return this.dependency_jars;
+ }
+
+ public void set_dependency_jars(List<String> dependency_jars) {
+ this.dependency_jars = dependency_jars;
+ }
+
+ public void unset_dependency_jars() {
+ this.dependency_jars = null;
+ }
+
+ /** Returns true if field dependency_jars is set (has been assigned a value) and false otherwise */
+ public boolean is_set_dependency_jars() {
+ return this.dependency_jars != null;
+ }
+
+ public void set_dependency_jars_isSet(boolean value) {
+ if (!value) {
+ this.dependency_jars = null;
+ }
+ }
+
+ public int get_dependency_artifacts_size() {
+ return (this.dependency_artifacts == null) ? 0 : this.dependency_artifacts.size();
+ }
+
+ public java.util.Iterator<String> get_dependency_artifacts_iterator() {
+ return (this.dependency_artifacts == null) ? null : this.dependency_artifacts.iterator();
+ }
+
+ public void add_to_dependency_artifacts(String elem) {
+ if (this.dependency_artifacts == null) {
+ this.dependency_artifacts = new ArrayList<String>();
+ }
+ this.dependency_artifacts.add(elem);
+ }
+
+ public List<String> get_dependency_artifacts() {
+ return this.dependency_artifacts;
+ }
+
+ public void set_dependency_artifacts(List<String> dependency_artifacts) {
+ this.dependency_artifacts = dependency_artifacts;
+ }
+
+ public void unset_dependency_artifacts() {
+ this.dependency_artifacts = null;
+ }
+
+ /** Returns true if field dependency_artifacts is set (has been assigned a value) and false otherwise */
+ public boolean is_set_dependency_artifacts() {
+ return this.dependency_artifacts != null;
+ }
+
+ public void set_dependency_artifacts_isSet(boolean value) {
+ if (!value) {
+ this.dependency_artifacts = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SPOUTS:
@@ -417,6 +519,22 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
break;
+ case DEPENDENCY_JARS:
+ if (value == null) {
+ unset_dependency_jars();
+ } else {
+ set_dependency_jars((List<String>)value);
+ }
+ break;
+
+ case DEPENDENCY_ARTIFACTS:
+ if (value == null) {
+ unset_dependency_artifacts();
+ } else {
+ set_dependency_artifacts((List<String>)value);
+ }
+ break;
+
}
}
@@ -434,6 +552,12 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
case WORKER_HOOKS:
return get_worker_hooks();
+ case DEPENDENCY_JARS:
+ return get_dependency_jars();
+
+ case DEPENDENCY_ARTIFACTS:
+ return get_dependency_artifacts();
+
}
throw new IllegalStateException();
}
@@ -453,6 +577,10 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return is_set_state_spouts();
case WORKER_HOOKS:
return is_set_worker_hooks();
+ case DEPENDENCY_JARS:
+ return is_set_dependency_jars();
+ case DEPENDENCY_ARTIFACTS:
+ return is_set_dependency_artifacts();
}
throw new IllegalStateException();
}
@@ -506,6 +634,24 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return false;
}
+ boolean this_present_dependency_jars = true && this.is_set_dependency_jars();
+ boolean that_present_dependency_jars = true && that.is_set_dependency_jars();
+ if (this_present_dependency_jars || that_present_dependency_jars) {
+ if (!(this_present_dependency_jars && that_present_dependency_jars))
+ return false;
+ if (!this.dependency_jars.equals(that.dependency_jars))
+ return false;
+ }
+
+ boolean this_present_dependency_artifacts = true && this.is_set_dependency_artifacts();
+ boolean that_present_dependency_artifacts = true && that.is_set_dependency_artifacts();
+ if (this_present_dependency_artifacts || that_present_dependency_artifacts) {
+ if (!(this_present_dependency_artifacts && that_present_dependency_artifacts))
+ return false;
+ if (!this.dependency_artifacts.equals(that.dependency_artifacts))
+ return false;
+ }
+
return true;
}
@@ -533,6 +679,16 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
if (present_worker_hooks)
list.add(worker_hooks);
+ boolean present_dependency_jars = true && (is_set_dependency_jars());
+ list.add(present_dependency_jars);
+ if (present_dependency_jars)
+ list.add(dependency_jars);
+
+ boolean present_dependency_artifacts = true && (is_set_dependency_artifacts());
+ list.add(present_dependency_artifacts);
+ if (present_dependency_artifacts)
+ list.add(dependency_artifacts);
+
return list.hashCode();
}
@@ -584,6 +740,26 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_dependency_jars()).compareTo(other.is_set_dependency_jars());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_dependency_jars()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dependency_jars, other.dependency_jars);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_dependency_artifacts()).compareTo(other.is_set_dependency_artifacts());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_dependency_artifacts()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dependency_artifacts, other.dependency_artifacts);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -637,6 +813,26 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
first = false;
}
+ if (is_set_dependency_jars()) {
+ if (!first) sb.append(", ");
+ sb.append("dependency_jars:");
+ if (this.dependency_jars == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.dependency_jars);
+ }
+ first = false;
+ }
+ if (is_set_dependency_artifacts()) {
+ if (!first) sb.append(", ");
+ sb.append("dependency_artifacts:");
+ if (this.dependency_artifacts == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.dependency_artifacts);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -773,6 +969,42 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 5: // DEPENDENCY_JARS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list59 = iprot.readListBegin();
+ struct.dependency_jars = new ArrayList<String>(_list59.size);
+ String _elem60;
+ for (int _i61 = 0; _i61 < _list59.size; ++_i61)
+ {
+ _elem60 = iprot.readString();
+ struct.dependency_jars.add(_elem60);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_dependency_jars_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // DEPENDENCY_ARTIFACTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
+ struct.dependency_artifacts = new ArrayList<String>(_list62.size);
+ String _elem63;
+ for (int _i64 = 0; _i64 < _list62.size; ++_i64)
+ {
+ _elem63 = iprot.readString();
+ struct.dependency_artifacts.add(_elem63);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_dependency_artifacts_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -790,10 +1022,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> _iter59 : struct.spouts.entrySet())
+ for (Map.Entry<String, SpoutSpec> _iter65 : struct.spouts.entrySet())
{
- oprot.writeString(_iter59.getKey());
- _iter59.getValue().write(oprot);
+ oprot.writeString(_iter65.getKey());
+ _iter65.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -803,10 +1035,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> _iter60 : struct.bolts.entrySet())
+ for (Map.Entry<String, Bolt> _iter66 : struct.bolts.entrySet())
{
- oprot.writeString(_iter60.getKey());
- _iter60.getValue().write(oprot);
+ oprot.writeString(_iter66.getKey());
+ _iter66.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -816,10 +1048,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> _iter61 : struct.state_spouts.entrySet())
+ for (Map.Entry<String, StateSpoutSpec> _iter67 : struct.state_spouts.entrySet())
{
- oprot.writeString(_iter61.getKey());
- _iter61.getValue().write(oprot);
+ oprot.writeString(_iter67.getKey());
+ _iter67.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -830,9 +1062,37 @@ 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 _iter62 : struct.worker_hooks)
+ for (ByteBuffer _iter68 : struct.worker_hooks)
+ {
+ oprot.writeBinary(_iter68);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.dependency_jars != null) {
+ if (struct.is_set_dependency_jars()) {
+ 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)
{
- oprot.writeBinary(_iter62);
+ oprot.writeString(_iter69);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.dependency_artifacts != null) {
+ if (struct.is_set_dependency_artifacts()) {
+ 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)
+ {
+ oprot.writeString(_iter70);
}
oprot.writeListEnd();
}
@@ -858,39 +1118,63 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.spouts.size());
- for (Map.Entry<String, SpoutSpec> _iter63 : struct.spouts.entrySet())
+ for (Map.Entry<String, SpoutSpec> _iter71 : struct.spouts.entrySet())
{
- oprot.writeString(_iter63.getKey());
- _iter63.getValue().write(oprot);
+ oprot.writeString(_iter71.getKey());
+ _iter71.getValue().write(oprot);
}
}
{
oprot.writeI32(struct.bolts.size());
- for (Map.Entry<String, Bolt> _iter64 : struct.bolts.entrySet())
+ for (Map.Entry<String, Bolt> _iter72 : struct.bolts.entrySet())
{
- oprot.writeString(_iter64.getKey());
- _iter64.getValue().write(oprot);
+ oprot.writeString(_iter72.getKey());
+ _iter72.getValue().write(oprot);
}
}
{
oprot.writeI32(struct.state_spouts.size());
- for (Map.Entry<String, StateSpoutSpec> _iter65 : struct.state_spouts.entrySet())
+ for (Map.Entry<String, StateSpoutSpec> _iter73 : struct.state_spouts.entrySet())
{
- oprot.writeString(_iter65.getKey());
- _iter65.getValue().write(oprot);
+ oprot.writeString(_iter73.getKey());
+ _iter73.getValue().write(oprot);
}
}
BitSet optionals = new BitSet();
if (struct.is_set_worker_hooks()) {
optionals.set(0);
}
- oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_dependency_jars()) {
+ optionals.set(1);
+ }
+ if (struct.is_set_dependency_artifacts()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
if (struct.is_set_worker_hooks()) {
{
oprot.writeI32(struct.worker_hooks.size());
- for (ByteBuffer _iter66 : struct.worker_hooks)
+ for (ByteBuffer _iter74 : struct.worker_hooks)
{
- oprot.writeBinary(_iter66);
+ oprot.writeBinary(_iter74);
+ }
+ }
+ }
+ if (struct.is_set_dependency_jars()) {
+ {
+ oprot.writeI32(struct.dependency_jars.size());
+ for (String _iter75 : struct.dependency_jars)
+ {
+ oprot.writeString(_iter75);
+ }
+ }
+ }
+ if (struct.is_set_dependency_artifacts()) {
+ {
+ oprot.writeI32(struct.dependency_artifacts.size());
+ for (String _iter76 : struct.dependency_artifacts)
+ {
+ oprot.writeString(_iter76);
}
}
}
@@ -900,61 +1184,87 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
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 _map67 = 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*_map67.size);
- String _key68;
- SpoutSpec _val69;
- for (int _i70 = 0; _i70 < _map67.size; ++_i70)
+ 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)
{
- _key68 = iprot.readString();
- _val69 = new SpoutSpec();
- _val69.read(iprot);
- struct.spouts.put(_key68, _val69);
+ _key78 = iprot.readString();
+ _val79 = new SpoutSpec();
+ _val79.read(iprot);
+ struct.spouts.put(_key78, _val79);
}
}
struct.set_spouts_isSet(true);
{
- org.apache.thrift.protocol.TMap _map71 = 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*_map71.size);
- String _key72;
- Bolt _val73;
- for (int _i74 = 0; _i74 < _map71.size; ++_i74)
+ 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)
{
- _key72 = iprot.readString();
- _val73 = new Bolt();
- _val73.read(iprot);
- struct.bolts.put(_key72, _val73);
+ _key82 = iprot.readString();
+ _val83 = new Bolt();
+ _val83.read(iprot);
+ struct.bolts.put(_key82, _val83);
}
}
struct.set_bolts_isSet(true);
{
- org.apache.thrift.protocol.TMap _map75 = 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*_map75.size);
- String _key76;
- StateSpoutSpec _val77;
- for (int _i78 = 0; _i78 < _map75.size; ++_i78)
+ 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)
{
- _key76 = iprot.readString();
- _val77 = new StateSpoutSpec();
- _val77.read(iprot);
- struct.state_spouts.put(_key76, _val77);
+ _key86 = iprot.readString();
+ _val87 = new StateSpoutSpec();
+ _val87.read(iprot);
+ struct.state_spouts.put(_key86, _val87);
}
}
struct.set_state_spouts_isSet(true);
- BitSet incoming = iprot.readBitSet(1);
+ BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.worker_hooks = new ArrayList<ByteBuffer>(_list79.size);
- ByteBuffer _elem80;
- for (int _i81 = 0; _i81 < _list79.size; ++_i81)
+ 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)
{
- _elem80 = iprot.readBinary();
- struct.worker_hooks.add(_elem80);
+ _elem90 = iprot.readBinary();
+ struct.worker_hooks.add(_elem90);
}
}
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)
+ {
+ _elem93 = iprot.readString();
+ struct.dependency_jars.add(_elem93);
+ }
+ }
+ 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)
+ {
+ _elem96 = iprot.readString();
+ struct.dependency_artifacts.add(_elem96);
+ }
+ }
+ struct.set_dependency_artifacts_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java
index 18805be..64b2d7d 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java
+++ b/storm-core/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 _list538 = iprot.readListBegin();
- struct.used_ports = new ArrayList<Long>(_list538.size);
- long _elem539;
- for (int _i540 = 0; _i540 < _list538.size; ++_i540)
+ org.apache.thrift.protocol.TList _list554 = iprot.readListBegin();
+ struct.used_ports = new ArrayList<Long>(_list554.size);
+ long _elem555;
+ for (int _i556 = 0; _i556 < _list554.size; ++_i556)
{
- _elem539 = iprot.readI64();
- struct.used_ports.add(_elem539);
+ _elem555 = iprot.readI64();
+ struct.used_ports.add(_elem555);
}
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 _list541 = iprot.readListBegin();
- struct.meta = new ArrayList<Long>(_list541.size);
- long _elem542;
- for (int _i543 = 0; _i543 < _list541.size; ++_i543)
+ org.apache.thrift.protocol.TList _list557 = iprot.readListBegin();
+ struct.meta = new ArrayList<Long>(_list557.size);
+ long _elem558;
+ for (int _i559 = 0; _i559 < _list557.size; ++_i559)
{
- _elem542 = iprot.readI64();
- struct.meta.add(_elem542);
+ _elem558 = iprot.readI64();
+ struct.meta.add(_elem558);
}
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 _map544 = iprot.readMapBegin();
- struct.scheduler_meta = new HashMap<String,String>(2*_map544.size);
- String _key545;
- String _val546;
- for (int _i547 = 0; _i547 < _map544.size; ++_i547)
+ org.apache.thrift.protocol.TMap _map560 = iprot.readMapBegin();
+ struct.scheduler_meta = new HashMap<String,String>(2*_map560.size);
+ String _key561;
+ String _val562;
+ for (int _i563 = 0; _i563 < _map560.size; ++_i563)
{
- _key545 = iprot.readString();
- _val546 = iprot.readString();
- struct.scheduler_meta.put(_key545, _val546);
+ _key561 = iprot.readString();
+ _val562 = iprot.readString();
+ struct.scheduler_meta.put(_key561, _val562);
}
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 _map548 = iprot.readMapBegin();
- struct.resources_map = new HashMap<String,Double>(2*_map548.size);
- String _key549;
- double _val550;
- for (int _i551 = 0; _i551 < _map548.size; ++_i551)
+ org.apache.thrift.protocol.TMap _map564 = iprot.readMapBegin();
+ struct.resources_map = new HashMap<String,Double>(2*_map564.size);
+ String _key565;
+ double _val566;
+ for (int _i567 = 0; _i567 < _map564.size; ++_i567)
{
- _key549 = iprot.readString();
- _val550 = iprot.readDouble();
- struct.resources_map.put(_key549, _val550);
+ _key565 = iprot.readString();
+ _val566 = iprot.readDouble();
+ struct.resources_map.put(_key565, _val566);
}
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 _iter552 : struct.used_ports)
+ for (long _iter568 : struct.used_ports)
{
- oprot.writeI64(_iter552);
+ oprot.writeI64(_iter568);
}
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 _iter553 : struct.meta)
+ for (long _iter569 : struct.meta)
{
- oprot.writeI64(_iter553);
+ oprot.writeI64(_iter569);
}
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> _iter554 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter570 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter554.getKey());
- oprot.writeString(_iter554.getValue());
+ oprot.writeString(_iter570.getKey());
+ oprot.writeString(_iter570.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> _iter555 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter571 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter555.getKey());
- oprot.writeDouble(_iter555.getValue());
+ oprot.writeString(_iter571.getKey());
+ oprot.writeDouble(_iter571.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 _iter556 : struct.used_ports)
+ for (long _iter572 : struct.used_ports)
{
- oprot.writeI64(_iter556);
+ oprot.writeI64(_iter572);
}
}
}
if (struct.is_set_meta()) {
{
oprot.writeI32(struct.meta.size());
- for (long _iter557 : struct.meta)
+ for (long _iter573 : struct.meta)
{
- oprot.writeI64(_iter557);
+ oprot.writeI64(_iter573);
}
}
}
if (struct.is_set_scheduler_meta()) {
{
oprot.writeI32(struct.scheduler_meta.size());
- for (Map.Entry<String, String> _iter558 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter574 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter558.getKey());
- oprot.writeString(_iter558.getValue());
+ oprot.writeString(_iter574.getKey());
+ oprot.writeString(_iter574.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> _iter559 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter575 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter559.getKey());
- oprot.writeDouble(_iter559.getValue());
+ oprot.writeString(_iter575.getKey());
+ oprot.writeDouble(_iter575.getValue());
}
}
}
@@ -1377,41 +1377,41 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list560 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.used_ports = new ArrayList<Long>(_list560.size);
- long _elem561;
- for (int _i562 = 0; _i562 < _list560.size; ++_i562)
+ org.apache.thrift.protocol.TList _list576 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.used_ports = new ArrayList<Long>(_list576.size);
+ long _elem577;
+ for (int _i578 = 0; _i578 < _list576.size; ++_i578)
{
- _elem561 = iprot.readI64();
- struct.used_ports.add(_elem561);
+ _elem577 = iprot.readI64();
+ struct.used_ports.add(_elem577);
}
}
struct.set_used_ports_isSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list563 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.meta = new ArrayList<Long>(_list563.size);
- long _elem564;
- for (int _i565 = 0; _i565 < _list563.size; ++_i565)
+ org.apache.thrift.protocol.TList _list579 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.meta = new ArrayList<Long>(_list579.size);
+ long _elem580;
+ for (int _i581 = 0; _i581 < _list579.size; ++_i581)
{
- _elem564 = iprot.readI64();
- struct.meta.add(_elem564);
+ _elem580 = iprot.readI64();
+ struct.meta.add(_elem580);
}
}
struct.set_meta_isSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map566 = 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*_map566.size);
- String _key567;
- String _val568;
- for (int _i569 = 0; _i569 < _map566.size; ++_i569)
+ org.apache.thrift.protocol.TMap _map582 = 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*_map582.size);
+ String _key583;
+ String _val584;
+ for (int _i585 = 0; _i585 < _map582.size; ++_i585)
{
- _key567 = iprot.readString();
- _val568 = iprot.readString();
- struct.scheduler_meta.put(_key567, _val568);
+ _key583 = iprot.readString();
+ _val584 = iprot.readString();
+ struct.scheduler_meta.put(_key583, _val584);
}
}
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 _map570 = 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*_map570.size);
- String _key571;
- double _val572;
- for (int _i573 = 0; _i573 < _map570.size; ++_i573)
+ org.apache.thrift.protocol.TMap _map586 = 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*_map586.size);
+ String _key587;
+ double _val588;
+ for (int _i589 = 0; _i589 < _map586.size; ++_i589)
{
- _key571 = iprot.readString();
- _val572 = iprot.readDouble();
- struct.resources_map.put(_key571, _val572);
+ _key587 = iprot.readString();
+ _val588 = iprot.readDouble();
+ struct.resources_map.put(_key587, _val588);
}
}
struct.set_resources_map_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java b/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
index d704005..03a5e8f 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
+++ b/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java
@@ -138,7 +138,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SupervisorSummary.class))));
tmpMap.put(_Fields.WORKER_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("worker_summaries", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "WorkerSummary"))));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkerSummary.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorPageInfo.class, metaDataMap);
}
@@ -160,7 +160,7 @@ public class SupervisorPageInfo implements org.apache.thrift.TBase<SupervisorPag
if (other.is_set_worker_summaries()) {
List<WorkerSummary> __this__worker_summaries = new ArrayList<WorkerSummary>(other.worker_summaries.size());
for (WorkerSummary other_element : other.worker_summaries) {
- __this__worker_summaries.add(other_element);
+ __this__worker_summaries.add(new WorkerSummary(other_element));
}
this.worker_summaries = __this__worker_summaries;
}
@@ -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 _list402 = iprot.readListBegin();
- struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list402.size);
- SupervisorSummary _elem403;
- for (int _i404 = 0; _i404 < _list402.size; ++_i404)
+ org.apache.thrift.protocol.TList _list428 = iprot.readListBegin();
+ struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list428.size);
+ SupervisorSummary _elem429;
+ for (int _i430 = 0; _i430 < _list428.size; ++_i430)
{
- _elem403 = new SupervisorSummary();
- _elem403.read(iprot);
- struct.supervisor_summaries.add(_elem403);
+ _elem429 = new SupervisorSummary();
+ _elem429.read(iprot);
+ struct.supervisor_summaries.add(_elem429);
}
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 _list405 = iprot.readListBegin();
- struct.worker_summaries = new ArrayList<WorkerSummary>(_list405.size);
- WorkerSummary _elem406;
- for (int _i407 = 0; _i407 < _list405.size; ++_i407)
+ org.apache.thrift.protocol.TList _list431 = iprot.readListBegin();
+ struct.worker_summaries = new ArrayList<WorkerSummary>(_list431.size);
+ WorkerSummary _elem432;
+ for (int _i433 = 0; _i433 < _list431.size; ++_i433)
{
- _elem406 = new WorkerSummary();
- _elem406.read(iprot);
- struct.worker_summaries.add(_elem406);
+ _elem432 = new WorkerSummary();
+ _elem432.read(iprot);
+ struct.worker_summaries.add(_elem432);
}
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 _iter408 : struct.supervisor_summaries)
+ for (SupervisorSummary _iter434 : struct.supervisor_summaries)
{
- _iter408.write(oprot);
+ _iter434.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 _iter409 : struct.worker_summaries)
+ for (WorkerSummary _iter435 : struct.worker_summaries)
{
- _iter409.write(oprot);
+ _iter435.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 _iter410 : struct.supervisor_summaries)
+ for (SupervisorSummary _iter436 : struct.supervisor_summaries)
{
- _iter410.write(oprot);
+ _iter436.write(oprot);
}
}
}
if (struct.is_set_worker_summaries()) {
{
oprot.writeI32(struct.worker_summaries.size());
- for (WorkerSummary _iter411 : struct.worker_summaries)
+ for (WorkerSummary _iter437 : struct.worker_summaries)
{
- _iter411.write(oprot);
+ _iter437.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 _list412 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list412.size);
- SupervisorSummary _elem413;
- for (int _i414 = 0; _i414 < _list412.size; ++_i414)
+ org.apache.thrift.protocol.TList _list438 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.supervisor_summaries = new ArrayList<SupervisorSummary>(_list438.size);
+ SupervisorSummary _elem439;
+ for (int _i440 = 0; _i440 < _list438.size; ++_i440)
{
- _elem413 = new SupervisorSummary();
- _elem413.read(iprot);
- struct.supervisor_summaries.add(_elem413);
+ _elem439 = new SupervisorSummary();
+ _elem439.read(iprot);
+ struct.supervisor_summaries.add(_elem439);
}
}
struct.set_supervisor_summaries_isSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list415 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.worker_summaries = new ArrayList<WorkerSummary>(_list415.size);
- WorkerSummary _elem416;
- for (int _i417 = 0; _i417 < _list415.size; ++_i417)
+ org.apache.thrift.protocol.TList _list441 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.worker_summaries = new ArrayList<WorkerSummary>(_list441.size);
+ WorkerSummary _elem442;
+ for (int _i443 = 0; _i443 < _list441.size; ++_i443)
{
- _elem416 = new WorkerSummary();
- _elem416.read(iprot);
- struct.worker_summaries.add(_elem416);
+ _elem442 = new WorkerSummary();
+ _elem442.read(iprot);
+ struct.worker_summaries.add(_elem442);
}
}
struct.set_worker_summaries_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/org/apache/storm/generated/SupervisorSummary.java
index 6100fcf..bd7d7a4 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/SupervisorSummary.java
+++ b/storm-core/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 _map82 = iprot.readMapBegin();
- struct.total_resources = new HashMap<String,Double>(2*_map82.size);
- String _key83;
- double _val84;
- for (int _i85 = 0; _i85 < _map82.size; ++_i85)
+ 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)
{
- _key83 = iprot.readString();
- _val84 = iprot.readDouble();
- struct.total_resources.put(_key83, _val84);
+ _key99 = iprot.readString();
+ _val100 = iprot.readDouble();
+ struct.total_resources.put(_key99, _val100);
}
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> _iter86 : struct.total_resources.entrySet())
+ for (Map.Entry<String, Double> _iter102 : struct.total_resources.entrySet())
{
- oprot.writeString(_iter86.getKey());
- oprot.writeDouble(_iter86.getValue());
+ oprot.writeString(_iter102.getKey());
+ oprot.writeDouble(_iter102.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> _iter87 : struct.total_resources.entrySet())
+ for (Map.Entry<String, Double> _iter103 : struct.total_resources.entrySet())
{
- oprot.writeString(_iter87.getKey());
- oprot.writeDouble(_iter87.getValue());
+ oprot.writeString(_iter103.getKey());
+ oprot.writeDouble(_iter103.getValue());
}
}
}
@@ -1237,15 +1237,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TMap _map88 = 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*_map88.size);
- String _key89;
- double _val90;
- for (int _i91 = 0; _i91 < _map88.size; ++_i91)
+ 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)
{
- _key89 = iprot.readString();
- _val90 = iprot.readDouble();
- struct.total_resources.put(_key89, _val90);
+ _key105 = iprot.readString();
+ _val106 = iprot.readDouble();
+ struct.total_resources.put(_key105, _val106);
}
}
struct.set_total_resources_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0b9a4d03/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java b/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
index 63225dc..27671aa 100644
--- a/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
+++ b/storm-core/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 _list748 = iprot.readListBegin();
- struct.topo_ids = new ArrayList<String>(_list748.size);
- String _elem749;
- for (int _i750 = 0; _i750 < _list748.size; ++_i750)
+ org.apache.thrift.protocol.TList _list764 = iprot.readListBegin();
+ struct.topo_ids = new ArrayList<String>(_list764.size);
+ String _elem765;
+ for (int _i766 = 0; _i766 < _list764.size; ++_i766)
{
- _elem749 = iprot.readString();
- struct.topo_ids.add(_elem749);
+ _elem765 = iprot.readString();
+ struct.topo_ids.add(_elem765);
}
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 _iter751 : struct.topo_ids)
+ for (String _iter767 : struct.topo_ids)
{
- oprot.writeString(_iter751);
+ oprot.writeString(_iter767);
}
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 _iter752 : struct.topo_ids)
+ for (String _iter768 : struct.topo_ids)
{
- oprot.writeString(_iter752);
+ oprot.writeString(_iter768);
}
}
}
@@ -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 _list753 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.topo_ids = new ArrayList<String>(_list753.size);
- String _elem754;
- for (int _i755 = 0; _i755 < _list753.size; ++_i755)
+ org.apache.thrift.protocol.TList _list769 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.topo_ids = new ArrayList<String>(_list769.size);
+ String _elem770;
+ for (int _i771 = 0; _i771 < _list769.size; ++_i771)
{
- _elem754 = iprot.readString();
- struct.topo_ids.add(_elem754);
+ _elem770 = iprot.readString();
+ struct.topo_ids.add(_elem770);
}
}
struct.set_topo_ids_isSet(true);