STORM-2887: store metrics into RocksDB
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/48e23a99 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/48e23a99 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/48e23a99 Branch: refs/heads/master Commit: 48e23a99bf90c50f5d4864dbd449b0079ab2d5e2 Parents: 879cb5b Author: Aaron Gresch <agre...@yahoo-inc.com> Authored: Thu Dec 7 11:36:03 2017 -0600 Committer: Aaron Gresch <agre...@yahoo-inc.com> Committed: Mon Jan 22 09:25:57 2018 -0600 ---------------------------------------------------------------------- conf/defaults.yaml | 6 + docs/index.md | 1 + docs/storm-metricstore.md | 83 ++ pom.xml | 9 + .../org/apache/storm/generated/Assignment.java | 288 +++--- .../storm/generated/ClusterWorkerHeartbeat.java | 52 +- .../jvm/org/apache/storm/generated/HBNodes.java | 32 +- .../org/apache/storm/generated/HBRecords.java | 36 +- .../storm/generated/LSApprovedWorkers.java | 44 +- .../generated/LSSupervisorAssignments.java | 48 +- .../apache/storm/generated/LSTopoHistory.java | 64 +- .../storm/generated/LSTopoHistoryList.java | 36 +- .../storm/generated/LSWorkerHeartbeat.java | 36 +- .../apache/storm/generated/LocalAssignment.java | 36 +- .../apache/storm/generated/LocalStateData.java | 48 +- .../org/apache/storm/generated/LogConfig.java | 48 +- .../jvm/org/apache/storm/generated/Nimbus.java | 809 ++++++++++++++++- .../org/apache/storm/generated/StormBase.java | 92 +- .../storm/generated/TopologyHistoryInfo.java | 32 +- .../storm/generated/WorkerMetricList.java | 466 ++++++++++ .../storm/generated/WorkerMetricPoint.java | 903 +++++++++++++++++++ .../apache/storm/generated/WorkerMetrics.java | 712 +++++++++++++++ .../apache/storm/generated/WorkerResources.java | 88 +- .../auth/authorizer/SimpleACLAuthorizer.java | 24 +- .../jvm/org/apache/storm/utils/ConfigUtils.java | 4 +- .../src/jvm/org/apache/storm/utils/Utils.java | 14 +- storm-client/src/py/storm/Nimbus-remote | 7 + storm-client/src/py/storm/Nimbus.py | 196 +++- storm-client/src/py/storm/ttypes.py | 715 +++++++++++---- storm-client/src/storm.thrift | 23 + storm-server/pom.xml | 4 + .../java/org/apache/storm/DaemonConfig.java | 59 +- .../java/org/apache/storm/LocalCluster.java | 8 +- .../org/apache/storm/daemon/nimbus/Nimbus.java | 66 +- .../storm/daemon/supervisor/Container.java | 61 +- .../apache/storm/daemon/supervisor/Slot.java | 3 + .../storm/metric/StormMetricsRegistry.java | 5 + .../org/apache/storm/metricstore/AggLevel.java | 40 + .../apache/storm/metricstore/FilterOptions.java | 154 ++++ .../org/apache/storm/metricstore/Metric.java | 270 ++++++ .../storm/metricstore/MetricException.java | 32 + .../apache/storm/metricstore/MetricStore.java | 74 ++ .../storm/metricstore/MetricStoreConfig.java | 45 + .../storm/metricstore/rocksdb/KeyType.java | 70 ++ .../metricstore/rocksdb/MetricsCleaner.java | 98 ++ .../rocksdb/ReadOnlyStringMetadataCache.java | 52 ++ .../storm/metricstore/rocksdb/RocksDbKey.java | 228 +++++ .../rocksdb/RocksDbMetricsWriter.java | 320 +++++++ .../storm/metricstore/rocksdb/RocksDbStore.java | 639 +++++++++++++ .../storm/metricstore/rocksdb/RocksDbValue.java | 144 +++ .../metricstore/rocksdb/StringMetadata.java | 78 ++ .../rocksdb/StringMetadataCache.java | 202 +++++ .../rocksdb/WritableStringMetadataCache.java | 54 ++ .../java/org/apache/storm/utils/LruMap.java | 56 ++ .../metricstore/rocksdb/RocksDbKeyTest.java | 74 ++ .../metricstore/rocksdb/RocksDbStoreTest.java | 328 +++++++ .../metricstore/rocksdb/RocksDbValueTest.java | 76 ++ .../rocksdb/StringMetadataCacheTest.java | 129 +++ 58 files changed, 7571 insertions(+), 750 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/conf/defaults.yaml ---------------------------------------------------------------------- diff --git a/conf/defaults.yaml b/conf/defaults.yaml index 2260a0b..e15a265 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -295,6 +295,12 @@ pacemaker.thrift.message.size.max: 10485760 storm.daemon.metrics.reporter.plugins: - "org.apache.storm.daemon.metrics.reporters.JmxPreparableReporter" +storm.metricstore.class: "org.apache.storm.metricstore.rocksdb.RocksDbStore" +storm.metricstore.rocksdb.location: "storm_rocks" +storm.metricstore.rocksdb.create_if_missing: true +storm.metricstore.rocksdb.metadata_string_cache_capacity: 4000 +storm.metricstore.rocksdb.retention_hours: 240 + # configuration of cluster metrics consumer storm.cluster.metrics.consumer.publish.interval.secs: 60 http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/docs/index.md ---------------------------------------------------------------------- diff --git a/docs/index.md b/docs/index.md index a0ee350..af7c182 100644 --- a/docs/index.md +++ b/docs/index.md @@ -122,4 +122,5 @@ But small change will not affect the user experience. We will notify the user wh * [Defining a non-JVM language DSL for Storm](Defining-a-non-jvm-language-dsl-for-storm.html) * [Multilang protocol](Multilang-protocol.html) (how to provide support for another language) * [Implementation docs](Implementation-docs.html) +* [Storm Metricstore](storm-metricstore.html) http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/docs/storm-metricstore.md ---------------------------------------------------------------------- diff --git a/docs/storm-metricstore.md b/docs/storm-metricstore.md new file mode 100644 index 0000000..4111322 --- /dev/null +++ b/docs/storm-metricstore.md @@ -0,0 +1,83 @@ +--- +title: Storm Metricstore +layout: documentation +documentation: true +--- +A metric store ([`MetricStore`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java)) interface was added +to Nimbus to allow storing metric information ([`Metric`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/Metric.java)) +to a database. The default implementation +([`RocksDbStore`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbStore.java)) is using RocksDB, +a key-value store. + +As metrics are stored in RocksDB, their string values (for topology ID and executor ID, etc.) are converted to unique integer IDs, and these strings +are also stored to the database as metadata indexed by the integer ID. When a metric is stored, it is also aggregated with any existing metric +within the same 1, 10, and 60 minute timeframe. + +The [`FilterOptions`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/FilterOptions.java) class provides an interface +to select which options can be used to scan the metrics. + + +### Configuration + +The following configuation options exist: + +```yaml +storm.metricstore.class: "org.apache.storm.metricstore.rocksdb.RocksDbStore" +storm.metricstore.rocksdb.location: "storm_rocks" +storm.metricstore.rocksdb.create_if_missing: true +storm.metricstore.rocksdb.metadata_string_cache_capacity: 4000 +storm.metricstore.rocksdb.retention_hours: 240 +``` + +* storm.metricstore.class is the class that implements the +([`MetricStore`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/MetricStore.java)). +* storm.metricstore.rocksdb.location provides to location of the RocksDB database on Nimbus +* storm.metricstore.rocksdb.create_if_missing permits creating a RocksDB database if missing +* storm.metricstore.rocksdb.metadata_string_cache_capacity controls the number of metadata strings cached in memory. +* storm.metricstore.rocksdb.retention_hours sets the length of time metrics will remain active. + + +### RocksDB Schema + +The RocksDB Key (represented by [`RocksDbKey`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java)) +fields are as follows: + + +| Field | Size | Offset | Description | +|-------------------|------|--------|--------------------------------------------------------------------------------------------------------------| +| Type | 1 | 0 | The type maps to the KeyType enum, specifying a metric or various types of metadata strings | +| Aggregation Level | 1 | 1 | The aggregation level for a metric (see AggLevel enum). Set to 0 for metadata. | +| Topology Id | 4 | 2 | The metadata string Id representing a topologyId for a metric, or the unique string Id for a metadata string | +| Timestamp | 8 | 6 | The timestamp for a metric, unused for metadata | +| Metric Id | 4 | 14 | The metadata string Id for the metric name | +| Component Id | 4 | 18 | The metadata string Id for the component Id | +| Executor Id | 4 | 22 | The metadata string Id for the executor Id | +| Host Id | 4 | 26 | The metadata string Id for the host Id | +| Port | 4 | 30 | The port number | +| Stream Id | 4 | 34 | The metadata string Id for the stream Id | + + +The RocksDB Value fields for metadata strings (represented by +[`RocksDbValue`]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbValue.java)) are as follows: + + +| Field | Size | Offset | Description | +|-----------------|------|--------|----------------------------------------------------------------------------------------| +| Version | 1 | 0 | The current metadata version - allows migrating if the format changes in the future | +| Timestamp | 8 | 1 | The time when the metadata was last used by a metric. Allows deleting of old metadata. | +| Metadata String | any | 9 | The metadata string | + + +RocksDB Value fields for metric data are as follows: + +| Field | Size | Offset | Description | +|---------|------|--------|-----------------------------------------------------------------------------------| +| Version | 1 | 0 | The current metric version - allows migrating if the format changes in the future | +| Value | 8 | 1 | The metric value | +| Count | 8 | 9 | The metric count | +| Min | 8 | 17 | The minimum metric value | +| Max | 8 | 25 | The maximum metric value | +| Sum | 8 | 33 | The sum of the metric values | + + + http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3c924e3..ccace42 100644 --- a/pom.xml +++ b/pom.xml @@ -324,6 +324,7 @@ <jool.version>0.9.12</jool.version> <caffeine.version>2.3.5</caffeine.version> <jaxb-version>2.3.0</jaxb-version> + <rocksdb-version>5.8.6</rocksdb-version> <!-- see intellij profile below... This fixes an annoyance with intellij --> <provided.scope>provided</provided.scope> @@ -1048,6 +1049,11 @@ <artifactId>jaxb-api</artifactId> <version>${jaxb-version}</version> </dependency> + <dependency> + <groupId>org.rocksdb</groupId> + <artifactId>rocksdbjni</artifactId> + <version>${rocksdb-version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -1091,6 +1097,9 @@ <trimStackTrace>false</trimStackTrace> <forkCount>1.0C</forkCount> <reuseForks>true</reuseForks> + <systemPropertyVariables> + <storm.home>${project.basedir}/target/testhome</storm.home> + </systemPropertyVariables> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/Assignment.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java index c3436d5..e8741df 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/Assignment.java +++ b/storm-client/src/jvm/org/apache/storm/generated/Assignment.java @@ -966,15 +966,15 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen case 2: // NODE_HOST if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map666 = iprot.readMapBegin(); - struct.node_host = new HashMap<String,String>(2*_map666.size); - String _key667; - String _val668; - for (int _i669 = 0; _i669 < _map666.size; ++_i669) + org.apache.thrift.protocol.TMap _map686 = iprot.readMapBegin(); + struct.node_host = new HashMap<String,String>(2*_map686.size); + String _key687; + String _val688; + for (int _i689 = 0; _i689 < _map686.size; ++_i689) { - _key667 = iprot.readString(); - _val668 = iprot.readString(); - struct.node_host.put(_key667, _val668); + _key687 = iprot.readString(); + _val688 = iprot.readString(); + struct.node_host.put(_key687, _val688); } iprot.readMapEnd(); } @@ -986,26 +986,26 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen case 3: // EXECUTOR_NODE_PORT if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map670 = iprot.readMapBegin(); - struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map670.size); - List<Long> _key671; - NodeInfo _val672; - for (int _i673 = 0; _i673 < _map670.size; ++_i673) + org.apache.thrift.protocol.TMap _map690 = iprot.readMapBegin(); + struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map690.size); + List<Long> _key691; + NodeInfo _val692; + for (int _i693 = 0; _i693 < _map690.size; ++_i693) { { - org.apache.thrift.protocol.TList _list674 = iprot.readListBegin(); - _key671 = new ArrayList<Long>(_list674.size); - long _elem675; - for (int _i676 = 0; _i676 < _list674.size; ++_i676) + org.apache.thrift.protocol.TList _list694 = iprot.readListBegin(); + _key691 = new ArrayList<Long>(_list694.size); + long _elem695; + for (int _i696 = 0; _i696 < _list694.size; ++_i696) { - _elem675 = iprot.readI64(); - _key671.add(_elem675); + _elem695 = iprot.readI64(); + _key691.add(_elem695); } iprot.readListEnd(); } - _val672 = new NodeInfo(); - _val672.read(iprot); - struct.executor_node_port.put(_key671, _val672); + _val692 = new NodeInfo(); + _val692.read(iprot); + struct.executor_node_port.put(_key691, _val692); } iprot.readMapEnd(); } @@ -1017,25 +1017,25 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen case 4: // EXECUTOR_START_TIME_SECS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map677 = iprot.readMapBegin(); - struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map677.size); - List<Long> _key678; - long _val679; - for (int _i680 = 0; _i680 < _map677.size; ++_i680) + org.apache.thrift.protocol.TMap _map697 = iprot.readMapBegin(); + struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map697.size); + List<Long> _key698; + long _val699; + for (int _i700 = 0; _i700 < _map697.size; ++_i700) { { - org.apache.thrift.protocol.TList _list681 = iprot.readListBegin(); - _key678 = new ArrayList<Long>(_list681.size); - long _elem682; - for (int _i683 = 0; _i683 < _list681.size; ++_i683) + org.apache.thrift.protocol.TList _list701 = iprot.readListBegin(); + _key698 = new ArrayList<Long>(_list701.size); + long _elem702; + for (int _i703 = 0; _i703 < _list701.size; ++_i703) { - _elem682 = iprot.readI64(); - _key678.add(_elem682); + _elem702 = iprot.readI64(); + _key698.add(_elem702); } iprot.readListEnd(); } - _val679 = iprot.readI64(); - struct.executor_start_time_secs.put(_key678, _val679); + _val699 = iprot.readI64(); + struct.executor_start_time_secs.put(_key698, _val699); } iprot.readMapEnd(); } @@ -1047,17 +1047,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen case 5: // WORKER_RESOURCES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map684 = iprot.readMapBegin(); - struct.worker_resources = new HashMap<NodeInfo,WorkerResources>(2*_map684.size); - NodeInfo _key685; - WorkerResources _val686; - for (int _i687 = 0; _i687 < _map684.size; ++_i687) + org.apache.thrift.protocol.TMap _map704 = iprot.readMapBegin(); + struct.worker_resources = new HashMap<NodeInfo,WorkerResources>(2*_map704.size); + NodeInfo _key705; + WorkerResources _val706; + for (int _i707 = 0; _i707 < _map704.size; ++_i707) { - _key685 = new NodeInfo(); - _key685.read(iprot); - _val686 = new WorkerResources(); - _val686.read(iprot); - struct.worker_resources.put(_key685, _val686); + _key705 = new NodeInfo(); + _key705.read(iprot); + _val706 = new WorkerResources(); + _val706.read(iprot); + struct.worker_resources.put(_key705, _val706); } iprot.readMapEnd(); } @@ -1069,15 +1069,15 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen case 6: // TOTAL_SHARED_OFF_HEAP if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map688 = iprot.readMapBegin(); - struct.total_shared_off_heap = new HashMap<String,Double>(2*_map688.size); - String _key689; - double _val690; - for (int _i691 = 0; _i691 < _map688.size; ++_i691) + org.apache.thrift.protocol.TMap _map708 = iprot.readMapBegin(); + struct.total_shared_off_heap = new HashMap<String,Double>(2*_map708.size); + String _key709; + double _val710; + for (int _i711 = 0; _i711 < _map708.size; ++_i711) { - _key689 = iprot.readString(); - _val690 = iprot.readDouble(); - struct.total_shared_off_heap.put(_key689, _val690); + _key709 = iprot.readString(); + _val710 = iprot.readDouble(); + struct.total_shared_off_heap.put(_key709, _val710); } iprot.readMapEnd(); } @@ -1117,10 +1117,10 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen oprot.writeFieldBegin(NODE_HOST_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.node_host.size())); - for (Map.Entry<String, String> _iter692 : struct.node_host.entrySet()) + for (Map.Entry<String, String> _iter712 : struct.node_host.entrySet()) { - oprot.writeString(_iter692.getKey()); - oprot.writeString(_iter692.getValue()); + oprot.writeString(_iter712.getKey()); + oprot.writeString(_iter712.getValue()); } oprot.writeMapEnd(); } @@ -1132,17 +1132,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen oprot.writeFieldBegin(EXECUTOR_NODE_PORT_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, struct.executor_node_port.size())); - for (Map.Entry<List<Long>, NodeInfo> _iter693 : struct.executor_node_port.entrySet()) + for (Map.Entry<List<Long>, NodeInfo> _iter713 : struct.executor_node_port.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter693.getKey().size())); - for (long _iter694 : _iter693.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter713.getKey().size())); + for (long _iter714 : _iter713.getKey()) { - oprot.writeI64(_iter694); + oprot.writeI64(_iter714); } oprot.writeListEnd(); } - _iter693.getValue().write(oprot); + _iter713.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1154,17 +1154,17 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen oprot.writeFieldBegin(EXECUTOR_START_TIME_SECS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, struct.executor_start_time_secs.size())); - for (Map.Entry<List<Long>, Long> _iter695 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry<List<Long>, Long> _iter715 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter695.getKey().size())); - for (long _iter696 : _iter695.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter715.getKey().size())); + for (long _iter716 : _iter715.getKey()) { - oprot.writeI64(_iter696); + oprot.writeI64(_iter716); } oprot.writeListEnd(); } - oprot.writeI64(_iter695.getValue()); + oprot.writeI64(_iter715.getValue()); } oprot.writeMapEnd(); } @@ -1176,10 +1176,10 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen oprot.writeFieldBegin(WORKER_RESOURCES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.worker_resources.size())); - for (Map.Entry<NodeInfo, WorkerResources> _iter697 : struct.worker_resources.entrySet()) + for (Map.Entry<NodeInfo, WorkerResources> _iter717 : struct.worker_resources.entrySet()) { - _iter697.getKey().write(oprot); - _iter697.getValue().write(oprot); + _iter717.getKey().write(oprot); + _iter717.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1191,10 +1191,10 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen oprot.writeFieldBegin(TOTAL_SHARED_OFF_HEAP_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.total_shared_off_heap.size())); - for (Map.Entry<String, Double> _iter698 : struct.total_shared_off_heap.entrySet()) + for (Map.Entry<String, Double> _iter718 : struct.total_shared_off_heap.entrySet()) { - oprot.writeString(_iter698.getKey()); - oprot.writeDouble(_iter698.getValue()); + oprot.writeString(_iter718.getKey()); + oprot.writeDouble(_iter718.getValue()); } oprot.writeMapEnd(); } @@ -1249,62 +1249,62 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen if (struct.is_set_node_host()) { { oprot.writeI32(struct.node_host.size()); - for (Map.Entry<String, String> _iter699 : struct.node_host.entrySet()) + for (Map.Entry<String, String> _iter719 : struct.node_host.entrySet()) { - oprot.writeString(_iter699.getKey()); - oprot.writeString(_iter699.getValue()); + oprot.writeString(_iter719.getKey()); + oprot.writeString(_iter719.getValue()); } } } if (struct.is_set_executor_node_port()) { { oprot.writeI32(struct.executor_node_port.size()); - for (Map.Entry<List<Long>, NodeInfo> _iter700 : struct.executor_node_port.entrySet()) + for (Map.Entry<List<Long>, NodeInfo> _iter720 : struct.executor_node_port.entrySet()) { { - oprot.writeI32(_iter700.getKey().size()); - for (long _iter701 : _iter700.getKey()) + oprot.writeI32(_iter720.getKey().size()); + for (long _iter721 : _iter720.getKey()) { - oprot.writeI64(_iter701); + oprot.writeI64(_iter721); } } - _iter700.getValue().write(oprot); + _iter720.getValue().write(oprot); } } } if (struct.is_set_executor_start_time_secs()) { { oprot.writeI32(struct.executor_start_time_secs.size()); - for (Map.Entry<List<Long>, Long> _iter702 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry<List<Long>, Long> _iter722 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeI32(_iter702.getKey().size()); - for (long _iter703 : _iter702.getKey()) + oprot.writeI32(_iter722.getKey().size()); + for (long _iter723 : _iter722.getKey()) { - oprot.writeI64(_iter703); + oprot.writeI64(_iter723); } } - oprot.writeI64(_iter702.getValue()); + oprot.writeI64(_iter722.getValue()); } } } if (struct.is_set_worker_resources()) { { oprot.writeI32(struct.worker_resources.size()); - for (Map.Entry<NodeInfo, WorkerResources> _iter704 : struct.worker_resources.entrySet()) + for (Map.Entry<NodeInfo, WorkerResources> _iter724 : struct.worker_resources.entrySet()) { - _iter704.getKey().write(oprot); - _iter704.getValue().write(oprot); + _iter724.getKey().write(oprot); + _iter724.getValue().write(oprot); } } } if (struct.is_set_total_shared_off_heap()) { { oprot.writeI32(struct.total_shared_off_heap.size()); - for (Map.Entry<String, Double> _iter705 : struct.total_shared_off_heap.entrySet()) + for (Map.Entry<String, Double> _iter725 : struct.total_shared_off_heap.entrySet()) { - oprot.writeString(_iter705.getKey()); - oprot.writeDouble(_iter705.getValue()); + oprot.writeString(_iter725.getKey()); + oprot.writeDouble(_iter725.getValue()); } } } @@ -1321,96 +1321,96 @@ public class Assignment implements org.apache.thrift.TBase<Assignment, Assignmen BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map706 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.node_host = new HashMap<String,String>(2*_map706.size); - String _key707; - String _val708; - for (int _i709 = 0; _i709 < _map706.size; ++_i709) + org.apache.thrift.protocol.TMap _map726 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.node_host = new HashMap<String,String>(2*_map726.size); + String _key727; + String _val728; + for (int _i729 = 0; _i729 < _map726.size; ++_i729) { - _key707 = iprot.readString(); - _val708 = iprot.readString(); - struct.node_host.put(_key707, _val708); + _key727 = iprot.readString(); + _val728 = iprot.readString(); + struct.node_host.put(_key727, _val728); } } struct.set_node_host_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map710 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map710.size); - List<Long> _key711; - NodeInfo _val712; - for (int _i713 = 0; _i713 < _map710.size; ++_i713) + org.apache.thrift.protocol.TMap _map730 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executor_node_port = new HashMap<List<Long>,NodeInfo>(2*_map730.size); + List<Long> _key731; + NodeInfo _val732; + for (int _i733 = 0; _i733 < _map730.size; ++_i733) { { - org.apache.thrift.protocol.TList _list714 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key711 = new ArrayList<Long>(_list714.size); - long _elem715; - for (int _i716 = 0; _i716 < _list714.size; ++_i716) + org.apache.thrift.protocol.TList _list734 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key731 = new ArrayList<Long>(_list734.size); + long _elem735; + for (int _i736 = 0; _i736 < _list734.size; ++_i736) { - _elem715 = iprot.readI64(); - _key711.add(_elem715); + _elem735 = iprot.readI64(); + _key731.add(_elem735); } } - _val712 = new NodeInfo(); - _val712.read(iprot); - struct.executor_node_port.put(_key711, _val712); + _val732 = new NodeInfo(); + _val732.read(iprot); + struct.executor_node_port.put(_key731, _val732); } } struct.set_executor_node_port_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map717 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map717.size); - List<Long> _key718; - long _val719; - for (int _i720 = 0; _i720 < _map717.size; ++_i720) + org.apache.thrift.protocol.TMap _map737 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.executor_start_time_secs = new HashMap<List<Long>,Long>(2*_map737.size); + List<Long> _key738; + long _val739; + for (int _i740 = 0; _i740 < _map737.size; ++_i740) { { - org.apache.thrift.protocol.TList _list721 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key718 = new ArrayList<Long>(_list721.size); - long _elem722; - for (int _i723 = 0; _i723 < _list721.size; ++_i723) + org.apache.thrift.protocol.TList _list741 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key738 = new ArrayList<Long>(_list741.size); + long _elem742; + for (int _i743 = 0; _i743 < _list741.size; ++_i743) { - _elem722 = iprot.readI64(); - _key718.add(_elem722); + _elem742 = iprot.readI64(); + _key738.add(_elem742); } } - _val719 = iprot.readI64(); - struct.executor_start_time_secs.put(_key718, _val719); + _val739 = iprot.readI64(); + struct.executor_start_time_secs.put(_key738, _val739); } } struct.set_executor_start_time_secs_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map724 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.worker_resources = new HashMap<NodeInfo,WorkerResources>(2*_map724.size); - NodeInfo _key725; - WorkerResources _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.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.worker_resources = new HashMap<NodeInfo,WorkerResources>(2*_map744.size); + NodeInfo _key745; + WorkerResources _val746; + for (int _i747 = 0; _i747 < _map744.size; ++_i747) { - _key725 = new NodeInfo(); - _key725.read(iprot); - _val726 = new WorkerResources(); - _val726.read(iprot); - struct.worker_resources.put(_key725, _val726); + _key745 = new NodeInfo(); + _key745.read(iprot); + _val746 = new WorkerResources(); + _val746.read(iprot); + struct.worker_resources.put(_key745, _val746); } } struct.set_worker_resources_isSet(true); } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map728 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - struct.total_shared_off_heap = new HashMap<String,Double>(2*_map728.size); - String _key729; - double _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.DOUBLE, iprot.readI32()); + struct.total_shared_off_heap = new HashMap<String,Double>(2*_map748.size); + String _key749; + double _val750; + for (int _i751 = 0; _i751 < _map748.size; ++_i751) { - _key729 = iprot.readString(); - _val730 = iprot.readDouble(); - struct.total_shared_off_heap.put(_key729, _val730); + _key749 = iprot.readString(); + _val750 = iprot.readDouble(); + struct.total_shared_off_heap.put(_key749, _val750); } } struct.set_total_shared_off_heap_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java index 1613778..a2651cd 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java +++ b/storm-client/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java @@ -635,17 +635,17 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo case 2: // EXECUTOR_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map752 = iprot.readMapBegin(); - struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map752.size); - ExecutorInfo _key753; - ExecutorStats _val754; - for (int _i755 = 0; _i755 < _map752.size; ++_i755) + org.apache.thrift.protocol.TMap _map772 = iprot.readMapBegin(); + struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map772.size); + ExecutorInfo _key773; + ExecutorStats _val774; + for (int _i775 = 0; _i775 < _map772.size; ++_i775) { - _key753 = new ExecutorInfo(); - _key753.read(iprot); - _val754 = new ExecutorStats(); - _val754.read(iprot); - struct.executor_stats.put(_key753, _val754); + _key773 = new ExecutorInfo(); + _key773.read(iprot); + _val774 = new ExecutorStats(); + _val774.read(iprot); + struct.executor_stats.put(_key773, _val774); } iprot.readMapEnd(); } @@ -692,10 +692,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo oprot.writeFieldBegin(EXECUTOR_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.executor_stats.size())); - for (Map.Entry<ExecutorInfo, ExecutorStats> _iter756 : struct.executor_stats.entrySet()) + for (Map.Entry<ExecutorInfo, ExecutorStats> _iter776 : struct.executor_stats.entrySet()) { - _iter756.getKey().write(oprot); - _iter756.getValue().write(oprot); + _iter776.getKey().write(oprot); + _iter776.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -727,10 +727,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo oprot.writeString(struct.storm_id); { oprot.writeI32(struct.executor_stats.size()); - for (Map.Entry<ExecutorInfo, ExecutorStats> _iter757 : struct.executor_stats.entrySet()) + for (Map.Entry<ExecutorInfo, ExecutorStats> _iter777 : struct.executor_stats.entrySet()) { - _iter757.getKey().write(oprot); - _iter757.getValue().write(oprot); + _iter777.getKey().write(oprot); + _iter777.getValue().write(oprot); } } oprot.writeI32(struct.time_secs); @@ -743,17 +743,17 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo struct.storm_id = iprot.readString(); struct.set_storm_id_isSet(true); { - org.apache.thrift.protocol.TMap _map758 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map758.size); - ExecutorInfo _key759; - ExecutorStats _val760; - for (int _i761 = 0; _i761 < _map758.size; ++_i761) + org.apache.thrift.protocol.TMap _map778 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executor_stats = new HashMap<ExecutorInfo,ExecutorStats>(2*_map778.size); + ExecutorInfo _key779; + ExecutorStats _val780; + for (int _i781 = 0; _i781 < _map778.size; ++_i781) { - _key759 = new ExecutorInfo(); - _key759.read(iprot); - _val760 = new ExecutorStats(); - _val760.read(iprot); - struct.executor_stats.put(_key759, _val760); + _key779 = new ExecutorInfo(); + _key779.read(iprot); + _val780 = new ExecutorStats(); + _val780.read(iprot); + struct.executor_stats.put(_key779, _val780); } } struct.set_executor_stats_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java index 75c5c6d..887dbc0 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java +++ b/storm-client/src/jvm/org/apache/storm/generated/HBNodes.java @@ -364,13 +364,13 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields case 1: // PULSE_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list858 = iprot.readListBegin(); - struct.pulseIds = new ArrayList<String>(_list858.size); - String _elem859; - for (int _i860 = 0; _i860 < _list858.size; ++_i860) + org.apache.thrift.protocol.TList _list886 = iprot.readListBegin(); + struct.pulseIds = new ArrayList<String>(_list886.size); + String _elem887; + for (int _i888 = 0; _i888 < _list886.size; ++_i888) { - _elem859 = iprot.readString(); - struct.pulseIds.add(_elem859); + _elem887 = iprot.readString(); + struct.pulseIds.add(_elem887); } iprot.readListEnd(); } @@ -396,9 +396,9 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields oprot.writeFieldBegin(PULSE_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.pulseIds.size())); - for (String _iter861 : struct.pulseIds) + for (String _iter889 : struct.pulseIds) { - oprot.writeString(_iter861); + oprot.writeString(_iter889); } oprot.writeListEnd(); } @@ -429,9 +429,9 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields if (struct.is_set_pulseIds()) { { oprot.writeI32(struct.pulseIds.size()); - for (String _iter862 : struct.pulseIds) + for (String _iter890 : struct.pulseIds) { - oprot.writeString(_iter862); + oprot.writeString(_iter890); } } } @@ -443,13 +443,13 @@ public class HBNodes implements org.apache.thrift.TBase<HBNodes, HBNodes._Fields BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list863 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.pulseIds = new ArrayList<String>(_list863.size); - String _elem864; - for (int _i865 = 0; _i865 < _list863.size; ++_i865) + org.apache.thrift.protocol.TList _list891 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pulseIds = new ArrayList<String>(_list891.size); + String _elem892; + for (int _i893 = 0; _i893 < _list891.size; ++_i893) { - _elem864 = iprot.readString(); - struct.pulseIds.add(_elem864); + _elem892 = iprot.readString(); + struct.pulseIds.add(_elem892); } } struct.set_pulseIds_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java index f726e5c..cfed785 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java +++ b/storm-client/src/jvm/org/apache/storm/generated/HBRecords.java @@ -367,14 +367,14 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._ case 1: // PULSES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list850 = iprot.readListBegin(); - struct.pulses = new ArrayList<HBPulse>(_list850.size); - HBPulse _elem851; - for (int _i852 = 0; _i852 < _list850.size; ++_i852) + org.apache.thrift.protocol.TList _list878 = iprot.readListBegin(); + struct.pulses = new ArrayList<HBPulse>(_list878.size); + HBPulse _elem879; + for (int _i880 = 0; _i880 < _list878.size; ++_i880) { - _elem851 = new HBPulse(); - _elem851.read(iprot); - struct.pulses.add(_elem851); + _elem879 = new HBPulse(); + _elem879.read(iprot); + struct.pulses.add(_elem879); } iprot.readListEnd(); } @@ -400,9 +400,9 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._ oprot.writeFieldBegin(PULSES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.pulses.size())); - for (HBPulse _iter853 : struct.pulses) + for (HBPulse _iter881 : struct.pulses) { - _iter853.write(oprot); + _iter881.write(oprot); } oprot.writeListEnd(); } @@ -433,9 +433,9 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._ if (struct.is_set_pulses()) { { oprot.writeI32(struct.pulses.size()); - for (HBPulse _iter854 : struct.pulses) + for (HBPulse _iter882 : struct.pulses) { - _iter854.write(oprot); + _iter882.write(oprot); } } } @@ -447,14 +447,14 @@ public class HBRecords implements org.apache.thrift.TBase<HBRecords, HBRecords._ BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list855 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.pulses = new ArrayList<HBPulse>(_list855.size); - HBPulse _elem856; - for (int _i857 = 0; _i857 < _list855.size; ++_i857) + org.apache.thrift.protocol.TList _list883 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pulses = new ArrayList<HBPulse>(_list883.size); + HBPulse _elem884; + for (int _i885 = 0; _i885 < _list883.size; ++_i885) { - _elem856 = new HBPulse(); - _elem856.read(iprot); - struct.pulses.add(_elem856); + _elem884 = new HBPulse(); + _elem884.read(iprot); + struct.pulses.add(_elem884); } } struct.set_pulses_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java index 9e8e5cf..9b13724 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java @@ -365,15 +365,15 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork case 1: // APPROVED_WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map780 = iprot.readMapBegin(); - struct.approved_workers = new HashMap<String,Integer>(2*_map780.size); - String _key781; - int _val782; - for (int _i783 = 0; _i783 < _map780.size; ++_i783) + org.apache.thrift.protocol.TMap _map800 = iprot.readMapBegin(); + struct.approved_workers = new HashMap<String,Integer>(2*_map800.size); + String _key801; + int _val802; + for (int _i803 = 0; _i803 < _map800.size; ++_i803) { - _key781 = iprot.readString(); - _val782 = iprot.readI32(); - struct.approved_workers.put(_key781, _val782); + _key801 = iprot.readString(); + _val802 = iprot.readI32(); + struct.approved_workers.put(_key801, _val802); } iprot.readMapEnd(); } @@ -399,10 +399,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork 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> _iter784 : struct.approved_workers.entrySet()) + for (Map.Entry<String, Integer> _iter804 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter784.getKey()); - oprot.writeI32(_iter784.getValue()); + oprot.writeString(_iter804.getKey()); + oprot.writeI32(_iter804.getValue()); } oprot.writeMapEnd(); } @@ -427,10 +427,10 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.approved_workers.size()); - for (Map.Entry<String, Integer> _iter785 : struct.approved_workers.entrySet()) + for (Map.Entry<String, Integer> _iter805 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter785.getKey()); - oprot.writeI32(_iter785.getValue()); + oprot.writeString(_iter805.getKey()); + oprot.writeI32(_iter805.getValue()); } } } @@ -439,15 +439,15 @@ public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWork 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 _map786 = 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*_map786.size); - String _key787; - int _val788; - for (int _i789 = 0; _i789 < _map786.size; ++_i789) + org.apache.thrift.protocol.TMap _map806 = 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*_map806.size); + String _key807; + int _val808; + for (int _i809 = 0; _i809 < _map806.size; ++_i809) { - _key787 = iprot.readString(); - _val788 = iprot.readI32(); - struct.approved_workers.put(_key787, _val788); + _key807 = iprot.readString(); + _val808 = iprot.readI32(); + struct.approved_workers.put(_key807, _val808); } } struct.set_approved_workers_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java index 64c36e2..95f78ca 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java @@ -376,16 +376,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv case 1: // ASSIGNMENTS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map790 = iprot.readMapBegin(); - struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map790.size); - int _key791; - LocalAssignment _val792; - for (int _i793 = 0; _i793 < _map790.size; ++_i793) + org.apache.thrift.protocol.TMap _map810 = iprot.readMapBegin(); + struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map810.size); + int _key811; + LocalAssignment _val812; + for (int _i813 = 0; _i813 < _map810.size; ++_i813) { - _key791 = iprot.readI32(); - _val792 = new LocalAssignment(); - _val792.read(iprot); - struct.assignments.put(_key791, _val792); + _key811 = iprot.readI32(); + _val812 = new LocalAssignment(); + _val812.read(iprot); + struct.assignments.put(_key811, _val812); } iprot.readMapEnd(); } @@ -411,10 +411,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv 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> _iter794 : struct.assignments.entrySet()) + for (Map.Entry<Integer, LocalAssignment> _iter814 : struct.assignments.entrySet()) { - oprot.writeI32(_iter794.getKey()); - _iter794.getValue().write(oprot); + oprot.writeI32(_iter814.getKey()); + _iter814.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.assignments.size()); - for (Map.Entry<Integer, LocalAssignment> _iter795 : struct.assignments.entrySet()) + for (Map.Entry<Integer, LocalAssignment> _iter815 : struct.assignments.entrySet()) { - oprot.writeI32(_iter795.getKey()); - _iter795.getValue().write(oprot); + oprot.writeI32(_iter815.getKey()); + _iter815.getValue().write(oprot); } } } @@ -451,16 +451,16 @@ public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSuperv 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 _map796 = 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*_map796.size); - int _key797; - LocalAssignment _val798; - for (int _i799 = 0; _i799 < _map796.size; ++_i799) + org.apache.thrift.protocol.TMap _map816 = 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*_map816.size); + int _key817; + LocalAssignment _val818; + for (int _i819 = 0; _i819 < _map816.size; ++_i819) { - _key797 = iprot.readI32(); - _val798 = new LocalAssignment(); - _val798.read(iprot); - struct.assignments.put(_key797, _val798); + _key817 = iprot.readI32(); + _val818 = new LocalAssignment(); + _val818.read(iprot); + struct.assignments.put(_key817, _val818); } } struct.set_assignments_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java index 6de53df..432b9b6 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistory.java @@ -656,13 +656,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST case 3: // USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list808 = iprot.readListBegin(); - struct.users = new ArrayList<String>(_list808.size); - String _elem809; - for (int _i810 = 0; _i810 < _list808.size; ++_i810) + org.apache.thrift.protocol.TList _list828 = iprot.readListBegin(); + struct.users = new ArrayList<String>(_list828.size); + String _elem829; + for (int _i830 = 0; _i830 < _list828.size; ++_i830) { - _elem809 = iprot.readString(); - struct.users.add(_elem809); + _elem829 = iprot.readString(); + struct.users.add(_elem829); } iprot.readListEnd(); } @@ -674,13 +674,13 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST case 4: // GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list811 = iprot.readListBegin(); - struct.groups = new ArrayList<String>(_list811.size); - String _elem812; - for (int _i813 = 0; _i813 < _list811.size; ++_i813) + org.apache.thrift.protocol.TList _list831 = iprot.readListBegin(); + struct.groups = new ArrayList<String>(_list831.size); + String _elem832; + for (int _i833 = 0; _i833 < _list831.size; ++_i833) { - _elem812 = iprot.readString(); - struct.groups.add(_elem812); + _elem832 = iprot.readString(); + struct.groups.add(_elem832); } iprot.readListEnd(); } @@ -714,9 +714,9 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST oprot.writeFieldBegin(USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.users.size())); - for (String _iter814 : struct.users) + for (String _iter834 : struct.users) { - oprot.writeString(_iter814); + oprot.writeString(_iter834); } oprot.writeListEnd(); } @@ -726,9 +726,9 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST oprot.writeFieldBegin(GROUPS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.groups.size())); - for (String _iter815 : struct.groups) + for (String _iter835 : struct.groups) { - oprot.writeString(_iter815); + oprot.writeString(_iter835); } oprot.writeListEnd(); } @@ -755,16 +755,16 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST oprot.writeI64(struct.time_stamp); { oprot.writeI32(struct.users.size()); - for (String _iter816 : struct.users) + for (String _iter836 : struct.users) { - oprot.writeString(_iter816); + oprot.writeString(_iter836); } } { oprot.writeI32(struct.groups.size()); - for (String _iter817 : struct.groups) + for (String _iter837 : struct.groups) { - oprot.writeString(_iter817); + oprot.writeString(_iter837); } } } @@ -777,24 +777,24 @@ public class LSTopoHistory implements org.apache.thrift.TBase<LSTopoHistory, LST struct.time_stamp = iprot.readI64(); struct.set_time_stamp_isSet(true); { - org.apache.thrift.protocol.TList _list818 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.users = new ArrayList<String>(_list818.size); - String _elem819; - for (int _i820 = 0; _i820 < _list818.size; ++_i820) + org.apache.thrift.protocol.TList _list838 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.users = new ArrayList<String>(_list838.size); + String _elem839; + for (int _i840 = 0; _i840 < _list838.size; ++_i840) { - _elem819 = iprot.readString(); - struct.users.add(_elem819); + _elem839 = iprot.readString(); + struct.users.add(_elem839); } } struct.set_users_isSet(true); { - org.apache.thrift.protocol.TList _list821 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.groups = new ArrayList<String>(_list821.size); - String _elem822; - for (int _i823 = 0; _i823 < _list821.size; ++_i823) + org.apache.thrift.protocol.TList _list841 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.groups = new ArrayList<String>(_list841.size); + String _elem842; + for (int _i843 = 0; _i843 < _list841.size; ++_i843) { - _elem822 = iprot.readString(); - struct.groups.add(_elem822); + _elem842 = iprot.readString(); + struct.groups.add(_elem842); } } struct.set_groups_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java index 790a6fb..461bd08 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java @@ -371,14 +371,14 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL case 1: // TOPO_HISTORY if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list824 = iprot.readListBegin(); - struct.topo_history = new ArrayList<LSTopoHistory>(_list824.size); - LSTopoHistory _elem825; - for (int _i826 = 0; _i826 < _list824.size; ++_i826) + org.apache.thrift.protocol.TList _list844 = iprot.readListBegin(); + struct.topo_history = new ArrayList<LSTopoHistory>(_list844.size); + LSTopoHistory _elem845; + for (int _i846 = 0; _i846 < _list844.size; ++_i846) { - _elem825 = new LSTopoHistory(); - _elem825.read(iprot); - struct.topo_history.add(_elem825); + _elem845 = new LSTopoHistory(); + _elem845.read(iprot); + struct.topo_history.add(_elem845); } iprot.readListEnd(); } @@ -404,9 +404,9 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL oprot.writeFieldBegin(TOPO_HISTORY_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.topo_history.size())); - for (LSTopoHistory _iter827 : struct.topo_history) + for (LSTopoHistory _iter847 : struct.topo_history) { - _iter827.write(oprot); + _iter847.write(oprot); } oprot.writeListEnd(); } @@ -431,9 +431,9 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.topo_history.size()); - for (LSTopoHistory _iter828 : struct.topo_history) + for (LSTopoHistory _iter848 : struct.topo_history) { - _iter828.write(oprot); + _iter848.write(oprot); } } } @@ -442,14 +442,14 @@ public class LSTopoHistoryList implements org.apache.thrift.TBase<LSTopoHistoryL public void read(org.apache.thrift.protocol.TProtocol prot, LSTopoHistoryList struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list829 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.topo_history = new ArrayList<LSTopoHistory>(_list829.size); - LSTopoHistory _elem830; - for (int _i831 = 0; _i831 < _list829.size; ++_i831) + org.apache.thrift.protocol.TList _list849 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.topo_history = new ArrayList<LSTopoHistory>(_list849.size); + LSTopoHistory _elem850; + for (int _i851 = 0; _i851 < _list849.size; ++_i851) { - _elem830 = new LSTopoHistory(); - _elem830.read(iprot); - struct.topo_history.add(_elem830); + _elem850 = new LSTopoHistory(); + _elem850.read(iprot); + struct.topo_history.add(_elem850); } } struct.set_topo_history_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java index 6cf386f..73b9c12 100644 --- a/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java +++ b/storm-client/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java @@ -638,14 +638,14 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb case 3: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list800 = iprot.readListBegin(); - struct.executors = new ArrayList<ExecutorInfo>(_list800.size); - ExecutorInfo _elem801; - for (int _i802 = 0; _i802 < _list800.size; ++_i802) + org.apache.thrift.protocol.TList _list820 = iprot.readListBegin(); + struct.executors = new ArrayList<ExecutorInfo>(_list820.size); + ExecutorInfo _elem821; + for (int _i822 = 0; _i822 < _list820.size; ++_i822) { - _elem801 = new ExecutorInfo(); - _elem801.read(iprot); - struct.executors.add(_elem801); + _elem821 = new ExecutorInfo(); + _elem821.read(iprot); + struct.executors.add(_elem821); } iprot.readListEnd(); } @@ -687,9 +687,9 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size())); - for (ExecutorInfo _iter803 : struct.executors) + for (ExecutorInfo _iter823 : struct.executors) { - _iter803.write(oprot); + _iter823.write(oprot); } oprot.writeListEnd(); } @@ -719,9 +719,9 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb oprot.writeString(struct.topology_id); { oprot.writeI32(struct.executors.size()); - for (ExecutorInfo _iter804 : struct.executors) + for (ExecutorInfo _iter824 : struct.executors) { - _iter804.write(oprot); + _iter824.write(oprot); } } oprot.writeI32(struct.port); @@ -735,14 +735,14 @@ public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartb struct.topology_id = iprot.readString(); struct.set_topology_id_isSet(true); { - org.apache.thrift.protocol.TList _list805 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList<ExecutorInfo>(_list805.size); - ExecutorInfo _elem806; - for (int _i807 = 0; _i807 < _list805.size; ++_i807) + org.apache.thrift.protocol.TList _list825 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList<ExecutorInfo>(_list825.size); + ExecutorInfo _elem826; + for (int _i827 = 0; _i827 < _list825.size; ++_i827) { - _elem806 = new ExecutorInfo(); - _elem806.read(iprot); - struct.executors.add(_elem806); + _elem826 = new ExecutorInfo(); + _elem826.read(iprot); + struct.executors.add(_elem826); } } struct.set_executors_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/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 e4d83aa..3814124 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 _list772 = iprot.readListBegin(); - struct.executors = new ArrayList<ExecutorInfo>(_list772.size); - ExecutorInfo _elem773; - for (int _i774 = 0; _i774 < _list772.size; ++_i774) + org.apache.thrift.protocol.TList _list792 = iprot.readListBegin(); + struct.executors = new ArrayList<ExecutorInfo>(_list792.size); + ExecutorInfo _elem793; + for (int _i794 = 0; _i794 < _list792.size; ++_i794) { - _elem773 = new ExecutorInfo(); - _elem773.read(iprot); - struct.executors.add(_elem773); + _elem793 = new ExecutorInfo(); + _elem793.read(iprot); + struct.executors.add(_elem793); } 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 _iter775 : struct.executors) + for (ExecutorInfo _iter795 : struct.executors) { - _iter775.write(oprot); + _iter795.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 _iter776 : struct.executors) + for (ExecutorInfo _iter796 : struct.executors) { - _iter776.write(oprot); + _iter796.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 _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) + org.apache.thrift.protocol.TList _list797 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList<ExecutorInfo>(_list797.size); + ExecutorInfo _elem798; + for (int _i799 = 0; _i799 < _list797.size; ++_i799) { - _elem778 = new ExecutorInfo(); - _elem778.read(iprot); - struct.executors.add(_elem778); + _elem798 = new ExecutorInfo(); + _elem798.read(iprot); + struct.executors.add(_elem798); } } struct.set_executors_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/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 3536c0b..a99475f 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 _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) + org.apache.thrift.protocol.TMap _map782 = iprot.readMapBegin(); + struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map782.size); + String _key783; + ThriftSerializedObject _val784; + for (int _i785 = 0; _i785 < _map782.size; ++_i785) { - _key763 = iprot.readString(); - _val764 = new ThriftSerializedObject(); - _val764.read(iprot); - struct.serialized_parts.put(_key763, _val764); + _key783 = iprot.readString(); + _val784 = new ThriftSerializedObject(); + _val784.read(iprot); + struct.serialized_parts.put(_key783, _val784); } 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> _iter766 : struct.serialized_parts.entrySet()) + for (Map.Entry<String, ThriftSerializedObject> _iter786 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter766.getKey()); - _iter766.getValue().write(oprot); + oprot.writeString(_iter786.getKey()); + _iter786.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> _iter767 : struct.serialized_parts.entrySet()) + for (Map.Entry<String, ThriftSerializedObject> _iter787 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter767.getKey()); - _iter767.getValue().write(oprot); + oprot.writeString(_iter787.getKey()); + _iter787.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 _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) + org.apache.thrift.protocol.TMap _map788 = 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*_map788.size); + String _key789; + ThriftSerializedObject _val790; + for (int _i791 = 0; _i791 < _map788.size; ++_i791) { - _key769 = iprot.readString(); - _val770 = new ThriftSerializedObject(); - _val770.read(iprot); - struct.serialized_parts.put(_key769, _val770); + _key789 = iprot.readString(); + _val790 = new ThriftSerializedObject(); + _val790.read(iprot); + struct.serialized_parts.put(_key789, _val790); } } struct.set_serialized_parts_isSet(true); http://git-wip-us.apache.org/repos/asf/storm/blob/48e23a99/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 e783e6c..f44203f 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 _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) + org.apache.thrift.protocol.TMap _map852 = iprot.readMapBegin(); + struct.named_logger_level = new HashMap<String,LogLevel>(2*_map852.size); + String _key853; + LogLevel _val854; + for (int _i855 = 0; _i855 < _map852.size; ++_i855) { - _key833 = iprot.readString(); - _val834 = new LogLevel(); - _val834.read(iprot); - struct.named_logger_level.put(_key833, _val834); + _key853 = iprot.readString(); + _val854 = new LogLevel(); + _val854.read(iprot); + struct.named_logger_level.put(_key853, _val854); } 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> _iter836 : struct.named_logger_level.entrySet()) + for (Map.Entry<String, LogLevel> _iter856 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter836.getKey()); - _iter836.getValue().write(oprot); + oprot.writeString(_iter856.getKey()); + _iter856.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> _iter837 : struct.named_logger_level.entrySet()) + for (Map.Entry<String, LogLevel> _iter857 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter837.getKey()); - _iter837.getValue().write(oprot); + oprot.writeString(_iter857.getKey()); + _iter857.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 _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) + org.apache.thrift.protocol.TMap _map858 = 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*_map858.size); + String _key859; + LogLevel _val860; + for (int _i861 = 0; _i861 < _map858.size; ++_i861) { - _key839 = iprot.readString(); - _val840 = new LogLevel(); - _val840.read(iprot); - struct.named_logger_level.put(_key839, _val840); + _key859 = iprot.readString(); + _val860 = new LogLevel(); + _val860.read(iprot); + struct.named_logger_level.put(_key859, _val860); } } struct.set_named_logger_level_isSet(true);
