You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/09/21 19:41:02 UTC
[17/24] storm git commit: merging from upstream
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Credentials.java
index 896d227,c1ef293..8484b18
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@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")
public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
@@@ -365,15 -365,15 +365,15 @@@
case 1: // CREDS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map336 = iprot.readMapBegin();
- struct.creds = new HashMap<String,String>(2*_map336.size);
- String _key337;
- String _val338;
- for (int _i339 = 0; _i339 < _map336.size; ++_i339)
- org.apache.thrift.protocol.TMap _map326 = iprot.readMapBegin();
- struct.creds = new HashMap<String,String>(2*_map326.size);
- String _key327;
- String _val328;
- for (int _i329 = 0; _i329 < _map326.size; ++_i329)
++ org.apache.thrift.protocol.TMap _map344 = iprot.readMapBegin();
++ struct.creds = new HashMap<String,String>(2*_map344.size);
++ String _key345;
++ String _val346;
++ for (int _i347 = 0; _i347 < _map344.size; ++_i347)
{
- _key337 = iprot.readString();
- _val338 = iprot.readString();
- struct.creds.put(_key337, _val338);
- _key327 = iprot.readString();
- _val328 = iprot.readString();
- struct.creds.put(_key327, _val328);
++ _key345 = iprot.readString();
++ _val346 = iprot.readString();
++ struct.creds.put(_key345, _val346);
}
iprot.readMapEnd();
}
@@@ -399,10 -399,10 +399,10 @@@
oprot.writeFieldBegin(CREDS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
- for (Map.Entry<String, String> _iter340 : struct.creds.entrySet())
- for (Map.Entry<String, String> _iter330 : struct.creds.entrySet())
++ for (Map.Entry<String, String> _iter348 : struct.creds.entrySet())
{
- oprot.writeString(_iter340.getKey());
- oprot.writeString(_iter340.getValue());
- oprot.writeString(_iter330.getKey());
- oprot.writeString(_iter330.getValue());
++ oprot.writeString(_iter348.getKey());
++ oprot.writeString(_iter348.getValue());
}
oprot.writeMapEnd();
}
@@@ -427,10 -427,10 +427,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.creds.size());
- for (Map.Entry<String, String> _iter341 : struct.creds.entrySet())
- for (Map.Entry<String, String> _iter331 : struct.creds.entrySet())
++ for (Map.Entry<String, String> _iter349 : struct.creds.entrySet())
{
- oprot.writeString(_iter341.getKey());
- oprot.writeString(_iter341.getValue());
- oprot.writeString(_iter331.getKey());
- oprot.writeString(_iter331.getValue());
++ oprot.writeString(_iter349.getKey());
++ oprot.writeString(_iter349.getValue());
}
}
}
@@@ -439,15 -439,15 +439,15 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map342 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.creds = new HashMap<String,String>(2*_map342.size);
- String _key343;
- String _val344;
- for (int _i345 = 0; _i345 < _map342.size; ++_i345)
- org.apache.thrift.protocol.TMap _map332 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.creds = new HashMap<String,String>(2*_map332.size);
- String _key333;
- String _val334;
- for (int _i335 = 0; _i335 < _map332.size; ++_i335)
++ org.apache.thrift.protocol.TMap _map350 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
++ struct.creds = new HashMap<String,String>(2*_map350.size);
++ String _key351;
++ String _val352;
++ for (int _i353 = 0; _i353 < _map350.size; ++_i353)
{
- _key343 = iprot.readString();
- _val344 = iprot.readString();
- struct.creds.put(_key343, _val344);
- _key333 = iprot.readString();
- _val334 = iprot.readString();
- struct.creds.put(_key333, _val334);
++ _key351 = iprot.readString();
++ _val352 = iprot.readString();
++ struct.creds.put(_key351, _val352);
}
}
struct.set_creds_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index 001fcff,001fcff..58a7936
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
--@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
@@@ -660,27 -660,27 +660,27 @@@
case 1: // EMITTED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
-- org.apache.thrift.protocol.TMap _map250 = iprot.readMapBegin();
-- struct.emitted = new HashMap<String,Map<String,Long>>(2*_map250.size);
-- String _key251;
-- Map<String,Long> _val252;
-- for (int _i253 = 0; _i253 < _map250.size; ++_i253)
++ org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin();
++ struct.emitted = new HashMap<String,Map<String,Long>>(2*_map258.size);
++ String _key259;
++ Map<String,Long> _val260;
++ for (int _i261 = 0; _i261 < _map258.size; ++_i261)
{
-- _key251 = iprot.readString();
++ _key259 = iprot.readString();
{
-- org.apache.thrift.protocol.TMap _map254 = iprot.readMapBegin();
-- _val252 = new HashMap<String,Long>(2*_map254.size);
-- String _key255;
-- long _val256;
-- for (int _i257 = 0; _i257 < _map254.size; ++_i257)
++ org.apache.thrift.protocol.TMap _map262 = iprot.readMapBegin();
++ _val260 = new HashMap<String,Long>(2*_map262.size);
++ String _key263;
++ long _val264;
++ for (int _i265 = 0; _i265 < _map262.size; ++_i265)
{
-- _key255 = iprot.readString();
-- _val256 = iprot.readI64();
-- _val252.put(_key255, _val256);
++ _key263 = iprot.readString();
++ _val264 = iprot.readI64();
++ _val260.put(_key263, _val264);
}
iprot.readMapEnd();
}
-- struct.emitted.put(_key251, _val252);
++ struct.emitted.put(_key259, _val260);
}
iprot.readMapEnd();
}
@@@ -692,27 -692,27 +692,27 @@@
case 2: // TRANSFERRED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
-- org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin();
-- struct.transferred = new HashMap<String,Map<String,Long>>(2*_map258.size);
-- String _key259;
-- Map<String,Long> _val260;
-- for (int _i261 = 0; _i261 < _map258.size; ++_i261)
++ org.apache.thrift.protocol.TMap _map266 = iprot.readMapBegin();
++ struct.transferred = new HashMap<String,Map<String,Long>>(2*_map266.size);
++ String _key267;
++ Map<String,Long> _val268;
++ for (int _i269 = 0; _i269 < _map266.size; ++_i269)
{
-- _key259 = iprot.readString();
++ _key267 = iprot.readString();
{
-- org.apache.thrift.protocol.TMap _map262 = iprot.readMapBegin();
-- _val260 = new HashMap<String,Long>(2*_map262.size);
-- String _key263;
-- long _val264;
-- for (int _i265 = 0; _i265 < _map262.size; ++_i265)
++ org.apache.thrift.protocol.TMap _map270 = iprot.readMapBegin();
++ _val268 = new HashMap<String,Long>(2*_map270.size);
++ String _key271;
++ long _val272;
++ for (int _i273 = 0; _i273 < _map270.size; ++_i273)
{
-- _key263 = iprot.readString();
-- _val264 = iprot.readI64();
-- _val260.put(_key263, _val264);
++ _key271 = iprot.readString();
++ _val272 = iprot.readI64();
++ _val268.put(_key271, _val272);
}
iprot.readMapEnd();
}
-- struct.transferred.put(_key259, _val260);
++ struct.transferred.put(_key267, _val268);
}
iprot.readMapEnd();
}
@@@ -755,15 -755,15 +755,15 @@@
oprot.writeFieldBegin(EMITTED_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size()));
-- for (Map.Entry<String, Map<String,Long>> _iter266 : struct.emitted.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter274 : struct.emitted.entrySet())
{
-- oprot.writeString(_iter266.getKey());
++ oprot.writeString(_iter274.getKey());
{
-- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter266.getValue().size()));
-- for (Map.Entry<String, Long> _iter267 : _iter266.getValue().entrySet())
++ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter274.getValue().size()));
++ for (Map.Entry<String, Long> _iter275 : _iter274.getValue().entrySet())
{
-- oprot.writeString(_iter267.getKey());
-- oprot.writeI64(_iter267.getValue());
++ oprot.writeString(_iter275.getKey());
++ oprot.writeI64(_iter275.getValue());
}
oprot.writeMapEnd();
}
@@@ -776,15 -776,15 +776,15 @@@
oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size()));
-- for (Map.Entry<String, Map<String,Long>> _iter268 : struct.transferred.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter276 : struct.transferred.entrySet())
{
-- oprot.writeString(_iter268.getKey());
++ oprot.writeString(_iter276.getKey());
{
-- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter268.getValue().size()));
-- for (Map.Entry<String, Long> _iter269 : _iter268.getValue().entrySet())
++ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter276.getValue().size()));
++ for (Map.Entry<String, Long> _iter277 : _iter276.getValue().entrySet())
{
-- oprot.writeString(_iter269.getKey());
-- oprot.writeI64(_iter269.getValue());
++ oprot.writeString(_iter277.getKey());
++ oprot.writeI64(_iter277.getValue());
}
oprot.writeMapEnd();
}
@@@ -820,30 -820,30 +820,30 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.emitted.size());
-- for (Map.Entry<String, Map<String,Long>> _iter270 : struct.emitted.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter278 : struct.emitted.entrySet())
{
-- oprot.writeString(_iter270.getKey());
++ oprot.writeString(_iter278.getKey());
{
-- oprot.writeI32(_iter270.getValue().size());
-- for (Map.Entry<String, Long> _iter271 : _iter270.getValue().entrySet())
++ oprot.writeI32(_iter278.getValue().size());
++ for (Map.Entry<String, Long> _iter279 : _iter278.getValue().entrySet())
{
-- oprot.writeString(_iter271.getKey());
-- oprot.writeI64(_iter271.getValue());
++ oprot.writeString(_iter279.getKey());
++ oprot.writeI64(_iter279.getValue());
}
}
}
}
{
oprot.writeI32(struct.transferred.size());
-- for (Map.Entry<String, Map<String,Long>> _iter272 : struct.transferred.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter280 : struct.transferred.entrySet())
{
-- oprot.writeString(_iter272.getKey());
++ oprot.writeString(_iter280.getKey());
{
-- oprot.writeI32(_iter272.getValue().size());
-- for (Map.Entry<String, Long> _iter273 : _iter272.getValue().entrySet())
++ oprot.writeI32(_iter280.getValue().size());
++ for (Map.Entry<String, Long> _iter281 : _iter280.getValue().entrySet())
{
-- oprot.writeString(_iter273.getKey());
-- oprot.writeI64(_iter273.getValue());
++ oprot.writeString(_iter281.getKey());
++ oprot.writeI64(_iter281.getValue());
}
}
}
@@@ -856,32 -856,32 +856,8 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
-- org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-- struct.emitted = new HashMap<String,Map<String,Long>>(2*_map274.size);
-- String _key275;
-- Map<String,Long> _val276;
-- for (int _i277 = 0; _i277 < _map274.size; ++_i277)
-- {
-- _key275 = iprot.readString();
-- {
-- org.apache.thrift.protocol.TMap _map278 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
-- _val276 = new HashMap<String,Long>(2*_map278.size);
-- String _key279;
-- long _val280;
-- for (int _i281 = 0; _i281 < _map278.size; ++_i281)
-- {
-- _key279 = iprot.readString();
-- _val280 = iprot.readI64();
-- _val276.put(_key279, _val280);
-- }
-- }
-- struct.emitted.put(_key275, _val276);
-- }
-- }
-- struct.set_emitted_isSet(true);
-- {
org.apache.thrift.protocol.TMap _map282 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-- struct.transferred = new HashMap<String,Map<String,Long>>(2*_map282.size);
++ struct.emitted = new HashMap<String,Map<String,Long>>(2*_map282.size);
String _key283;
Map<String,Long> _val284;
for (int _i285 = 0; _i285 < _map282.size; ++_i285)
@@@ -899,7 -899,7 +875,31 @@@
_val284.put(_key287, _val288);
}
}
-- struct.transferred.put(_key283, _val284);
++ struct.emitted.put(_key283, _val284);
++ }
++ }
++ struct.set_emitted_isSet(true);
++ {
++ org.apache.thrift.protocol.TMap _map290 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
++ struct.transferred = new HashMap<String,Map<String,Long>>(2*_map290.size);
++ String _key291;
++ Map<String,Long> _val292;
++ for (int _i293 = 0; _i293 < _map290.size; ++_i293)
++ {
++ _key291 = iprot.readString();
++ {
++ org.apache.thrift.protocol.TMap _map294 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ _val292 = new HashMap<String,Long>(2*_map294.size);
++ String _key295;
++ long _val296;
++ for (int _i297 = 0; _i297 < _map294.size; ++_i297)
++ {
++ _key295 = iprot.readString();
++ _val296 = iprot.readI64();
++ _val292.put(_key295, _val296);
++ }
++ }
++ struct.transferred.put(_key291, _val292);
}
}
struct.set_transferred_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
index be950cb,1d97dca..fd9740b
--- a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers");
@@@ -365,15 -365,15 +365,15 @@@
case 1: // APPROVED_WORKERS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map474 = iprot.readMapBegin();
- struct.approved_workers = new HashMap<String,Integer>(2*_map474.size);
- String _key475;
- int _val476;
- for (int _i477 = 0; _i477 < _map474.size; ++_i477)
- org.apache.thrift.protocol.TMap _map454 = iprot.readMapBegin();
- struct.approved_workers = new HashMap<String,Integer>(2*_map454.size);
- String _key455;
- int _val456;
- for (int _i457 = 0; _i457 < _map454.size; ++_i457)
++ org.apache.thrift.protocol.TMap _map482 = iprot.readMapBegin();
++ struct.approved_workers = new HashMap<String,Integer>(2*_map482.size);
++ String _key483;
++ int _val484;
++ for (int _i485 = 0; _i485 < _map482.size; ++_i485)
{
- _key475 = iprot.readString();
- _val476 = iprot.readI32();
- struct.approved_workers.put(_key475, _val476);
- _key455 = iprot.readString();
- _val456 = iprot.readI32();
- struct.approved_workers.put(_key455, _val456);
++ _key483 = iprot.readString();
++ _val484 = iprot.readI32();
++ struct.approved_workers.put(_key483, _val484);
}
iprot.readMapEnd();
}
@@@ -399,10 -399,10 +399,10 @@@
oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size()));
- for (Map.Entry<String, Integer> _iter478 : struct.approved_workers.entrySet())
- for (Map.Entry<String, Integer> _iter458 : struct.approved_workers.entrySet())
++ for (Map.Entry<String, Integer> _iter486 : struct.approved_workers.entrySet())
{
- oprot.writeString(_iter478.getKey());
- oprot.writeI32(_iter478.getValue());
- oprot.writeString(_iter458.getKey());
- oprot.writeI32(_iter458.getValue());
++ oprot.writeString(_iter486.getKey());
++ oprot.writeI32(_iter486.getValue());
}
oprot.writeMapEnd();
}
@@@ -427,10 -427,10 +427,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.approved_workers.size());
- for (Map.Entry<String, Integer> _iter479 : struct.approved_workers.entrySet())
- for (Map.Entry<String, Integer> _iter459 : struct.approved_workers.entrySet())
++ for (Map.Entry<String, Integer> _iter487 : struct.approved_workers.entrySet())
{
- oprot.writeString(_iter479.getKey());
- oprot.writeI32(_iter479.getValue());
- oprot.writeString(_iter459.getKey());
- oprot.writeI32(_iter459.getValue());
++ oprot.writeString(_iter487.getKey());
++ oprot.writeI32(_iter487.getValue());
}
}
}
@@@ -439,15 -439,15 +439,15 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map480 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.approved_workers = new HashMap<String,Integer>(2*_map480.size);
- String _key481;
- int _val482;
- for (int _i483 = 0; _i483 < _map480.size; ++_i483)
- org.apache.thrift.protocol.TMap _map460 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.approved_workers = new HashMap<String,Integer>(2*_map460.size);
- String _key461;
- int _val462;
- for (int _i463 = 0; _i463 < _map460.size; ++_i463)
++ org.apache.thrift.protocol.TMap _map488 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
++ struct.approved_workers = new HashMap<String,Integer>(2*_map488.size);
++ String _key489;
++ int _val490;
++ for (int _i491 = 0; _i491 < _map488.size; ++_i491)
{
- _key481 = iprot.readString();
- _val482 = iprot.readI32();
- struct.approved_workers.put(_key481, _val482);
- _key461 = iprot.readString();
- _val462 = iprot.readI32();
- struct.approved_workers.put(_key461, _val462);
++ _key489 = iprot.readString();
++ _val490 = iprot.readI32();
++ struct.approved_workers.put(_key489, _val490);
}
}
struct.set_approved_workers_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
index 4ad9aaf,4667287..1d85cec
--- a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments");
@@@ -376,16 -376,16 +376,16 @@@
case 1: // ASSIGNMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map484 = iprot.readMapBegin();
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map484.size);
- int _key485;
- LocalAssignment _val486;
- for (int _i487 = 0; _i487 < _map484.size; ++_i487)
- org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin();
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map464.size);
- int _key465;
- LocalAssignment _val466;
- for (int _i467 = 0; _i467 < _map464.size; ++_i467)
++ org.apache.thrift.protocol.TMap _map492 = iprot.readMapBegin();
++ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map492.size);
++ int _key493;
++ LocalAssignment _val494;
++ for (int _i495 = 0; _i495 < _map492.size; ++_i495)
{
- _key485 = iprot.readI32();
- _val486 = new LocalAssignment();
- _val486.read(iprot);
- struct.assignments.put(_key485, _val486);
- _key465 = iprot.readI32();
- _val466 = new LocalAssignment();
- _val466.read(iprot);
- struct.assignments.put(_key465, _val466);
++ _key493 = iprot.readI32();
++ _val494 = new LocalAssignment();
++ _val494.read(iprot);
++ struct.assignments.put(_key493, _val494);
}
iprot.readMapEnd();
}
@@@ -411,10 -411,10 +411,10 @@@
oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size()));
- for (Map.Entry<Integer, LocalAssignment> _iter488 : struct.assignments.entrySet())
- for (Map.Entry<Integer, LocalAssignment> _iter468 : struct.assignments.entrySet())
++ for (Map.Entry<Integer, LocalAssignment> _iter496 : struct.assignments.entrySet())
{
- oprot.writeI32(_iter488.getKey());
- _iter488.getValue().write(oprot);
- oprot.writeI32(_iter468.getKey());
- _iter468.getValue().write(oprot);
++ oprot.writeI32(_iter496.getKey());
++ _iter496.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@@ -439,10 -439,10 +439,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.assignments.size());
- for (Map.Entry<Integer, LocalAssignment> _iter489 : struct.assignments.entrySet())
- for (Map.Entry<Integer, LocalAssignment> _iter469 : struct.assignments.entrySet())
++ for (Map.Entry<Integer, LocalAssignment> _iter497 : struct.assignments.entrySet())
{
- oprot.writeI32(_iter489.getKey());
- _iter489.getValue().write(oprot);
- oprot.writeI32(_iter469.getKey());
- _iter469.getValue().write(oprot);
++ oprot.writeI32(_iter497.getKey());
++ _iter497.getValue().write(oprot);
}
}
}
@@@ -451,16 -451,16 +451,16 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map490 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map490.size);
- int _key491;
- LocalAssignment _val492;
- for (int _i493 = 0; _i493 < _map490.size; ++_i493)
- org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map470.size);
- int _key471;
- LocalAssignment _val472;
- for (int _i473 = 0; _i473 < _map470.size; ++_i473)
++ org.apache.thrift.protocol.TMap _map498 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map498.size);
++ int _key499;
++ LocalAssignment _val500;
++ for (int _i501 = 0; _i501 < _map498.size; ++_i501)
{
- _key491 = iprot.readI32();
- _val492 = new LocalAssignment();
- _val492.read(iprot);
- struct.assignments.put(_key491, _val492);
- _key471 = iprot.readI32();
- _val472 = new LocalAssignment();
- _val472.read(iprot);
- struct.assignments.put(_key471, _val472);
++ _key499 = iprot.readI32();
++ _val500 = new LocalAssignment();
++ _val500.read(iprot);
++ struct.assignments.put(_key499, _val500);
}
}
struct.set_assignments_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
index 5384063,80f917b..98726cc
--- a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat");
@@@ -638,14 -638,14 +638,14 @@@
case 3: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list494 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list494.size);
- ExecutorInfo _elem495;
- for (int _i496 = 0; _i496 < _list494.size; ++_i496)
- org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list474.size);
- ExecutorInfo _elem475;
- for (int _i476 = 0; _i476 < _list474.size; ++_i476)
++ org.apache.thrift.protocol.TList _list502 = iprot.readListBegin();
++ struct.executors = new ArrayList<ExecutorInfo>(_list502.size);
++ ExecutorInfo _elem503;
++ for (int _i504 = 0; _i504 < _list502.size; ++_i504)
{
- _elem495 = new ExecutorInfo();
- _elem495.read(iprot);
- struct.executors.add(_elem495);
- _elem475 = new ExecutorInfo();
- _elem475.read(iprot);
- struct.executors.add(_elem475);
++ _elem503 = new ExecutorInfo();
++ _elem503.read(iprot);
++ struct.executors.add(_elem503);
}
iprot.readListEnd();
}
@@@ -687,9 -687,9 +687,9 @@@
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorInfo _iter497 : struct.executors)
- for (ExecutorInfo _iter477 : struct.executors)
++ for (ExecutorInfo _iter505 : struct.executors)
{
- _iter497.write(oprot);
- _iter477.write(oprot);
++ _iter505.write(oprot);
}
oprot.writeListEnd();
}
@@@ -719,9 -719,9 +719,9 @@@
oprot.writeString(struct.topology_id);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorInfo _iter498 : struct.executors)
- for (ExecutorInfo _iter478 : struct.executors)
++ for (ExecutorInfo _iter506 : struct.executors)
{
- _iter498.write(oprot);
- _iter478.write(oprot);
++ _iter506.write(oprot);
}
}
oprot.writeI32(struct.port);
@@@ -735,14 -735,14 +735,14 @@@
struct.topology_id = iprot.readString();
struct.set_topology_id_isSet(true);
{
- org.apache.thrift.protocol.TList _list499 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list499.size);
- ExecutorInfo _elem500;
- for (int _i501 = 0; _i501 < _list499.size; ++_i501)
- org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list479.size);
- ExecutorInfo _elem480;
- for (int _i481 = 0; _i481 < _list479.size; ++_i481)
++ org.apache.thrift.protocol.TList _list507 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.executors = new ArrayList<ExecutorInfo>(_list507.size);
++ ExecutorInfo _elem508;
++ for (int _i509 = 0; _i509 < _list507.size; ++_i509)
{
- _elem500 = new ExecutorInfo();
- _elem500.read(iprot);
- struct.executors.add(_elem500);
- _elem480 = new ExecutorInfo();
- _elem480.read(iprot);
- struct.executors.add(_elem480);
++ _elem508 = new ExecutorInfo();
++ _elem508.read(iprot);
++ struct.executors.add(_elem508);
}
}
struct.set_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
index 695c2cb,3c34891..d985cba
--- a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment");
@@@ -464,14 -464,14 +464,14 @@@
case 2: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list466 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list466.size);
- ExecutorInfo _elem467;
- for (int _i468 = 0; _i468 < _list466.size; ++_i468)
- org.apache.thrift.protocol.TList _list446 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list446.size);
- ExecutorInfo _elem447;
- for (int _i448 = 0; _i448 < _list446.size; ++_i448)
++ org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
++ struct.executors = new ArrayList<ExecutorInfo>(_list474.size);
++ ExecutorInfo _elem475;
++ for (int _i476 = 0; _i476 < _list474.size; ++_i476)
{
- _elem467 = new ExecutorInfo();
- _elem467.read(iprot);
- struct.executors.add(_elem467);
- _elem447 = new ExecutorInfo();
- _elem447.read(iprot);
- struct.executors.add(_elem447);
++ _elem475 = new ExecutorInfo();
++ _elem475.read(iprot);
++ struct.executors.add(_elem475);
}
iprot.readListEnd();
}
@@@ -502,9 -502,9 +502,9 @@@
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorInfo _iter469 : struct.executors)
- for (ExecutorInfo _iter449 : struct.executors)
++ for (ExecutorInfo _iter477 : struct.executors)
{
- _iter469.write(oprot);
- _iter449.write(oprot);
++ _iter477.write(oprot);
}
oprot.writeListEnd();
}
@@@ -530,9 -530,9 +530,9 @@@
oprot.writeString(struct.topology_id);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorInfo _iter470 : struct.executors)
- for (ExecutorInfo _iter450 : struct.executors)
++ for (ExecutorInfo _iter478 : struct.executors)
{
- _iter470.write(oprot);
- _iter450.write(oprot);
++ _iter478.write(oprot);
}
}
}
@@@ -543,14 -543,14 +543,14 @@@
struct.topology_id = iprot.readString();
struct.set_topology_id_isSet(true);
{
- org.apache.thrift.protocol.TList _list471 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list471.size);
- ExecutorInfo _elem472;
- for (int _i473 = 0; _i473 < _list471.size; ++_i473)
- org.apache.thrift.protocol.TList _list451 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list451.size);
- ExecutorInfo _elem452;
- for (int _i453 = 0; _i453 < _list451.size; ++_i453)
++ org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.executors = new ArrayList<ExecutorInfo>(_list479.size);
++ ExecutorInfo _elem480;
++ for (int _i481 = 0; _i481 < _list479.size; ++_i481)
{
- _elem472 = new ExecutorInfo();
- _elem472.read(iprot);
- struct.executors.add(_elem472);
- _elem452 = new ExecutorInfo();
- _elem452.read(iprot);
- struct.executors.add(_elem452);
++ _elem480 = new ExecutorInfo();
++ _elem480.read(iprot);
++ struct.executors.add(_elem480);
}
}
struct.set_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
index 69eb2a9,448711d..0ce2d7a
--- a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData");
@@@ -376,16 -376,16 +376,16 @@@
case 1: // SERIALIZED_PARTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map456 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map456.size);
- String _key457;
- ThriftSerializedObject _val458;
- for (int _i459 = 0; _i459 < _map456.size; ++_i459)
- org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map436.size);
- String _key437;
- ThriftSerializedObject _val438;
- for (int _i439 = 0; _i439 < _map436.size; ++_i439)
++ org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin();
++ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map464.size);
++ String _key465;
++ ThriftSerializedObject _val466;
++ for (int _i467 = 0; _i467 < _map464.size; ++_i467)
{
- _key457 = iprot.readString();
- _val458 = new ThriftSerializedObject();
- _val458.read(iprot);
- struct.serialized_parts.put(_key457, _val458);
- _key437 = iprot.readString();
- _val438 = new ThriftSerializedObject();
- _val438.read(iprot);
- struct.serialized_parts.put(_key437, _val438);
++ _key465 = iprot.readString();
++ _val466 = new ThriftSerializedObject();
++ _val466.read(iprot);
++ struct.serialized_parts.put(_key465, _val466);
}
iprot.readMapEnd();
}
@@@ -411,10 -411,10 +411,10 @@@
oprot.writeFieldBegin(SERIALIZED_PARTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.serialized_parts.size()));
- for (Map.Entry<String, ThriftSerializedObject> _iter460 : struct.serialized_parts.entrySet())
- for (Map.Entry<String, ThriftSerializedObject> _iter440 : struct.serialized_parts.entrySet())
++ for (Map.Entry<String, ThriftSerializedObject> _iter468 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter460.getKey());
- _iter460.getValue().write(oprot);
- oprot.writeString(_iter440.getKey());
- _iter440.getValue().write(oprot);
++ oprot.writeString(_iter468.getKey());
++ _iter468.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@@ -439,10 -439,10 +439,10 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.serialized_parts.size());
- for (Map.Entry<String, ThriftSerializedObject> _iter461 : struct.serialized_parts.entrySet())
- for (Map.Entry<String, ThriftSerializedObject> _iter441 : struct.serialized_parts.entrySet())
++ for (Map.Entry<String, ThriftSerializedObject> _iter469 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter461.getKey());
- _iter461.getValue().write(oprot);
- oprot.writeString(_iter441.getKey());
- _iter441.getValue().write(oprot);
++ oprot.writeString(_iter469.getKey());
++ _iter469.getValue().write(oprot);
}
}
}
@@@ -451,16 -451,16 +451,16 @@@
public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map462 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map462.size);
- String _key463;
- ThriftSerializedObject _val464;
- for (int _i465 = 0; _i465 < _map462.size; ++_i465)
- org.apache.thrift.protocol.TMap _map442 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map442.size);
- String _key443;
- ThriftSerializedObject _val444;
- for (int _i445 = 0; _i445 < _map442.size; ++_i445)
++ org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
++ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map470.size);
++ String _key471;
++ ThriftSerializedObject _val472;
++ for (int _i473 = 0; _i473 < _map470.size; ++_i473)
{
- _key463 = iprot.readString();
- _val464 = new ThriftSerializedObject();
- _val464.read(iprot);
- struct.serialized_parts.put(_key463, _val464);
- _key443 = iprot.readString();
- _val444 = new ThriftSerializedObject();
- _val444.read(iprot);
- struct.serialized_parts.put(_key443, _val444);
++ _key471 = iprot.readString();
++ _val472 = new ThriftSerializedObject();
++ _val472.read(iprot);
++ struct.serialized_parts.put(_key471, _val472);
}
}
struct.set_serialized_parts_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
index f844023,a71d1b4..f272cd8
--- a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-7")
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3")
public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
@@@ -461,13 -461,13 +461,13 @@@
case 2: // PORT
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set372 = iprot.readSetBegin();
- struct.port = new HashSet<Long>(2*_set372.size);
- long _elem373;
- for (int _i374 = 0; _i374 < _set372.size; ++_i374)
- org.apache.thrift.protocol.TSet _set362 = iprot.readSetBegin();
- struct.port = new HashSet<Long>(2*_set362.size);
- long _elem363;
- for (int _i364 = 0; _i364 < _set362.size; ++_i364)
++ org.apache.thrift.protocol.TSet _set380 = iprot.readSetBegin();
++ struct.port = new HashSet<Long>(2*_set380.size);
++ long _elem381;
++ for (int _i382 = 0; _i382 < _set380.size; ++_i382)
{
- _elem373 = iprot.readI64();
- struct.port.add(_elem373);
- _elem363 = iprot.readI64();
- struct.port.add(_elem363);
++ _elem381 = iprot.readI64();
++ struct.port.add(_elem381);
}
iprot.readSetEnd();
}
@@@ -498,9 -498,9 +498,9 @@@
oprot.writeFieldBegin(PORT_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size()));
- for (long _iter375 : struct.port)
- for (long _iter365 : struct.port)
++ for (long _iter383 : struct.port)
{
- oprot.writeI64(_iter375);
- oprot.writeI64(_iter365);
++ oprot.writeI64(_iter383);
}
oprot.writeSetEnd();
}
@@@ -526,9 -526,9 +526,9 @@@
oprot.writeString(struct.node);
{
oprot.writeI32(struct.port.size());
- for (long _iter376 : struct.port)
- for (long _iter366 : struct.port)
++ for (long _iter384 : struct.port)
{
- oprot.writeI64(_iter376);
- oprot.writeI64(_iter366);
++ oprot.writeI64(_iter384);
}
}
}
@@@ -539,13 -539,13 +539,13 @@@
struct.node = iprot.readString();
struct.set_node_isSet(true);
{
- org.apache.thrift.protocol.TSet _set377 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.port = new HashSet<Long>(2*_set377.size);
- long _elem378;
- for (int _i379 = 0; _i379 < _set377.size; ++_i379)
- org.apache.thrift.protocol.TSet _set367 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.port = new HashSet<Long>(2*_set367.size);
- long _elem368;
- for (int _i369 = 0; _i369 < _set367.size; ++_i369)
++ org.apache.thrift.protocol.TSet _set385 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ struct.port = new HashSet<Long>(2*_set385.size);
++ long _elem386;
++ for (int _i387 = 0; _i387 < _set385.size; ++_i387)
{
- _elem378 = iprot.readI64();
- struct.port.add(_elem378);
- _elem368 = iprot.readI64();
- struct.port.add(_elem368);
++ _elem386 = iprot.readI64();
++ struct.port.add(_elem386);
}
}
struct.set_port_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index 98d035a,f973ffc..2cc7762
--- 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-8-7")
-@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")
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 _map326 = iprot.readMapBegin();
- struct.num_executors = new HashMap<String,Integer>(2*_map326.size);
- String _key327;
- int _val328;
- for (int _i329 = 0; _i329 < _map326.size; ++_i329)
- org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin();
- struct.num_executors = new HashMap<String,Integer>(2*_map316.size);
- String _key317;
- int _val318;
- for (int _i319 = 0; _i319 < _map316.size; ++_i319)
++ 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)
{
- _key327 = iprot.readString();
- _val328 = iprot.readI32();
- struct.num_executors.put(_key327, _val328);
- _key317 = iprot.readString();
- _val318 = iprot.readI32();
- struct.num_executors.put(_key317, _val318);
++ _key335 = iprot.readString();
++ _val336 = iprot.readI32();
++ struct.num_executors.put(_key335, _val336);
}
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> _iter330 : struct.num_executors.entrySet())
- for (Map.Entry<String, Integer> _iter320 : struct.num_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter338 : struct.num_executors.entrySet())
{
- oprot.writeString(_iter330.getKey());
- oprot.writeI32(_iter330.getValue());
- oprot.writeString(_iter320.getKey());
- oprot.writeI32(_iter320.getValue());
++ oprot.writeString(_iter338.getKey());
++ oprot.writeI32(_iter338.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> _iter331 : struct.num_executors.entrySet())
- for (Map.Entry<String, Integer> _iter321 : struct.num_executors.entrySet())
++ for (Map.Entry<String, Integer> _iter339 : struct.num_executors.entrySet())
{
- oprot.writeString(_iter331.getKey());
- oprot.writeI32(_iter331.getValue());
- oprot.writeString(_iter321.getKey());
- oprot.writeI32(_iter321.getValue());
++ oprot.writeString(_iter339.getKey());
++ oprot.writeI32(_iter339.getValue());
}
}
}
@@@ -644,15 -644,15 +644,15 @@@
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TMap _map332 = 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*_map332.size);
- String _key333;
- int _val334;
- for (int _i335 = 0; _i335 < _map332.size; ++_i335)
- org.apache.thrift.protocol.TMap _map322 = 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*_map322.size);
- String _key323;
- int _val324;
- for (int _i325 = 0; _i325 < _map322.size; ++_i325)
++ 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)
{
- _key333 = iprot.readString();
- _val334 = iprot.readI32();
- struct.num_executors.put(_key333, _val334);
- _key323 = iprot.readString();
- _val324 = iprot.readI32();
- struct.num_executors.put(_key323, _val324);
++ _key341 = iprot.readString();
++ _val342 = iprot.readI32();
++ struct.num_executors.put(_key341, _val342);
}
}
struct.set_num_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/0151b441/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index 7826fe4,7826fe4..c18a7d0
--- 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")
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");
@@@ -602,40 -602,40 +602,8 @@@
case 1: // ACKED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
-- org.apache.thrift.protocol.TMap _map190 = iprot.readMapBegin();
-- struct.acked = new HashMap<String,Map<String,Long>>(2*_map190.size);
-- String _key191;
-- Map<String,Long> _val192;
-- for (int _i193 = 0; _i193 < _map190.size; ++_i193)
-- {
-- _key191 = iprot.readString();
-- {
-- org.apache.thrift.protocol.TMap _map194 = iprot.readMapBegin();
-- _val192 = new HashMap<String,Long>(2*_map194.size);
-- String _key195;
-- long _val196;
-- for (int _i197 = 0; _i197 < _map194.size; ++_i197)
-- {
-- _key195 = iprot.readString();
-- _val196 = iprot.readI64();
-- _val192.put(_key195, _val196);
-- }
-- iprot.readMapEnd();
-- }
-- struct.acked.put(_key191, _val192);
-- }
-- iprot.readMapEnd();
-- }
-- struct.set_acked_isSet(true);
-- } else {
-- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-- }
-- break;
-- case 2: // FAILED
-- if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-- {
org.apache.thrift.protocol.TMap _map198 = iprot.readMapBegin();
-- struct.failed = new HashMap<String,Map<String,Long>>(2*_map198.size);
++ struct.acked = new HashMap<String,Map<String,Long>>(2*_map198.size);
String _key199;
Map<String,Long> _val200;
for (int _i201 = 0; _i201 < _map198.size; ++_i201)
@@@ -654,39 -654,39 +622,71 @@@
}
iprot.readMapEnd();
}
-- struct.failed.put(_key199, _val200);
++ struct.acked.put(_key199, _val200);
}
iprot.readMapEnd();
}
-- struct.set_failed_isSet(true);
++ struct.set_acked_isSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
-- case 3: // COMPLETE_MS_AVG
++ case 2: // FAILED
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map206 = iprot.readMapBegin();
-- struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map206.size);
++ struct.failed = new HashMap<String,Map<String,Long>>(2*_map206.size);
String _key207;
-- Map<String,Double> _val208;
++ Map<String,Long> _val208;
for (int _i209 = 0; _i209 < _map206.size; ++_i209)
{
_key207 = iprot.readString();
{
org.apache.thrift.protocol.TMap _map210 = iprot.readMapBegin();
-- _val208 = new HashMap<String,Double>(2*_map210.size);
++ _val208 = new HashMap<String,Long>(2*_map210.size);
String _key211;
-- double _val212;
++ long _val212;
for (int _i213 = 0; _i213 < _map210.size; ++_i213)
{
_key211 = iprot.readString();
-- _val212 = iprot.readDouble();
++ _val212 = iprot.readI64();
_val208.put(_key211, _val212);
}
iprot.readMapEnd();
}
-- struct.complete_ms_avg.put(_key207, _val208);
++ struct.failed.put(_key207, _val208);
++ }
++ iprot.readMapEnd();
++ }
++ struct.set_failed_isSet(true);
++ } else {
++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
++ }
++ break;
++ case 3: // COMPLETE_MS_AVG
++ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
++ {
++ org.apache.thrift.protocol.TMap _map214 = iprot.readMapBegin();
++ struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map214.size);
++ String _key215;
++ Map<String,Double> _val216;
++ for (int _i217 = 0; _i217 < _map214.size; ++_i217)
++ {
++ _key215 = iprot.readString();
++ {
++ org.apache.thrift.protocol.TMap _map218 = iprot.readMapBegin();
++ _val216 = new HashMap<String,Double>(2*_map218.size);
++ String _key219;
++ double _val220;
++ for (int _i221 = 0; _i221 < _map218.size; ++_i221)
++ {
++ _key219 = iprot.readString();
++ _val220 = iprot.readDouble();
++ _val216.put(_key219, _val220);
++ }
++ iprot.readMapEnd();
++ }
++ struct.complete_ms_avg.put(_key215, _val216);
}
iprot.readMapEnd();
}
@@@ -712,15 -712,15 +712,15 @@@
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>> _iter214 : struct.acked.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter222 : struct.acked.entrySet())
{
-- oprot.writeString(_iter214.getKey());
++ oprot.writeString(_iter222.getKey());
{
-- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter214.getValue().size()));
-- for (Map.Entry<String, Long> _iter215 : _iter214.getValue().entrySet())
++ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter222.getValue().size()));
++ for (Map.Entry<String, Long> _iter223 : _iter222.getValue().entrySet())
{
-- oprot.writeString(_iter215.getKey());
-- oprot.writeI64(_iter215.getValue());
++ oprot.writeString(_iter223.getKey());
++ oprot.writeI64(_iter223.getValue());
}
oprot.writeMapEnd();
}
@@@ -733,15 -733,15 +733,15 @@@
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>> _iter216 : struct.failed.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter224 : struct.failed.entrySet())
{
-- oprot.writeString(_iter216.getKey());
++ oprot.writeString(_iter224.getKey());
{
-- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter216.getValue().size()));
-- for (Map.Entry<String, Long> _iter217 : _iter216.getValue().entrySet())
++ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter224.getValue().size()));
++ for (Map.Entry<String, Long> _iter225 : _iter224.getValue().entrySet())
{
-- oprot.writeString(_iter217.getKey());
-- oprot.writeI64(_iter217.getValue());
++ oprot.writeString(_iter225.getKey());
++ oprot.writeI64(_iter225.getValue());
}
oprot.writeMapEnd();
}
@@@ -754,15 -754,15 +754,15 @@@
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>> _iter218 : struct.complete_ms_avg.entrySet())
++ for (Map.Entry<String, Map<String,Double>> _iter226 : struct.complete_ms_avg.entrySet())
{
-- oprot.writeString(_iter218.getKey());
++ oprot.writeString(_iter226.getKey());
{
-- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter218.getValue().size()));
-- for (Map.Entry<String, Double> _iter219 : _iter218.getValue().entrySet())
++ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter226.getValue().size()));
++ for (Map.Entry<String, Double> _iter227 : _iter226.getValue().entrySet())
{
-- oprot.writeString(_iter219.getKey());
-- oprot.writeDouble(_iter219.getValue());
++ oprot.writeString(_iter227.getKey());
++ oprot.writeDouble(_iter227.getValue());
}
oprot.writeMapEnd();
}
@@@ -790,45 -790,45 +790,45 @@@
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.acked.size());
-- for (Map.Entry<String, Map<String,Long>> _iter220 : struct.acked.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter228 : struct.acked.entrySet())
{
-- oprot.writeString(_iter220.getKey());
++ oprot.writeString(_iter228.getKey());
{
-- oprot.writeI32(_iter220.getValue().size());
-- for (Map.Entry<String, Long> _iter221 : _iter220.getValue().entrySet())
++ oprot.writeI32(_iter228.getValue().size());
++ for (Map.Entry<String, Long> _iter229 : _iter228.getValue().entrySet())
{
-- oprot.writeString(_iter221.getKey());
-- oprot.writeI64(_iter221.getValue());
++ oprot.writeString(_iter229.getKey());
++ oprot.writeI64(_iter229.getValue());
}
}
}
}
{
oprot.writeI32(struct.failed.size());
-- for (Map.Entry<String, Map<String,Long>> _iter222 : struct.failed.entrySet())
++ for (Map.Entry<String, Map<String,Long>> _iter230 : struct.failed.entrySet())
{
-- oprot.writeString(_iter222.getKey());
++ oprot.writeString(_iter230.getKey());
{
-- oprot.writeI32(_iter222.getValue().size());
-- for (Map.Entry<String, Long> _iter223 : _iter222.getValue().entrySet())
++ oprot.writeI32(_iter230.getValue().size());
++ for (Map.Entry<String, Long> _iter231 : _iter230.getValue().entrySet())
{
-- oprot.writeString(_iter223.getKey());
-- oprot.writeI64(_iter223.getValue());
++ oprot.writeString(_iter231.getKey());
++ oprot.writeI64(_iter231.getValue());
}
}
}
}
{
oprot.writeI32(struct.complete_ms_avg.size());
-- for (Map.Entry<String, Map<String,Double>> _iter224 : struct.complete_ms_avg.entrySet())
++ for (Map.Entry<String, Map<String,Double>> _iter232 : struct.complete_ms_avg.entrySet())
{
-- oprot.writeString(_iter224.getKey());
++ oprot.writeString(_iter232.getKey());
{
-- oprot.writeI32(_iter224.getValue().size());
-- for (Map.Entry<String, Double> _iter225 : _iter224.getValue().entrySet())
++ oprot.writeI32(_iter232.getValue().size());
++ for (Map.Entry<String, Double> _iter233 : _iter232.getValue().entrySet())
{
-- oprot.writeString(_iter225.getKey());
-- oprot.writeDouble(_iter225.getValue());
++ oprot.writeString(_iter233.getKey());
++ oprot.writeDouble(_iter233.getValue());
}
}
}
@@@ -839,32 -839,32 +839,8 @@@
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 _map226 = 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*_map226.size);
-- String _key227;
-- Map<String,Long> _val228;
-- for (int _i229 = 0; _i229 < _map226.size; ++_i229)
-- {
-- _key227 = iprot.readString();
-- {
-- org.apache.thrift.protocol.TMap _map230 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
-- _val228 = new HashMap<String,Long>(2*_map230.size);
-- String _key231;
-- long _val232;
-- for (int _i233 = 0; _i233 < _map230.size; ++_i233)
-- {
-- _key231 = iprot.readString();
-- _val232 = iprot.readI64();
-- _val228.put(_key231, _val232);
-- }
-- }
-- struct.acked.put(_key227, _val228);
-- }
-- }
-- struct.set_acked_isSet(true);
-- {
org.apache.thrift.protocol.TMap _map234 = 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*_map234.size);
++ struct.acked = new HashMap<String,Map<String,Long>>(2*_map234.size);
String _key235;
Map<String,Long> _val236;
for (int _i237 = 0; _i237 < _map234.size; ++_i237)
@@@ -882,31 -882,31 +858,55 @@@
_val236.put(_key239, _val240);
}
}
-- struct.failed.put(_key235, _val236);
++ struct.acked.put(_key235, _val236);
}
}
-- struct.set_failed_isSet(true);
++ struct.set_acked_isSet(true);
{
org.apache.thrift.protocol.TMap _map242 = 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*_map242.size);
++ struct.failed = new HashMap<String,Map<String,Long>>(2*_map242.size);
String _key243;
-- Map<String,Double> _val244;
++ Map<String,Long> _val244;
for (int _i245 = 0; _i245 < _map242.size; ++_i245)
{
_key243 = iprot.readString();
{
-- org.apache.thrift.protocol.TMap _map246 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
-- _val244 = new HashMap<String,Double>(2*_map246.size);
++ org.apache.thrift.protocol.TMap _map246 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
++ _val244 = new HashMap<String,Long>(2*_map246.size);
String _key247;
-- double _val248;
++ long _val248;
for (int _i249 = 0; _i249 < _map246.size; ++_i249)
{
_key247 = iprot.readString();
-- _val248 = iprot.readDouble();
++ _val248 = iprot.readI64();
_val244.put(_key247, _val248);
}
}
-- struct.complete_ms_avg.put(_key243, _val244);
++ struct.failed.put(_key243, _val244);
++ }
++ }
++ struct.set_failed_isSet(true);
++ {
++ org.apache.thrift.protocol.TMap _map250 = 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*_map250.size);
++ String _key251;
++ Map<String,Double> _val252;
++ for (int _i253 = 0; _i253 < _map250.size; ++_i253)
++ {
++ _key251 = iprot.readString();
++ {
++ org.apache.thrift.protocol.TMap _map254 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
++ _val252 = new HashMap<String,Double>(2*_map254.size);
++ String _key255;
++ double _val256;
++ for (int _i257 = 0; _i257 < _map254.size; ++_i257)
++ {
++ _key255 = iprot.readString();
++ _val256 = iprot.readDouble();
++ _val252.put(_key255, _val256);
++ }
++ }
++ struct.complete_ms_avg.put(_key251, _val252);
}
}
struct.set_complete_ms_avg_isSet(true);