You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/10/05 23:00:58 UTC
[26/37] storm git commit: Merge remote-tracking branch
'apache/master' into storm-820-agg-stats-on-nimbus
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index df89140,2cc7762..5764c1d
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
@@@ -529,15 -529,15 +529,15 @@@
case 3: // NUM_EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map432 = iprot.readMapBegin();
- struct.num_executors = new HashMap<String,Integer>(2*_map432.size);
- String _key433;
- int _val434;
- for (int _i435 = 0; _i435 < _map432.size; ++_i435)
- org.apache.thrift.protocol.TMap _map334 = iprot.readMapBegin();
- struct.num_executors = new HashMap<String,Integer>(2*_map334.size);
- String _key335;
- int _val336;
- for (int _i337 = 0; _i337 < _map334.size; ++_i337)
++ org.apache.thrift.protocol.TMap _map450 = iprot.readMapBegin();
++ struct.num_executors = new HashMap<String,Integer>(2*_map450.size);
++ String _key451;
++ int _val452;
++ for (int _i453 = 0; _i453 < _map450.size; ++_i453)
{
- _key433 = iprot.readString();
- _val434 = iprot.readI32();
- struct.num_executors.put(_key433, _val434);
- _key335 = iprot.readString();
- _val336 = iprot.readI32();
- struct.num_executors.put(_key335, _val336);
++ _key451 = iprot.readString();
++ _val452 = iprot.readI32();
++ struct.num_executors.put(_key451, _val452);
}
iprot.readMapEnd();
}
@@@ -574,10 -574,10 +574,10 @@@
oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.num_executors.size()));
- for (Map.Entry<String, Integer> _iter436 : struct.num_executors.entrySet())
- for (Map.Entry<String, Integer> _iter338 : struct.num_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter454 : struct.num_executors.entrySet())
{
- oprot.writeString(_iter436.getKey());
- oprot.writeI32(_iter436.getValue());
- oprot.writeString(_iter338.getKey());
- oprot.writeI32(_iter338.getValue());
++ oprot.writeString(_iter454.getKey());
++ oprot.writeI32(_iter454.getValue());
}
oprot.writeMapEnd();
}
@@@ -621,10 -621,10 +621,10 @@@
if (struct.is_set_num_executors()) {
{
oprot.writeI32(struct.num_executors.size());
- for (Map.Entry<String, Integer> _iter437 : struct.num_executors.entrySet())
- for (Map.Entry<String, Integer> _iter339 : struct.num_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter455 : struct.num_executors.entrySet())
{
- oprot.writeString(_iter437.getKey());
- oprot.writeI32(_iter437.getValue());
- oprot.writeString(_iter339.getKey());
- oprot.writeI32(_iter339.getValue());
++ oprot.writeString(_iter455.getKey());
++ oprot.writeI32(_iter455.getValue());
}
}
}
@@@ -644,15 -644,15 +644,15 @@@
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TMap _map438 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.num_executors = new HashMap<String,Integer>(2*_map438.size);
- String _key439;
- int _val440;
- for (int _i441 = 0; _i441 < _map438.size; ++_i441)
- org.apache.thrift.protocol.TMap _map340 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.num_executors = new HashMap<String,Integer>(2*_map340.size);
- String _key341;
- int _val342;
- for (int _i343 = 0; _i343 < _map340.size; ++_i343)
++ org.apache.thrift.protocol.TMap _map456 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
++ struct.num_executors = new HashMap<String,Integer>(2*_map456.size);
++ String _key457;
++ int _val458;
++ for (int _i459 = 0; _i459 < _map456.size; ++_i459)
{
- _key439 = iprot.readString();
- _val440 = iprot.readI32();
- struct.num_executors.put(_key439, _val440);
- _key341 = iprot.readString();
- _val342 = iprot.readI32();
- struct.num_executors.put(_key341, _val342);
++ _key457 = iprot.readString();
++ _val458 = iprot.readI32();
++ struct.num_executors.put(_key457, _val458);
}
}
struct.set_num_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index 7826fe4,c18a7d0..00d4418
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StormBase.java
index 9d20aa5,250cc9c..b880bc3
--- a/storm-core/src/jvm/backtype/storm/generated/StormBase.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase");
@@@ -984,15 -1090,15 +1090,15 @@@
case 4: // COMPONENT_EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map532 = iprot.readMapBegin();
- struct.component_executors = new HashMap<String,Integer>(2*_map532.size);
- String _key533;
- int _val534;
- for (int _i535 = 0; _i535 < _map532.size; ++_i535)
- org.apache.thrift.protocol.TMap _map434 = iprot.readMapBegin();
- struct.component_executors = new HashMap<String,Integer>(2*_map434.size);
- String _key435;
- int _val436;
- for (int _i437 = 0; _i437 < _map434.size; ++_i437)
++ org.apache.thrift.protocol.TMap _map550 = iprot.readMapBegin();
++ struct.component_executors = new HashMap<String,Integer>(2*_map550.size);
++ String _key551;
++ int _val552;
++ for (int _i553 = 0; _i553 < _map550.size; ++_i553)
{
- _key533 = iprot.readString();
- _val534 = iprot.readI32();
- struct.component_executors.put(_key533, _val534);
- _key435 = iprot.readString();
- _val436 = iprot.readI32();
- struct.component_executors.put(_key435, _val436);
++ _key551 = iprot.readString();
++ _val552 = iprot.readI32();
++ struct.component_executors.put(_key551, _val552);
}
iprot.readMapEnd();
}
@@@ -1034,6 -1140,27 +1140,27 @@@
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 9: // COMPONENT_DEBUG
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
- org.apache.thrift.protocol.TMap _map438 = iprot.readMapBegin();
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map438.size);
- String _key439;
- DebugOptions _val440;
- for (int _i441 = 0; _i441 < _map438.size; ++_i441)
++ org.apache.thrift.protocol.TMap _map554 = iprot.readMapBegin();
++ struct.component_debug = new HashMap<String,DebugOptions>(2*_map554.size);
++ String _key555;
++ DebugOptions _val556;
++ for (int _i557 = 0; _i557 < _map554.size; ++_i557)
+ {
- _key439 = iprot.readString();
- _val440 = new DebugOptions();
- _val440.read(iprot);
- struct.component_debug.put(_key439, _val440);
++ _key555 = iprot.readString();
++ _val556 = new DebugOptions();
++ _val556.read(iprot);
++ struct.component_debug.put(_key555, _val556);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_component_debug_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@@ -1065,10 -1192,10 +1192,10 @@@
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> _iter536 : struct.component_executors.entrySet())
- for (Map.Entry<String, Integer> _iter442 : struct.component_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter558 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter536.getKey());
- oprot.writeI32(_iter536.getValue());
- oprot.writeString(_iter442.getKey());
- oprot.writeI32(_iter442.getValue());
++ oprot.writeString(_iter558.getKey());
++ oprot.writeI32(_iter558.getValue());
}
oprot.writeMapEnd();
}
@@@ -1101,6 -1228,21 +1228,21 @@@
oprot.writeFieldEnd();
}
}
+ if (struct.component_debug != null) {
+ if (struct.is_set_component_debug()) {
+ 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> _iter443 : struct.component_debug.entrySet())
++ for (Map.Entry<String, DebugOptions> _iter559 : struct.component_debug.entrySet())
+ {
- oprot.writeString(_iter443.getKey());
- _iter443.getValue().write(oprot);
++ oprot.writeString(_iter559.getKey());
++ _iter559.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@@ -1141,10 -1286,10 +1286,10 @@@
if (struct.is_set_component_executors()) {
{
oprot.writeI32(struct.component_executors.size());
- for (Map.Entry<String, Integer> _iter537 : struct.component_executors.entrySet())
- for (Map.Entry<String, Integer> _iter444 : struct.component_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter560 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter537.getKey());
- oprot.writeI32(_iter537.getValue());
- oprot.writeString(_iter444.getKey());
- oprot.writeI32(_iter444.getValue());
++ oprot.writeString(_iter560.getKey());
++ oprot.writeI32(_iter560.getValue());
}
}
}
@@@ -1160,6 -1305,16 +1305,16 @@@
if (struct.is_set_prev_status()) {
oprot.writeI32(struct.prev_status.getValue());
}
+ if (struct.is_set_component_debug()) {
+ {
+ oprot.writeI32(struct.component_debug.size());
- for (Map.Entry<String, DebugOptions> _iter445 : struct.component_debug.entrySet())
++ for (Map.Entry<String, DebugOptions> _iter561 : struct.component_debug.entrySet())
+ {
- oprot.writeString(_iter445.getKey());
- _iter445.getValue().write(oprot);
++ oprot.writeString(_iter561.getKey());
++ _iter561.getValue().write(oprot);
+ }
+ }
+ }
}
@Override
@@@ -1171,18 -1326,18 +1326,18 @@@
struct.set_status_isSet(true);
struct.num_workers = iprot.readI32();
struct.set_num_workers_isSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map538 = 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*_map538.size);
- String _key539;
- int _val540;
- for (int _i541 = 0; _i541 < _map538.size; ++_i541)
- org.apache.thrift.protocol.TMap _map446 = 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*_map446.size);
- String _key447;
- int _val448;
- for (int _i449 = 0; _i449 < _map446.size; ++_i449)
++ org.apache.thrift.protocol.TMap _map562 = 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*_map562.size);
++ String _key563;
++ int _val564;
++ for (int _i565 = 0; _i565 < _map562.size; ++_i565)
{
- _key539 = iprot.readString();
- _val540 = iprot.readI32();
- struct.component_executors.put(_key539, _val540);
- _key447 = iprot.readString();
- _val448 = iprot.readI32();
- struct.component_executors.put(_key447, _val448);
++ _key563 = iprot.readString();
++ _val564 = iprot.readI32();
++ struct.component_executors.put(_key563, _val564);
}
}
struct.set_component_executors_isSet(true);
@@@ -1204,6 -1359,22 +1359,22 @@@
struct.prev_status = backtype.storm.generated.TopologyStatus.findByValue(iprot.readI32());
struct.set_prev_status_isSet(true);
}
+ if (incoming.get(5)) {
+ {
- org.apache.thrift.protocol.TMap _map450 = 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*_map450.size);
- String _key451;
- DebugOptions _val452;
- for (int _i453 = 0; _i453 < _map450.size; ++_i453)
++ org.apache.thrift.protocol.TMap _map566 = 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*_map566.size);
++ String _key567;
++ DebugOptions _val568;
++ for (int _i569 = 0; _i569 < _map566.size; ++_i569)
+ {
- _key451 = iprot.readString();
- _val452 = new DebugOptions();
- _val452.read(iprot);
- struct.component_debug.put(_key451, _val452);
++ _key567 = iprot.readString();
++ _val568 = new DebugOptions();
++ _val568.read(iprot);
++ struct.component_debug.put(_key567, _val568);
+ }
+ }
+ struct.set_component_debug_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
index fb14c4a,bb4698c..de48f99
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo");
@@@ -990,13 -990,13 +990,13 @@@
case 4: // USED_PORTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list452 = iprot.readListBegin();
- struct.used_ports = new ArrayList<Long>(_list452.size);
- long _elem453;
- for (int _i454 = 0; _i454 < _list452.size; ++_i454)
- org.apache.thrift.protocol.TList _list354 = iprot.readListBegin();
- struct.used_ports = new ArrayList<Long>(_list354.size);
- long _elem355;
- for (int _i356 = 0; _i356 < _list354.size; ++_i356)
++ org.apache.thrift.protocol.TList _list470 = iprot.readListBegin();
++ struct.used_ports = new ArrayList<Long>(_list470.size);
++ long _elem471;
++ for (int _i472 = 0; _i472 < _list470.size; ++_i472)
{
- _elem453 = iprot.readI64();
- struct.used_ports.add(_elem453);
- _elem355 = iprot.readI64();
- struct.used_ports.add(_elem355);
++ _elem471 = iprot.readI64();
++ struct.used_ports.add(_elem471);
}
iprot.readListEnd();
}
@@@ -1008,13 -1008,13 +1008,13 @@@
case 5: // META
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list455 = iprot.readListBegin();
- struct.meta = new ArrayList<Long>(_list455.size);
- long _elem456;
- for (int _i457 = 0; _i457 < _list455.size; ++_i457)
- org.apache.thrift.protocol.TList _list357 = iprot.readListBegin();
- struct.meta = new ArrayList<Long>(_list357.size);
- long _elem358;
- for (int _i359 = 0; _i359 < _list357.size; ++_i359)
++ org.apache.thrift.protocol.TList _list473 = iprot.readListBegin();
++ struct.meta = new ArrayList<Long>(_list473.size);
++ long _elem474;
++ for (int _i475 = 0; _i475 < _list473.size; ++_i475)
{
- _elem456 = iprot.readI64();
- struct.meta.add(_elem456);
- _elem358 = iprot.readI64();
- struct.meta.add(_elem358);
++ _elem474 = iprot.readI64();
++ struct.meta.add(_elem474);
}
iprot.readListEnd();
}
@@@ -1026,15 -1026,15 +1026,15 @@@
case 6: // SCHEDULER_META
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map458 = iprot.readMapBegin();
- struct.scheduler_meta = new HashMap<String,String>(2*_map458.size);
- String _key459;
- String _val460;
- for (int _i461 = 0; _i461 < _map458.size; ++_i461)
- org.apache.thrift.protocol.TMap _map360 = iprot.readMapBegin();
- struct.scheduler_meta = new HashMap<String,String>(2*_map360.size);
- String _key361;
- String _val362;
- for (int _i363 = 0; _i363 < _map360.size; ++_i363)
++ org.apache.thrift.protocol.TMap _map476 = iprot.readMapBegin();
++ struct.scheduler_meta = new HashMap<String,String>(2*_map476.size);
++ String _key477;
++ String _val478;
++ for (int _i479 = 0; _i479 < _map476.size; ++_i479)
{
- _key459 = iprot.readString();
- _val460 = iprot.readString();
- struct.scheduler_meta.put(_key459, _val460);
- _key361 = iprot.readString();
- _val362 = iprot.readString();
- struct.scheduler_meta.put(_key361, _val362);
++ _key477 = iprot.readString();
++ _val478 = iprot.readString();
++ struct.scheduler_meta.put(_key477, _val478);
}
iprot.readMapEnd();
}
@@@ -1092,9 -1092,9 +1092,9 @@@
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 _iter462 : struct.used_ports)
- for (long _iter364 : struct.used_ports)
++ for (long _iter480 : struct.used_ports)
{
- oprot.writeI64(_iter462);
- oprot.writeI64(_iter364);
++ oprot.writeI64(_iter480);
}
oprot.writeListEnd();
}
@@@ -1106,9 -1106,9 +1106,9 @@@
oprot.writeFieldBegin(META_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.meta.size()));
- for (long _iter463 : struct.meta)
- for (long _iter365 : struct.meta)
++ for (long _iter481 : struct.meta)
{
- oprot.writeI64(_iter463);
- oprot.writeI64(_iter365);
++ oprot.writeI64(_iter481);
}
oprot.writeListEnd();
}
@@@ -1120,10 -1120,10 +1120,10 @@@
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> _iter464 : struct.scheduler_meta.entrySet())
- for (Map.Entry<String, String> _iter366 : struct.scheduler_meta.entrySet())
++ for (Map.Entry<String, String> _iter482 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter464.getKey());
- oprot.writeString(_iter464.getValue());
- oprot.writeString(_iter366.getKey());
- oprot.writeString(_iter366.getValue());
++ oprot.writeString(_iter482.getKey());
++ oprot.writeString(_iter482.getValue());
}
oprot.writeMapEnd();
}
@@@ -1187,28 -1187,28 +1187,28 @@@
if (struct.is_set_used_ports()) {
{
oprot.writeI32(struct.used_ports.size());
- for (long _iter465 : struct.used_ports)
- for (long _iter367 : struct.used_ports)
++ for (long _iter483 : struct.used_ports)
{
- oprot.writeI64(_iter465);
- oprot.writeI64(_iter367);
++ oprot.writeI64(_iter483);
}
}
}
if (struct.is_set_meta()) {
{
oprot.writeI32(struct.meta.size());
- for (long _iter466 : struct.meta)
- for (long _iter368 : struct.meta)
++ for (long _iter484 : struct.meta)
{
- oprot.writeI64(_iter466);
- oprot.writeI64(_iter368);
++ oprot.writeI64(_iter484);
}
}
}
if (struct.is_set_scheduler_meta()) {
{
oprot.writeI32(struct.scheduler_meta.size());
- for (Map.Entry<String, String> _iter467 : struct.scheduler_meta.entrySet())
- for (Map.Entry<String, String> _iter369 : struct.scheduler_meta.entrySet())
++ for (Map.Entry<String, String> _iter485 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter467.getKey());
- oprot.writeString(_iter467.getValue());
- oprot.writeString(_iter369.getKey());
- oprot.writeString(_iter369.getValue());
++ oprot.writeString(_iter485.getKey());
++ oprot.writeString(_iter485.getValue());
}
}
}
@@@ -1234,41 -1234,41 +1234,41 @@@
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list468 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.used_ports = new ArrayList<Long>(_list468.size);
- long _elem469;
- for (int _i470 = 0; _i470 < _list468.size; ++_i470)
- org.apache.thrift.protocol.TList _list370 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.used_ports = new ArrayList<Long>(_list370.size);
- long _elem371;
- for (int _i372 = 0; _i372 < _list370.size; ++_i372)
++ org.apache.thrift.protocol.TList _list486 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ struct.used_ports = new ArrayList<Long>(_list486.size);
++ long _elem487;
++ for (int _i488 = 0; _i488 < _list486.size; ++_i488)
{
- _elem469 = iprot.readI64();
- struct.used_ports.add(_elem469);
- _elem371 = iprot.readI64();
- struct.used_ports.add(_elem371);
++ _elem487 = iprot.readI64();
++ struct.used_ports.add(_elem487);
}
}
struct.set_used_ports_isSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list471 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.meta = new ArrayList<Long>(_list471.size);
- long _elem472;
- for (int _i473 = 0; _i473 < _list471.size; ++_i473)
- org.apache.thrift.protocol.TList _list373 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.meta = new ArrayList<Long>(_list373.size);
- long _elem374;
- for (int _i375 = 0; _i375 < _list373.size; ++_i375)
++ org.apache.thrift.protocol.TList _list489 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ struct.meta = new ArrayList<Long>(_list489.size);
++ long _elem490;
++ for (int _i491 = 0; _i491 < _list489.size; ++_i491)
{
- _elem472 = iprot.readI64();
- struct.meta.add(_elem472);
- _elem374 = iprot.readI64();
- struct.meta.add(_elem374);
++ _elem490 = iprot.readI64();
++ struct.meta.add(_elem490);
}
}
struct.set_meta_isSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map474 = 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*_map474.size);
- String _key475;
- String _val476;
- for (int _i477 = 0; _i477 < _map474.size; ++_i477)
- org.apache.thrift.protocol.TMap _map376 = 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*_map376.size);
- String _key377;
- String _val378;
- for (int _i379 = 0; _i379 < _map376.size; ++_i379)
++ org.apache.thrift.protocol.TMap _map492 = 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*_map492.size);
++ String _key493;
++ String _val494;
++ for (int _i495 = 0; _i495 < _map492.size; ++_i495)
{
- _key475 = iprot.readString();
- _val476 = iprot.readString();
- struct.scheduler_meta.put(_key475, _val476);
- _key377 = iprot.readString();
- _val378 = iprot.readString();
- struct.scheduler_meta.put(_key377, _val378);
++ _key493 = iprot.readString();
++ _val494 = iprot.readString();
++ struct.scheduler_meta.put(_key493, _val494);
}
}
struct.set_scheduler_meta_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/5d847945/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index 6e1a503,6c2cc69..17cc1f1
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-28")
public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");