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 2017/10/10 18:48:27 UTC
[5/8] storm git commit: STORM-2438: added in rebalance changes to
support RAS
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
index 88ce039..e4d83aa 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalAssignment.java
@@ -710,14 +710,14 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
case 2: // EXECUTORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list752 = iprot.readListBegin();
- struct.executors = new ArrayList<ExecutorInfo>(_list752.size);
- ExecutorInfo _elem753;
- for (int _i754 = 0; _i754 < _list752.size; ++_i754)
+ org.apache.thrift.protocol.TList _list772 = iprot.readListBegin();
+ struct.executors = new ArrayList<ExecutorInfo>(_list772.size);
+ ExecutorInfo _elem773;
+ for (int _i774 = 0; _i774 < _list772.size; ++_i774)
{
- _elem753 = new ExecutorInfo();
- _elem753.read(iprot);
- struct.executors.add(_elem753);
+ _elem773 = new ExecutorInfo();
+ _elem773.read(iprot);
+ struct.executors.add(_elem773);
}
iprot.readListEnd();
}
@@ -773,9 +773,9 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
- for (ExecutorInfo _iter755 : struct.executors)
+ for (ExecutorInfo _iter775 : struct.executors)
{
- _iter755.write(oprot);
+ _iter775.write(oprot);
}
oprot.writeListEnd();
}
@@ -820,9 +820,9 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
oprot.writeString(struct.topology_id);
{
oprot.writeI32(struct.executors.size());
- for (ExecutorInfo _iter756 : struct.executors)
+ for (ExecutorInfo _iter776 : struct.executors)
{
- _iter756.write(oprot);
+ _iter776.write(oprot);
}
}
BitSet optionals = new BitSet();
@@ -853,14 +853,14 @@ public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment,
struct.topology_id = iprot.readString();
struct.set_topology_id_isSet(true);
{
- org.apache.thrift.protocol.TList _list757 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.executors = new ArrayList<ExecutorInfo>(_list757.size);
- ExecutorInfo _elem758;
- for (int _i759 = 0; _i759 < _list757.size; ++_i759)
+ org.apache.thrift.protocol.TList _list777 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.executors = new ArrayList<ExecutorInfo>(_list777.size);
+ ExecutorInfo _elem778;
+ for (int _i779 = 0; _i779 < _list777.size; ++_i779)
{
- _elem758 = new ExecutorInfo();
- _elem758.read(iprot);
- struct.executors.add(_elem758);
+ _elem778 = new ExecutorInfo();
+ _elem778.read(iprot);
+ struct.executors.add(_elem778);
}
}
struct.set_executors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
index d644e73..3536c0b 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LocalStateData.java
@@ -376,16 +376,16 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
case 1: // SERIALIZED_PARTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map742 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map742.size);
- String _key743;
- ThriftSerializedObject _val744;
- for (int _i745 = 0; _i745 < _map742.size; ++_i745)
+ org.apache.thrift.protocol.TMap _map762 = iprot.readMapBegin();
+ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map762.size);
+ String _key763;
+ ThriftSerializedObject _val764;
+ for (int _i765 = 0; _i765 < _map762.size; ++_i765)
{
- _key743 = iprot.readString();
- _val744 = new ThriftSerializedObject();
- _val744.read(iprot);
- struct.serialized_parts.put(_key743, _val744);
+ _key763 = iprot.readString();
+ _val764 = new ThriftSerializedObject();
+ _val764.read(iprot);
+ struct.serialized_parts.put(_key763, _val764);
}
iprot.readMapEnd();
}
@@ -411,10 +411,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
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> _iter746 : struct.serialized_parts.entrySet())
+ for (Map.Entry<String, ThriftSerializedObject> _iter766 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter746.getKey());
- _iter746.getValue().write(oprot);
+ oprot.writeString(_iter766.getKey());
+ _iter766.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -439,10 +439,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.serialized_parts.size());
- for (Map.Entry<String, ThriftSerializedObject> _iter747 : struct.serialized_parts.entrySet())
+ for (Map.Entry<String, ThriftSerializedObject> _iter767 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter747.getKey());
- _iter747.getValue().write(oprot);
+ oprot.writeString(_iter767.getKey());
+ _iter767.getValue().write(oprot);
}
}
}
@@ -451,16 +451,16 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
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 _map748 = 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*_map748.size);
- String _key749;
- ThriftSerializedObject _val750;
- for (int _i751 = 0; _i751 < _map748.size; ++_i751)
+ org.apache.thrift.protocol.TMap _map768 = 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*_map768.size);
+ String _key769;
+ ThriftSerializedObject _val770;
+ for (int _i771 = 0; _i771 < _map768.size; ++_i771)
{
- _key749 = iprot.readString();
- _val750 = new ThriftSerializedObject();
- _val750.read(iprot);
- struct.serialized_parts.put(_key749, _val750);
+ _key769 = iprot.readString();
+ _val770 = new ThriftSerializedObject();
+ _val770.read(iprot);
+ struct.serialized_parts.put(_key769, _val770);
}
}
struct.set_serialized_parts_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
index 58086a1..e783e6c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/LogConfig.java
@@ -368,16 +368,16 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
case 2: // NAMED_LOGGER_LEVEL
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map812 = iprot.readMapBegin();
- struct.named_logger_level = new HashMap<String,LogLevel>(2*_map812.size);
- String _key813;
- LogLevel _val814;
- for (int _i815 = 0; _i815 < _map812.size; ++_i815)
+ org.apache.thrift.protocol.TMap _map832 = iprot.readMapBegin();
+ struct.named_logger_level = new HashMap<String,LogLevel>(2*_map832.size);
+ String _key833;
+ LogLevel _val834;
+ for (int _i835 = 0; _i835 < _map832.size; ++_i835)
{
- _key813 = iprot.readString();
- _val814 = new LogLevel();
- _val814.read(iprot);
- struct.named_logger_level.put(_key813, _val814);
+ _key833 = iprot.readString();
+ _val834 = new LogLevel();
+ _val834.read(iprot);
+ struct.named_logger_level.put(_key833, _val834);
}
iprot.readMapEnd();
}
@@ -404,10 +404,10 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
oprot.writeFieldBegin(NAMED_LOGGER_LEVEL_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.named_logger_level.size()));
- for (Map.Entry<String, LogLevel> _iter816 : struct.named_logger_level.entrySet())
+ for (Map.Entry<String, LogLevel> _iter836 : struct.named_logger_level.entrySet())
{
- oprot.writeString(_iter816.getKey());
- _iter816.getValue().write(oprot);
+ oprot.writeString(_iter836.getKey());
+ _iter836.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -439,10 +439,10 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
if (struct.is_set_named_logger_level()) {
{
oprot.writeI32(struct.named_logger_level.size());
- for (Map.Entry<String, LogLevel> _iter817 : struct.named_logger_level.entrySet())
+ for (Map.Entry<String, LogLevel> _iter837 : struct.named_logger_level.entrySet())
{
- oprot.writeString(_iter817.getKey());
- _iter817.getValue().write(oprot);
+ oprot.writeString(_iter837.getKey());
+ _iter837.getValue().write(oprot);
}
}
}
@@ -454,16 +454,16 @@ public class LogConfig implements org.apache.thrift.TBase<LogConfig, LogConfig._
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map818 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.named_logger_level = new HashMap<String,LogLevel>(2*_map818.size);
- String _key819;
- LogLevel _val820;
- for (int _i821 = 0; _i821 < _map818.size; ++_i821)
+ org.apache.thrift.protocol.TMap _map838 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.named_logger_level = new HashMap<String,LogLevel>(2*_map838.size);
+ String _key839;
+ LogLevel _val840;
+ for (int _i841 = 0; _i841 < _map838.size; ++_i841)
{
- _key819 = iprot.readString();
- _val820 = new LogLevel();
- _val820.read(iprot);
- struct.named_logger_level.put(_key819, _val820);
+ _key839 = iprot.readString();
+ _val840 = new LogLevel();
+ _val840.read(iprot);
+ struct.named_logger_level.put(_key839, _val840);
}
}
struct.set_named_logger_level_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java b/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
index f14ddcf..ea4dcc9 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/Nimbus.java
@@ -18287,14 +18287,14 @@ public class Nimbus {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list846 = iprot.readListBegin();
- struct.success = new ArrayList<ProfileRequest>(_list846.size);
- ProfileRequest _elem847;
- for (int _i848 = 0; _i848 < _list846.size; ++_i848)
+ org.apache.thrift.protocol.TList _list866 = iprot.readListBegin();
+ struct.success = new ArrayList<ProfileRequest>(_list866.size);
+ ProfileRequest _elem867;
+ for (int _i868 = 0; _i868 < _list866.size; ++_i868)
{
- _elem847 = new ProfileRequest();
- _elem847.read(iprot);
- struct.success.add(_elem847);
+ _elem867 = new ProfileRequest();
+ _elem867.read(iprot);
+ struct.success.add(_elem867);
}
iprot.readListEnd();
}
@@ -18320,9 +18320,9 @@ public class Nimbus {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (ProfileRequest _iter849 : struct.success)
+ for (ProfileRequest _iter869 : struct.success)
{
- _iter849.write(oprot);
+ _iter869.write(oprot);
}
oprot.writeListEnd();
}
@@ -18353,9 +18353,9 @@ public class Nimbus {
if (struct.is_set_success()) {
{
oprot.writeI32(struct.success.size());
- for (ProfileRequest _iter850 : struct.success)
+ for (ProfileRequest _iter870 : struct.success)
{
- _iter850.write(oprot);
+ _iter870.write(oprot);
}
}
}
@@ -18367,14 +18367,14 @@ public class Nimbus {
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list851 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<ProfileRequest>(_list851.size);
- ProfileRequest _elem852;
- for (int _i853 = 0; _i853 < _list851.size; ++_i853)
+ org.apache.thrift.protocol.TList _list871 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<ProfileRequest>(_list871.size);
+ ProfileRequest _elem872;
+ for (int _i873 = 0; _i873 < _list871.size; ++_i873)
{
- _elem852 = new ProfileRequest();
- _elem852.read(iprot);
- struct.success.add(_elem852);
+ _elem872 = new ProfileRequest();
+ _elem872.read(iprot);
+ struct.success.add(_elem872);
}
}
struct.set_success_isSet(true);
@@ -48137,14 +48137,14 @@ public class Nimbus {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list854 = iprot.readListBegin();
- struct.success = new ArrayList<OwnerResourceSummary>(_list854.size);
- OwnerResourceSummary _elem855;
- for (int _i856 = 0; _i856 < _list854.size; ++_i856)
+ org.apache.thrift.protocol.TList _list874 = iprot.readListBegin();
+ struct.success = new ArrayList<OwnerResourceSummary>(_list874.size);
+ OwnerResourceSummary _elem875;
+ for (int _i876 = 0; _i876 < _list874.size; ++_i876)
{
- _elem855 = new OwnerResourceSummary();
- _elem855.read(iprot);
- struct.success.add(_elem855);
+ _elem875 = new OwnerResourceSummary();
+ _elem875.read(iprot);
+ struct.success.add(_elem875);
}
iprot.readListEnd();
}
@@ -48179,9 +48179,9 @@ public class Nimbus {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (OwnerResourceSummary _iter857 : struct.success)
+ for (OwnerResourceSummary _iter877 : struct.success)
{
- _iter857.write(oprot);
+ _iter877.write(oprot);
}
oprot.writeListEnd();
}
@@ -48220,9 +48220,9 @@ public class Nimbus {
if (struct.is_set_success()) {
{
oprot.writeI32(struct.success.size());
- for (OwnerResourceSummary _iter858 : struct.success)
+ for (OwnerResourceSummary _iter878 : struct.success)
{
- _iter858.write(oprot);
+ _iter878.write(oprot);
}
}
}
@@ -48237,14 +48237,14 @@ public class Nimbus {
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list859 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<OwnerResourceSummary>(_list859.size);
- OwnerResourceSummary _elem860;
- for (int _i861 = 0; _i861 < _list859.size; ++_i861)
+ org.apache.thrift.protocol.TList _list879 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<OwnerResourceSummary>(_list879.size);
+ OwnerResourceSummary _elem880;
+ for (int _i881 = 0; _i881 < _list879.size; ++_i881)
{
- _elem860 = new OwnerResourceSummary();
- _elem860.read(iprot);
- struct.success.add(_elem860);
+ _elem880 = new OwnerResourceSummary();
+ _elem880.read(iprot);
+ struct.success.add(_elem880);
}
}
struct.set_success_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java b/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
index 403892c..6bb9c1f 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/NodeInfo.java
@@ -461,13 +461,13 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
case 2: // PORT
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set638 = iprot.readSetBegin();
- struct.port = new HashSet<Long>(2*_set638.size);
- long _elem639;
- for (int _i640 = 0; _i640 < _set638.size; ++_i640)
+ org.apache.thrift.protocol.TSet _set658 = iprot.readSetBegin();
+ struct.port = new HashSet<Long>(2*_set658.size);
+ long _elem659;
+ for (int _i660 = 0; _i660 < _set658.size; ++_i660)
{
- _elem639 = iprot.readI64();
- struct.port.add(_elem639);
+ _elem659 = iprot.readI64();
+ struct.port.add(_elem659);
}
iprot.readSetEnd();
}
@@ -498,9 +498,9 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
oprot.writeFieldBegin(PORT_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size()));
- for (long _iter641 : struct.port)
+ for (long _iter661 : struct.port)
{
- oprot.writeI64(_iter641);
+ oprot.writeI64(_iter661);
}
oprot.writeSetEnd();
}
@@ -526,9 +526,9 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
oprot.writeString(struct.node);
{
oprot.writeI32(struct.port.size());
- for (long _iter642 : struct.port)
+ for (long _iter662 : struct.port)
{
- oprot.writeI64(_iter642);
+ oprot.writeI64(_iter662);
}
}
}
@@ -539,13 +539,13 @@ public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fie
struct.node = iprot.readString();
struct.set_node_isSet(true);
{
- org.apache.thrift.protocol.TSet _set643 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.port = new HashSet<Long>(2*_set643.size);
- long _elem644;
- for (int _i645 = 0; _i645 < _set643.size; ++_i645)
+ org.apache.thrift.protocol.TSet _set663 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.port = new HashSet<Long>(2*_set663.size);
+ long _elem664;
+ for (int _i665 = 0; _i665 < _set663.size; ++_i665)
{
- _elem644 = iprot.readI64();
- struct.port.add(_elem644);
+ _elem664 = iprot.readI64();
+ struct.port.add(_elem664);
}
}
struct.set_port_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
index ea7c256..9cd8a2e 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/RebalanceOptions.java
@@ -58,6 +58,9 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)2);
private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.MAP, (short)3);
+ private static final org.apache.thrift.protocol.TField TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_resources_overrides", org.apache.thrift.protocol.TType.MAP, (short)4);
+ private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_OVERRIDES_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf_overrides", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -68,12 +71,18 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
private int wait_secs; // optional
private int num_workers; // optional
private Map<String,Integer> num_executors; // optional
+ private Map<String,Map<String,Double>> topology_resources_overrides; // optional
+ private String topology_conf_overrides; // optional
+ private String principal; // 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 {
WAIT_SECS((short)1, "wait_secs"),
NUM_WORKERS((short)2, "num_workers"),
- NUM_EXECUTORS((short)3, "num_executors");
+ NUM_EXECUTORS((short)3, "num_executors"),
+ TOPOLOGY_RESOURCES_OVERRIDES((short)4, "topology_resources_overrides"),
+ TOPOLOGY_CONF_OVERRIDES((short)5, "topology_conf_overrides"),
+ PRINCIPAL((short)6, "principal");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -94,6 +103,12 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
return NUM_WORKERS;
case 3: // NUM_EXECUTORS
return NUM_EXECUTORS;
+ case 4: // TOPOLOGY_RESOURCES_OVERRIDES
+ return TOPOLOGY_RESOURCES_OVERRIDES;
+ case 5: // TOPOLOGY_CONF_OVERRIDES
+ return TOPOLOGY_CONF_OVERRIDES;
+ case 6: // PRINCIPAL
+ return PRINCIPAL;
default:
return null;
}
@@ -137,7 +152,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
private static final int __WAIT_SECS_ISSET_ID = 0;
private static final int __NUM_WORKERS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.WAIT_SECS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS};
+ private static final _Fields optionals[] = {_Fields.WAIT_SECS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS,_Fields.TOPOLOGY_RESOURCES_OVERRIDES,_Fields.TOPOLOGY_CONF_OVERRIDES,_Fields.PRINCIPAL};
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);
@@ -149,6 +164,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+ tmpMap.put(_Fields.TOPOLOGY_RESOURCES_OVERRIDES, new org.apache.thrift.meta_data.FieldMetaData("topology_resources_overrides", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))));
+ tmpMap.put(_Fields.TOPOLOGY_CONF_OVERRIDES, new org.apache.thrift.meta_data.FieldMetaData("topology_conf_overrides", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.PRINCIPAL, new org.apache.thrift.meta_data.FieldMetaData("principal", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RebalanceOptions.class, metaDataMap);
}
@@ -167,6 +192,27 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
Map<String,Integer> __this__num_executors = new HashMap<String,Integer>(other.num_executors);
this.num_executors = __this__num_executors;
}
+ if (other.is_set_topology_resources_overrides()) {
+ Map<String,Map<String,Double>> __this__topology_resources_overrides = new HashMap<String,Map<String,Double>>(other.topology_resources_overrides.size());
+ for (Map.Entry<String, Map<String,Double>> other_element : other.topology_resources_overrides.entrySet()) {
+
+ String other_element_key = other_element.getKey();
+ Map<String,Double> other_element_value = other_element.getValue();
+
+ String __this__topology_resources_overrides_copy_key = other_element_key;
+
+ Map<String,Double> __this__topology_resources_overrides_copy_value = new HashMap<String,Double>(other_element_value);
+
+ __this__topology_resources_overrides.put(__this__topology_resources_overrides_copy_key, __this__topology_resources_overrides_copy_value);
+ }
+ this.topology_resources_overrides = __this__topology_resources_overrides;
+ }
+ if (other.is_set_topology_conf_overrides()) {
+ this.topology_conf_overrides = other.topology_conf_overrides;
+ }
+ if (other.is_set_principal()) {
+ this.principal = other.principal;
+ }
}
public RebalanceOptions deepCopy() {
@@ -180,6 +226,9 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
set_num_workers_isSet(false);
this.num_workers = 0;
this.num_executors = null;
+ this.topology_resources_overrides = null;
+ this.topology_conf_overrides = null;
+ this.principal = null;
}
public int get_wait_secs() {
@@ -260,6 +309,86 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
}
+ public int get_topology_resources_overrides_size() {
+ return (this.topology_resources_overrides == null) ? 0 : this.topology_resources_overrides.size();
+ }
+
+ public void put_to_topology_resources_overrides(String key, Map<String,Double> val) {
+ if (this.topology_resources_overrides == null) {
+ this.topology_resources_overrides = new HashMap<String,Map<String,Double>>();
+ }
+ this.topology_resources_overrides.put(key, val);
+ }
+
+ public Map<String,Map<String,Double>> get_topology_resources_overrides() {
+ return this.topology_resources_overrides;
+ }
+
+ public void set_topology_resources_overrides(Map<String,Map<String,Double>> topology_resources_overrides) {
+ this.topology_resources_overrides = topology_resources_overrides;
+ }
+
+ public void unset_topology_resources_overrides() {
+ this.topology_resources_overrides = null;
+ }
+
+ /** Returns true if field topology_resources_overrides is set (has been assigned a value) and false otherwise */
+ public boolean is_set_topology_resources_overrides() {
+ return this.topology_resources_overrides != null;
+ }
+
+ public void set_topology_resources_overrides_isSet(boolean value) {
+ if (!value) {
+ this.topology_resources_overrides = null;
+ }
+ }
+
+ public String get_topology_conf_overrides() {
+ return this.topology_conf_overrides;
+ }
+
+ public void set_topology_conf_overrides(String topology_conf_overrides) {
+ this.topology_conf_overrides = topology_conf_overrides;
+ }
+
+ public void unset_topology_conf_overrides() {
+ this.topology_conf_overrides = null;
+ }
+
+ /** Returns true if field topology_conf_overrides is set (has been assigned a value) and false otherwise */
+ public boolean is_set_topology_conf_overrides() {
+ return this.topology_conf_overrides != null;
+ }
+
+ public void set_topology_conf_overrides_isSet(boolean value) {
+ if (!value) {
+ this.topology_conf_overrides = null;
+ }
+ }
+
+ public String get_principal() {
+ return this.principal;
+ }
+
+ public void set_principal(String principal) {
+ this.principal = principal;
+ }
+
+ public void unset_principal() {
+ this.principal = null;
+ }
+
+ /** Returns true if field principal is set (has been assigned a value) and false otherwise */
+ public boolean is_set_principal() {
+ return this.principal != null;
+ }
+
+ public void set_principal_isSet(boolean value) {
+ if (!value) {
+ this.principal = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case WAIT_SECS:
@@ -286,6 +415,30 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
break;
+ case TOPOLOGY_RESOURCES_OVERRIDES:
+ if (value == null) {
+ unset_topology_resources_overrides();
+ } else {
+ set_topology_resources_overrides((Map<String,Map<String,Double>>)value);
+ }
+ break;
+
+ case TOPOLOGY_CONF_OVERRIDES:
+ if (value == null) {
+ unset_topology_conf_overrides();
+ } else {
+ set_topology_conf_overrides((String)value);
+ }
+ break;
+
+ case PRINCIPAL:
+ if (value == null) {
+ unset_principal();
+ } else {
+ set_principal((String)value);
+ }
+ break;
+
}
}
@@ -300,6 +453,15 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
case NUM_EXECUTORS:
return get_num_executors();
+ case TOPOLOGY_RESOURCES_OVERRIDES:
+ return get_topology_resources_overrides();
+
+ case TOPOLOGY_CONF_OVERRIDES:
+ return get_topology_conf_overrides();
+
+ case PRINCIPAL:
+ return get_principal();
+
}
throw new IllegalStateException();
}
@@ -317,6 +479,12 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
return is_set_num_workers();
case NUM_EXECUTORS:
return is_set_num_executors();
+ case TOPOLOGY_RESOURCES_OVERRIDES:
+ return is_set_topology_resources_overrides();
+ case TOPOLOGY_CONF_OVERRIDES:
+ return is_set_topology_conf_overrides();
+ case PRINCIPAL:
+ return is_set_principal();
}
throw new IllegalStateException();
}
@@ -361,6 +529,33 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
return false;
}
+ boolean this_present_topology_resources_overrides = true && this.is_set_topology_resources_overrides();
+ boolean that_present_topology_resources_overrides = true && that.is_set_topology_resources_overrides();
+ if (this_present_topology_resources_overrides || that_present_topology_resources_overrides) {
+ if (!(this_present_topology_resources_overrides && that_present_topology_resources_overrides))
+ return false;
+ if (!this.topology_resources_overrides.equals(that.topology_resources_overrides))
+ return false;
+ }
+
+ boolean this_present_topology_conf_overrides = true && this.is_set_topology_conf_overrides();
+ boolean that_present_topology_conf_overrides = true && that.is_set_topology_conf_overrides();
+ if (this_present_topology_conf_overrides || that_present_topology_conf_overrides) {
+ if (!(this_present_topology_conf_overrides && that_present_topology_conf_overrides))
+ return false;
+ if (!this.topology_conf_overrides.equals(that.topology_conf_overrides))
+ return false;
+ }
+
+ boolean this_present_principal = true && this.is_set_principal();
+ boolean that_present_principal = true && that.is_set_principal();
+ if (this_present_principal || that_present_principal) {
+ if (!(this_present_principal && that_present_principal))
+ return false;
+ if (!this.principal.equals(that.principal))
+ return false;
+ }
+
return true;
}
@@ -383,6 +578,21 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
if (present_num_executors)
list.add(num_executors);
+ boolean present_topology_resources_overrides = true && (is_set_topology_resources_overrides());
+ list.add(present_topology_resources_overrides);
+ if (present_topology_resources_overrides)
+ list.add(topology_resources_overrides);
+
+ boolean present_topology_conf_overrides = true && (is_set_topology_conf_overrides());
+ list.add(present_topology_conf_overrides);
+ if (present_topology_conf_overrides)
+ list.add(topology_conf_overrides);
+
+ boolean present_principal = true && (is_set_principal());
+ list.add(present_principal);
+ if (present_principal)
+ list.add(principal);
+
return list.hashCode();
}
@@ -424,6 +634,36 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_topology_resources_overrides()).compareTo(other.is_set_topology_resources_overrides());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_topology_resources_overrides()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_resources_overrides, other.topology_resources_overrides);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_topology_conf_overrides()).compareTo(other.is_set_topology_conf_overrides());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_topology_conf_overrides()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_conf_overrides, other.topology_conf_overrides);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_principal()).compareTo(other.is_set_principal());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_principal()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal, other.principal);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -465,6 +705,36 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
first = false;
}
+ if (is_set_topology_resources_overrides()) {
+ if (!first) sb.append(", ");
+ sb.append("topology_resources_overrides:");
+ if (this.topology_resources_overrides == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.topology_resources_overrides);
+ }
+ first = false;
+ }
+ if (is_set_topology_conf_overrides()) {
+ if (!first) sb.append(", ");
+ sb.append("topology_conf_overrides:");
+ if (this.topology_conf_overrides == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.topology_conf_overrides);
+ }
+ first = false;
+ }
+ if (is_set_principal()) {
+ if (!first) sb.append(", ");
+ sb.append("principal:");
+ if (this.principal == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.principal);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -546,6 +816,54 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // TOPOLOGY_RESOURCES_OVERRIDES
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map570 = iprot.readMapBegin();
+ struct.topology_resources_overrides = new HashMap<String,Map<String,Double>>(2*_map570.size);
+ String _key571;
+ Map<String,Double> _val572;
+ for (int _i573 = 0; _i573 < _map570.size; ++_i573)
+ {
+ _key571 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map574 = iprot.readMapBegin();
+ _val572 = new HashMap<String,Double>(2*_map574.size);
+ String _key575;
+ double _val576;
+ for (int _i577 = 0; _i577 < _map574.size; ++_i577)
+ {
+ _key575 = iprot.readString();
+ _val576 = iprot.readDouble();
+ _val572.put(_key575, _val576);
+ }
+ iprot.readMapEnd();
+ }
+ struct.topology_resources_overrides.put(_key571, _val572);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_topology_resources_overrides_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // TOPOLOGY_CONF_OVERRIDES
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.topology_conf_overrides = iprot.readString();
+ struct.set_topology_conf_overrides_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // PRINCIPAL
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.principal = iprot.readString();
+ struct.set_principal_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -574,16 +892,53 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
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> _iter570 : struct.num_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter578 : struct.num_executors.entrySet())
{
- oprot.writeString(_iter570.getKey());
- oprot.writeI32(_iter570.getValue());
+ oprot.writeString(_iter578.getKey());
+ oprot.writeI32(_iter578.getValue());
}
oprot.writeMapEnd();
}
oprot.writeFieldEnd();
}
}
+ if (struct.topology_resources_overrides != null) {
+ if (struct.is_set_topology_resources_overrides()) {
+ oprot.writeFieldBegin(TOPOLOGY_RESOURCES_OVERRIDES_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.topology_resources_overrides.size()));
+ for (Map.Entry<String, Map<String,Double>> _iter579 : struct.topology_resources_overrides.entrySet())
+ {
+ oprot.writeString(_iter579.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter579.getValue().size()));
+ for (Map.Entry<String, Double> _iter580 : _iter579.getValue().entrySet())
+ {
+ oprot.writeString(_iter580.getKey());
+ oprot.writeDouble(_iter580.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.topology_conf_overrides != null) {
+ if (struct.is_set_topology_conf_overrides()) {
+ oprot.writeFieldBegin(TOPOLOGY_CONF_OVERRIDES_FIELD_DESC);
+ oprot.writeString(struct.topology_conf_overrides);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.principal != null) {
+ if (struct.is_set_principal()) {
+ oprot.writeFieldBegin(PRINCIPAL_FIELD_DESC);
+ oprot.writeString(struct.principal);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -611,7 +966,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
if (struct.is_set_num_executors()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.is_set_topology_resources_overrides()) {
+ optionals.set(3);
+ }
+ if (struct.is_set_topology_conf_overrides()) {
+ optionals.set(4);
+ }
+ if (struct.is_set_principal()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
if (struct.is_set_wait_secs()) {
oprot.writeI32(struct.wait_secs);
}
@@ -621,19 +985,42 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
if (struct.is_set_num_executors()) {
{
oprot.writeI32(struct.num_executors.size());
- for (Map.Entry<String, Integer> _iter571 : struct.num_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter581 : struct.num_executors.entrySet())
+ {
+ oprot.writeString(_iter581.getKey());
+ oprot.writeI32(_iter581.getValue());
+ }
+ }
+ }
+ if (struct.is_set_topology_resources_overrides()) {
+ {
+ oprot.writeI32(struct.topology_resources_overrides.size());
+ for (Map.Entry<String, Map<String,Double>> _iter582 : struct.topology_resources_overrides.entrySet())
{
- oprot.writeString(_iter571.getKey());
- oprot.writeI32(_iter571.getValue());
+ oprot.writeString(_iter582.getKey());
+ {
+ oprot.writeI32(_iter582.getValue().size());
+ for (Map.Entry<String, Double> _iter583 : _iter582.getValue().entrySet())
+ {
+ oprot.writeString(_iter583.getKey());
+ oprot.writeDouble(_iter583.getValue());
+ }
+ }
}
}
}
+ if (struct.is_set_topology_conf_overrides()) {
+ oprot.writeString(struct.topology_conf_overrides);
+ }
+ if (struct.is_set_principal()) {
+ oprot.writeString(struct.principal);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.wait_secs = iprot.readI32();
struct.set_wait_secs_isSet(true);
@@ -644,19 +1031,53 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TMap _map572 = 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*_map572.size);
- String _key573;
- int _val574;
- for (int _i575 = 0; _i575 < _map572.size; ++_i575)
+ org.apache.thrift.protocol.TMap _map584 = 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*_map584.size);
+ String _key585;
+ int _val586;
+ for (int _i587 = 0; _i587 < _map584.size; ++_i587)
{
- _key573 = iprot.readString();
- _val574 = iprot.readI32();
- struct.num_executors.put(_key573, _val574);
+ _key585 = iprot.readString();
+ _val586 = iprot.readI32();
+ struct.num_executors.put(_key585, _val586);
}
}
struct.set_num_executors_isSet(true);
}
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TMap _map588 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.topology_resources_overrides = new HashMap<String,Map<String,Double>>(2*_map588.size);
+ String _key589;
+ Map<String,Double> _val590;
+ for (int _i591 = 0; _i591 < _map588.size; ++_i591)
+ {
+ _key589 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map592 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ _val590 = new HashMap<String,Double>(2*_map592.size);
+ String _key593;
+ double _val594;
+ for (int _i595 = 0; _i595 < _map592.size; ++_i595)
+ {
+ _key593 = iprot.readString();
+ _val594 = iprot.readDouble();
+ _val590.put(_key593, _val594);
+ }
+ }
+ struct.topology_resources_overrides.put(_key589, _val590);
+ }
+ }
+ struct.set_topology_resources_overrides_isSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.topology_conf_overrides = iprot.readString();
+ struct.set_topology_conf_overrides_isSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.principal = iprot.readString();
+ struct.set_principal_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
index 48e1fd4..604e446 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SettableBlobMeta.java
@@ -452,14 +452,14 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
case 1: // ACL
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list586 = iprot.readListBegin();
- struct.acl = new ArrayList<AccessControl>(_list586.size);
- AccessControl _elem587;
- for (int _i588 = 0; _i588 < _list586.size; ++_i588)
+ org.apache.thrift.protocol.TList _list606 = iprot.readListBegin();
+ struct.acl = new ArrayList<AccessControl>(_list606.size);
+ AccessControl _elem607;
+ for (int _i608 = 0; _i608 < _list606.size; ++_i608)
{
- _elem587 = new AccessControl();
- _elem587.read(iprot);
- struct.acl.add(_elem587);
+ _elem607 = new AccessControl();
+ _elem607.read(iprot);
+ struct.acl.add(_elem607);
}
iprot.readListEnd();
}
@@ -493,9 +493,9 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
oprot.writeFieldBegin(ACL_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.acl.size()));
- for (AccessControl _iter589 : struct.acl)
+ for (AccessControl _iter609 : struct.acl)
{
- _iter589.write(oprot);
+ _iter609.write(oprot);
}
oprot.writeListEnd();
}
@@ -525,9 +525,9 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.acl.size());
- for (AccessControl _iter590 : struct.acl)
+ for (AccessControl _iter610 : struct.acl)
{
- _iter590.write(oprot);
+ _iter610.write(oprot);
}
}
BitSet optionals = new BitSet();
@@ -544,14 +544,14 @@ public class SettableBlobMeta implements org.apache.thrift.TBase<SettableBlobMet
public void read(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list591 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.acl = new ArrayList<AccessControl>(_list591.size);
- AccessControl _elem592;
- for (int _i593 = 0; _i593 < _list591.size; ++_i593)
+ org.apache.thrift.protocol.TList _list611 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.acl = new ArrayList<AccessControl>(_list611.size);
+ AccessControl _elem612;
+ for (int _i613 = 0; _i613 < _list611.size; ++_i613)
{
- _elem592 = new AccessControl();
- _elem592.read(iprot);
- struct.acl.add(_elem592);
+ _elem612 = new AccessControl();
+ _elem612.read(iprot);
+ struct.acl.add(_elem612);
}
}
struct.set_acl_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
index 84051f1..b1b205c 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/StormBase.java
@@ -1252,15 +1252,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 _map712 = iprot.readMapBegin();
- struct.component_executors = new HashMap<String,Integer>(2*_map712.size);
- String _key713;
- int _val714;
- for (int _i715 = 0; _i715 < _map712.size; ++_i715)
+ org.apache.thrift.protocol.TMap _map732 = iprot.readMapBegin();
+ struct.component_executors = new HashMap<String,Integer>(2*_map732.size);
+ String _key733;
+ int _val734;
+ for (int _i735 = 0; _i735 < _map732.size; ++_i735)
{
- _key713 = iprot.readString();
- _val714 = iprot.readI32();
- struct.component_executors.put(_key713, _val714);
+ _key733 = iprot.readString();
+ _val734 = iprot.readI32();
+ struct.component_executors.put(_key733, _val734);
}
iprot.readMapEnd();
}
@@ -1305,16 +1305,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 _map716 = iprot.readMapBegin();
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map716.size);
- String _key717;
- DebugOptions _val718;
- for (int _i719 = 0; _i719 < _map716.size; ++_i719)
+ org.apache.thrift.protocol.TMap _map736 = iprot.readMapBegin();
+ struct.component_debug = new HashMap<String,DebugOptions>(2*_map736.size);
+ String _key737;
+ DebugOptions _val738;
+ for (int _i739 = 0; _i739 < _map736.size; ++_i739)
{
- _key717 = iprot.readString();
- _val718 = new DebugOptions();
- _val718.read(iprot);
- struct.component_debug.put(_key717, _val718);
+ _key737 = iprot.readString();
+ _val738 = new DebugOptions();
+ _val738.read(iprot);
+ struct.component_debug.put(_key737, _val738);
}
iprot.readMapEnd();
}
@@ -1370,10 +1370,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> _iter720 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter740 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter720.getKey());
- oprot.writeI32(_iter720.getValue());
+ oprot.writeString(_iter740.getKey());
+ oprot.writeI32(_iter740.getValue());
}
oprot.writeMapEnd();
}
@@ -1411,10 +1411,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> _iter721 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter741 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter721.getKey());
- _iter721.getValue().write(oprot);
+ oprot.writeString(_iter741.getKey());
+ _iter741.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -1484,10 +1484,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> _iter722 : struct.component_executors.entrySet())
+ for (Map.Entry<String, Integer> _iter742 : struct.component_executors.entrySet())
{
- oprot.writeString(_iter722.getKey());
- oprot.writeI32(_iter722.getValue());
+ oprot.writeString(_iter742.getKey());
+ oprot.writeI32(_iter742.getValue());
}
}
}
@@ -1506,10 +1506,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> _iter723 : struct.component_debug.entrySet())
+ for (Map.Entry<String, DebugOptions> _iter743 : struct.component_debug.entrySet())
{
- oprot.writeString(_iter723.getKey());
- _iter723.getValue().write(oprot);
+ oprot.writeString(_iter743.getKey());
+ _iter743.getValue().write(oprot);
}
}
}
@@ -1533,15 +1533,15 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
BitSet incoming = iprot.readBitSet(8);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map724 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.component_executors = new HashMap<String,Integer>(2*_map724.size);
- String _key725;
- int _val726;
- for (int _i727 = 0; _i727 < _map724.size; ++_i727)
+ org.apache.thrift.protocol.TMap _map744 = 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*_map744.size);
+ String _key745;
+ int _val746;
+ for (int _i747 = 0; _i747 < _map744.size; ++_i747)
{
- _key725 = iprot.readString();
- _val726 = iprot.readI32();
- struct.component_executors.put(_key725, _val726);
+ _key745 = iprot.readString();
+ _val746 = iprot.readI32();
+ struct.component_executors.put(_key745, _val746);
}
}
struct.set_component_executors_isSet(true);
@@ -1565,16 +1565,16 @@ public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TMap _map728 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.component_debug = new HashMap<String,DebugOptions>(2*_map728.size);
- String _key729;
- DebugOptions _val730;
- for (int _i731 = 0; _i731 < _map728.size; ++_i731)
+ org.apache.thrift.protocol.TMap _map748 = 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*_map748.size);
+ String _key749;
+ DebugOptions _val750;
+ for (int _i751 = 0; _i751 < _map748.size; ++_i751)
{
- _key729 = iprot.readString();
- _val730 = new DebugOptions();
- _val730.read(iprot);
- struct.component_debug.put(_key729, _val730);
+ _key749 = iprot.readString();
+ _val750 = new DebugOptions();
+ _val750.read(iprot);
+ struct.component_debug.put(_key749, _val750);
}
}
struct.set_component_debug_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
index d19bac4..45293ed 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/SupervisorInfo.java
@@ -1085,13 +1085,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case 4: // USED_PORTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list602 = iprot.readListBegin();
- struct.used_ports = new ArrayList<Long>(_list602.size);
- long _elem603;
- for (int _i604 = 0; _i604 < _list602.size; ++_i604)
+ org.apache.thrift.protocol.TList _list622 = iprot.readListBegin();
+ struct.used_ports = new ArrayList<Long>(_list622.size);
+ long _elem623;
+ for (int _i624 = 0; _i624 < _list622.size; ++_i624)
{
- _elem603 = iprot.readI64();
- struct.used_ports.add(_elem603);
+ _elem623 = iprot.readI64();
+ struct.used_ports.add(_elem623);
}
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 _list605 = iprot.readListBegin();
- struct.meta = new ArrayList<Long>(_list605.size);
- long _elem606;
- for (int _i607 = 0; _i607 < _list605.size; ++_i607)
+ org.apache.thrift.protocol.TList _list625 = iprot.readListBegin();
+ struct.meta = new ArrayList<Long>(_list625.size);
+ long _elem626;
+ for (int _i627 = 0; _i627 < _list625.size; ++_i627)
{
- _elem606 = iprot.readI64();
- struct.meta.add(_elem606);
+ _elem626 = iprot.readI64();
+ struct.meta.add(_elem626);
}
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 _map608 = iprot.readMapBegin();
- struct.scheduler_meta = new HashMap<String,String>(2*_map608.size);
- String _key609;
- String _val610;
- for (int _i611 = 0; _i611 < _map608.size; ++_i611)
+ org.apache.thrift.protocol.TMap _map628 = iprot.readMapBegin();
+ struct.scheduler_meta = new HashMap<String,String>(2*_map628.size);
+ String _key629;
+ String _val630;
+ for (int _i631 = 0; _i631 < _map628.size; ++_i631)
{
- _key609 = iprot.readString();
- _val610 = iprot.readString();
- struct.scheduler_meta.put(_key609, _val610);
+ _key629 = iprot.readString();
+ _val630 = iprot.readString();
+ struct.scheduler_meta.put(_key629, _val630);
}
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 _map612 = iprot.readMapBegin();
- struct.resources_map = new HashMap<String,Double>(2*_map612.size);
- String _key613;
- double _val614;
- for (int _i615 = 0; _i615 < _map612.size; ++_i615)
+ org.apache.thrift.protocol.TMap _map632 = iprot.readMapBegin();
+ struct.resources_map = new HashMap<String,Double>(2*_map632.size);
+ String _key633;
+ double _val634;
+ for (int _i635 = 0; _i635 < _map632.size; ++_i635)
{
- _key613 = iprot.readString();
- _val614 = iprot.readDouble();
- struct.resources_map.put(_key613, _val614);
+ _key633 = iprot.readString();
+ _val634 = iprot.readDouble();
+ struct.resources_map.put(_key633, _val634);
}
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 _iter616 : struct.used_ports)
+ for (long _iter636 : struct.used_ports)
{
- oprot.writeI64(_iter616);
+ oprot.writeI64(_iter636);
}
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 _iter617 : struct.meta)
+ for (long _iter637 : struct.meta)
{
- oprot.writeI64(_iter617);
+ oprot.writeI64(_iter637);
}
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> _iter618 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter638 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter618.getKey());
- oprot.writeString(_iter618.getValue());
+ oprot.writeString(_iter638.getKey());
+ oprot.writeString(_iter638.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> _iter619 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter639 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter619.getKey());
- oprot.writeDouble(_iter619.getValue());
+ oprot.writeString(_iter639.getKey());
+ oprot.writeDouble(_iter639.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 _iter620 : struct.used_ports)
+ for (long _iter640 : struct.used_ports)
{
- oprot.writeI64(_iter620);
+ oprot.writeI64(_iter640);
}
}
}
if (struct.is_set_meta()) {
{
oprot.writeI32(struct.meta.size());
- for (long _iter621 : struct.meta)
+ for (long _iter641 : struct.meta)
{
- oprot.writeI64(_iter621);
+ oprot.writeI64(_iter641);
}
}
}
if (struct.is_set_scheduler_meta()) {
{
oprot.writeI32(struct.scheduler_meta.size());
- for (Map.Entry<String, String> _iter622 : struct.scheduler_meta.entrySet())
+ for (Map.Entry<String, String> _iter642 : struct.scheduler_meta.entrySet())
{
- oprot.writeString(_iter622.getKey());
- oprot.writeString(_iter622.getValue());
+ oprot.writeString(_iter642.getKey());
+ oprot.writeString(_iter642.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> _iter623 : struct.resources_map.entrySet())
+ for (Map.Entry<String, Double> _iter643 : struct.resources_map.entrySet())
{
- oprot.writeString(_iter623.getKey());
- oprot.writeDouble(_iter623.getValue());
+ oprot.writeString(_iter643.getKey());
+ oprot.writeDouble(_iter643.getValue());
}
}
}
@@ -1377,41 +1377,41 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list624 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.used_ports = new ArrayList<Long>(_list624.size);
- long _elem625;
- for (int _i626 = 0; _i626 < _list624.size; ++_i626)
+ org.apache.thrift.protocol.TList _list644 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.used_ports = new ArrayList<Long>(_list644.size);
+ long _elem645;
+ for (int _i646 = 0; _i646 < _list644.size; ++_i646)
{
- _elem625 = iprot.readI64();
- struct.used_ports.add(_elem625);
+ _elem645 = iprot.readI64();
+ struct.used_ports.add(_elem645);
}
}
struct.set_used_ports_isSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list627 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.meta = new ArrayList<Long>(_list627.size);
- long _elem628;
- for (int _i629 = 0; _i629 < _list627.size; ++_i629)
+ org.apache.thrift.protocol.TList _list647 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.meta = new ArrayList<Long>(_list647.size);
+ long _elem648;
+ for (int _i649 = 0; _i649 < _list647.size; ++_i649)
{
- _elem628 = iprot.readI64();
- struct.meta.add(_elem628);
+ _elem648 = iprot.readI64();
+ struct.meta.add(_elem648);
}
}
struct.set_meta_isSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map630 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.scheduler_meta = new HashMap<String,String>(2*_map630.size);
- String _key631;
- String _val632;
- for (int _i633 = 0; _i633 < _map630.size; ++_i633)
+ org.apache.thrift.protocol.TMap _map650 = 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*_map650.size);
+ String _key651;
+ String _val652;
+ for (int _i653 = 0; _i653 < _map650.size; ++_i653)
{
- _key631 = iprot.readString();
- _val632 = iprot.readString();
- struct.scheduler_meta.put(_key631, _val632);
+ _key651 = iprot.readString();
+ _val652 = iprot.readString();
+ struct.scheduler_meta.put(_key651, _val652);
}
}
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 _map634 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
- struct.resources_map = new HashMap<String,Double>(2*_map634.size);
- String _key635;
- double _val636;
- for (int _i637 = 0; _i637 < _map634.size; ++_i637)
+ org.apache.thrift.protocol.TMap _map654 = 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*_map654.size);
+ String _key655;
+ double _val656;
+ for (int _i657 = 0; _i657 < _map654.size; ++_i657)
{
- _key635 = iprot.readString();
- _val636 = iprot.readDouble();
- struct.resources_map.put(_key635, _val636);
+ _key655 = iprot.readString();
+ _val656 = iprot.readDouble();
+ struct.resources_map.put(_key655, _val656);
}
}
struct.set_resources_map_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
index 58cf9bb..0fc7cab 100644
--- a/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
+++ b/storm-client/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java
@@ -364,13 +364,13 @@ public class TopologyHistoryInfo implements org.apache.thrift.TBase<TopologyHist
case 1: // TOPO_IDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list822 = iprot.readListBegin();
- struct.topo_ids = new ArrayList<String>(_list822.size);
- String _elem823;
- for (int _i824 = 0; _i824 < _list822.size; ++_i824)
+ org.apache.thrift.protocol.TList _list842 = iprot.readListBegin();
+ struct.topo_ids = new ArrayList<String>(_list842.size);
+ String _elem843;
+ for (int _i844 = 0; _i844 < _list842.size; ++_i844)
{
- _elem823 = iprot.readString();
- struct.topo_ids.add(_elem823);
+ _elem843 = iprot.readString();
+ struct.topo_ids.add(_elem843);
}
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 _iter825 : struct.topo_ids)
+ for (String _iter845 : struct.topo_ids)
{
- oprot.writeString(_iter825);
+ oprot.writeString(_iter845);
}
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 _iter826 : struct.topo_ids)
+ for (String _iter846 : struct.topo_ids)
{
- oprot.writeString(_iter826);
+ oprot.writeString(_iter846);
}
}
}
@@ -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 _list827 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.topo_ids = new ArrayList<String>(_list827.size);
- String _elem828;
- for (int _i829 = 0; _i829 < _list827.size; ++_i829)
+ org.apache.thrift.protocol.TList _list847 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.topo_ids = new ArrayList<String>(_list847.size);
+ String _elem848;
+ for (int _i849 = 0; _i849 < _list847.size; ++_i849)
{
- _elem828 = iprot.readString();
- struct.topo_ids.add(_elem828);
+ _elem848 = iprot.readString();
+ struct.topo_ids.add(_elem848);
}
}
struct.set_topo_ids_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
index 99ef9cd..971e5f3 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
@@ -46,7 +46,6 @@ import org.apache.storm.tuple.Tuple;
import org.apache.storm.utils.Utils;
import org.apache.storm.windowing.TupleWindow;
import org.json.simple.JSONValue;
-import org.json.simple.parser.ParseException;
import java.io.NotSerializableException;
import java.nio.ByteBuffer;
@@ -577,7 +576,7 @@ public class TopologyBuilder {
throw new IllegalArgumentException("Cannot set serializations for a component using fluent API");
}
String currConf = _commons.get(_id).get_json_conf();
- _commons.get(_id).set_json_conf(mergeIntoJson(parseJson(currConf), conf));
+ _commons.get(_id).set_json_conf(mergeIntoJson(Utils.parseJson(currConf), conf));
return (T) this;
}
@@ -695,19 +694,7 @@ public class TopologyBuilder {
return grouping(id.get_componentId(), id.get_streamId(), grouping);
}
}
-
- private static Map parseJson(String json) {
- if (json==null) {
- return new HashMap();
- } else {
- try {
- return (Map) JSONValue.parseWithException(json);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
+
private static String mergeIntoJson(Map into, Map newMap) {
Map res = new HashMap(into);
if(newMap!=null) res.putAll(newMap);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 0a38f61..37c2963 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -905,7 +905,7 @@ public class Utils {
/**
* parses the arguments to extract jvm heap memory size in MB.
- * @param input
+ * @param options
* @param defaultValue
* @return the value of the JVM heap memory setting (in MB) in a java command.
*/
@@ -1288,6 +1288,18 @@ public class Utils {
return findOne(pred, (Set<T>) map.entrySet());
}
+ public static Map<String, Object> parseJson(String json) {
+ if (json==null) {
+ return new HashMap<>();
+ } else {
+ try {
+ return (Map<String, Object>) JSONValue.parseWithException(json);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
// Non-static impl methods exist for mocking purposes.
protected void forceDeleteImpl(String path) throws IOException {
LOG.debug("Deleting path {}", path);
http://git-wip-us.apache.org/repos/asf/storm/blob/e94b735a/storm-client/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --git a/storm-client/src/py/storm/Nimbus.py b/storm-client/src/py/storm/Nimbus.py
index 545b05d..522921b 100644
--- a/storm-client/src/py/storm/Nimbus.py
+++ b/storm-client/src/py/storm/Nimbus.py
@@ -4977,11 +4977,11 @@ class getComponentPendingProfileActions_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype758, _size755) = iprot.readListBegin()
- for _i759 in xrange(_size755):
- _elem760 = ProfileRequest()
- _elem760.read(iprot)
- self.success.append(_elem760)
+ (_etype776, _size773) = iprot.readListBegin()
+ for _i777 in xrange(_size773):
+ _elem778 = ProfileRequest()
+ _elem778.read(iprot)
+ self.success.append(_elem778)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -4998,8 +4998,8 @@ class getComponentPendingProfileActions_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter761 in self.success:
- iter761.write(oprot)
+ for iter779 in self.success:
+ iter779.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -10070,11 +10070,11 @@ class getOwnerResourceSummaries_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype765, _size762) = iprot.readListBegin()
- for _i766 in xrange(_size762):
- _elem767 = OwnerResourceSummary()
- _elem767.read(iprot)
- self.success.append(_elem767)
+ (_etype783, _size780) = iprot.readListBegin()
+ for _i784 in xrange(_size780):
+ _elem785 = OwnerResourceSummary()
+ _elem785.read(iprot)
+ self.success.append(_elem785)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -10097,8 +10097,8 @@ class getOwnerResourceSummaries_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter768 in self.success:
- iter768.write(oprot)
+ for iter786 in self.success:
+ iter786.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.aze is not None: