diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj index 52e4059b0fb..2483b41b40b 100644 --- a/storm-core/src/clj/org/apache/storm/ui/core.clj +++ b/storm-core/src/clj/org/apache/storm/ui/core.clj @@ -239,6 +239,13 @@ (get-in (clojurify-structure (StatsUtil/spoutStreamsStats spout-summs true)) ["complete-latencies" window])) + :throughput (if bolt-summs + (get-in + (clojurify-structure (StatsUtil/boltStreamsStats bolt-summs true)) + [:throughput window]) + (get-in + (clojurify-structure (StatsUtil/spoutStreamsStats spout-summs true)) + [:throughput window])) :transferred (or (get-in (clojurify-structure (StatsUtil/spoutStreamsStats spout-summs true)) @@ -566,6 +573,7 @@ "emitted" (get-in stats [:emitted w]) "transferred" (get-in stats [:transferred w]) "completeLatency" (StatsUtil/floatStr (get-in stats [:complete-latencies w])) + "throughput" (StatsUtil/floatStr (get-in stats [:throughput w])) "acked" (get-in stats [:acked w]) "failed" (get-in stats [:failed w])}))) @@ -612,6 +620,7 @@ "tasks" (.get_num_tasks common-stats) "emitted" (.get_emitted common-stats) "transferred" (.get_transferred common-stats) + "throughput" (StatsUtil/floatStr (.get_throughput common-stats)) "acked" (.get_acked common-stats) "failed" (.get_failed common-stats) "requestedMemOnHeap" (.get (.get_resources_map common-stats) Config/TOPOLOGY_COMPONENT_RESOURCES_ONHEAP_MEMORY_MB) @@ -656,6 +665,7 @@ {:emitted (.get_window_to_emitted topo-stats) :transferred (.get_window_to_transferred topo-stats) :complete-latencies (.get_window_to_complete_latencies_ms topo-stats) + :throughput (.get_window_to_throughput topo-stats) :acked (.get_window_to_acked topo-stats) :failed (.get_window_to_failed topo-stats)} topo-stats (topology-stats window stat->window->number) @@ -857,6 +867,7 @@ "windowPretty" (window-hint window) "emitted" (.get_emitted comm-s) "transferred" (.get_transferred comm-s) + "throughput" (StatsUtil/floatStr (.get_throughput comm-s)) "acked" (.get_acked comm-s) "failed" (.get_failed comm-s) "executeLatency" (StatsUtil/floatStr (.get_execute_latency_ms bolt-s)) @@ -873,6 +884,7 @@ "windowPretty" (window-hint window) "emitted" (.get_emitted comm-s) "transferred" (.get_transferred comm-s) + "throughput" (StatsUtil/floatStr (.get_throughput comm-s)) "acked" (.get_acked comm-s) "failed" (.get_failed comm-s) "completeLatency" (StatsUtil/floatStr (.get_complete_latency_ms spout-s))})) @@ -900,7 +912,8 @@ (let [^CommonAggregateStats cas (.get_common_stats stats)] {"stream" stream-id "emitted" (Utils/nullToZero (.get_emitted cas)) - "transferred" (Utils/nullToZero (.get_transferred cas))})) + "transferred" (Utils/nullToZero (.get_transferred cas)) + "throughput" (StatsUtil/floatStr (.get_throughput cas))})) (defmethod unpack-comp-output-stat ComponentType/SPOUT [[stream-id ^ComponentAggregateStats stats]] @@ -910,6 +923,7 @@ {"stream" stream-id "emitted" (Utils/nullToZero (.get_emitted cas)) "transferred" (Utils/nullToZero (.get_transferred cas)) + "throughput" (StatsUtil/floatStr (.get_throughput cas)) "completeLatency" (StatsUtil/floatStr (.get_complete_latency_ms spout-s)) "acked" (Utils/nullToZero (.get_acked cas)) "failed" (Utils/nullToZero (.get_failed cas))})) @@ -937,6 +951,7 @@ "port" port "emitted" (Utils/nullToZero (.get_emitted cas)) "transferred" (Utils/nullToZero (.get_transferred cas)) + "throughput" (StatsUtil/floatStr (.get_throughput cas)) "capacity" (StatsUtil/floatStr (Utils/nullToZero (.get_capacity bas))) "executeLatency" (StatsUtil/floatStr (.get_execute_latency_ms bas)) "executed" (Utils/nullToZero (.get_executed bas)) @@ -965,6 +980,7 @@ "port" port "emitted" (Utils/nullToZero (.get_emitted cas)) "transferred" (Utils/nullToZero (.get_transferred cas)) + "throughput" (StatsUtil/floatStr (.get_throughput cas)) "completeLatency" (StatsUtil/floatStr (.get_complete_latency_ms sas)) "acked" (Utils/nullToZero (.get_acked cas)) "failed" (Utils/nullToZero (.get_failed cas)) diff --git a/storm-core/src/jvm/org/apache/storm/generated/Assignment.java b/storm-core/src/jvm/org/apache/storm/generated/Assignment.java index 4c973d54bb8..2a6858bcb15 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/Assignment.java +++ b/storm-core/src/jvm/org/apache/storm/generated/Assignment.java @@ -787,15 +787,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) case 2: // NODE_HOST if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map618 = iprot.readMapBegin(); - struct.node_host = new HashMap(2*_map618.size); - String _key619; - String _val620; - for (int _i621 = 0; _i621 < _map618.size; ++_i621) + org.apache.thrift.protocol.TMap _map648 = iprot.readMapBegin(); + struct.node_host = new HashMap(2*_map648.size); + String _key649; + String _val650; + for (int _i651 = 0; _i651 < _map648.size; ++_i651) { - _key619 = iprot.readString(); - _val620 = iprot.readString(); - struct.node_host.put(_key619, _val620); + _key649 = iprot.readString(); + _val650 = iprot.readString(); + struct.node_host.put(_key649, _val650); } iprot.readMapEnd(); } @@ -807,26 +807,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) case 3: // EXECUTOR_NODE_PORT if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map622 = iprot.readMapBegin(); - struct.executor_node_port = new HashMap,NodeInfo>(2*_map622.size); - List _key623; - NodeInfo _val624; - for (int _i625 = 0; _i625 < _map622.size; ++_i625) + org.apache.thrift.protocol.TMap _map652 = iprot.readMapBegin(); + struct.executor_node_port = new HashMap,NodeInfo>(2*_map652.size); + List _key653; + NodeInfo _val654; + for (int _i655 = 0; _i655 < _map652.size; ++_i655) { { - org.apache.thrift.protocol.TList _list626 = iprot.readListBegin(); - _key623 = new ArrayList(_list626.size); - long _elem627; - for (int _i628 = 0; _i628 < _list626.size; ++_i628) + org.apache.thrift.protocol.TList _list656 = iprot.readListBegin(); + _key653 = new ArrayList(_list656.size); + long _elem657; + for (int _i658 = 0; _i658 < _list656.size; ++_i658) { - _elem627 = iprot.readI64(); - _key623.add(_elem627); + _elem657 = iprot.readI64(); + _key653.add(_elem657); } iprot.readListEnd(); } - _val624 = new NodeInfo(); - _val624.read(iprot); - struct.executor_node_port.put(_key623, _val624); + _val654 = new NodeInfo(); + _val654.read(iprot); + struct.executor_node_port.put(_key653, _val654); } iprot.readMapEnd(); } @@ -838,25 +838,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) case 4: // EXECUTOR_START_TIME_SECS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map629 = iprot.readMapBegin(); - struct.executor_start_time_secs = new HashMap,Long>(2*_map629.size); - List _key630; - long _val631; - for (int _i632 = 0; _i632 < _map629.size; ++_i632) + org.apache.thrift.protocol.TMap _map659 = iprot.readMapBegin(); + struct.executor_start_time_secs = new HashMap,Long>(2*_map659.size); + List _key660; + long _val661; + for (int _i662 = 0; _i662 < _map659.size; ++_i662) { { - org.apache.thrift.protocol.TList _list633 = iprot.readListBegin(); - _key630 = new ArrayList(_list633.size); - long _elem634; - for (int _i635 = 0; _i635 < _list633.size; ++_i635) + org.apache.thrift.protocol.TList _list663 = iprot.readListBegin(); + _key660 = new ArrayList(_list663.size); + long _elem664; + for (int _i665 = 0; _i665 < _list663.size; ++_i665) { - _elem634 = iprot.readI64(); - _key630.add(_elem634); + _elem664 = iprot.readI64(); + _key660.add(_elem664); } iprot.readListEnd(); } - _val631 = iprot.readI64(); - struct.executor_start_time_secs.put(_key630, _val631); + _val661 = iprot.readI64(); + struct.executor_start_time_secs.put(_key660, _val661); } iprot.readMapEnd(); } @@ -868,17 +868,17 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Assignment struct) case 5: // WORKER_RESOURCES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map636 = iprot.readMapBegin(); - struct.worker_resources = new HashMap(2*_map636.size); - NodeInfo _key637; - WorkerResources _val638; - for (int _i639 = 0; _i639 < _map636.size; ++_i639) + org.apache.thrift.protocol.TMap _map666 = iprot.readMapBegin(); + struct.worker_resources = new HashMap(2*_map666.size); + NodeInfo _key667; + WorkerResources _val668; + for (int _i669 = 0; _i669 < _map666.size; ++_i669) { - _key637 = new NodeInfo(); - _key637.read(iprot); - _val638 = new WorkerResources(); - _val638.read(iprot); - struct.worker_resources.put(_key637, _val638); + _key667 = new NodeInfo(); + _key667.read(iprot); + _val668 = new WorkerResources(); + _val668.read(iprot); + struct.worker_resources.put(_key667, _val668); } iprot.readMapEnd(); } @@ -910,10 +910,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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 _iter640 : struct.node_host.entrySet()) + for (Map.Entry _iter670 : struct.node_host.entrySet()) { - oprot.writeString(_iter640.getKey()); - oprot.writeString(_iter640.getValue()); + oprot.writeString(_iter670.getKey()); + oprot.writeString(_iter670.getValue()); } oprot.writeMapEnd(); } @@ -925,17 +925,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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, NodeInfo> _iter641 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter671 : struct.executor_node_port.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter641.getKey().size())); - for (long _iter642 : _iter641.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter671.getKey().size())); + for (long _iter672 : _iter671.getKey()) { - oprot.writeI64(_iter642); + oprot.writeI64(_iter672); } oprot.writeListEnd(); } - _iter641.getValue().write(oprot); + _iter671.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -947,17 +947,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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, Long> _iter643 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter673 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter643.getKey().size())); - for (long _iter644 : _iter643.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter673.getKey().size())); + for (long _iter674 : _iter673.getKey()) { - oprot.writeI64(_iter644); + oprot.writeI64(_iter674); } oprot.writeListEnd(); } - oprot.writeI64(_iter643.getValue()); + oprot.writeI64(_iter673.getValue()); } oprot.writeMapEnd(); } @@ -969,10 +969,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Assignment struct) 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 _iter645 : struct.worker_resources.entrySet()) + for (Map.Entry _iter675 : struct.worker_resources.entrySet()) { - _iter645.getKey().write(oprot); - _iter645.getValue().write(oprot); + _iter675.getKey().write(oprot); + _iter675.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1014,52 +1014,52 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Assignment struct) if (struct.is_set_node_host()) { { oprot.writeI32(struct.node_host.size()); - for (Map.Entry _iter646 : struct.node_host.entrySet()) + for (Map.Entry _iter676 : struct.node_host.entrySet()) { - oprot.writeString(_iter646.getKey()); - oprot.writeString(_iter646.getValue()); + oprot.writeString(_iter676.getKey()); + oprot.writeString(_iter676.getValue()); } } } if (struct.is_set_executor_node_port()) { { oprot.writeI32(struct.executor_node_port.size()); - for (Map.Entry, NodeInfo> _iter647 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter677 : struct.executor_node_port.entrySet()) { { - oprot.writeI32(_iter647.getKey().size()); - for (long _iter648 : _iter647.getKey()) + oprot.writeI32(_iter677.getKey().size()); + for (long _iter678 : _iter677.getKey()) { - oprot.writeI64(_iter648); + oprot.writeI64(_iter678); } } - _iter647.getValue().write(oprot); + _iter677.getValue().write(oprot); } } } if (struct.is_set_executor_start_time_secs()) { { oprot.writeI32(struct.executor_start_time_secs.size()); - for (Map.Entry, Long> _iter649 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter679 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeI32(_iter649.getKey().size()); - for (long _iter650 : _iter649.getKey()) + oprot.writeI32(_iter679.getKey().size()); + for (long _iter680 : _iter679.getKey()) { - oprot.writeI64(_iter650); + oprot.writeI64(_iter680); } } - oprot.writeI64(_iter649.getValue()); + oprot.writeI64(_iter679.getValue()); } } } if (struct.is_set_worker_resources()) { { oprot.writeI32(struct.worker_resources.size()); - for (Map.Entry _iter651 : struct.worker_resources.entrySet()) + for (Map.Entry _iter681 : struct.worker_resources.entrySet()) { - _iter651.getKey().write(oprot); - _iter651.getValue().write(oprot); + _iter681.getKey().write(oprot); + _iter681.getValue().write(oprot); } } } @@ -1073,81 +1073,81 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Assignment struct) t BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map652 = 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(2*_map652.size); - String _key653; - String _val654; - for (int _i655 = 0; _i655 < _map652.size; ++_i655) + org.apache.thrift.protocol.TMap _map682 = 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(2*_map682.size); + String _key683; + String _val684; + for (int _i685 = 0; _i685 < _map682.size; ++_i685) { - _key653 = iprot.readString(); - _val654 = iprot.readString(); - struct.node_host.put(_key653, _val654); + _key683 = iprot.readString(); + _val684 = iprot.readString(); + struct.node_host.put(_key683, _val684); } } struct.set_node_host_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map656 = 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,NodeInfo>(2*_map656.size); - List _key657; - NodeInfo _val658; - for (int _i659 = 0; _i659 < _map656.size; ++_i659) + org.apache.thrift.protocol.TMap _map686 = 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,NodeInfo>(2*_map686.size); + List _key687; + NodeInfo _val688; + for (int _i689 = 0; _i689 < _map686.size; ++_i689) { { - org.apache.thrift.protocol.TList _list660 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key657 = new ArrayList(_list660.size); - long _elem661; - for (int _i662 = 0; _i662 < _list660.size; ++_i662) + org.apache.thrift.protocol.TList _list690 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key687 = new ArrayList(_list690.size); + long _elem691; + for (int _i692 = 0; _i692 < _list690.size; ++_i692) { - _elem661 = iprot.readI64(); - _key657.add(_elem661); + _elem691 = iprot.readI64(); + _key687.add(_elem691); } } - _val658 = new NodeInfo(); - _val658.read(iprot); - struct.executor_node_port.put(_key657, _val658); + _val688 = new NodeInfo(); + _val688.read(iprot); + struct.executor_node_port.put(_key687, _val688); } } struct.set_executor_node_port_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map663 = 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,Long>(2*_map663.size); - List _key664; - long _val665; - for (int _i666 = 0; _i666 < _map663.size; ++_i666) + org.apache.thrift.protocol.TMap _map693 = 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,Long>(2*_map693.size); + List _key694; + long _val695; + for (int _i696 = 0; _i696 < _map693.size; ++_i696) { { - org.apache.thrift.protocol.TList _list667 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key664 = new ArrayList(_list667.size); - long _elem668; - for (int _i669 = 0; _i669 < _list667.size; ++_i669) + org.apache.thrift.protocol.TList _list697 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key694 = new ArrayList(_list697.size); + long _elem698; + for (int _i699 = 0; _i699 < _list697.size; ++_i699) { - _elem668 = iprot.readI64(); - _key664.add(_elem668); + _elem698 = iprot.readI64(); + _key694.add(_elem698); } } - _val665 = iprot.readI64(); - struct.executor_start_time_secs.put(_key664, _val665); + _val695 = iprot.readI64(); + struct.executor_start_time_secs.put(_key694, _val695); } } struct.set_executor_start_time_secs_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map670 = 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(2*_map670.size); - NodeInfo _key671; - WorkerResources _val672; - for (int _i673 = 0; _i673 < _map670.size; ++_i673) + org.apache.thrift.protocol.TMap _map700 = 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(2*_map700.size); + NodeInfo _key701; + WorkerResources _val702; + for (int _i703 = 0; _i703 < _map700.size; ++_i703) { - _key671 = new NodeInfo(); - _key671.read(iprot); - _val672 = new WorkerResources(); - _val672.read(iprot); - struct.worker_resources.put(_key671, _val672); + _key701 = new NodeInfo(); + _key701.read(iprot); + _val702 = new WorkerResources(); + _val702.read(iprot); + struct.worker_resources.put(_key701, _val702); } } struct.set_worker_resources_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java b/storm-core/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java index d974f1dfb92..5af8cef9a18 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java +++ b/storm-core/src/jvm/org/apache/storm/generated/ClusterWorkerHeartbeat.java @@ -635,17 +635,17 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterWorkerHeartb case 2: // EXECUTOR_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map694 = iprot.readMapBegin(); - struct.executor_stats = new HashMap(2*_map694.size); - ExecutorInfo _key695; - ExecutorStats _val696; - for (int _i697 = 0; _i697 < _map694.size; ++_i697) + org.apache.thrift.protocol.TMap _map724 = iprot.readMapBegin(); + struct.executor_stats = new HashMap(2*_map724.size); + ExecutorInfo _key725; + ExecutorStats _val726; + for (int _i727 = 0; _i727 < _map724.size; ++_i727) { - _key695 = new ExecutorInfo(); - _key695.read(iprot); - _val696 = new ExecutorStats(); - _val696.read(iprot); - struct.executor_stats.put(_key695, _val696); + _key725 = new ExecutorInfo(); + _key725.read(iprot); + _val726 = new ExecutorStats(); + _val726.read(iprot); + struct.executor_stats.put(_key725, _val726); } iprot.readMapEnd(); } @@ -692,10 +692,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterWorkerHeart 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 _iter698 : struct.executor_stats.entrySet()) + for (Map.Entry _iter728 : struct.executor_stats.entrySet()) { - _iter698.getKey().write(oprot); - _iter698.getValue().write(oprot); + _iter728.getKey().write(oprot); + _iter728.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -727,10 +727,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartb oprot.writeString(struct.storm_id); { oprot.writeI32(struct.executor_stats.size()); - for (Map.Entry _iter699 : struct.executor_stats.entrySet()) + for (Map.Entry _iter729 : struct.executor_stats.entrySet()) { - _iter699.getKey().write(oprot); - _iter699.getValue().write(oprot); + _iter729.getKey().write(oprot); + _iter729.getValue().write(oprot); } } oprot.writeI32(struct.time_secs); @@ -743,17 +743,17 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ClusterWorkerHeartbe struct.storm_id = iprot.readString(); struct.set_storm_id_isSet(true); { - org.apache.thrift.protocol.TMap _map700 = 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(2*_map700.size); - ExecutorInfo _key701; - ExecutorStats _val702; - for (int _i703 = 0; _i703 < _map700.size; ++_i703) + org.apache.thrift.protocol.TMap _map730 = 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(2*_map730.size); + ExecutorInfo _key731; + ExecutorStats _val732; + for (int _i733 = 0; _i733 < _map730.size; ++_i733) { - _key701 = new ExecutorInfo(); - _key701.read(iprot); - _val702 = new ExecutorStats(); - _val702.read(iprot); - struct.executor_stats.put(_key701, _val702); + _key731 = new ExecutorInfo(); + _key731.read(iprot); + _val732 = new ExecutorStats(); + _val732.read(iprot); + struct.executor_stats.put(_key731, _val732); } } struct.set_executor_stats_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java b/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java index ba35319b95a..cbbe44245f9 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java +++ b/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java @@ -62,6 +62,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -76,6 +77,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase resources_map; // optional + private double throughput; // 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 { @@ -85,7 +87,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TRANSFERRED((short)4, "transferred"), ACKED((short)5, "acked"), FAILED((short)6, "failed"), - RESOURCES_MAP((short)7, "resources_map"); + RESOURCES_MAP((short)7, "resources_map"), + THROUGHPUT((short)8, "throughput"); private static final Map byName = new HashMap(); @@ -114,6 +117,8 @@ public static _Fields findByThriftId(int fieldId) { return FAILED; case 7: // RESOURCES_MAP return RESOURCES_MAP; + case 8: // THROUGHPUT + return THROUGHPUT; default: return null; } @@ -160,8 +165,9 @@ public String getFieldName() { private static final int __TRANSFERRED_ISSET_ID = 3; private static final int __ACKED_ISSET_ID = 4; private static final int __FAILED_ISSET_ID = 5; + private static final int __THROUGHPUT_ISSET_ID = 6; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.EMITTED,_Fields.TRANSFERRED,_Fields.ACKED,_Fields.FAILED,_Fields.RESOURCES_MAP}; + private static final _Fields optionals[] = {_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.EMITTED,_Fields.TRANSFERRED,_Fields.ACKED,_Fields.FAILED,_Fields.RESOURCES_MAP,_Fields.THROUGHPUT}; 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); @@ -181,6 +187,8 @@ public String getFieldName() { 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.THROUGHPUT, new org.apache.thrift.meta_data.FieldMetaData("throughput", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CommonAggregateStats.class, metaDataMap); } @@ -203,6 +211,7 @@ public CommonAggregateStats(CommonAggregateStats other) { Map __this__resources_map = new HashMap(other.resources_map); this.resources_map = __this__resources_map; } + this.throughput = other.throughput; } public CommonAggregateStats deepCopy() { @@ -224,6 +233,8 @@ public void clear() { set_failed_isSet(false); this.failed = 0; this.resources_map = null; + set_throughput_isSet(false); + this.throughput = 0.0; } public int get_num_executors() { @@ -392,6 +403,28 @@ public void set_resources_map_isSet(boolean value) { } } + public double get_throughput() { + return this.throughput; + } + + public void set_throughput(double throughput) { + this.throughput = throughput; + set_throughput_isSet(true); + } + + public void unset_throughput() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __THROUGHPUT_ISSET_ID); + } + + /** Returns true if field throughput is set (has been assigned a value) and false otherwise */ + public boolean is_set_throughput() { + return EncodingUtils.testBit(__isset_bitfield, __THROUGHPUT_ISSET_ID); + } + + public void set_throughput_isSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THROUGHPUT_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NUM_EXECUTORS: @@ -450,6 +483,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case THROUGHPUT: + if (value == null) { + unset_throughput(); + } else { + set_throughput((Double)value); + } + break; + } } @@ -476,6 +517,9 @@ public Object getFieldValue(_Fields field) { case RESOURCES_MAP: return get_resources_map(); + case THROUGHPUT: + return get_throughput(); + } throw new IllegalStateException(); } @@ -501,6 +545,8 @@ public boolean isSet(_Fields field) { return is_set_failed(); case RESOURCES_MAP: return is_set_resources_map(); + case THROUGHPUT: + return is_set_throughput(); } throw new IllegalStateException(); } @@ -581,6 +627,15 @@ public boolean equals(CommonAggregateStats that) { return false; } + boolean this_present_throughput = true && this.is_set_throughput(); + boolean that_present_throughput = true && that.is_set_throughput(); + if (this_present_throughput || that_present_throughput) { + if (!(this_present_throughput && that_present_throughput)) + return false; + if (this.throughput != that.throughput) + return false; + } + return true; } @@ -623,6 +678,11 @@ public int hashCode() { if (present_resources_map) list.add(resources_map); + boolean present_throughput = true && (is_set_throughput()); + list.add(present_throughput); + if (present_throughput) + list.add(throughput); + return list.hashCode(); } @@ -704,6 +764,16 @@ public int compareTo(CommonAggregateStats other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_throughput()).compareTo(other.is_set_throughput()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_throughput()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.throughput, other.throughput); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -769,6 +839,12 @@ public String toString() { } first = false; } + if (is_set_throughput()) { + if (!first) sb.append(", "); + sb.append("throughput:"); + sb.append(this.throughput); + first = false; + } sb.append(")"); return sb.toString(); } @@ -865,15 +941,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CommonAggregateStat case 7: // RESOURCES_MAP if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map368 = iprot.readMapBegin(); - struct.resources_map = new HashMap(2*_map368.size); - String _key369; - double _val370; - for (int _i371 = 0; _i371 < _map368.size; ++_i371) + org.apache.thrift.protocol.TMap _map388 = iprot.readMapBegin(); + struct.resources_map = new HashMap(2*_map388.size); + String _key389; + double _val390; + for (int _i391 = 0; _i391 < _map388.size; ++_i391) { - _key369 = iprot.readString(); - _val370 = iprot.readDouble(); - struct.resources_map.put(_key369, _val370); + _key389 = iprot.readString(); + _val390 = iprot.readDouble(); + struct.resources_map.put(_key389, _val390); } iprot.readMapEnd(); } @@ -882,6 +958,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CommonAggregateStat org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 8: // THROUGHPUT + if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) { + struct.throughput = iprot.readDouble(); + struct.set_throughput_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -930,16 +1014,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CommonAggregateSta 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 _iter372 : struct.resources_map.entrySet()) + for (Map.Entry _iter392 : struct.resources_map.entrySet()) { - oprot.writeString(_iter372.getKey()); - oprot.writeDouble(_iter372.getValue()); + oprot.writeString(_iter392.getKey()); + oprot.writeDouble(_iter392.getValue()); } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } } + if (struct.is_set_throughput()) { + oprot.writeFieldBegin(THROUGHPUT_FIELD_DESC); + oprot.writeDouble(struct.throughput); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -979,7 +1068,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStat if (struct.is_set_resources_map()) { optionals.set(6); } - oprot.writeBitSet(optionals, 7); + if (struct.is_set_throughput()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.is_set_num_executors()) { oprot.writeI32(struct.num_executors); } @@ -1001,19 +1093,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStat if (struct.is_set_resources_map()) { { oprot.writeI32(struct.resources_map.size()); - for (Map.Entry _iter373 : struct.resources_map.entrySet()) + for (Map.Entry _iter393 : struct.resources_map.entrySet()) { - oprot.writeString(_iter373.getKey()); - oprot.writeDouble(_iter373.getValue()); + oprot.writeString(_iter393.getKey()); + oprot.writeDouble(_iter393.getValue()); } } } + if (struct.is_set_throughput()) { + oprot.writeDouble(struct.throughput); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.num_executors = iprot.readI32(); struct.set_num_executors_isSet(true); @@ -1040,19 +1135,23 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStats } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map374 = 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(2*_map374.size); - String _key375; - double _val376; - for (int _i377 = 0; _i377 < _map374.size; ++_i377) + org.apache.thrift.protocol.TMap _map394 = 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(2*_map394.size); + String _key395; + double _val396; + for (int _i397 = 0; _i397 < _map394.size; ++_i397) { - _key375 = iprot.readString(); - _val376 = iprot.readDouble(); - struct.resources_map.put(_key375, _val376); + _key395 = iprot.readString(); + _val396 = iprot.readDouble(); + struct.resources_map.put(_key395, _val396); } } struct.set_resources_map_isSet(true); } + if (incoming.get(7)) { + struct.throughput = iprot.readDouble(); + struct.set_throughput_isSet(true); + } } } diff --git a/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java b/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java index 7fcebcc83d0..b2f15bc5eb4 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java @@ -1752,16 +1752,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 7: // WINDOW_TO_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map482 = iprot.readMapBegin(); - struct.window_to_stats = new HashMap(2*_map482.size); - String _key483; - ComponentAggregateStats _val484; - for (int _i485 = 0; _i485 < _map482.size; ++_i485) + org.apache.thrift.protocol.TMap _map512 = iprot.readMapBegin(); + struct.window_to_stats = new HashMap(2*_map512.size); + String _key513; + ComponentAggregateStats _val514; + for (int _i515 = 0; _i515 < _map512.size; ++_i515) { - _key483 = iprot.readString(); - _val484 = new ComponentAggregateStats(); - _val484.read(iprot); - struct.window_to_stats.put(_key483, _val484); + _key513 = iprot.readString(); + _val514 = new ComponentAggregateStats(); + _val514.read(iprot); + struct.window_to_stats.put(_key513, _val514); } iprot.readMapEnd(); } @@ -1773,17 +1773,17 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 8: // GSID_TO_INPUT_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map486 = iprot.readMapBegin(); - struct.gsid_to_input_stats = new HashMap(2*_map486.size); - GlobalStreamId _key487; - ComponentAggregateStats _val488; - for (int _i489 = 0; _i489 < _map486.size; ++_i489) + org.apache.thrift.protocol.TMap _map516 = iprot.readMapBegin(); + struct.gsid_to_input_stats = new HashMap(2*_map516.size); + GlobalStreamId _key517; + ComponentAggregateStats _val518; + for (int _i519 = 0; _i519 < _map516.size; ++_i519) { - _key487 = new GlobalStreamId(); - _key487.read(iprot); - _val488 = new ComponentAggregateStats(); - _val488.read(iprot); - struct.gsid_to_input_stats.put(_key487, _val488); + _key517 = new GlobalStreamId(); + _key517.read(iprot); + _val518 = new ComponentAggregateStats(); + _val518.read(iprot); + struct.gsid_to_input_stats.put(_key517, _val518); } iprot.readMapEnd(); } @@ -1795,16 +1795,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 9: // SID_TO_OUTPUT_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map490 = iprot.readMapBegin(); - struct.sid_to_output_stats = new HashMap(2*_map490.size); - String _key491; - ComponentAggregateStats _val492; - for (int _i493 = 0; _i493 < _map490.size; ++_i493) + org.apache.thrift.protocol.TMap _map520 = iprot.readMapBegin(); + struct.sid_to_output_stats = new HashMap(2*_map520.size); + String _key521; + ComponentAggregateStats _val522; + for (int _i523 = 0; _i523 < _map520.size; ++_i523) { - _key491 = iprot.readString(); - _val492 = new ComponentAggregateStats(); - _val492.read(iprot); - struct.sid_to_output_stats.put(_key491, _val492); + _key521 = iprot.readString(); + _val522 = new ComponentAggregateStats(); + _val522.read(iprot); + struct.sid_to_output_stats.put(_key521, _val522); } iprot.readMapEnd(); } @@ -1816,14 +1816,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 10: // EXEC_STATS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list494 = iprot.readListBegin(); - struct.exec_stats = new ArrayList(_list494.size); - ExecutorAggregateStats _elem495; - for (int _i496 = 0; _i496 < _list494.size; ++_i496) + org.apache.thrift.protocol.TList _list524 = iprot.readListBegin(); + struct.exec_stats = new ArrayList(_list524.size); + ExecutorAggregateStats _elem525; + for (int _i526 = 0; _i526 < _list524.size; ++_i526) { - _elem495 = new ExecutorAggregateStats(); - _elem495.read(iprot); - struct.exec_stats.add(_elem495); + _elem525 = new ExecutorAggregateStats(); + _elem525.read(iprot); + struct.exec_stats.add(_elem525); } iprot.readListEnd(); } @@ -1835,14 +1835,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 11: // ERRORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list497 = iprot.readListBegin(); - struct.errors = new ArrayList(_list497.size); - ErrorInfo _elem498; - for (int _i499 = 0; _i499 < _list497.size; ++_i499) + org.apache.thrift.protocol.TList _list527 = iprot.readListBegin(); + struct.errors = new ArrayList(_list527.size); + ErrorInfo _elem528; + for (int _i529 = 0; _i529 < _list527.size; ++_i529) { - _elem498 = new ErrorInfo(); - _elem498.read(iprot); - struct.errors.add(_elem498); + _elem528 = new ErrorInfo(); + _elem528.read(iprot); + struct.errors.add(_elem528); } iprot.readListEnd(); } @@ -1887,15 +1887,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentPageInfo s case 16: // RESOURCES_MAP if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map500 = iprot.readMapBegin(); - struct.resources_map = new HashMap(2*_map500.size); - String _key501; - double _val502; - for (int _i503 = 0; _i503 < _map500.size; ++_i503) + org.apache.thrift.protocol.TMap _map530 = iprot.readMapBegin(); + struct.resources_map = new HashMap(2*_map530.size); + String _key531; + double _val532; + for (int _i533 = 0; _i533 < _map530.size; ++_i533) { - _key501 = iprot.readString(); - _val502 = iprot.readDouble(); - struct.resources_map.put(_key501, _val502); + _key531 = iprot.readString(); + _val532 = iprot.readDouble(); + struct.resources_map.put(_key531, _val532); } iprot.readMapEnd(); } @@ -1956,10 +1956,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo oprot.writeFieldBegin(WINDOW_TO_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.window_to_stats.size())); - for (Map.Entry _iter504 : struct.window_to_stats.entrySet()) + for (Map.Entry _iter534 : struct.window_to_stats.entrySet()) { - oprot.writeString(_iter504.getKey()); - _iter504.getValue().write(oprot); + oprot.writeString(_iter534.getKey()); + _iter534.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1971,10 +1971,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo oprot.writeFieldBegin(GSID_TO_INPUT_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.gsid_to_input_stats.size())); - for (Map.Entry _iter505 : struct.gsid_to_input_stats.entrySet()) + for (Map.Entry _iter535 : struct.gsid_to_input_stats.entrySet()) { - _iter505.getKey().write(oprot); - _iter505.getValue().write(oprot); + _iter535.getKey().write(oprot); + _iter535.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1986,10 +1986,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo oprot.writeFieldBegin(SID_TO_OUTPUT_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.sid_to_output_stats.size())); - for (Map.Entry _iter506 : struct.sid_to_output_stats.entrySet()) + for (Map.Entry _iter536 : struct.sid_to_output_stats.entrySet()) { - oprot.writeString(_iter506.getKey()); - _iter506.getValue().write(oprot); + oprot.writeString(_iter536.getKey()); + _iter536.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2001,9 +2001,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo oprot.writeFieldBegin(EXEC_STATS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.exec_stats.size())); - for (ExecutorAggregateStats _iter507 : struct.exec_stats) + for (ExecutorAggregateStats _iter537 : struct.exec_stats) { - _iter507.write(oprot); + _iter537.write(oprot); } oprot.writeListEnd(); } @@ -2015,9 +2015,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo oprot.writeFieldBegin(ERRORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size())); - for (ErrorInfo _iter508 : struct.errors) + for (ErrorInfo _iter538 : struct.errors) { - _iter508.write(oprot); + _iter538.write(oprot); } oprot.writeListEnd(); } @@ -2055,10 +2055,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentPageInfo 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 _iter509 : struct.resources_map.entrySet()) + for (Map.Entry _iter539 : struct.resources_map.entrySet()) { - oprot.writeString(_iter509.getKey()); - oprot.writeDouble(_iter509.getValue()); + oprot.writeString(_iter539.getKey()); + oprot.writeDouble(_iter539.getValue()); } oprot.writeMapEnd(); } @@ -2143,48 +2143,48 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo s if (struct.is_set_window_to_stats()) { { oprot.writeI32(struct.window_to_stats.size()); - for (Map.Entry _iter510 : struct.window_to_stats.entrySet()) + for (Map.Entry _iter540 : struct.window_to_stats.entrySet()) { - oprot.writeString(_iter510.getKey()); - _iter510.getValue().write(oprot); + oprot.writeString(_iter540.getKey()); + _iter540.getValue().write(oprot); } } } if (struct.is_set_gsid_to_input_stats()) { { oprot.writeI32(struct.gsid_to_input_stats.size()); - for (Map.Entry _iter511 : struct.gsid_to_input_stats.entrySet()) + for (Map.Entry _iter541 : struct.gsid_to_input_stats.entrySet()) { - _iter511.getKey().write(oprot); - _iter511.getValue().write(oprot); + _iter541.getKey().write(oprot); + _iter541.getValue().write(oprot); } } } if (struct.is_set_sid_to_output_stats()) { { oprot.writeI32(struct.sid_to_output_stats.size()); - for (Map.Entry _iter512 : struct.sid_to_output_stats.entrySet()) + for (Map.Entry _iter542 : struct.sid_to_output_stats.entrySet()) { - oprot.writeString(_iter512.getKey()); - _iter512.getValue().write(oprot); + oprot.writeString(_iter542.getKey()); + _iter542.getValue().write(oprot); } } } if (struct.is_set_exec_stats()) { { oprot.writeI32(struct.exec_stats.size()); - for (ExecutorAggregateStats _iter513 : struct.exec_stats) + for (ExecutorAggregateStats _iter543 : struct.exec_stats) { - _iter513.write(oprot); + _iter543.write(oprot); } } } if (struct.is_set_errors()) { { oprot.writeI32(struct.errors.size()); - for (ErrorInfo _iter514 : struct.errors) + for (ErrorInfo _iter544 : struct.errors) { - _iter514.write(oprot); + _iter544.write(oprot); } } } @@ -2203,10 +2203,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo s if (struct.is_set_resources_map()) { { oprot.writeI32(struct.resources_map.size()); - for (Map.Entry _iter515 : struct.resources_map.entrySet()) + for (Map.Entry _iter545 : struct.resources_map.entrySet()) { - oprot.writeString(_iter515.getKey()); - oprot.writeDouble(_iter515.getValue()); + oprot.writeString(_iter545.getKey()); + oprot.writeDouble(_iter545.getValue()); } } } @@ -2238,77 +2238,77 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo st } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map516 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.window_to_stats = new HashMap(2*_map516.size); - String _key517; - ComponentAggregateStats _val518; - for (int _i519 = 0; _i519 < _map516.size; ++_i519) + org.apache.thrift.protocol.TMap _map546 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.window_to_stats = new HashMap(2*_map546.size); + String _key547; + ComponentAggregateStats _val548; + for (int _i549 = 0; _i549 < _map546.size; ++_i549) { - _key517 = iprot.readString(); - _val518 = new ComponentAggregateStats(); - _val518.read(iprot); - struct.window_to_stats.put(_key517, _val518); + _key547 = iprot.readString(); + _val548 = new ComponentAggregateStats(); + _val548.read(iprot); + struct.window_to_stats.put(_key547, _val548); } } struct.set_window_to_stats_isSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map520 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.gsid_to_input_stats = new HashMap(2*_map520.size); - GlobalStreamId _key521; - ComponentAggregateStats _val522; - for (int _i523 = 0; _i523 < _map520.size; ++_i523) + org.apache.thrift.protocol.TMap _map550 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.gsid_to_input_stats = new HashMap(2*_map550.size); + GlobalStreamId _key551; + ComponentAggregateStats _val552; + for (int _i553 = 0; _i553 < _map550.size; ++_i553) { - _key521 = new GlobalStreamId(); - _key521.read(iprot); - _val522 = new ComponentAggregateStats(); - _val522.read(iprot); - struct.gsid_to_input_stats.put(_key521, _val522); + _key551 = new GlobalStreamId(); + _key551.read(iprot); + _val552 = new ComponentAggregateStats(); + _val552.read(iprot); + struct.gsid_to_input_stats.put(_key551, _val552); } } struct.set_gsid_to_input_stats_isSet(true); } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map524 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.sid_to_output_stats = new HashMap(2*_map524.size); - String _key525; - ComponentAggregateStats _val526; - for (int _i527 = 0; _i527 < _map524.size; ++_i527) + org.apache.thrift.protocol.TMap _map554 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.sid_to_output_stats = new HashMap(2*_map554.size); + String _key555; + ComponentAggregateStats _val556; + for (int _i557 = 0; _i557 < _map554.size; ++_i557) { - _key525 = iprot.readString(); - _val526 = new ComponentAggregateStats(); - _val526.read(iprot); - struct.sid_to_output_stats.put(_key525, _val526); + _key555 = iprot.readString(); + _val556 = new ComponentAggregateStats(); + _val556.read(iprot); + struct.sid_to_output_stats.put(_key555, _val556); } } struct.set_sid_to_output_stats_isSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TList _list528 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.exec_stats = new ArrayList(_list528.size); - ExecutorAggregateStats _elem529; - for (int _i530 = 0; _i530 < _list528.size; ++_i530) + org.apache.thrift.protocol.TList _list558 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.exec_stats = new ArrayList(_list558.size); + ExecutorAggregateStats _elem559; + for (int _i560 = 0; _i560 < _list558.size; ++_i560) { - _elem529 = new ExecutorAggregateStats(); - _elem529.read(iprot); - struct.exec_stats.add(_elem529); + _elem559 = new ExecutorAggregateStats(); + _elem559.read(iprot); + struct.exec_stats.add(_elem559); } } struct.set_exec_stats_isSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TList _list531 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.errors = new ArrayList(_list531.size); - ErrorInfo _elem532; - for (int _i533 = 0; _i533 < _list531.size; ++_i533) + org.apache.thrift.protocol.TList _list561 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.errors = new ArrayList(_list561.size); + ErrorInfo _elem562; + for (int _i563 = 0; _i563 < _list561.size; ++_i563) { - _elem532 = new ErrorInfo(); - _elem532.read(iprot); - struct.errors.add(_elem532); + _elem562 = new ErrorInfo(); + _elem562.read(iprot); + struct.errors.add(_elem562); } } struct.set_errors_isSet(true); @@ -2332,15 +2332,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo st } if (incoming.get(13)) { { - org.apache.thrift.protocol.TMap _map534 = 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(2*_map534.size); - String _key535; - double _val536; - for (int _i537 = 0; _i537 < _map534.size; ++_i537) + org.apache.thrift.protocol.TMap _map564 = 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(2*_map564.size); + String _key565; + double _val566; + for (int _i567 = 0; _i567 < _map564.size; ++_i567) { - _key535 = iprot.readString(); - _val536 = iprot.readDouble(); - struct.resources_map.put(_key535, _val536); + _key565 = iprot.readString(); + _val566 = iprot.readDouble(); + struct.resources_map.put(_key565, _val566); } } struct.set_resources_map_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/Credentials.java b/storm-core/src/jvm/org/apache/storm/generated/Credentials.java index 231af066900..4927d64f656 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/Credentials.java +++ b/storm-core/src/jvm/org/apache/storm/generated/Credentials.java @@ -365,15 +365,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) case 1: // CREDS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map548 = iprot.readMapBegin(); - struct.creds = new HashMap(2*_map548.size); - String _key549; - String _val550; - for (int _i551 = 0; _i551 < _map548.size; ++_i551) + org.apache.thrift.protocol.TMap _map578 = iprot.readMapBegin(); + struct.creds = new HashMap(2*_map578.size); + String _key579; + String _val580; + for (int _i581 = 0; _i581 < _map578.size; ++_i581) { - _key549 = iprot.readString(); - _val550 = iprot.readString(); - struct.creds.put(_key549, _val550); + _key579 = iprot.readString(); + _val580 = iprot.readString(); + struct.creds.put(_key579, _val580); } iprot.readMapEnd(); } @@ -399,10 +399,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Credentials struct oprot.writeFieldBegin(CREDS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size())); - for (Map.Entry _iter552 : struct.creds.entrySet()) + for (Map.Entry _iter582 : struct.creds.entrySet()) { - oprot.writeString(_iter552.getKey()); - oprot.writeString(_iter552.getValue()); + oprot.writeString(_iter582.getKey()); + oprot.writeString(_iter582.getValue()); } oprot.writeMapEnd(); } @@ -427,10 +427,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.creds.size()); - for (Map.Entry _iter553 : struct.creds.entrySet()) + for (Map.Entry _iter583 : struct.creds.entrySet()) { - oprot.writeString(_iter553.getKey()); - oprot.writeString(_iter553.getValue()); + oprot.writeString(_iter583.getKey()); + oprot.writeString(_iter583.getValue()); } } } @@ -439,15 +439,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map554 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.creds = new HashMap(2*_map554.size); - String _key555; - String _val556; - for (int _i557 = 0; _i557 < _map554.size; ++_i557) + org.apache.thrift.protocol.TMap _map584 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.creds = new HashMap(2*_map584.size); + String _key585; + String _val586; + for (int _i587 = 0; _i587 < _map584.size; ++_i587) { - _key555 = iprot.readString(); - _val556 = iprot.readString(); - struct.creds.put(_key555, _val556); + _key585 = iprot.readString(); + _val586 = iprot.readString(); + struct.creds.put(_key585, _val586); } } struct.set_creds_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/ExecutorStats.java b/storm-core/src/jvm/org/apache/storm/generated/ExecutorStats.java index bbb8e7a2375..ca590e0572d 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/ExecutorStats.java +++ b/storm-core/src/jvm/org/apache/storm/generated/ExecutorStats.java @@ -59,6 +59,7 @@ public class ExecutorStats implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -70,13 +71,15 @@ public class ExecutorStats implements org.apache.thrift.TBase> transferred; // required private ExecutorSpecificStats specific; // required private double rate; // required + private Map> throughput; // 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 { EMITTED((short)1, "emitted"), TRANSFERRED((short)2, "transferred"), SPECIFIC((short)3, "specific"), - RATE((short)4, "rate"); + RATE((short)4, "rate"), + THROUGHPUT((short)5, "throughput"); private static final Map byName = new HashMap(); @@ -99,6 +102,8 @@ public static _Fields findByThriftId(int fieldId) { return SPECIFIC; case 4: // RATE return RATE; + case 5: // THROUGHPUT + return THROUGHPUT; default: return null; } @@ -141,6 +146,7 @@ public String getFieldName() { // isset id assignments private static final int __RATE_ISSET_ID = 0; private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.THROUGHPUT}; 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); @@ -160,6 +166,12 @@ public String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorSpecificStats.class))); tmpMap.put(_Fields.RATE, new org.apache.thrift.meta_data.FieldMetaData("rate", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); + tmpMap.put(_Fields.THROUGHPUT, new org.apache.thrift.meta_data.FieldMetaData("throughput", 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))))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExecutorStats.class, metaDataMap); } @@ -220,6 +232,21 @@ public ExecutorStats(ExecutorStats other) { this.specific = new ExecutorSpecificStats(other.specific); } this.rate = other.rate; + if (other.is_set_throughput()) { + Map> __this__throughput = new HashMap>(other.throughput.size()); + for (Map.Entry> other_element : other.throughput.entrySet()) { + + String other_element_key = other_element.getKey(); + Map other_element_value = other_element.getValue(); + + String __this__throughput_copy_key = other_element_key; + + Map __this__throughput_copy_value = new HashMap(other_element_value); + + __this__throughput.put(__this__throughput_copy_key, __this__throughput_copy_value); + } + this.throughput = __this__throughput; + } } public ExecutorStats deepCopy() { @@ -233,6 +260,7 @@ public void clear() { this.specific = null; set_rate_isSet(false); this.rate = 0.0; + this.throughput = null; } public int get_emitted_size() { @@ -348,6 +376,40 @@ public void set_rate_isSet(boolean value) { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RATE_ISSET_ID, value); } + public int get_throughput_size() { + return (this.throughput == null) ? 0 : this.throughput.size(); + } + + public void put_to_throughput(String key, Map val) { + if (this.throughput == null) { + this.throughput = new HashMap>(); + } + this.throughput.put(key, val); + } + + public Map> get_throughput() { + return this.throughput; + } + + public void set_throughput(Map> throughput) { + this.throughput = throughput; + } + + public void unset_throughput() { + this.throughput = null; + } + + /** Returns true if field throughput is set (has been assigned a value) and false otherwise */ + public boolean is_set_throughput() { + return this.throughput != null; + } + + public void set_throughput_isSet(boolean value) { + if (!value) { + this.throughput = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case EMITTED: @@ -382,6 +444,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case THROUGHPUT: + if (value == null) { + unset_throughput(); + } else { + set_throughput((Map>)value); + } + break; + } } @@ -399,6 +469,9 @@ public Object getFieldValue(_Fields field) { case RATE: return get_rate(); + case THROUGHPUT: + return get_throughput(); + } throw new IllegalStateException(); } @@ -418,6 +491,8 @@ public boolean isSet(_Fields field) { return is_set_specific(); case RATE: return is_set_rate(); + case THROUGHPUT: + return is_set_throughput(); } throw new IllegalStateException(); } @@ -471,6 +546,15 @@ public boolean equals(ExecutorStats that) { return false; } + boolean this_present_throughput = true && this.is_set_throughput(); + boolean that_present_throughput = true && that.is_set_throughput(); + if (this_present_throughput || that_present_throughput) { + if (!(this_present_throughput && that_present_throughput)) + return false; + if (!this.throughput.equals(that.throughput)) + return false; + } + return true; } @@ -498,6 +582,11 @@ public int hashCode() { if (present_rate) list.add(rate); + boolean present_throughput = true && (is_set_throughput()); + list.add(present_throughput); + if (present_throughput) + list.add(throughput); + return list.hashCode(); } @@ -549,6 +638,16 @@ public int compareTo(ExecutorStats other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_throughput()).compareTo(other.is_set_throughput()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_throughput()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.throughput, other.throughput); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -596,6 +695,16 @@ public String toString() { sb.append("rate:"); sb.append(this.rate); first = false; + if (is_set_throughput()) { + if (!first) sb.append(", "); + sb.append("throughput:"); + if (this.throughput == null) { + sb.append("null"); + } else { + sb.append(this.throughput); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -738,6 +847,38 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats struc org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 5: // THROUGHPUT + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map308 = iprot.readMapBegin(); + struct.throughput = new HashMap>(2*_map308.size); + String _key309; + Map _val310; + for (int _i311 = 0; _i311 < _map308.size; ++_i311) + { + _key309 = iprot.readString(); + { + org.apache.thrift.protocol.TMap _map312 = iprot.readMapBegin(); + _val310 = new HashMap(2*_map312.size); + String _key313; + double _val314; + for (int _i315 = 0; _i315 < _map312.size; ++_i315) + { + _key313 = iprot.readString(); + _val314 = iprot.readDouble(); + _val310.put(_key313, _val314); + } + iprot.readMapEnd(); + } + struct.throughput.put(_key309, _val310); + } + iprot.readMapEnd(); + } + struct.set_throughput_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -755,15 +896,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats stru oprot.writeFieldBegin(EMITTED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size())); - for (Map.Entry> _iter308 : struct.emitted.entrySet()) + for (Map.Entry> _iter316 : struct.emitted.entrySet()) { - oprot.writeString(_iter308.getKey()); + oprot.writeString(_iter316.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter308.getValue().size())); - for (Map.Entry _iter309 : _iter308.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter316.getValue().size())); + for (Map.Entry _iter317 : _iter316.getValue().entrySet()) { - oprot.writeString(_iter309.getKey()); - oprot.writeI64(_iter309.getValue()); + oprot.writeString(_iter317.getKey()); + oprot.writeI64(_iter317.getValue()); } oprot.writeMapEnd(); } @@ -776,15 +917,15 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats stru oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size())); - for (Map.Entry> _iter310 : struct.transferred.entrySet()) + for (Map.Entry> _iter318 : struct.transferred.entrySet()) { - oprot.writeString(_iter310.getKey()); + oprot.writeString(_iter318.getKey()); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter310.getValue().size())); - for (Map.Entry _iter311 : _iter310.getValue().entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter318.getValue().size())); + for (Map.Entry _iter319 : _iter318.getValue().entrySet()) { - oprot.writeString(_iter311.getKey()); - oprot.writeI64(_iter311.getValue()); + oprot.writeString(_iter319.getKey()); + oprot.writeI64(_iter319.getValue()); } oprot.writeMapEnd(); } @@ -801,6 +942,29 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats stru oprot.writeFieldBegin(RATE_FIELD_DESC); oprot.writeDouble(struct.rate); oprot.writeFieldEnd(); + if (struct.throughput != null) { + if (struct.is_set_throughput()) { + oprot.writeFieldBegin(THROUGHPUT_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.throughput.size())); + for (Map.Entry> _iter320 : struct.throughput.entrySet()) + { + oprot.writeString(_iter320.getKey()); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter320.getValue().size())); + for (Map.Entry _iter321 : _iter320.getValue().entrySet()) + { + oprot.writeString(_iter321.getKey()); + oprot.writeDouble(_iter321.getValue()); + } + oprot.writeMapEnd(); + } + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -820,86 +984,108 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struc TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.emitted.size()); - for (Map.Entry> _iter312 : struct.emitted.entrySet()) + for (Map.Entry> _iter322 : struct.emitted.entrySet()) { - oprot.writeString(_iter312.getKey()); + oprot.writeString(_iter322.getKey()); { - oprot.writeI32(_iter312.getValue().size()); - for (Map.Entry _iter313 : _iter312.getValue().entrySet()) + oprot.writeI32(_iter322.getValue().size()); + for (Map.Entry _iter323 : _iter322.getValue().entrySet()) { - oprot.writeString(_iter313.getKey()); - oprot.writeI64(_iter313.getValue()); + oprot.writeString(_iter323.getKey()); + oprot.writeI64(_iter323.getValue()); } } } } { oprot.writeI32(struct.transferred.size()); - for (Map.Entry> _iter314 : struct.transferred.entrySet()) + for (Map.Entry> _iter324 : struct.transferred.entrySet()) { - oprot.writeString(_iter314.getKey()); + oprot.writeString(_iter324.getKey()); { - oprot.writeI32(_iter314.getValue().size()); - for (Map.Entry _iter315 : _iter314.getValue().entrySet()) + oprot.writeI32(_iter324.getValue().size()); + for (Map.Entry _iter325 : _iter324.getValue().entrySet()) { - oprot.writeString(_iter315.getKey()); - oprot.writeI64(_iter315.getValue()); + oprot.writeString(_iter325.getKey()); + oprot.writeI64(_iter325.getValue()); } } } } struct.specific.write(oprot); oprot.writeDouble(struct.rate); + BitSet optionals = new BitSet(); + if (struct.is_set_throughput()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.is_set_throughput()) { + { + oprot.writeI32(struct.throughput.size()); + for (Map.Entry> _iter326 : struct.throughput.entrySet()) + { + oprot.writeString(_iter326.getKey()); + { + oprot.writeI32(_iter326.getValue().size()); + for (Map.Entry _iter327 : _iter326.getValue().entrySet()) + { + oprot.writeString(_iter327.getKey()); + oprot.writeDouble(_iter327.getValue()); + } + } + } + } + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map316 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.emitted = new HashMap>(2*_map316.size); - String _key317; - Map _val318; - for (int _i319 = 0; _i319 < _map316.size; ++_i319) + org.apache.thrift.protocol.TMap _map328 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.emitted = new HashMap>(2*_map328.size); + String _key329; + Map _val330; + for (int _i331 = 0; _i331 < _map328.size; ++_i331) { - _key317 = iprot.readString(); + _key329 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map320 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val318 = new HashMap(2*_map320.size); - String _key321; - long _val322; - for (int _i323 = 0; _i323 < _map320.size; ++_i323) + org.apache.thrift.protocol.TMap _map332 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val330 = new HashMap(2*_map332.size); + String _key333; + long _val334; + for (int _i335 = 0; _i335 < _map332.size; ++_i335) { - _key321 = iprot.readString(); - _val322 = iprot.readI64(); - _val318.put(_key321, _val322); + _key333 = iprot.readString(); + _val334 = iprot.readI64(); + _val330.put(_key333, _val334); } } - struct.emitted.put(_key317, _val318); + struct.emitted.put(_key329, _val330); } } struct.set_emitted_isSet(true); { - org.apache.thrift.protocol.TMap _map324 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.transferred = new HashMap>(2*_map324.size); - String _key325; - Map _val326; - for (int _i327 = 0; _i327 < _map324.size; ++_i327) + org.apache.thrift.protocol.TMap _map336 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.transferred = new HashMap>(2*_map336.size); + String _key337; + Map _val338; + for (int _i339 = 0; _i339 < _map336.size; ++_i339) { - _key325 = iprot.readString(); + _key337 = iprot.readString(); { - org.apache.thrift.protocol.TMap _map328 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _val326 = new HashMap(2*_map328.size); - String _key329; - long _val330; - for (int _i331 = 0; _i331 < _map328.size; ++_i331) + org.apache.thrift.protocol.TMap _map340 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _val338 = new HashMap(2*_map340.size); + String _key341; + long _val342; + for (int _i343 = 0; _i343 < _map340.size; ++_i343) { - _key329 = iprot.readString(); - _val330 = iprot.readI64(); - _val326.put(_key329, _val330); + _key341 = iprot.readString(); + _val342 = iprot.readI64(); + _val338.put(_key341, _val342); } } - struct.transferred.put(_key325, _val326); + struct.transferred.put(_key337, _val338); } } struct.set_transferred_isSet(true); @@ -908,6 +1094,33 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct struct.set_specific_isSet(true); struct.rate = iprot.readDouble(); struct.set_rate_isSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + { + org.apache.thrift.protocol.TMap _map344 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.throughput = new HashMap>(2*_map344.size); + String _key345; + Map _val346; + for (int _i347 = 0; _i347 < _map344.size; ++_i347) + { + _key345 = iprot.readString(); + { + org.apache.thrift.protocol.TMap _map348 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + _val346 = new HashMap(2*_map348.size); + String _key349; + double _val350; + for (int _i351 = 0; _i351 < _map348.size; ++_i351) + { + _key349 = iprot.readString(); + _val350 = iprot.readDouble(); + _val346.put(_key349, _val350); + } + } + struct.throughput.put(_key345, _val346); + } + } + struct.set_throughput_isSet(true); + } } } diff --git a/storm-core/src/jvm/org/apache/storm/generated/HBNodes.java b/storm-core/src/jvm/org/apache/storm/generated/HBNodes.java index c5c7407f10a..bbeb4519f71 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/HBNodes.java +++ b/storm-core/src/jvm/org/apache/storm/generated/HBNodes.java @@ -364,13 +364,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HBNodes struct) thr case 1: // PULSE_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list800 = iprot.readListBegin(); - struct.pulseIds = new ArrayList(_list800.size); - String _elem801; - for (int _i802 = 0; _i802 < _list800.size; ++_i802) + org.apache.thrift.protocol.TList _list830 = iprot.readListBegin(); + struct.pulseIds = new ArrayList(_list830.size); + String _elem831; + for (int _i832 = 0; _i832 < _list830.size; ++_i832) { - _elem801 = iprot.readString(); - struct.pulseIds.add(_elem801); + _elem831 = iprot.readString(); + struct.pulseIds.add(_elem831); } iprot.readListEnd(); } @@ -396,9 +396,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HBNodes struct) th 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 _iter803 : struct.pulseIds) + for (String _iter833 : struct.pulseIds) { - oprot.writeString(_iter803); + oprot.writeString(_iter833); } oprot.writeListEnd(); } @@ -429,9 +429,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HBNodes struct) thr if (struct.is_set_pulseIds()) { { oprot.writeI32(struct.pulseIds.size()); - for (String _iter804 : struct.pulseIds) + for (String _iter834 : struct.pulseIds) { - oprot.writeString(_iter804); + oprot.writeString(_iter834); } } } @@ -443,13 +443,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, HBNodes struct) thro BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list805 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.pulseIds = new ArrayList(_list805.size); - String _elem806; - for (int _i807 = 0; _i807 < _list805.size; ++_i807) + org.apache.thrift.protocol.TList _list835 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pulseIds = new ArrayList(_list835.size); + String _elem836; + for (int _i837 = 0; _i837 < _list835.size; ++_i837) { - _elem806 = iprot.readString(); - struct.pulseIds.add(_elem806); + _elem836 = iprot.readString(); + struct.pulseIds.add(_elem836); } } struct.set_pulseIds_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/HBRecords.java b/storm-core/src/jvm/org/apache/storm/generated/HBRecords.java index 6a6d4f20fe1..ee143995a39 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/HBRecords.java +++ b/storm-core/src/jvm/org/apache/storm/generated/HBRecords.java @@ -367,14 +367,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HBRecords struct) t case 1: // PULSES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list792 = iprot.readListBegin(); - struct.pulses = new ArrayList(_list792.size); - HBPulse _elem793; - for (int _i794 = 0; _i794 < _list792.size; ++_i794) + org.apache.thrift.protocol.TList _list822 = iprot.readListBegin(); + struct.pulses = new ArrayList(_list822.size); + HBPulse _elem823; + for (int _i824 = 0; _i824 < _list822.size; ++_i824) { - _elem793 = new HBPulse(); - _elem793.read(iprot); - struct.pulses.add(_elem793); + _elem823 = new HBPulse(); + _elem823.read(iprot); + struct.pulses.add(_elem823); } iprot.readListEnd(); } @@ -400,9 +400,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, HBRecords struct) oprot.writeFieldBegin(PULSES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.pulses.size())); - for (HBPulse _iter795 : struct.pulses) + for (HBPulse _iter825 : struct.pulses) { - _iter795.write(oprot); + _iter825.write(oprot); } oprot.writeListEnd(); } @@ -433,9 +433,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, HBRecords struct) t if (struct.is_set_pulses()) { { oprot.writeI32(struct.pulses.size()); - for (HBPulse _iter796 : struct.pulses) + for (HBPulse _iter826 : struct.pulses) { - _iter796.write(oprot); + _iter826.write(oprot); } } } @@ -447,14 +447,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, HBRecords struct) th BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list797 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.pulses = new ArrayList(_list797.size); - HBPulse _elem798; - for (int _i799 = 0; _i799 < _list797.size; ++_i799) + org.apache.thrift.protocol.TList _list827 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pulses = new ArrayList(_list827.size); + HBPulse _elem828; + for (int _i829 = 0; _i829 < _list827.size; ++_i829) { - _elem798 = new HBPulse(); - _elem798.read(iprot); - struct.pulses.add(_elem798); + _elem828 = new HBPulse(); + _elem828.read(iprot); + struct.pulses.add(_elem828); } } struct.set_pulses_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java b/storm-core/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java index b4795a5fd6a..ec9864c5a21 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LSApprovedWorkers.java @@ -365,15 +365,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSApprovedWorkers s case 1: // APPROVED_WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map722 = iprot.readMapBegin(); - struct.approved_workers = new HashMap(2*_map722.size); - String _key723; - int _val724; - for (int _i725 = 0; _i725 < _map722.size; ++_i725) + org.apache.thrift.protocol.TMap _map752 = iprot.readMapBegin(); + struct.approved_workers = new HashMap(2*_map752.size); + String _key753; + int _val754; + for (int _i755 = 0; _i755 < _map752.size; ++_i755) { - _key723 = iprot.readString(); - _val724 = iprot.readI32(); - struct.approved_workers.put(_key723, _val724); + _key753 = iprot.readString(); + _val754 = iprot.readI32(); + struct.approved_workers.put(_key753, _val754); } iprot.readMapEnd(); } @@ -399,10 +399,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSApprovedWorkers 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 _iter726 : struct.approved_workers.entrySet()) + for (Map.Entry _iter756 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter726.getKey()); - oprot.writeI32(_iter726.getValue()); + oprot.writeString(_iter756.getKey()); + oprot.writeI32(_iter756.getValue()); } oprot.writeMapEnd(); } @@ -427,10 +427,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers s TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.approved_workers.size()); - for (Map.Entry _iter727 : struct.approved_workers.entrySet()) + for (Map.Entry _iter757 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter727.getKey()); - oprot.writeI32(_iter727.getValue()); + oprot.writeString(_iter757.getKey()); + oprot.writeI32(_iter757.getValue()); } } } @@ -439,15 +439,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers s 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 _map728 = 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(2*_map728.size); - String _key729; - int _val730; - for (int _i731 = 0; _i731 < _map728.size; ++_i731) + org.apache.thrift.protocol.TMap _map758 = 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(2*_map758.size); + String _key759; + int _val760; + for (int _i761 = 0; _i761 < _map758.size; ++_i761) { - _key729 = iprot.readString(); - _val730 = iprot.readI32(); - struct.approved_workers.put(_key729, _val730); + _key759 = iprot.readString(); + _val760 = iprot.readI32(); + struct.approved_workers.put(_key759, _val760); } } struct.set_approved_workers_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java b/storm-core/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java index b3194ada70f..096e87ed5be 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LSSupervisorAssignments.java @@ -376,16 +376,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorAssignm case 1: // ASSIGNMENTS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map732 = iprot.readMapBegin(); - struct.assignments = new HashMap(2*_map732.size); - int _key733; - LocalAssignment _val734; - for (int _i735 = 0; _i735 < _map732.size; ++_i735) + org.apache.thrift.protocol.TMap _map762 = iprot.readMapBegin(); + struct.assignments = new HashMap(2*_map762.size); + int _key763; + LocalAssignment _val764; + for (int _i765 = 0; _i765 < _map762.size; ++_i765) { - _key733 = iprot.readI32(); - _val734 = new LocalAssignment(); - _val734.read(iprot); - struct.assignments.put(_key733, _val734); + _key763 = iprot.readI32(); + _val764 = new LocalAssignment(); + _val764.read(iprot); + struct.assignments.put(_key763, _val764); } iprot.readMapEnd(); } @@ -411,10 +411,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSSupervisorAssign 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 _iter736 : struct.assignments.entrySet()) + for (Map.Entry _iter766 : struct.assignments.entrySet()) { - oprot.writeI32(_iter736.getKey()); - _iter736.getValue().write(oprot); + oprot.writeI32(_iter766.getKey()); + _iter766.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignm TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.assignments.size()); - for (Map.Entry _iter737 : struct.assignments.entrySet()) + for (Map.Entry _iter767 : struct.assignments.entrySet()) { - oprot.writeI32(_iter737.getKey()); - _iter737.getValue().write(oprot); + oprot.writeI32(_iter767.getKey()); + _iter767.getValue().write(oprot); } } } @@ -451,16 +451,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignm 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 _map738 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.assignments = new HashMap(2*_map738.size); - int _key739; - LocalAssignment _val740; - for (int _i741 = 0; _i741 < _map738.size; ++_i741) + org.apache.thrift.protocol.TMap _map768 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.assignments = new HashMap(2*_map768.size); + int _key769; + LocalAssignment _val770; + for (int _i771 = 0; _i771 < _map768.size; ++_i771) { - _key739 = iprot.readI32(); - _val740 = new LocalAssignment(); - _val740.read(iprot); - struct.assignments.put(_key739, _val740); + _key769 = iprot.readI32(); + _val770 = new LocalAssignment(); + _val770.read(iprot); + struct.assignments.put(_key769, _val770); } } struct.set_assignments_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistory.java b/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistory.java index 792c185a4f3..f58010fa16b 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistory.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistory.java @@ -656,13 +656,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistory struc case 3: // USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list750 = iprot.readListBegin(); - struct.users = new ArrayList(_list750.size); - String _elem751; - for (int _i752 = 0; _i752 < _list750.size; ++_i752) + org.apache.thrift.protocol.TList _list780 = iprot.readListBegin(); + struct.users = new ArrayList(_list780.size); + String _elem781; + for (int _i782 = 0; _i782 < _list780.size; ++_i782) { - _elem751 = iprot.readString(); - struct.users.add(_elem751); + _elem781 = iprot.readString(); + struct.users.add(_elem781); } iprot.readListEnd(); } @@ -674,13 +674,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistory struc case 4: // GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list753 = iprot.readListBegin(); - struct.groups = new ArrayList(_list753.size); - String _elem754; - for (int _i755 = 0; _i755 < _list753.size; ++_i755) + org.apache.thrift.protocol.TList _list783 = iprot.readListBegin(); + struct.groups = new ArrayList(_list783.size); + String _elem784; + for (int _i785 = 0; _i785 < _list783.size; ++_i785) { - _elem754 = iprot.readString(); - struct.groups.add(_elem754); + _elem784 = iprot.readString(); + struct.groups.add(_elem784); } iprot.readListEnd(); } @@ -714,9 +714,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSTopoHistory stru oprot.writeFieldBegin(USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.users.size())); - for (String _iter756 : struct.users) + for (String _iter786 : struct.users) { - oprot.writeString(_iter756); + oprot.writeString(_iter786); } oprot.writeListEnd(); } @@ -726,9 +726,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSTopoHistory stru oprot.writeFieldBegin(GROUPS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.groups.size())); - for (String _iter757 : struct.groups) + for (String _iter787 : struct.groups) { - oprot.writeString(_iter757); + oprot.writeString(_iter787); } oprot.writeListEnd(); } @@ -755,16 +755,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory struc oprot.writeI64(struct.time_stamp); { oprot.writeI32(struct.users.size()); - for (String _iter758 : struct.users) + for (String _iter788 : struct.users) { - oprot.writeString(_iter758); + oprot.writeString(_iter788); } } { oprot.writeI32(struct.groups.size()); - for (String _iter759 : struct.groups) + for (String _iter789 : struct.groups) { - oprot.writeString(_iter759); + oprot.writeString(_iter789); } } } @@ -777,24 +777,24 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LSTopoHistory struct struct.time_stamp = iprot.readI64(); struct.set_time_stamp_isSet(true); { - org.apache.thrift.protocol.TList _list760 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.users = new ArrayList(_list760.size); - String _elem761; - for (int _i762 = 0; _i762 < _list760.size; ++_i762) + org.apache.thrift.protocol.TList _list790 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.users = new ArrayList(_list790.size); + String _elem791; + for (int _i792 = 0; _i792 < _list790.size; ++_i792) { - _elem761 = iprot.readString(); - struct.users.add(_elem761); + _elem791 = iprot.readString(); + struct.users.add(_elem791); } } struct.set_users_isSet(true); { - org.apache.thrift.protocol.TList _list763 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.groups = new ArrayList(_list763.size); - String _elem764; - for (int _i765 = 0; _i765 < _list763.size; ++_i765) + org.apache.thrift.protocol.TList _list793 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.groups = new ArrayList(_list793.size); + String _elem794; + for (int _i795 = 0; _i795 < _list793.size; ++_i795) { - _elem764 = iprot.readString(); - struct.groups.add(_elem764); + _elem794 = iprot.readString(); + struct.groups.add(_elem794); } } struct.set_groups_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java b/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java index 4b9b15062f8..3e62416ea7b 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LSTopoHistoryList.java @@ -371,14 +371,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSTopoHistoryList s case 1: // TOPO_HISTORY if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list766 = iprot.readListBegin(); - struct.topo_history = new ArrayList(_list766.size); - LSTopoHistory _elem767; - for (int _i768 = 0; _i768 < _list766.size; ++_i768) + org.apache.thrift.protocol.TList _list796 = iprot.readListBegin(); + struct.topo_history = new ArrayList(_list796.size); + LSTopoHistory _elem797; + for (int _i798 = 0; _i798 < _list796.size; ++_i798) { - _elem767 = new LSTopoHistory(); - _elem767.read(iprot); - struct.topo_history.add(_elem767); + _elem797 = new LSTopoHistory(); + _elem797.read(iprot); + struct.topo_history.add(_elem797); } iprot.readListEnd(); } @@ -404,9 +404,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSTopoHistoryList 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 _iter769 : struct.topo_history) + for (LSTopoHistory _iter799 : struct.topo_history) { - _iter769.write(oprot); + _iter799.write(oprot); } oprot.writeListEnd(); } @@ -431,9 +431,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistoryList s TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.topo_history.size()); - for (LSTopoHistory _iter770 : struct.topo_history) + for (LSTopoHistory _iter800 : struct.topo_history) { - _iter770.write(oprot); + _iter800.write(oprot); } } } @@ -442,14 +442,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSTopoHistoryList s 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 _list771 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.topo_history = new ArrayList(_list771.size); - LSTopoHistory _elem772; - for (int _i773 = 0; _i773 < _list771.size; ++_i773) + org.apache.thrift.protocol.TList _list801 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.topo_history = new ArrayList(_list801.size); + LSTopoHistory _elem802; + for (int _i803 = 0; _i803 < _list801.size; ++_i803) { - _elem772 = new LSTopoHistory(); - _elem772.read(iprot); - struct.topo_history.add(_elem772); + _elem802 = new LSTopoHistory(); + _elem802.read(iprot); + struct.topo_history.add(_elem802); } } struct.set_topo_history_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java b/storm-core/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java index 1c42bdefc95..d11e1fa7d8e 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LSWorkerHeartbeat.java @@ -638,14 +638,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat s case 3: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list742 = iprot.readListBegin(); - struct.executors = new ArrayList(_list742.size); - ExecutorInfo _elem743; - for (int _i744 = 0; _i744 < _list742.size; ++_i744) + org.apache.thrift.protocol.TList _list772 = iprot.readListBegin(); + struct.executors = new ArrayList(_list772.size); + ExecutorInfo _elem773; + for (int _i774 = 0; _i774 < _list772.size; ++_i774) { - _elem743 = new ExecutorInfo(); - _elem743.read(iprot); - struct.executors.add(_elem743); + _elem773 = new ExecutorInfo(); + _elem773.read(iprot); + struct.executors.add(_elem773); } iprot.readListEnd(); } @@ -687,9 +687,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LSWorkerHeartbeat oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size())); - for (ExecutorInfo _iter745 : struct.executors) + for (ExecutorInfo _iter775 : struct.executors) { - _iter745.write(oprot); + _iter775.write(oprot); } oprot.writeListEnd(); } @@ -719,9 +719,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat s oprot.writeString(struct.topology_id); { oprot.writeI32(struct.executors.size()); - for (ExecutorInfo _iter746 : struct.executors) + for (ExecutorInfo _iter776 : struct.executors) { - _iter746.write(oprot); + _iter776.write(oprot); } } oprot.writeI32(struct.port); @@ -735,14 +735,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat st struct.topology_id = iprot.readString(); struct.set_topology_id_isSet(true); { - org.apache.thrift.protocol.TList _list747 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list747.size); - ExecutorInfo _elem748; - for (int _i749 = 0; _i749 < _list747.size; ++_i749) + org.apache.thrift.protocol.TList _list777 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list777.size); + ExecutorInfo _elem778; + for (int _i779 = 0; _i779 < _list777.size; ++_i779) { - _elem748 = new ExecutorInfo(); - _elem748.read(iprot); - struct.executors.add(_elem748); + _elem778 = new ExecutorInfo(); + _elem778.read(iprot); + struct.executors.add(_elem778); } } struct.set_executors_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/ListBlobsResult.java b/storm-core/src/jvm/org/apache/storm/generated/ListBlobsResult.java index 87337e14b75..ae454e35952 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/ListBlobsResult.java +++ b/storm-core/src/jvm/org/apache/storm/generated/ListBlobsResult.java @@ -453,13 +453,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ListBlobsResult str case 1: // KEYS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list566 = iprot.readListBegin(); - struct.keys = new ArrayList(_list566.size); - String _elem567; - for (int _i568 = 0; _i568 < _list566.size; ++_i568) + org.apache.thrift.protocol.TList _list596 = iprot.readListBegin(); + struct.keys = new ArrayList(_list596.size); + String _elem597; + for (int _i598 = 0; _i598 < _list596.size; ++_i598) { - _elem567 = iprot.readString(); - struct.keys.add(_elem567); + _elem597 = iprot.readString(); + struct.keys.add(_elem597); } iprot.readListEnd(); } @@ -493,9 +493,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ListBlobsResult st oprot.writeFieldBegin(KEYS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.keys.size())); - for (String _iter569 : struct.keys) + for (String _iter599 : struct.keys) { - oprot.writeString(_iter569); + oprot.writeString(_iter599); } oprot.writeListEnd(); } @@ -525,9 +525,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ListBlobsResult str TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.keys.size()); - for (String _iter570 : struct.keys) + for (String _iter600 : struct.keys) { - oprot.writeString(_iter570); + oprot.writeString(_iter600); } } oprot.writeString(struct.session); @@ -537,13 +537,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, ListBlobsResult str public void read(org.apache.thrift.protocol.TProtocol prot, ListBlobsResult struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list571 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.keys = new ArrayList(_list571.size); - String _elem572; - for (int _i573 = 0; _i573 < _list571.size; ++_i573) + org.apache.thrift.protocol.TList _list601 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.keys = new ArrayList(_list601.size); + String _elem602; + for (int _i603 = 0; _i603 < _list601.size; ++_i603) { - _elem572 = iprot.readString(); - struct.keys.add(_elem572); + _elem602 = iprot.readString(); + struct.keys.add(_elem602); } } struct.set_keys_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LocalAssignment.java b/storm-core/src/jvm/org/apache/storm/generated/LocalAssignment.java index b48d34274b7..d5e7cda5823 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LocalAssignment.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LocalAssignment.java @@ -549,14 +549,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalAssignment str case 2: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list714 = iprot.readListBegin(); - struct.executors = new ArrayList(_list714.size); - ExecutorInfo _elem715; - for (int _i716 = 0; _i716 < _list714.size; ++_i716) + org.apache.thrift.protocol.TList _list744 = iprot.readListBegin(); + struct.executors = new ArrayList(_list744.size); + ExecutorInfo _elem745; + for (int _i746 = 0; _i746 < _list744.size; ++_i746) { - _elem715 = new ExecutorInfo(); - _elem715.read(iprot); - struct.executors.add(_elem715); + _elem745 = new ExecutorInfo(); + _elem745.read(iprot); + struct.executors.add(_elem745); } iprot.readListEnd(); } @@ -596,9 +596,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LocalAssignment st oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size())); - for (ExecutorInfo _iter717 : struct.executors) + for (ExecutorInfo _iter747 : struct.executors) { - _iter717.write(oprot); + _iter747.write(oprot); } oprot.writeListEnd(); } @@ -631,9 +631,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalAssignment str oprot.writeString(struct.topology_id); { oprot.writeI32(struct.executors.size()); - for (ExecutorInfo _iter718 : struct.executors) + for (ExecutorInfo _iter748 : struct.executors) { - _iter718.write(oprot); + _iter748.write(oprot); } } BitSet optionals = new BitSet(); @@ -652,14 +652,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LocalAssignment stru struct.topology_id = iprot.readString(); struct.set_topology_id_isSet(true); { - org.apache.thrift.protocol.TList _list719 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list719.size); - ExecutorInfo _elem720; - for (int _i721 = 0; _i721 < _list719.size; ++_i721) + org.apache.thrift.protocol.TList _list749 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list749.size); + ExecutorInfo _elem750; + for (int _i751 = 0; _i751 < _list749.size; ++_i751) { - _elem720 = new ExecutorInfo(); - _elem720.read(iprot); - struct.executors.add(_elem720); + _elem750 = new ExecutorInfo(); + _elem750.read(iprot); + struct.executors.add(_elem750); } } struct.set_executors_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LocalStateData.java b/storm-core/src/jvm/org/apache/storm/generated/LocalStateData.java index 4b8c430dd44..61c6c630a55 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LocalStateData.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LocalStateData.java @@ -376,16 +376,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData stru case 1: // SERIALIZED_PARTS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map704 = iprot.readMapBegin(); - struct.serialized_parts = new HashMap(2*_map704.size); - String _key705; - ThriftSerializedObject _val706; - for (int _i707 = 0; _i707 < _map704.size; ++_i707) + org.apache.thrift.protocol.TMap _map734 = iprot.readMapBegin(); + struct.serialized_parts = new HashMap(2*_map734.size); + String _key735; + ThriftSerializedObject _val736; + for (int _i737 = 0; _i737 < _map734.size; ++_i737) { - _key705 = iprot.readString(); - _val706 = new ThriftSerializedObject(); - _val706.read(iprot); - struct.serialized_parts.put(_key705, _val706); + _key735 = iprot.readString(); + _val736 = new ThriftSerializedObject(); + _val736.read(iprot); + struct.serialized_parts.put(_key735, _val736); } iprot.readMapEnd(); } @@ -411,10 +411,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LocalStateData str 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 _iter708 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter738 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter708.getKey()); - _iter708.getValue().write(oprot); + oprot.writeString(_iter738.getKey()); + _iter738.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData stru TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.serialized_parts.size()); - for (Map.Entry _iter709 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter739 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter709.getKey()); - _iter709.getValue().write(oprot); + oprot.writeString(_iter739.getKey()); + _iter739.getValue().write(oprot); } } } @@ -451,16 +451,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData stru 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 _map710 = 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(2*_map710.size); - String _key711; - ThriftSerializedObject _val712; - for (int _i713 = 0; _i713 < _map710.size; ++_i713) + org.apache.thrift.protocol.TMap _map740 = 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(2*_map740.size); + String _key741; + ThriftSerializedObject _val742; + for (int _i743 = 0; _i743 < _map740.size; ++_i743) { - _key711 = iprot.readString(); - _val712 = new ThriftSerializedObject(); - _val712.read(iprot); - struct.serialized_parts.put(_key711, _val712); + _key741 = iprot.readString(); + _val742 = new ThriftSerializedObject(); + _val742.read(iprot); + struct.serialized_parts.put(_key741, _val742); } } struct.set_serialized_parts_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/LogConfig.java b/storm-core/src/jvm/org/apache/storm/generated/LogConfig.java index f6633a63e5b..c72b1ee0612 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/LogConfig.java +++ b/storm-core/src/jvm/org/apache/storm/generated/LogConfig.java @@ -368,16 +368,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, LogConfig struct) t case 2: // NAMED_LOGGER_LEVEL if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map774 = iprot.readMapBegin(); - struct.named_logger_level = new HashMap(2*_map774.size); - String _key775; - LogLevel _val776; - for (int _i777 = 0; _i777 < _map774.size; ++_i777) + org.apache.thrift.protocol.TMap _map804 = iprot.readMapBegin(); + struct.named_logger_level = new HashMap(2*_map804.size); + String _key805; + LogLevel _val806; + for (int _i807 = 0; _i807 < _map804.size; ++_i807) { - _key775 = iprot.readString(); - _val776 = new LogLevel(); - _val776.read(iprot); - struct.named_logger_level.put(_key775, _val776); + _key805 = iprot.readString(); + _val806 = new LogLevel(); + _val806.read(iprot); + struct.named_logger_level.put(_key805, _val806); } iprot.readMapEnd(); } @@ -404,10 +404,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, LogConfig struct) 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 _iter778 : struct.named_logger_level.entrySet()) + for (Map.Entry _iter808 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter778.getKey()); - _iter778.getValue().write(oprot); + oprot.writeString(_iter808.getKey()); + _iter808.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -439,10 +439,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, LogConfig struct) t if (struct.is_set_named_logger_level()) { { oprot.writeI32(struct.named_logger_level.size()); - for (Map.Entry _iter779 : struct.named_logger_level.entrySet()) + for (Map.Entry _iter809 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter779.getKey()); - _iter779.getValue().write(oprot); + oprot.writeString(_iter809.getKey()); + _iter809.getValue().write(oprot); } } } @@ -454,16 +454,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, LogConfig struct) th BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map780 = 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(2*_map780.size); - String _key781; - LogLevel _val782; - for (int _i783 = 0; _i783 < _map780.size; ++_i783) + org.apache.thrift.protocol.TMap _map810 = 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(2*_map810.size); + String _key811; + LogLevel _val812; + for (int _i813 = 0; _i813 < _map810.size; ++_i813) { - _key781 = iprot.readString(); - _val782 = new LogLevel(); - _val782.read(iprot); - struct.named_logger_level.put(_key781, _val782); + _key811 = iprot.readString(); + _val812 = new LogLevel(); + _val812.read(iprot); + struct.named_logger_level.put(_key811, _val812); } } struct.set_named_logger_level_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/Nimbus.java b/storm-core/src/jvm/org/apache/storm/generated/Nimbus.java index ba9e66a44ca..5a77ec9c968 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/Nimbus.java +++ b/storm-core/src/jvm/org/apache/storm/generated/Nimbus.java @@ -17854,14 +17854,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getComponentPending case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list808 = iprot.readListBegin(); - struct.success = new ArrayList(_list808.size); - ProfileRequest _elem809; - for (int _i810 = 0; _i810 < _list808.size; ++_i810) + org.apache.thrift.protocol.TList _list838 = iprot.readListBegin(); + struct.success = new ArrayList(_list838.size); + ProfileRequest _elem839; + for (int _i840 = 0; _i840 < _list838.size; ++_i840) { - _elem809 = new ProfileRequest(); - _elem809.read(iprot); - struct.success.add(_elem809); + _elem839 = new ProfileRequest(); + _elem839.read(iprot); + struct.success.add(_elem839); } iprot.readListEnd(); } @@ -17887,9 +17887,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getComponentPendin oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (ProfileRequest _iter811 : struct.success) + for (ProfileRequest _iter841 : struct.success) { - _iter811.write(oprot); + _iter841.write(oprot); } oprot.writeListEnd(); } @@ -17920,9 +17920,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getComponentPending if (struct.is_set_success()) { { oprot.writeI32(struct.success.size()); - for (ProfileRequest _iter812 : struct.success) + for (ProfileRequest _iter842 : struct.success) { - _iter812.write(oprot); + _iter842.write(oprot); } } } @@ -17934,14 +17934,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getComponentPendingP BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list813 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list813.size); - ProfileRequest _elem814; - for (int _i815 = 0; _i815 < _list813.size; ++_i815) + org.apache.thrift.protocol.TList _list843 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list843.size); + ProfileRequest _elem844; + for (int _i845 = 0; _i845 < _list843.size; ++_i845) { - _elem814 = new ProfileRequest(); - _elem814.read(iprot); - struct.success.add(_elem814); + _elem844 = new ProfileRequest(); + _elem844.read(iprot); + struct.success.add(_elem844); } } struct.set_success_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/NodeInfo.java b/storm-core/src/jvm/org/apache/storm/generated/NodeInfo.java index 577671767d8..214edcb8f9d 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/NodeInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/NodeInfo.java @@ -461,13 +461,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, NodeInfo struct) th case 2: // PORT if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set610 = iprot.readSetBegin(); - struct.port = new HashSet(2*_set610.size); - long _elem611; - for (int _i612 = 0; _i612 < _set610.size; ++_i612) + org.apache.thrift.protocol.TSet _set640 = iprot.readSetBegin(); + struct.port = new HashSet(2*_set640.size); + long _elem641; + for (int _i642 = 0; _i642 < _set640.size; ++_i642) { - _elem611 = iprot.readI64(); - struct.port.add(_elem611); + _elem641 = iprot.readI64(); + struct.port.add(_elem641); } iprot.readSetEnd(); } @@ -498,9 +498,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, NodeInfo struct) t oprot.writeFieldBegin(PORT_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.port.size())); - for (long _iter613 : struct.port) + for (long _iter643 : struct.port) { - oprot.writeI64(_iter613); + oprot.writeI64(_iter643); } oprot.writeSetEnd(); } @@ -526,9 +526,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, NodeInfo struct) th oprot.writeString(struct.node); { oprot.writeI32(struct.port.size()); - for (long _iter614 : struct.port) + for (long _iter644 : struct.port) { - oprot.writeI64(_iter614); + oprot.writeI64(_iter644); } } } @@ -539,13 +539,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, NodeInfo struct) thr struct.node = iprot.readString(); struct.set_node_isSet(true); { - org.apache.thrift.protocol.TSet _set615 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.port = new HashSet(2*_set615.size); - long _elem616; - for (int _i617 = 0; _i617 < _set615.size; ++_i617) + org.apache.thrift.protocol.TSet _set645 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.port = new HashSet(2*_set645.size); + long _elem646; + for (int _i647 = 0; _i647 < _set645.size; ++_i647) { - _elem616 = iprot.readI64(); - struct.port.add(_elem616); + _elem646 = iprot.readI64(); + struct.port.add(_elem646); } } struct.set_port_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/org/apache/storm/generated/RebalanceOptions.java index bbb8f91a854..edcbece75ce 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/RebalanceOptions.java +++ b/storm-core/src/jvm/org/apache/storm/generated/RebalanceOptions.java @@ -529,15 +529,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RebalanceOptions st case 3: // NUM_EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map538 = iprot.readMapBegin(); - struct.num_executors = new HashMap(2*_map538.size); - String _key539; - int _val540; - for (int _i541 = 0; _i541 < _map538.size; ++_i541) + org.apache.thrift.protocol.TMap _map568 = iprot.readMapBegin(); + struct.num_executors = new HashMap(2*_map568.size); + String _key569; + int _val570; + for (int _i571 = 0; _i571 < _map568.size; ++_i571) { - _key539 = iprot.readString(); - _val540 = iprot.readI32(); - struct.num_executors.put(_key539, _val540); + _key569 = iprot.readString(); + _val570 = iprot.readI32(); + struct.num_executors.put(_key569, _val570); } iprot.readMapEnd(); } @@ -574,10 +574,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RebalanceOptions s 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 _iter542 : struct.num_executors.entrySet()) + for (Map.Entry _iter572 : struct.num_executors.entrySet()) { - oprot.writeString(_iter542.getKey()); - oprot.writeI32(_iter542.getValue()); + oprot.writeString(_iter572.getKey()); + oprot.writeI32(_iter572.getValue()); } oprot.writeMapEnd(); } @@ -621,10 +621,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions st if (struct.is_set_num_executors()) { { oprot.writeI32(struct.num_executors.size()); - for (Map.Entry _iter543 : struct.num_executors.entrySet()) + for (Map.Entry _iter573 : struct.num_executors.entrySet()) { - oprot.writeString(_iter543.getKey()); - oprot.writeI32(_iter543.getValue()); + oprot.writeString(_iter573.getKey()); + oprot.writeI32(_iter573.getValue()); } } } @@ -644,15 +644,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions str } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map544 = 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(2*_map544.size); - String _key545; - int _val546; - for (int _i547 = 0; _i547 < _map544.size; ++_i547) + org.apache.thrift.protocol.TMap _map574 = 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(2*_map574.size); + String _key575; + int _val576; + for (int _i577 = 0; _i577 < _map574.size; ++_i577) { - _key545 = iprot.readString(); - _val546 = iprot.readI32(); - struct.num_executors.put(_key545, _val546); + _key575 = iprot.readString(); + _val576 = iprot.readI32(); + struct.num_executors.put(_key575, _val576); } } struct.set_num_executors_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/SettableBlobMeta.java b/storm-core/src/jvm/org/apache/storm/generated/SettableBlobMeta.java index 349e0450bae..41a3d79fb39 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/SettableBlobMeta.java +++ b/storm-core/src/jvm/org/apache/storm/generated/SettableBlobMeta.java @@ -452,14 +452,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SettableBlobMeta st case 1: // ACL if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list558 = iprot.readListBegin(); - struct.acl = new ArrayList(_list558.size); - AccessControl _elem559; - for (int _i560 = 0; _i560 < _list558.size; ++_i560) + org.apache.thrift.protocol.TList _list588 = iprot.readListBegin(); + struct.acl = new ArrayList(_list588.size); + AccessControl _elem589; + for (int _i590 = 0; _i590 < _list588.size; ++_i590) { - _elem559 = new AccessControl(); - _elem559.read(iprot); - struct.acl.add(_elem559); + _elem589 = new AccessControl(); + _elem589.read(iprot); + struct.acl.add(_elem589); } iprot.readListEnd(); } @@ -493,9 +493,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SettableBlobMeta s oprot.writeFieldBegin(ACL_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.acl.size())); - for (AccessControl _iter561 : struct.acl) + for (AccessControl _iter591 : struct.acl) { - _iter561.write(oprot); + _iter591.write(oprot); } oprot.writeListEnd(); } @@ -525,9 +525,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta st TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.acl.size()); - for (AccessControl _iter562 : struct.acl) + for (AccessControl _iter592 : struct.acl) { - _iter562.write(oprot); + _iter592.write(oprot); } } BitSet optionals = new BitSet(); @@ -544,14 +544,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SettableBlobMeta st 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 _list563 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.acl = new ArrayList(_list563.size); - AccessControl _elem564; - for (int _i565 = 0; _i565 < _list563.size; ++_i565) + org.apache.thrift.protocol.TList _list593 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.acl = new ArrayList(_list593.size); + AccessControl _elem594; + for (int _i595 = 0; _i595 < _list593.size; ++_i595) { - _elem564 = new AccessControl(); - _elem564.read(iprot); - struct.acl.add(_elem564); + _elem594 = new AccessControl(); + _elem594.read(iprot); + struct.acl.add(_elem594); } } struct.set_acl_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/StormBase.java b/storm-core/src/jvm/org/apache/storm/generated/StormBase.java index 34b23586c17..d3811937f11 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/StormBase.java +++ b/storm-core/src/jvm/org/apache/storm/generated/StormBase.java @@ -1090,15 +1090,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StormBase struct) t case 4: // COMPONENT_EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map674 = iprot.readMapBegin(); - struct.component_executors = new HashMap(2*_map674.size); - String _key675; - int _val676; - for (int _i677 = 0; _i677 < _map674.size; ++_i677) + org.apache.thrift.protocol.TMap _map704 = iprot.readMapBegin(); + struct.component_executors = new HashMap(2*_map704.size); + String _key705; + int _val706; + for (int _i707 = 0; _i707 < _map704.size; ++_i707) { - _key675 = iprot.readString(); - _val676 = iprot.readI32(); - struct.component_executors.put(_key675, _val676); + _key705 = iprot.readString(); + _val706 = iprot.readI32(); + struct.component_executors.put(_key705, _val706); } iprot.readMapEnd(); } @@ -1143,16 +1143,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StormBase struct) t case 9: // COMPONENT_DEBUG if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map678 = iprot.readMapBegin(); - struct.component_debug = new HashMap(2*_map678.size); - String _key679; - DebugOptions _val680; - for (int _i681 = 0; _i681 < _map678.size; ++_i681) + org.apache.thrift.protocol.TMap _map708 = iprot.readMapBegin(); + struct.component_debug = new HashMap(2*_map708.size); + String _key709; + DebugOptions _val710; + for (int _i711 = 0; _i711 < _map708.size; ++_i711) { - _key679 = iprot.readString(); - _val680 = new DebugOptions(); - _val680.read(iprot); - struct.component_debug.put(_key679, _val680); + _key709 = iprot.readString(); + _val710 = new DebugOptions(); + _val710.read(iprot); + struct.component_debug.put(_key709, _val710); } iprot.readMapEnd(); } @@ -1192,10 +1192,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StormBase struct) 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 _iter682 : struct.component_executors.entrySet()) + for (Map.Entry _iter712 : struct.component_executors.entrySet()) { - oprot.writeString(_iter682.getKey()); - oprot.writeI32(_iter682.getValue()); + oprot.writeString(_iter712.getKey()); + oprot.writeI32(_iter712.getValue()); } oprot.writeMapEnd(); } @@ -1233,10 +1233,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, StormBase struct) 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 _iter683 : struct.component_debug.entrySet()) + for (Map.Entry _iter713 : struct.component_debug.entrySet()) { - oprot.writeString(_iter683.getKey()); - _iter683.getValue().write(oprot); + oprot.writeString(_iter713.getKey()); + _iter713.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1286,10 +1286,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StormBase struct) t if (struct.is_set_component_executors()) { { oprot.writeI32(struct.component_executors.size()); - for (Map.Entry _iter684 : struct.component_executors.entrySet()) + for (Map.Entry _iter714 : struct.component_executors.entrySet()) { - oprot.writeString(_iter684.getKey()); - oprot.writeI32(_iter684.getValue()); + oprot.writeString(_iter714.getKey()); + oprot.writeI32(_iter714.getValue()); } } } @@ -1308,10 +1308,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, StormBase struct) t if (struct.is_set_component_debug()) { { oprot.writeI32(struct.component_debug.size()); - for (Map.Entry _iter685 : struct.component_debug.entrySet()) + for (Map.Entry _iter715 : struct.component_debug.entrySet()) { - oprot.writeString(_iter685.getKey()); - _iter685.getValue().write(oprot); + oprot.writeString(_iter715.getKey()); + _iter715.getValue().write(oprot); } } } @@ -1329,15 +1329,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, StormBase struct) th BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map686 = 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(2*_map686.size); - String _key687; - int _val688; - for (int _i689 = 0; _i689 < _map686.size; ++_i689) + org.apache.thrift.protocol.TMap _map716 = 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(2*_map716.size); + String _key717; + int _val718; + for (int _i719 = 0; _i719 < _map716.size; ++_i719) { - _key687 = iprot.readString(); - _val688 = iprot.readI32(); - struct.component_executors.put(_key687, _val688); + _key717 = iprot.readString(); + _val718 = iprot.readI32(); + struct.component_executors.put(_key717, _val718); } } struct.set_component_executors_isSet(true); @@ -1361,16 +1361,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, StormBase struct) th } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map690 = 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(2*_map690.size); - String _key691; - DebugOptions _val692; - for (int _i693 = 0; _i693 < _map690.size; ++_i693) + org.apache.thrift.protocol.TMap _map720 = 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(2*_map720.size); + String _key721; + DebugOptions _val722; + for (int _i723 = 0; _i723 < _map720.size; ++_i723) { - _key691 = iprot.readString(); - _val692 = new DebugOptions(); - _val692.read(iprot); - struct.component_debug.put(_key691, _val692); + _key721 = iprot.readString(); + _val722 = new DebugOptions(); + _val722.read(iprot); + struct.component_debug.put(_key721, _val722); } } struct.set_component_debug_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java index 44003c23f1b..65fa68eda69 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/SupervisorInfo.java @@ -1085,13 +1085,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 4: // USED_PORTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list574 = iprot.readListBegin(); - struct.used_ports = new ArrayList(_list574.size); - long _elem575; - for (int _i576 = 0; _i576 < _list574.size; ++_i576) + org.apache.thrift.protocol.TList _list604 = iprot.readListBegin(); + struct.used_ports = new ArrayList(_list604.size); + long _elem605; + for (int _i606 = 0; _i606 < _list604.size; ++_i606) { - _elem575 = iprot.readI64(); - struct.used_ports.add(_elem575); + _elem605 = iprot.readI64(); + struct.used_ports.add(_elem605); } iprot.readListEnd(); } @@ -1103,13 +1103,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 5: // META if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list577 = iprot.readListBegin(); - struct.meta = new ArrayList(_list577.size); - long _elem578; - for (int _i579 = 0; _i579 < _list577.size; ++_i579) + org.apache.thrift.protocol.TList _list607 = iprot.readListBegin(); + struct.meta = new ArrayList(_list607.size); + long _elem608; + for (int _i609 = 0; _i609 < _list607.size; ++_i609) { - _elem578 = iprot.readI64(); - struct.meta.add(_elem578); + _elem608 = iprot.readI64(); + struct.meta.add(_elem608); } iprot.readListEnd(); } @@ -1121,15 +1121,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 6: // SCHEDULER_META if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map580 = iprot.readMapBegin(); - struct.scheduler_meta = new HashMap(2*_map580.size); - String _key581; - String _val582; - for (int _i583 = 0; _i583 < _map580.size; ++_i583) + org.apache.thrift.protocol.TMap _map610 = iprot.readMapBegin(); + struct.scheduler_meta = new HashMap(2*_map610.size); + String _key611; + String _val612; + for (int _i613 = 0; _i613 < _map610.size; ++_i613) { - _key581 = iprot.readString(); - _val582 = iprot.readString(); - struct.scheduler_meta.put(_key581, _val582); + _key611 = iprot.readString(); + _val612 = iprot.readString(); + struct.scheduler_meta.put(_key611, _val612); } iprot.readMapEnd(); } @@ -1157,15 +1157,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorInfo stru case 9: // RESOURCES_MAP if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map584 = iprot.readMapBegin(); - struct.resources_map = new HashMap(2*_map584.size); - String _key585; - double _val586; - for (int _i587 = 0; _i587 < _map584.size; ++_i587) + org.apache.thrift.protocol.TMap _map614 = iprot.readMapBegin(); + struct.resources_map = new HashMap(2*_map614.size); + String _key615; + double _val616; + for (int _i617 = 0; _i617 < _map614.size; ++_i617) { - _key585 = iprot.readString(); - _val586 = iprot.readDouble(); - struct.resources_map.put(_key585, _val586); + _key615 = iprot.readString(); + _val616 = iprot.readDouble(); + struct.resources_map.put(_key615, _val616); } iprot.readMapEnd(); } @@ -1207,9 +1207,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str 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 _iter588 : struct.used_ports) + for (long _iter618 : struct.used_ports) { - oprot.writeI64(_iter588); + oprot.writeI64(_iter618); } oprot.writeListEnd(); } @@ -1221,9 +1221,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str oprot.writeFieldBegin(META_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.meta.size())); - for (long _iter589 : struct.meta) + for (long _iter619 : struct.meta) { - oprot.writeI64(_iter589); + oprot.writeI64(_iter619); } oprot.writeListEnd(); } @@ -1235,10 +1235,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str 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 _iter590 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter620 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter590.getKey()); - oprot.writeString(_iter590.getValue()); + oprot.writeString(_iter620.getKey()); + oprot.writeString(_iter620.getValue()); } oprot.writeMapEnd(); } @@ -1262,10 +1262,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorInfo str 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 _iter591 : struct.resources_map.entrySet()) + for (Map.Entry _iter621 : struct.resources_map.entrySet()) { - oprot.writeString(_iter591.getKey()); - oprot.writeDouble(_iter591.getValue()); + oprot.writeString(_iter621.getKey()); + oprot.writeDouble(_iter621.getValue()); } oprot.writeMapEnd(); } @@ -1320,28 +1320,28 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo stru if (struct.is_set_used_ports()) { { oprot.writeI32(struct.used_ports.size()); - for (long _iter592 : struct.used_ports) + for (long _iter622 : struct.used_ports) { - oprot.writeI64(_iter592); + oprot.writeI64(_iter622); } } } if (struct.is_set_meta()) { { oprot.writeI32(struct.meta.size()); - for (long _iter593 : struct.meta) + for (long _iter623 : struct.meta) { - oprot.writeI64(_iter593); + oprot.writeI64(_iter623); } } } if (struct.is_set_scheduler_meta()) { { oprot.writeI32(struct.scheduler_meta.size()); - for (Map.Entry _iter594 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter624 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter594.getKey()); - oprot.writeString(_iter594.getValue()); + oprot.writeString(_iter624.getKey()); + oprot.writeString(_iter624.getValue()); } } } @@ -1354,10 +1354,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo stru if (struct.is_set_resources_map()) { { oprot.writeI32(struct.resources_map.size()); - for (Map.Entry _iter595 : struct.resources_map.entrySet()) + for (Map.Entry _iter625 : struct.resources_map.entrySet()) { - oprot.writeString(_iter595.getKey()); - oprot.writeDouble(_iter595.getValue()); + oprot.writeString(_iter625.getKey()); + oprot.writeDouble(_iter625.getValue()); } } } @@ -1377,41 +1377,41 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo struc } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list596 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.used_ports = new ArrayList(_list596.size); - long _elem597; - for (int _i598 = 0; _i598 < _list596.size; ++_i598) + org.apache.thrift.protocol.TList _list626 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.used_ports = new ArrayList(_list626.size); + long _elem627; + for (int _i628 = 0; _i628 < _list626.size; ++_i628) { - _elem597 = iprot.readI64(); - struct.used_ports.add(_elem597); + _elem627 = iprot.readI64(); + struct.used_ports.add(_elem627); } } struct.set_used_ports_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list599 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.meta = new ArrayList(_list599.size); - long _elem600; - for (int _i601 = 0; _i601 < _list599.size; ++_i601) + org.apache.thrift.protocol.TList _list629 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.meta = new ArrayList(_list629.size); + long _elem630; + for (int _i631 = 0; _i631 < _list629.size; ++_i631) { - _elem600 = iprot.readI64(); - struct.meta.add(_elem600); + _elem630 = iprot.readI64(); + struct.meta.add(_elem630); } } struct.set_meta_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map602 = 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(2*_map602.size); - String _key603; - String _val604; - for (int _i605 = 0; _i605 < _map602.size; ++_i605) + org.apache.thrift.protocol.TMap _map632 = 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(2*_map632.size); + String _key633; + String _val634; + for (int _i635 = 0; _i635 < _map632.size; ++_i635) { - _key603 = iprot.readString(); - _val604 = iprot.readString(); - struct.scheduler_meta.put(_key603, _val604); + _key633 = iprot.readString(); + _val634 = iprot.readString(); + struct.scheduler_meta.put(_key633, _val634); } } struct.set_scheduler_meta_isSet(true); @@ -1426,15 +1426,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorInfo struc } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map606 = 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(2*_map606.size); - String _key607; - double _val608; - for (int _i609 = 0; _i609 < _map606.size; ++_i609) + org.apache.thrift.protocol.TMap _map636 = 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(2*_map636.size); + String _key637; + double _val638; + for (int _i639 = 0; _i639 < _map636.size; ++_i639) { - _key607 = iprot.readString(); - _val608 = iprot.readDouble(); - struct.resources_map.put(_key607, _val608); + _key637 = iprot.readString(); + _val638 = iprot.readDouble(); + struct.resources_map.put(_key637, _val638); } } struct.set_resources_map_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java b/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java index c6bafd97b2d..aff56058138 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/SupervisorPageInfo.java @@ -464,14 +464,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorPageInfo case 1: // SUPERVISOR_SUMMARIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list438 = iprot.readListBegin(); - struct.supervisor_summaries = new ArrayList(_list438.size); - SupervisorSummary _elem439; - for (int _i440 = 0; _i440 < _list438.size; ++_i440) + org.apache.thrift.protocol.TList _list468 = iprot.readListBegin(); + struct.supervisor_summaries = new ArrayList(_list468.size); + SupervisorSummary _elem469; + for (int _i470 = 0; _i470 < _list468.size; ++_i470) { - _elem439 = new SupervisorSummary(); - _elem439.read(iprot); - struct.supervisor_summaries.add(_elem439); + _elem469 = new SupervisorSummary(); + _elem469.read(iprot); + struct.supervisor_summaries.add(_elem469); } iprot.readListEnd(); } @@ -483,14 +483,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorPageInfo case 2: // WORKER_SUMMARIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list441 = iprot.readListBegin(); - struct.worker_summaries = new ArrayList(_list441.size); - WorkerSummary _elem442; - for (int _i443 = 0; _i443 < _list441.size; ++_i443) + org.apache.thrift.protocol.TList _list471 = iprot.readListBegin(); + struct.worker_summaries = new ArrayList(_list471.size); + WorkerSummary _elem472; + for (int _i473 = 0; _i473 < _list471.size; ++_i473) { - _elem442 = new WorkerSummary(); - _elem442.read(iprot); - struct.worker_summaries.add(_elem442); + _elem472 = new WorkerSummary(); + _elem472.read(iprot); + struct.worker_summaries.add(_elem472); } iprot.readListEnd(); } @@ -517,9 +517,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorPageInfo oprot.writeFieldBegin(SUPERVISOR_SUMMARIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisor_summaries.size())); - for (SupervisorSummary _iter444 : struct.supervisor_summaries) + for (SupervisorSummary _iter474 : struct.supervisor_summaries) { - _iter444.write(oprot); + _iter474.write(oprot); } oprot.writeListEnd(); } @@ -531,9 +531,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, SupervisorPageInfo oprot.writeFieldBegin(WORKER_SUMMARIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.worker_summaries.size())); - for (WorkerSummary _iter445 : struct.worker_summaries) + for (WorkerSummary _iter475 : struct.worker_summaries) { - _iter445.write(oprot); + _iter475.write(oprot); } oprot.writeListEnd(); } @@ -568,18 +568,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo if (struct.is_set_supervisor_summaries()) { { oprot.writeI32(struct.supervisor_summaries.size()); - for (SupervisorSummary _iter446 : struct.supervisor_summaries) + for (SupervisorSummary _iter476 : struct.supervisor_summaries) { - _iter446.write(oprot); + _iter476.write(oprot); } } } if (struct.is_set_worker_summaries()) { { oprot.writeI32(struct.worker_summaries.size()); - for (WorkerSummary _iter447 : struct.worker_summaries) + for (WorkerSummary _iter477 : struct.worker_summaries) { - _iter447.write(oprot); + _iter477.write(oprot); } } } @@ -591,28 +591,28 @@ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorPageInfo s BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list448 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.supervisor_summaries = new ArrayList(_list448.size); - SupervisorSummary _elem449; - for (int _i450 = 0; _i450 < _list448.size; ++_i450) + org.apache.thrift.protocol.TList _list478 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.supervisor_summaries = new ArrayList(_list478.size); + SupervisorSummary _elem479; + for (int _i480 = 0; _i480 < _list478.size; ++_i480) { - _elem449 = new SupervisorSummary(); - _elem449.read(iprot); - struct.supervisor_summaries.add(_elem449); + _elem479 = new SupervisorSummary(); + _elem479.read(iprot); + struct.supervisor_summaries.add(_elem479); } } struct.set_supervisor_summaries_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list451 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.worker_summaries = new ArrayList(_list451.size); - WorkerSummary _elem452; - for (int _i453 = 0; _i453 < _list451.size; ++_i453) + org.apache.thrift.protocol.TList _list481 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.worker_summaries = new ArrayList(_list481.size); + WorkerSummary _elem482; + for (int _i483 = 0; _i483 < _list481.size; ++_i483) { - _elem452 = new WorkerSummary(); - _elem452.read(iprot); - struct.worker_summaries.add(_elem452); + _elem482 = new WorkerSummary(); + _elem482.read(iprot); + struct.worker_summaries.add(_elem482); } } struct.set_worker_summaries_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java b/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java index 5e774e22108..3a50e341036 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/TopologyHistoryInfo.java @@ -364,13 +364,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyHistoryInfo case 1: // TOPO_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list784 = iprot.readListBegin(); - struct.topo_ids = new ArrayList(_list784.size); - String _elem785; - for (int _i786 = 0; _i786 < _list784.size; ++_i786) + org.apache.thrift.protocol.TList _list814 = iprot.readListBegin(); + struct.topo_ids = new ArrayList(_list814.size); + String _elem815; + for (int _i816 = 0; _i816 < _list814.size; ++_i816) { - _elem785 = iprot.readString(); - struct.topo_ids.add(_elem785); + _elem815 = iprot.readString(); + struct.topo_ids.add(_elem815); } iprot.readListEnd(); } @@ -396,9 +396,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyHistoryInf 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 _iter787 : struct.topo_ids) + for (String _iter817 : struct.topo_ids) { - oprot.writeString(_iter787); + oprot.writeString(_iter817); } oprot.writeListEnd(); } @@ -429,9 +429,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyHistoryInfo if (struct.is_set_topo_ids()) { { oprot.writeI32(struct.topo_ids.size()); - for (String _iter788 : struct.topo_ids) + for (String _iter818 : struct.topo_ids) { - oprot.writeString(_iter788); + oprot.writeString(_iter818); } } } @@ -443,13 +443,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyHistoryInfo BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list789 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.topo_ids = new ArrayList(_list789.size); - String _elem790; - for (int _i791 = 0; _i791 < _list789.size; ++_i791) + org.apache.thrift.protocol.TList _list819 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.topo_ids = new ArrayList(_list819.size); + String _elem820; + for (int _i821 = 0; _i821 < _list819.size; ++_i821) { - _elem790 = iprot.readString(); - struct.topo_ids.add(_elem790); + _elem820 = iprot.readString(); + struct.topo_ids.add(_elem820); } } struct.set_topo_ids_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/TopologyInfo.java b/storm-core/src/jvm/org/apache/storm/generated/TopologyInfo.java index fa95be7749b..7a4e2ad9431 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/TopologyInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/TopologyInfo.java @@ -1650,14 +1650,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct case 4: // EXECUTORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list332 = iprot.readListBegin(); - struct.executors = new ArrayList(_list332.size); - ExecutorSummary _elem333; - for (int _i334 = 0; _i334 < _list332.size; ++_i334) + org.apache.thrift.protocol.TList _list352 = iprot.readListBegin(); + struct.executors = new ArrayList(_list352.size); + ExecutorSummary _elem353; + for (int _i354 = 0; _i354 < _list352.size; ++_i354) { - _elem333 = new ExecutorSummary(); - _elem333.read(iprot); - struct.executors.add(_elem333); + _elem353 = new ExecutorSummary(); + _elem353.read(iprot); + struct.executors.add(_elem353); } iprot.readListEnd(); } @@ -1677,26 +1677,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct case 6: // ERRORS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map335 = iprot.readMapBegin(); - struct.errors = new HashMap>(2*_map335.size); - String _key336; - List _val337; - for (int _i338 = 0; _i338 < _map335.size; ++_i338) + org.apache.thrift.protocol.TMap _map355 = iprot.readMapBegin(); + struct.errors = new HashMap>(2*_map355.size); + String _key356; + List _val357; + for (int _i358 = 0; _i358 < _map355.size; ++_i358) { - _key336 = iprot.readString(); + _key356 = iprot.readString(); { - org.apache.thrift.protocol.TList _list339 = iprot.readListBegin(); - _val337 = new ArrayList(_list339.size); - ErrorInfo _elem340; - for (int _i341 = 0; _i341 < _list339.size; ++_i341) + org.apache.thrift.protocol.TList _list359 = iprot.readListBegin(); + _val357 = new ArrayList(_list359.size); + ErrorInfo _elem360; + for (int _i361 = 0; _i361 < _list359.size; ++_i361) { - _elem340 = new ErrorInfo(); - _elem340.read(iprot); - _val337.add(_elem340); + _elem360 = new ErrorInfo(); + _elem360.read(iprot); + _val357.add(_elem360); } iprot.readListEnd(); } - struct.errors.put(_key336, _val337); + struct.errors.put(_key356, _val357); } iprot.readMapEnd(); } @@ -1708,16 +1708,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo struct case 7: // COMPONENT_DEBUG if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map342 = iprot.readMapBegin(); - struct.component_debug = new HashMap(2*_map342.size); - String _key343; - DebugOptions _val344; - for (int _i345 = 0; _i345 < _map342.size; ++_i345) + org.apache.thrift.protocol.TMap _map362 = iprot.readMapBegin(); + struct.component_debug = new HashMap(2*_map362.size); + String _key363; + DebugOptions _val364; + for (int _i365 = 0; _i365 < _map362.size; ++_i365) { - _key343 = iprot.readString(); - _val344 = new DebugOptions(); - _val344.read(iprot); - struct.component_debug.put(_key343, _val344); + _key363 = iprot.readString(); + _val364 = new DebugOptions(); + _val364.read(iprot); + struct.component_debug.put(_key363, _val364); } iprot.readMapEnd(); } @@ -1828,9 +1828,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struc oprot.writeFieldBegin(EXECUTORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size())); - for (ExecutorSummary _iter346 : struct.executors) + for (ExecutorSummary _iter366 : struct.executors) { - _iter346.write(oprot); + _iter366.write(oprot); } oprot.writeListEnd(); } @@ -1845,14 +1845,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struc oprot.writeFieldBegin(ERRORS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.errors.size())); - for (Map.Entry> _iter347 : struct.errors.entrySet()) + for (Map.Entry> _iter367 : struct.errors.entrySet()) { - oprot.writeString(_iter347.getKey()); + oprot.writeString(_iter367.getKey()); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter347.getValue().size())); - for (ErrorInfo _iter348 : _iter347.getValue()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter367.getValue().size())); + for (ErrorInfo _iter368 : _iter367.getValue()) { - _iter348.write(oprot); + _iter368.write(oprot); } oprot.writeListEnd(); } @@ -1866,10 +1866,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyInfo struc 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 _iter349 : struct.component_debug.entrySet()) + for (Map.Entry _iter369 : struct.component_debug.entrySet()) { - oprot.writeString(_iter349.getKey()); - _iter349.getValue().write(oprot); + oprot.writeString(_iter369.getKey()); + _iter369.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1947,22 +1947,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct oprot.writeI32(struct.uptime_secs); { oprot.writeI32(struct.executors.size()); - for (ExecutorSummary _iter350 : struct.executors) + for (ExecutorSummary _iter370 : struct.executors) { - _iter350.write(oprot); + _iter370.write(oprot); } } oprot.writeString(struct.status); { oprot.writeI32(struct.errors.size()); - for (Map.Entry> _iter351 : struct.errors.entrySet()) + for (Map.Entry> _iter371 : struct.errors.entrySet()) { - oprot.writeString(_iter351.getKey()); + oprot.writeString(_iter371.getKey()); { - oprot.writeI32(_iter351.getValue().size()); - for (ErrorInfo _iter352 : _iter351.getValue()) + oprot.writeI32(_iter371.getValue().size()); + for (ErrorInfo _iter372 : _iter371.getValue()) { - _iter352.write(oprot); + _iter372.write(oprot); } } } @@ -2002,10 +2002,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct if (struct.is_set_component_debug()) { { oprot.writeI32(struct.component_debug.size()); - for (Map.Entry _iter353 : struct.component_debug.entrySet()) + for (Map.Entry _iter373 : struct.component_debug.entrySet()) { - oprot.writeString(_iter353.getKey()); - _iter353.getValue().write(oprot); + oprot.writeString(_iter373.getKey()); + _iter373.getValue().write(oprot); } } } @@ -2048,55 +2048,55 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct) struct.uptime_secs = iprot.readI32(); struct.set_uptime_secs_isSet(true); { - org.apache.thrift.protocol.TList _list354 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list354.size); - ExecutorSummary _elem355; - for (int _i356 = 0; _i356 < _list354.size; ++_i356) + org.apache.thrift.protocol.TList _list374 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list374.size); + ExecutorSummary _elem375; + for (int _i376 = 0; _i376 < _list374.size; ++_i376) { - _elem355 = new ExecutorSummary(); - _elem355.read(iprot); - struct.executors.add(_elem355); + _elem375 = new ExecutorSummary(); + _elem375.read(iprot); + struct.executors.add(_elem375); } } struct.set_executors_isSet(true); struct.status = iprot.readString(); struct.set_status_isSet(true); { - org.apache.thrift.protocol.TMap _map357 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); - struct.errors = new HashMap>(2*_map357.size); - String _key358; - List _val359; - for (int _i360 = 0; _i360 < _map357.size; ++_i360) + org.apache.thrift.protocol.TMap _map377 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.errors = new HashMap>(2*_map377.size); + String _key378; + List _val379; + for (int _i380 = 0; _i380 < _map377.size; ++_i380) { - _key358 = iprot.readString(); + _key378 = iprot.readString(); { - org.apache.thrift.protocol.TList _list361 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - _val359 = new ArrayList(_list361.size); - ErrorInfo _elem362; - for (int _i363 = 0; _i363 < _list361.size; ++_i363) + org.apache.thrift.protocol.TList _list381 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + _val379 = new ArrayList(_list381.size); + ErrorInfo _elem382; + for (int _i383 = 0; _i383 < _list381.size; ++_i383) { - _elem362 = new ErrorInfo(); - _elem362.read(iprot); - _val359.add(_elem362); + _elem382 = new ErrorInfo(); + _elem382.read(iprot); + _val379.add(_elem382); } } - struct.errors.put(_key358, _val359); + struct.errors.put(_key378, _val379); } } struct.set_errors_isSet(true); BitSet incoming = iprot.readBitSet(10); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map364 = 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(2*_map364.size); - String _key365; - DebugOptions _val366; - for (int _i367 = 0; _i367 < _map364.size; ++_i367) + org.apache.thrift.protocol.TMap _map384 = 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(2*_map384.size); + String _key385; + DebugOptions _val386; + for (int _i387 = 0; _i387 < _map384.size; ++_i387) { - _key365 = iprot.readString(); - _val366 = new DebugOptions(); - _val366.read(iprot); - struct.component_debug.put(_key365, _val366); + _key385 = iprot.readString(); + _val386 = new DebugOptions(); + _val386.read(iprot); + struct.component_debug.put(_key385, _val386); } } struct.set_component_debug_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/TopologyPageInfo.java b/storm-core/src/jvm/org/apache/storm/generated/TopologyPageInfo.java index a0e25cedb89..9326e1ef615 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/TopologyPageInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/TopologyPageInfo.java @@ -2142,16 +2142,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyPageInfo st case 9: // ID_TO_SPOUT_AGG_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map454 = iprot.readMapBegin(); - struct.id_to_spout_agg_stats = new HashMap(2*_map454.size); - String _key455; - ComponentAggregateStats _val456; - for (int _i457 = 0; _i457 < _map454.size; ++_i457) + org.apache.thrift.protocol.TMap _map484 = iprot.readMapBegin(); + struct.id_to_spout_agg_stats = new HashMap(2*_map484.size); + String _key485; + ComponentAggregateStats _val486; + for (int _i487 = 0; _i487 < _map484.size; ++_i487) { - _key455 = iprot.readString(); - _val456 = new ComponentAggregateStats(); - _val456.read(iprot); - struct.id_to_spout_agg_stats.put(_key455, _val456); + _key485 = iprot.readString(); + _val486 = new ComponentAggregateStats(); + _val486.read(iprot); + struct.id_to_spout_agg_stats.put(_key485, _val486); } iprot.readMapEnd(); } @@ -2163,16 +2163,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyPageInfo st case 10: // ID_TO_BOLT_AGG_STATS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map458 = iprot.readMapBegin(); - struct.id_to_bolt_agg_stats = new HashMap(2*_map458.size); - String _key459; - ComponentAggregateStats _val460; - for (int _i461 = 0; _i461 < _map458.size; ++_i461) + org.apache.thrift.protocol.TMap _map488 = iprot.readMapBegin(); + struct.id_to_bolt_agg_stats = new HashMap(2*_map488.size); + String _key489; + ComponentAggregateStats _val490; + for (int _i491 = 0; _i491 < _map488.size; ++_i491) { - _key459 = iprot.readString(); - _val460 = new ComponentAggregateStats(); - _val460.read(iprot); - struct.id_to_bolt_agg_stats.put(_key459, _val460); + _key489 = iprot.readString(); + _val490 = new ComponentAggregateStats(); + _val490.read(iprot); + struct.id_to_bolt_agg_stats.put(_key489, _val490); } iprot.readMapEnd(); } @@ -2226,14 +2226,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyPageInfo st case 16: // WORKERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list462 = iprot.readListBegin(); - struct.workers = new ArrayList(_list462.size); - WorkerSummary _elem463; - for (int _i464 = 0; _i464 < _list462.size; ++_i464) + org.apache.thrift.protocol.TList _list492 = iprot.readListBegin(); + struct.workers = new ArrayList(_list492.size); + WorkerSummary _elem493; + for (int _i494 = 0; _i494 < _list492.size; ++_i494) { - _elem463 = new WorkerSummary(); - _elem463.read(iprot); - struct.workers.add(_elem463); + _elem493 = new WorkerSummary(); + _elem493.read(iprot); + struct.workers.add(_elem493); } iprot.readListEnd(); } @@ -2354,10 +2354,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyPageInfo s oprot.writeFieldBegin(ID_TO_SPOUT_AGG_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.id_to_spout_agg_stats.size())); - for (Map.Entry _iter465 : struct.id_to_spout_agg_stats.entrySet()) + for (Map.Entry _iter495 : struct.id_to_spout_agg_stats.entrySet()) { - oprot.writeString(_iter465.getKey()); - _iter465.getValue().write(oprot); + oprot.writeString(_iter495.getKey()); + _iter495.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2369,10 +2369,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyPageInfo s oprot.writeFieldBegin(ID_TO_BOLT_AGG_STATS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.id_to_bolt_agg_stats.size())); - for (Map.Entry _iter466 : struct.id_to_bolt_agg_stats.entrySet()) + for (Map.Entry _iter496 : struct.id_to_bolt_agg_stats.entrySet()) { - oprot.writeString(_iter466.getKey()); - _iter466.getValue().write(oprot); + oprot.writeString(_iter496.getKey()); + _iter496.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -2417,9 +2417,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyPageInfo s oprot.writeFieldBegin(WORKERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.workers.size())); - for (WorkerSummary _iter467 : struct.workers) + for (WorkerSummary _iter497 : struct.workers) { - _iter467.write(oprot); + _iter497.write(oprot); } oprot.writeListEnd(); } @@ -2563,20 +2563,20 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyPageInfo st if (struct.is_set_id_to_spout_agg_stats()) { { oprot.writeI32(struct.id_to_spout_agg_stats.size()); - for (Map.Entry _iter468 : struct.id_to_spout_agg_stats.entrySet()) + for (Map.Entry _iter498 : struct.id_to_spout_agg_stats.entrySet()) { - oprot.writeString(_iter468.getKey()); - _iter468.getValue().write(oprot); + oprot.writeString(_iter498.getKey()); + _iter498.getValue().write(oprot); } } } if (struct.is_set_id_to_bolt_agg_stats()) { { oprot.writeI32(struct.id_to_bolt_agg_stats.size()); - for (Map.Entry _iter469 : struct.id_to_bolt_agg_stats.entrySet()) + for (Map.Entry _iter499 : struct.id_to_bolt_agg_stats.entrySet()) { - oprot.writeString(_iter469.getKey()); - _iter469.getValue().write(oprot); + oprot.writeString(_iter499.getKey()); + _iter499.getValue().write(oprot); } } } @@ -2598,9 +2598,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyPageInfo st if (struct.is_set_workers()) { { oprot.writeI32(struct.workers.size()); - for (WorkerSummary _iter470 : struct.workers) + for (WorkerSummary _iter500 : struct.workers) { - _iter470.write(oprot); + _iter500.write(oprot); } } } @@ -2660,32 +2660,32 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyPageInfo str } if (incoming.get(7)) { { - org.apache.thrift.protocol.TMap _map471 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.id_to_spout_agg_stats = new HashMap(2*_map471.size); - String _key472; - ComponentAggregateStats _val473; - for (int _i474 = 0; _i474 < _map471.size; ++_i474) + org.apache.thrift.protocol.TMap _map501 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.id_to_spout_agg_stats = new HashMap(2*_map501.size); + String _key502; + ComponentAggregateStats _val503; + for (int _i504 = 0; _i504 < _map501.size; ++_i504) { - _key472 = iprot.readString(); - _val473 = new ComponentAggregateStats(); - _val473.read(iprot); - struct.id_to_spout_agg_stats.put(_key472, _val473); + _key502 = iprot.readString(); + _val503 = new ComponentAggregateStats(); + _val503.read(iprot); + struct.id_to_spout_agg_stats.put(_key502, _val503); } } struct.set_id_to_spout_agg_stats_isSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map475 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.id_to_bolt_agg_stats = new HashMap(2*_map475.size); - String _key476; - ComponentAggregateStats _val477; - for (int _i478 = 0; _i478 < _map475.size; ++_i478) + org.apache.thrift.protocol.TMap _map505 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.id_to_bolt_agg_stats = new HashMap(2*_map505.size); + String _key506; + ComponentAggregateStats _val507; + for (int _i508 = 0; _i508 < _map505.size; ++_i508) { - _key476 = iprot.readString(); - _val477 = new ComponentAggregateStats(); - _val477.read(iprot); - struct.id_to_bolt_agg_stats.put(_key476, _val477); + _key506 = iprot.readString(); + _val507 = new ComponentAggregateStats(); + _val507.read(iprot); + struct.id_to_bolt_agg_stats.put(_key506, _val507); } } struct.set_id_to_bolt_agg_stats_isSet(true); @@ -2714,14 +2714,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyPageInfo str } if (incoming.get(14)) { { - org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.workers = new ArrayList(_list479.size); - WorkerSummary _elem480; - for (int _i481 = 0; _i481 < _list479.size; ++_i481) + org.apache.thrift.protocol.TList _list509 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.workers = new ArrayList(_list509.size); + WorkerSummary _elem510; + for (int _i511 = 0; _i511 < _list509.size; ++_i511) { - _elem480 = new WorkerSummary(); - _elem480.read(iprot); - struct.workers.add(_elem480); + _elem510 = new WorkerSummary(); + _elem510.read(iprot); + struct.workers.add(_elem510); } } struct.set_workers_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/generated/TopologyStats.java b/storm-core/src/jvm/org/apache/storm/generated/TopologyStats.java index e63c4867986..b8a1b34bf45 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/TopologyStats.java +++ b/storm-core/src/jvm/org/apache/storm/generated/TopologyStats.java @@ -60,6 +60,7 @@ public class TopologyStats implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -72,6 +73,7 @@ public class TopologyStats implements org.apache.thrift.TBase window_to_complete_latencies_ms; // optional private Map window_to_acked; // optional private Map window_to_failed; // optional + private Map window_to_throughput; // 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 { @@ -79,7 +81,8 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { WINDOW_TO_TRANSFERRED((short)2, "window_to_transferred"), WINDOW_TO_COMPLETE_LATENCIES_MS((short)3, "window_to_complete_latencies_ms"), WINDOW_TO_ACKED((short)4, "window_to_acked"), - WINDOW_TO_FAILED((short)5, "window_to_failed"); + WINDOW_TO_FAILED((short)5, "window_to_failed"), + WINDOW_TO_THROUGHPUT((short)6, "window_to_throughput"); private static final Map byName = new HashMap(); @@ -104,6 +107,8 @@ public static _Fields findByThriftId(int fieldId) { return WINDOW_TO_ACKED; case 5: // WINDOW_TO_FAILED return WINDOW_TO_FAILED; + case 6: // WINDOW_TO_THROUGHPUT + return WINDOW_TO_THROUGHPUT; default: return null; } @@ -144,7 +149,7 @@ public String getFieldName() { } // isset id assignments - private static final _Fields optionals[] = {_Fields.WINDOW_TO_EMITTED,_Fields.WINDOW_TO_TRANSFERRED,_Fields.WINDOW_TO_COMPLETE_LATENCIES_MS,_Fields.WINDOW_TO_ACKED,_Fields.WINDOW_TO_FAILED}; + private static final _Fields optionals[] = {_Fields.WINDOW_TO_EMITTED,_Fields.WINDOW_TO_TRANSFERRED,_Fields.WINDOW_TO_COMPLETE_LATENCIES_MS,_Fields.WINDOW_TO_ACKED,_Fields.WINDOW_TO_FAILED,_Fields.WINDOW_TO_THROUGHPUT}; 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); @@ -168,6 +173,10 @@ public String getFieldName() { 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.I64)))); + tmpMap.put(_Fields.WINDOW_TO_THROUGHPUT, new org.apache.thrift.meta_data.FieldMetaData("window_to_throughput", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TopologyStats.class, metaDataMap); } @@ -199,6 +208,10 @@ public TopologyStats(TopologyStats other) { Map __this__window_to_failed = new HashMap(other.window_to_failed); this.window_to_failed = __this__window_to_failed; } + if (other.is_set_window_to_throughput()) { + Map __this__window_to_throughput = new HashMap(other.window_to_throughput); + this.window_to_throughput = __this__window_to_throughput; + } } public TopologyStats deepCopy() { @@ -212,6 +225,7 @@ public void clear() { this.window_to_complete_latencies_ms = null; this.window_to_acked = null; this.window_to_failed = null; + this.window_to_throughput = null; } public int get_window_to_emitted_size() { @@ -384,6 +398,40 @@ public void set_window_to_failed_isSet(boolean value) { } } + public int get_window_to_throughput_size() { + return (this.window_to_throughput == null) ? 0 : this.window_to_throughput.size(); + } + + public void put_to_window_to_throughput(String key, double val) { + if (this.window_to_throughput == null) { + this.window_to_throughput = new HashMap(); + } + this.window_to_throughput.put(key, val); + } + + public Map get_window_to_throughput() { + return this.window_to_throughput; + } + + public void set_window_to_throughput(Map window_to_throughput) { + this.window_to_throughput = window_to_throughput; + } + + public void unset_window_to_throughput() { + this.window_to_throughput = null; + } + + /** Returns true if field window_to_throughput is set (has been assigned a value) and false otherwise */ + public boolean is_set_window_to_throughput() { + return this.window_to_throughput != null; + } + + public void set_window_to_throughput_isSet(boolean value) { + if (!value) { + this.window_to_throughput = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case WINDOW_TO_EMITTED: @@ -426,6 +474,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case WINDOW_TO_THROUGHPUT: + if (value == null) { + unset_window_to_throughput(); + } else { + set_window_to_throughput((Map)value); + } + break; + } } @@ -446,6 +502,9 @@ public Object getFieldValue(_Fields field) { case WINDOW_TO_FAILED: return get_window_to_failed(); + case WINDOW_TO_THROUGHPUT: + return get_window_to_throughput(); + } throw new IllegalStateException(); } @@ -467,6 +526,8 @@ public boolean isSet(_Fields field) { return is_set_window_to_acked(); case WINDOW_TO_FAILED: return is_set_window_to_failed(); + case WINDOW_TO_THROUGHPUT: + return is_set_window_to_throughput(); } throw new IllegalStateException(); } @@ -529,6 +590,15 @@ public boolean equals(TopologyStats that) { return false; } + boolean this_present_window_to_throughput = true && this.is_set_window_to_throughput(); + boolean that_present_window_to_throughput = true && that.is_set_window_to_throughput(); + if (this_present_window_to_throughput || that_present_window_to_throughput) { + if (!(this_present_window_to_throughput && that_present_window_to_throughput)) + return false; + if (!this.window_to_throughput.equals(that.window_to_throughput)) + return false; + } + return true; } @@ -561,6 +631,11 @@ public int hashCode() { if (present_window_to_failed) list.add(window_to_failed); + boolean present_window_to_throughput = true && (is_set_window_to_throughput()); + list.add(present_window_to_throughput); + if (present_window_to_throughput) + list.add(window_to_throughput); + return list.hashCode(); } @@ -622,6 +697,16 @@ public int compareTo(TopologyStats other) { return lastComparison; } } + lastComparison = Boolean.valueOf(is_set_window_to_throughput()).compareTo(other.is_set_window_to_throughput()); + if (lastComparison != 0) { + return lastComparison; + } + if (is_set_window_to_throughput()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.window_to_throughput, other.window_to_throughput); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -691,6 +776,16 @@ public String toString() { } first = false; } + if (is_set_window_to_throughput()) { + if (!first) sb.append(", "); + sb.append("window_to_throughput:"); + if (this.window_to_throughput == null) { + sb.append("null"); + } else { + sb.append(this.window_to_throughput); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -737,15 +832,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc case 1: // WINDOW_TO_EMITTED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map378 = iprot.readMapBegin(); - struct.window_to_emitted = new HashMap(2*_map378.size); - String _key379; - long _val380; - for (int _i381 = 0; _i381 < _map378.size; ++_i381) + org.apache.thrift.protocol.TMap _map398 = iprot.readMapBegin(); + struct.window_to_emitted = new HashMap(2*_map398.size); + String _key399; + long _val400; + for (int _i401 = 0; _i401 < _map398.size; ++_i401) { - _key379 = iprot.readString(); - _val380 = iprot.readI64(); - struct.window_to_emitted.put(_key379, _val380); + _key399 = iprot.readString(); + _val400 = iprot.readI64(); + struct.window_to_emitted.put(_key399, _val400); } iprot.readMapEnd(); } @@ -757,15 +852,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc case 2: // WINDOW_TO_TRANSFERRED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map382 = iprot.readMapBegin(); - struct.window_to_transferred = new HashMap(2*_map382.size); - String _key383; - long _val384; - for (int _i385 = 0; _i385 < _map382.size; ++_i385) + org.apache.thrift.protocol.TMap _map402 = iprot.readMapBegin(); + struct.window_to_transferred = new HashMap(2*_map402.size); + String _key403; + long _val404; + for (int _i405 = 0; _i405 < _map402.size; ++_i405) { - _key383 = iprot.readString(); - _val384 = iprot.readI64(); - struct.window_to_transferred.put(_key383, _val384); + _key403 = iprot.readString(); + _val404 = iprot.readI64(); + struct.window_to_transferred.put(_key403, _val404); } iprot.readMapEnd(); } @@ -777,15 +872,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc case 3: // WINDOW_TO_COMPLETE_LATENCIES_MS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map386 = iprot.readMapBegin(); - struct.window_to_complete_latencies_ms = new HashMap(2*_map386.size); - String _key387; - double _val388; - for (int _i389 = 0; _i389 < _map386.size; ++_i389) + org.apache.thrift.protocol.TMap _map406 = iprot.readMapBegin(); + struct.window_to_complete_latencies_ms = new HashMap(2*_map406.size); + String _key407; + double _val408; + for (int _i409 = 0; _i409 < _map406.size; ++_i409) { - _key387 = iprot.readString(); - _val388 = iprot.readDouble(); - struct.window_to_complete_latencies_ms.put(_key387, _val388); + _key407 = iprot.readString(); + _val408 = iprot.readDouble(); + struct.window_to_complete_latencies_ms.put(_key407, _val408); } iprot.readMapEnd(); } @@ -797,15 +892,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc case 4: // WINDOW_TO_ACKED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map390 = iprot.readMapBegin(); - struct.window_to_acked = new HashMap(2*_map390.size); - String _key391; - long _val392; - for (int _i393 = 0; _i393 < _map390.size; ++_i393) + org.apache.thrift.protocol.TMap _map410 = iprot.readMapBegin(); + struct.window_to_acked = new HashMap(2*_map410.size); + String _key411; + long _val412; + for (int _i413 = 0; _i413 < _map410.size; ++_i413) { - _key391 = iprot.readString(); - _val392 = iprot.readI64(); - struct.window_to_acked.put(_key391, _val392); + _key411 = iprot.readString(); + _val412 = iprot.readI64(); + struct.window_to_acked.put(_key411, _val412); } iprot.readMapEnd(); } @@ -817,15 +912,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc case 5: // WINDOW_TO_FAILED if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin(); - struct.window_to_failed = new HashMap(2*_map394.size); - String _key395; - long _val396; - for (int _i397 = 0; _i397 < _map394.size; ++_i397) + org.apache.thrift.protocol.TMap _map414 = iprot.readMapBegin(); + struct.window_to_failed = new HashMap(2*_map414.size); + String _key415; + long _val416; + for (int _i417 = 0; _i417 < _map414.size; ++_i417) { - _key395 = iprot.readString(); - _val396 = iprot.readI64(); - struct.window_to_failed.put(_key395, _val396); + _key415 = iprot.readString(); + _val416 = iprot.readI64(); + struct.window_to_failed.put(_key415, _val416); } iprot.readMapEnd(); } @@ -834,6 +929,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyStats struc org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // WINDOW_TO_THROUGHPUT + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map418 = iprot.readMapBegin(); + struct.window_to_throughput = new HashMap(2*_map418.size); + String _key419; + double _val420; + for (int _i421 = 0; _i421 < _map418.size; ++_i421) + { + _key419 = iprot.readString(); + _val420 = iprot.readDouble(); + struct.window_to_throughput.put(_key419, _val420); + } + iprot.readMapEnd(); + } + struct.set_window_to_throughput_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -852,10 +967,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats stru oprot.writeFieldBegin(WINDOW_TO_EMITTED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_emitted.size())); - for (Map.Entry _iter398 : struct.window_to_emitted.entrySet()) + for (Map.Entry _iter422 : struct.window_to_emitted.entrySet()) { - oprot.writeString(_iter398.getKey()); - oprot.writeI64(_iter398.getValue()); + oprot.writeString(_iter422.getKey()); + oprot.writeI64(_iter422.getValue()); } oprot.writeMapEnd(); } @@ -867,10 +982,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats stru oprot.writeFieldBegin(WINDOW_TO_TRANSFERRED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_transferred.size())); - for (Map.Entry _iter399 : struct.window_to_transferred.entrySet()) + for (Map.Entry _iter423 : struct.window_to_transferred.entrySet()) { - oprot.writeString(_iter399.getKey()); - oprot.writeI64(_iter399.getValue()); + oprot.writeString(_iter423.getKey()); + oprot.writeI64(_iter423.getValue()); } oprot.writeMapEnd(); } @@ -882,10 +997,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats stru oprot.writeFieldBegin(WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.window_to_complete_latencies_ms.size())); - for (Map.Entry _iter400 : struct.window_to_complete_latencies_ms.entrySet()) + for (Map.Entry _iter424 : struct.window_to_complete_latencies_ms.entrySet()) { - oprot.writeString(_iter400.getKey()); - oprot.writeDouble(_iter400.getValue()); + oprot.writeString(_iter424.getKey()); + oprot.writeDouble(_iter424.getValue()); } oprot.writeMapEnd(); } @@ -897,10 +1012,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats stru oprot.writeFieldBegin(WINDOW_TO_ACKED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_acked.size())); - for (Map.Entry _iter401 : struct.window_to_acked.entrySet()) + for (Map.Entry _iter425 : struct.window_to_acked.entrySet()) { - oprot.writeString(_iter401.getKey()); - oprot.writeI64(_iter401.getValue()); + oprot.writeString(_iter425.getKey()); + oprot.writeI64(_iter425.getValue()); } oprot.writeMapEnd(); } @@ -912,10 +1027,25 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TopologyStats stru oprot.writeFieldBegin(WINDOW_TO_FAILED_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.window_to_failed.size())); - for (Map.Entry _iter402 : struct.window_to_failed.entrySet()) + for (Map.Entry _iter426 : struct.window_to_failed.entrySet()) { - oprot.writeString(_iter402.getKey()); - oprot.writeI64(_iter402.getValue()); + oprot.writeString(_iter426.getKey()); + oprot.writeI64(_iter426.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.window_to_throughput != null) { + if (struct.is_set_window_to_throughput()) { + oprot.writeFieldBegin(WINDOW_TO_THROUGHPUT_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, struct.window_to_throughput.size())); + for (Map.Entry _iter427 : struct.window_to_throughput.entrySet()) + { + oprot.writeString(_iter427.getKey()); + oprot.writeDouble(_iter427.getValue()); } oprot.writeMapEnd(); } @@ -955,54 +1085,67 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyStats struc if (struct.is_set_window_to_failed()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.is_set_window_to_throughput()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.is_set_window_to_emitted()) { { oprot.writeI32(struct.window_to_emitted.size()); - for (Map.Entry _iter403 : struct.window_to_emitted.entrySet()) + for (Map.Entry _iter428 : struct.window_to_emitted.entrySet()) { - oprot.writeString(_iter403.getKey()); - oprot.writeI64(_iter403.getValue()); + oprot.writeString(_iter428.getKey()); + oprot.writeI64(_iter428.getValue()); } } } if (struct.is_set_window_to_transferred()) { { oprot.writeI32(struct.window_to_transferred.size()); - for (Map.Entry _iter404 : struct.window_to_transferred.entrySet()) + for (Map.Entry _iter429 : struct.window_to_transferred.entrySet()) { - oprot.writeString(_iter404.getKey()); - oprot.writeI64(_iter404.getValue()); + oprot.writeString(_iter429.getKey()); + oprot.writeI64(_iter429.getValue()); } } } if (struct.is_set_window_to_complete_latencies_ms()) { { oprot.writeI32(struct.window_to_complete_latencies_ms.size()); - for (Map.Entry _iter405 : struct.window_to_complete_latencies_ms.entrySet()) + for (Map.Entry _iter430 : struct.window_to_complete_latencies_ms.entrySet()) { - oprot.writeString(_iter405.getKey()); - oprot.writeDouble(_iter405.getValue()); + oprot.writeString(_iter430.getKey()); + oprot.writeDouble(_iter430.getValue()); } } } if (struct.is_set_window_to_acked()) { { oprot.writeI32(struct.window_to_acked.size()); - for (Map.Entry _iter406 : struct.window_to_acked.entrySet()) + for (Map.Entry _iter431 : struct.window_to_acked.entrySet()) { - oprot.writeString(_iter406.getKey()); - oprot.writeI64(_iter406.getValue()); + oprot.writeString(_iter431.getKey()); + oprot.writeI64(_iter431.getValue()); } } } if (struct.is_set_window_to_failed()) { { oprot.writeI32(struct.window_to_failed.size()); - for (Map.Entry _iter407 : struct.window_to_failed.entrySet()) + for (Map.Entry _iter432 : struct.window_to_failed.entrySet()) + { + oprot.writeString(_iter432.getKey()); + oprot.writeI64(_iter432.getValue()); + } + } + } + if (struct.is_set_window_to_throughput()) { + { + oprot.writeI32(struct.window_to_throughput.size()); + for (Map.Entry _iter433 : struct.window_to_throughput.entrySet()) { - oprot.writeString(_iter407.getKey()); - oprot.writeI64(_iter407.getValue()); + oprot.writeString(_iter433.getKey()); + oprot.writeDouble(_iter433.getValue()); } } } @@ -1011,82 +1154,97 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyStats struc @Override public void read(org.apache.thrift.protocol.TProtocol prot, TopologyStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map408 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.window_to_emitted = new HashMap(2*_map408.size); - String _key409; - long _val410; - for (int _i411 = 0; _i411 < _map408.size; ++_i411) + org.apache.thrift.protocol.TMap _map434 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.window_to_emitted = new HashMap(2*_map434.size); + String _key435; + long _val436; + for (int _i437 = 0; _i437 < _map434.size; ++_i437) { - _key409 = iprot.readString(); - _val410 = iprot.readI64(); - struct.window_to_emitted.put(_key409, _val410); + _key435 = iprot.readString(); + _val436 = iprot.readI64(); + struct.window_to_emitted.put(_key435, _val436); } } struct.set_window_to_emitted_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map412 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.window_to_transferred = new HashMap(2*_map412.size); - String _key413; - long _val414; - for (int _i415 = 0; _i415 < _map412.size; ++_i415) + org.apache.thrift.protocol.TMap _map438 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.window_to_transferred = new HashMap(2*_map438.size); + String _key439; + long _val440; + for (int _i441 = 0; _i441 < _map438.size; ++_i441) { - _key413 = iprot.readString(); - _val414 = iprot.readI64(); - struct.window_to_transferred.put(_key413, _val414); + _key439 = iprot.readString(); + _val440 = iprot.readI64(); + struct.window_to_transferred.put(_key439, _val440); } } struct.set_window_to_transferred_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map416 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); - struct.window_to_complete_latencies_ms = new HashMap(2*_map416.size); - String _key417; - double _val418; - for (int _i419 = 0; _i419 < _map416.size; ++_i419) + org.apache.thrift.protocol.TMap _map442 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + struct.window_to_complete_latencies_ms = new HashMap(2*_map442.size); + String _key443; + double _val444; + for (int _i445 = 0; _i445 < _map442.size; ++_i445) { - _key417 = iprot.readString(); - _val418 = iprot.readDouble(); - struct.window_to_complete_latencies_ms.put(_key417, _val418); + _key443 = iprot.readString(); + _val444 = iprot.readDouble(); + struct.window_to_complete_latencies_ms.put(_key443, _val444); } } struct.set_window_to_complete_latencies_ms_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map420 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.window_to_acked = new HashMap(2*_map420.size); - String _key421; - long _val422; - for (int _i423 = 0; _i423 < _map420.size; ++_i423) + org.apache.thrift.protocol.TMap _map446 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.window_to_acked = new HashMap(2*_map446.size); + String _key447; + long _val448; + for (int _i449 = 0; _i449 < _map446.size; ++_i449) { - _key421 = iprot.readString(); - _val422 = iprot.readI64(); - struct.window_to_acked.put(_key421, _val422); + _key447 = iprot.readString(); + _val448 = iprot.readI64(); + struct.window_to_acked.put(_key447, _val448); } } struct.set_window_to_acked_isSet(true); } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map424 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.window_to_failed = new HashMap(2*_map424.size); - String _key425; - long _val426; - for (int _i427 = 0; _i427 < _map424.size; ++_i427) + org.apache.thrift.protocol.TMap _map450 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.window_to_failed = new HashMap(2*_map450.size); + String _key451; + long _val452; + for (int _i453 = 0; _i453 < _map450.size; ++_i453) { - _key425 = iprot.readString(); - _val426 = iprot.readI64(); - struct.window_to_failed.put(_key425, _val426); + _key451 = iprot.readString(); + _val452 = iprot.readI64(); + struct.window_to_failed.put(_key451, _val452); } } struct.set_window_to_failed_isSet(true); } + if (incoming.get(5)) { + { + org.apache.thrift.protocol.TMap _map454 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32()); + struct.window_to_throughput = new HashMap(2*_map454.size); + String _key455; + double _val456; + for (int _i457 = 0; _i457 < _map454.size; ++_i457) + { + _key455 = iprot.readString(); + _val456 = iprot.readDouble(); + struct.window_to_throughput.put(_key455, _val456); + } + } + struct.set_window_to_throughput_isSet(true); + } } } diff --git a/storm-core/src/jvm/org/apache/storm/generated/WorkerSummary.java b/storm-core/src/jvm/org/apache/storm/generated/WorkerSummary.java index fff93732d6c..1bf44d15f43 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/WorkerSummary.java +++ b/storm-core/src/jvm/org/apache/storm/generated/WorkerSummary.java @@ -1493,15 +1493,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, WorkerSummary struc case 7: // COMPONENT_TO_NUM_TASKS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map428 = iprot.readMapBegin(); - struct.component_to_num_tasks = new HashMap(2*_map428.size); - String _key429; - long _val430; - for (int _i431 = 0; _i431 < _map428.size; ++_i431) + org.apache.thrift.protocol.TMap _map458 = iprot.readMapBegin(); + struct.component_to_num_tasks = new HashMap(2*_map458.size); + String _key459; + long _val460; + for (int _i461 = 0; _i461 < _map458.size; ++_i461) { - _key429 = iprot.readString(); - _val430 = iprot.readI64(); - struct.component_to_num_tasks.put(_key429, _val430); + _key459 = iprot.readString(); + _val460 = iprot.readI64(); + struct.component_to_num_tasks.put(_key459, _val460); } iprot.readMapEnd(); } @@ -1630,10 +1630,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, WorkerSummary stru oprot.writeFieldBegin(COMPONENT_TO_NUM_TASKS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.component_to_num_tasks.size())); - for (Map.Entry _iter432 : struct.component_to_num_tasks.entrySet()) + for (Map.Entry _iter462 : struct.component_to_num_tasks.entrySet()) { - oprot.writeString(_iter432.getKey()); - oprot.writeI64(_iter432.getValue()); + oprot.writeString(_iter462.getKey()); + oprot.writeI64(_iter462.getValue()); } oprot.writeMapEnd(); } @@ -1765,10 +1765,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, WorkerSummary struc if (struct.is_set_component_to_num_tasks()) { { oprot.writeI32(struct.component_to_num_tasks.size()); - for (Map.Entry _iter433 : struct.component_to_num_tasks.entrySet()) + for (Map.Entry _iter463 : struct.component_to_num_tasks.entrySet()) { - oprot.writeString(_iter433.getKey()); - oprot.writeI64(_iter433.getValue()); + oprot.writeString(_iter463.getKey()); + oprot.writeI64(_iter463.getValue()); } } } @@ -1828,15 +1828,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, WorkerSummary struct } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map434 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.component_to_num_tasks = new HashMap(2*_map434.size); - String _key435; - long _val436; - for (int _i437 = 0; _i437 < _map434.size; ++_i437) + org.apache.thrift.protocol.TMap _map464 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.component_to_num_tasks = new HashMap(2*_map464.size); + String _key465; + long _val466; + for (int _i467 = 0; _i467 < _map464.size; ++_i467) { - _key435 = iprot.readString(); - _val436 = iprot.readI64(); - struct.component_to_num_tasks.put(_key435, _val436); + _key465 = iprot.readString(); + _val466 = iprot.readI64(); + struct.component_to_num_tasks.put(_key465, _val466); } } struct.set_component_to_num_tasks_isSet(true); diff --git a/storm-core/src/jvm/org/apache/storm/metric/internal/MultiCountStatAndMetric.java b/storm-core/src/jvm/org/apache/storm/metric/internal/MultiCountStatAndMetric.java index 874387c2434..ded50beff0d 100644 --- a/storm-core/src/jvm/org/apache/storm/metric/internal/MultiCountStatAndMetric.java +++ b/storm-core/src/jvm/org/apache/storm/metric/internal/MultiCountStatAndMetric.java @@ -31,12 +31,18 @@ public class MultiCountStatAndMetric implements IMetric { private ConcurrentHashMap _counts = new ConcurrentHashMap<>(); private final int _numBuckets; + private final long _startTime; /** * @param numBuckets the number of buckets to divide the time periods into. */ public MultiCountStatAndMetric(int numBuckets) { + this(numBuckets, -1); + } + + public MultiCountStatAndMetric(int numBuckets, long startTime) { _numBuckets = numBuckets; + _startTime = startTime; } CountStatAndMetric get(T key) { @@ -45,7 +51,7 @@ CountStatAndMetric get(T key) { synchronized(this) { c = _counts.get(key); if (c == null) { - c = new CountStatAndMetric(_numBuckets); + c = new CountStatAndMetric(_numBuckets, _startTime); _counts.put(key, c); } } diff --git a/storm-core/src/jvm/org/apache/storm/stats/BoltExecutorStats.java b/storm-core/src/jvm/org/apache/storm/stats/BoltExecutorStats.java index 610254907cc..d251f744879 100644 --- a/storm-core/src/jvm/org/apache/storm/stats/BoltExecutorStats.java +++ b/storm-core/src/jvm/org/apache/storm/stats/BoltExecutorStats.java @@ -26,6 +26,7 @@ import org.apache.storm.metric.internal.MultiLatencyStatAndMetric; import java.util.List; +import java.util.Map; @SuppressWarnings("unchecked") public class BoltExecutorStats extends CommonStats { @@ -91,6 +92,7 @@ public ExecutorStats renderStats() { ret.set_emitted(valueStat(EMITTED)); ret.set_transferred(valueStat(TRANSFERRED)); ret.set_rate(this.rate); + ret.set_throughput(StatsUtil.convertCountsToThroughputs((Map>) valueStat(EMITTED), startTime)); // bolt stats BoltStats boltStats = new BoltStats( diff --git a/storm-core/src/jvm/org/apache/storm/stats/CommonStats.java b/storm-core/src/jvm/org/apache/storm/stats/CommonStats.java index 9b9a4f36bfa..4b2bdc78b6c 100644 --- a/storm-core/src/jvm/org/apache/storm/stats/CommonStats.java +++ b/storm-core/src/jvm/org/apache/storm/stats/CommonStats.java @@ -37,10 +37,13 @@ public abstract class CommonStats { protected final int rate; protected final Map metricMap = new HashMap<>(); + protected long startTime; + public CommonStats(int rate) { + startTime = System.currentTimeMillis(); this.rate = rate; - this.put(EMITTED, new MultiCountStatAndMetric(NUM_STAT_BUCKETS)); - this.put(TRANSFERRED, new MultiCountStatAndMetric(NUM_STAT_BUCKETS)); + this.put(EMITTED, new MultiCountStatAndMetric(NUM_STAT_BUCKETS, startTime)); + this.put(TRANSFERRED, new MultiCountStatAndMetric(NUM_STAT_BUCKETS, startTime)); } public int getRate() { diff --git a/storm-core/src/jvm/org/apache/storm/stats/SpoutExecutorStats.java b/storm-core/src/jvm/org/apache/storm/stats/SpoutExecutorStats.java index c7ba844854f..9f7b91c1985 100644 --- a/storm-core/src/jvm/org/apache/storm/stats/SpoutExecutorStats.java +++ b/storm-core/src/jvm/org/apache/storm/stats/SpoutExecutorStats.java @@ -17,6 +17,7 @@ */ package org.apache.storm.stats; +import java.util.Map; import org.apache.storm.generated.ExecutorSpecificStats; import org.apache.storm.generated.ExecutorStats; import org.apache.storm.generated.SpoutStats; @@ -65,6 +66,7 @@ public ExecutorStats renderStats() { ret.set_emitted(valueStat(EMITTED)); ret.set_transferred(valueStat(TRANSFERRED)); ret.set_rate(this.rate); + ret.set_throughput(StatsUtil.convertCountsToThroughputs((Map>) valueStat(EMITTED), startTime)); // spout stats SpoutStats spoutStats = new SpoutStats( diff --git a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java index 0524dc85808..cb39202818d 100644 --- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java +++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java @@ -86,6 +86,7 @@ public class StatsUtil { private static final String EXECUTED = "executed"; private static final String EMITTED = "emitted"; private static final String TRANSFERRED = "transferred"; + private static final String THROUGHPUT = "throughput"; private static final String EXEC_LATENCIES = "execute-latencies"; private static final String PROC_LATENCIES = "process-latencies"; @@ -104,6 +105,7 @@ public class StatsUtil { private static final String WIN_TO_FAILED = "window->failed"; private static final String WIN_TO_EXECUTED = "window->executed"; private static final String WIN_TO_TRANSFERRED = "window->transferred"; + private static final String WIN_TO_THROUGHPUT = "window->throughput"; private static final String WIN_TO_EXEC_LAT = "window->execute-latency"; private static final String WIN_TO_PROC_LAT = "window->process-latency"; private static final String WIN_TO_COMP_LAT = "window->complete-latency"; @@ -241,6 +243,7 @@ public static Map aggPreMergeCompPageBolt(Map be Map outputStats = new HashMap(); Map sid2emitted = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, EMITTED), TO_STRING).get(window); Map sid2transferred = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, TRANSFERRED), TO_STRING).get(window); + Map sid2throughput = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, THROUGHPUT), TO_STRING).get(window); if (sid2emitted != null) { putKV(outputStats, EMITTED, filterSysStreams2Stat(sid2emitted, includeSys)); } else { @@ -251,6 +254,11 @@ public static Map aggPreMergeCompPageBolt(Map be } else { putKV(outputStats, TRANSFERRED, new HashMap()); } + if (sid2throughput != null) { + putKV(outputStats, THROUGHPUT, filterSysStreams2Stat(sid2throughput, includeSys)); + } else { + putKV(outputStats, THROUGHPUT, new HashMap<>()); + } outputStats = swapMapOrder(outputStats); putKV(ret, SID_TO_OUT_STATS, outputStats); @@ -285,6 +293,7 @@ public static Map aggPreMergeCompPageSpout(Map b Map win2sid2failed = windowSetConverter(getMapByKey(stat2win2sid2num, FAILED), TO_STRING); Map win2sid2emitted = windowSetConverter(getMapByKey(stat2win2sid2num, EMITTED), TO_STRING); Map win2sid2transferred = windowSetConverter(getMapByKey(stat2win2sid2num, TRANSFERRED), TO_STRING); + Map win2sid2throughput = windowSetConverter(getMapByKey(stat2win2sid2num, THROUGHPUT), TO_STRING); Map win2sid2compLat = windowSetConverter(getMapByKey(stat2win2sid2num, COMP_LATENCIES), TO_STRING); putKV(outputStats, ACKED, win2sid2acked.get(window)); @@ -300,6 +309,12 @@ public static Map aggPreMergeCompPageSpout(Map b sid2transferred = new HashMap<>(); } putKV(outputStats, TRANSFERRED, filterSysStreams2Stat(sid2transferred, includeSys)); + + Map sid2throughput = (Map) win2sid2throughput.get(window); + if (sid2throughput == null) { + sid2throughput = new HashMap<>(); + } + putKV(outputStats, THROUGHPUT, filterSysStreams2Stat(sid2throughput, includeSys)); outputStats = swapMapOrder(outputStats); Map sid2compLat = (Map) win2sid2compLat.get(window); @@ -329,19 +344,29 @@ public static Map aggPreMergeTopoPageBolt( Map stat2win2sid2num = getMapByKey(beat, STATS); putKV(subRet, CAPACITY, computeAggCapacity(stat2win2sid2num, getByKeyOr0(beat, UPTIME).intValue())); - for (String key : new String[]{EMITTED, TRANSFERRED, ACKED, FAILED}) { + for (String key : new String[]{EMITTED, TRANSFERRED, THROUGHPUT, ACKED, FAILED}) { Map> stat = windowSetConverter(getMapByKey(stat2win2sid2num, key), TO_STRING); - if (EMITTED.equals(key) || TRANSFERRED.equals(key)) { + if (EMITTED.equals(key) || TRANSFERRED.equals(key) || THROUGHPUT.equals(key)) { stat = filterSysStreams(stat, includeSys); } Map winStat = stat.get(window); - long sum = 0; - if (winStat != null) { - for (V v : winStat.values()) { - sum += v.longValue(); + if(key.equals(THROUGHPUT)) { + double sum = 0; + if (winStat != null) { + for (V v : winStat.values()) { + sum += v.doubleValue(); + } + } + putKV(subRet, key, sum); + } else { + long sum = 0; + if (winStat != null) { + for (V v : winStat.values()) { + sum += v.longValue(); + } } + putKV(subRet, key, sum); } - putKV(subRet, key, sum); } Map, Double>> win2sid2execLat = @@ -370,19 +395,29 @@ public static Map aggPreMergeTopoPageSpout // no capacity for spout Map>> stat2win2sid2num = getMapByKey(m, STATS); - for (String key : new String[]{EMITTED, TRANSFERRED, FAILED}) { + for (String key : new String[]{EMITTED, TRANSFERRED, THROUGHPUT, FAILED}) { Map> stat = windowSetConverter(stat2win2sid2num.get(key), TO_STRING); - if (EMITTED.equals(key) || TRANSFERRED.equals(key)) { + if (EMITTED.equals(key) || TRANSFERRED.equals(key) || THROUGHPUT.equals(key)) { stat = filterSysStreams(stat, includeSys); } Map winStat = stat.get(window); - long sum = 0; - if (winStat != null) { - for (V v : winStat.values()) { - sum += v.longValue(); + if(key.equals(THROUGHPUT)) { + double sum = 0; + if (winStat != null) { + for (V v : winStat.values()) { + sum += v.doubleValue(); + } + } + putKV(subRet, key, sum); + } else { + long sum = 0; + if (winStat != null) { + for (V v : winStat.values()) { + sum += v.longValue(); + } } + putKV(subRet, key, sum); } - putKV(subRet, key, sum); } Map> win2sid2compLat = @@ -433,6 +468,7 @@ public static Map mergeAggCompStatsCompPageBolt( putKV(executorStats, EMITTED, sumStreamsLong(boltOut, EMITTED)); putKV(executorStats, TRANSFERRED, sumStreamsLong(boltOut, TRANSFERRED)); + putKV(executorStats, THROUGHPUT, sumStreamsDouble(boltOut, THROUGHPUT)); putKV(executorStats, ACKED, sumStreamsLong(boltIn, ACKED)); putKV(executorStats, FAILED, sumStreamsLong(boltIn, FAILED)); putKV(executorStats, EXECUTED, executed); @@ -476,6 +512,7 @@ public static Map mergeAggCompStatsCompPageSpout( putKV(executorStats, EMITTED, sumStreamsLong(spoutOut, EMITTED)); putKV(executorStats, TRANSFERRED, sumStreamsLong(spoutOut, TRANSFERRED)); + putKV(executorStats, THROUGHPUT, sumStreamsDouble(spoutOut, THROUGHPUT)); putKV(executorStats, FAILED, sumStreamsLong(spoutOut, FAILED)); long acked = sumStreamsLong(spoutOut, ACKED); putKV(executorStats, ACKED, acked); @@ -510,6 +547,8 @@ public static Map mergeAggCompStatsTopoPageBolt(Map mergeAggCompStatsTopoPageSpout(Map aggTopoExecStats( Map spout2stats = getMapByKey(accStats, SPOUT_TO_STATS); Map win2emitted = getMapByKey(accStats, WIN_TO_EMITTED); Map win2transferred = getMapByKey(accStats, WIN_TO_TRANSFERRED); + Map win2throughput = getMapByKey(accStats, WIN_TO_THROUGHPUT); Map win2compLatWgtAvg = getMapByKey(accStats, WIN_TO_COMP_LAT_WGT_AVG); Map win2acked = getMapByKey(accStats, WIN_TO_ACKED); Map win2failed = getMapByKey(accStats, WIN_TO_FAILED); @@ -603,6 +645,8 @@ public static Map aggTopoExecStats( filterSysStreams(getMapByKey(stats, EMITTED), includeSys)))); putKV(ret, WIN_TO_TRANSFERRED, mergeWithSumLong(win2transferred, aggregateCountStreams( filterSysStreams(getMapByKey(stats, TRANSFERRED), includeSys)))); + putKV(ret, WIN_TO_THROUGHPUT, mergeWithSumDouble(win2throughput, aggregateCountStreamsForDouble( + filterSysStreams(getMapByKey(stats, THROUGHPUT), includeSys)))); putKV(ret, WIN_TO_COMP_LAT_WGT_AVG, mergeWithSumDouble(win2compLatWgtAvg, w2compLatWgtAvg)); //boolean isSpoutStat = SPOUT.equals(((Keyword) getByKey(stats, TYPE)).getName()); @@ -667,6 +711,7 @@ public static Map aggregateTopoStats(String win, boolean include putKV(initVal, SPOUT_TO_STATS, new HashMap()); putKV(initVal, WIN_TO_EMITTED, new HashMap()); putKV(initVal, WIN_TO_TRANSFERRED, new HashMap()); + putKV(initVal, WIN_TO_THROUGHPUT, new HashMap<>()); putKV(initVal, WIN_TO_COMP_LAT_WGT_AVG, new HashMap()); putKV(initVal, WIN_TO_ACKED, new HashMap()); putKV(initVal, WIN_TO_FAILED, new HashMap()); @@ -730,6 +775,7 @@ public static TopologyPageInfo postAggregateTopoStats(Map task2comp, Map exec2no topologyStats.set_window_to_emitted(mapKeyStr(getMapByKey(accData, WIN_TO_EMITTED))); topologyStats.set_window_to_failed(mapKeyStr(getMapByKey(accData, WIN_TO_FAILED))); topologyStats.set_window_to_transferred(mapKeyStr(getMapByKey(accData, WIN_TO_TRANSFERRED))); + topologyStats.set_window_to_throughput(mapKeyStr(getMapByKey(accData, WIN_TO_THROUGHPUT))); topologyStats.set_window_to_complete_latencies_ms(computeWeightedAveragesPerWindow( accData, WIN_TO_COMP_LAT_WGT_AVG, WIN_TO_ACKED)); @@ -817,12 +863,15 @@ public static Map>> aggregateCommonStats(Li List>> emitted = new ArrayList<>(); List>> transferred = new ArrayList<>(); + List>> throughput = new ArrayList<>(); for (ExecutorSummary summ : statsSeq) { emitted.add(summ.get_stats().get_emitted()); transferred.add(summ.get_stats().get_transferred()); + throughput.add(summ.get_stats().get_throughput()); } putKV(ret, EMITTED, aggregateCounts(emitted)); putKV(ret, TRANSFERRED, aggregateCounts(transferred)); + putKV(ret, THROUGHPUT, aggregateCountsForDouble(throughput)); return ret; } @@ -834,9 +883,11 @@ public static Map>> preProcessStreamSummary Map>> streamSummary, boolean includeSys) { Map> emitted = getMapByKey(streamSummary, EMITTED); Map> transferred = getMapByKey(streamSummary, TRANSFERRED); + Map> throughput = getMapByKey(streamSummary, THROUGHPUT); putKV(streamSummary, EMITTED, filterSysStreams(emitted, includeSys)); putKV(streamSummary, TRANSFERRED, filterSysStreams(transferred, includeSys)); + putKV(streamSummary, THROUGHPUT, filterSysStreams(throughput, includeSys)); return streamSummary; } @@ -861,6 +912,26 @@ public static Map aggregateCountStreams( return ret; } + /** + * aggregate value(in Double) streams by window + * + * @param stats a Map of value: {win -> stream -> value} + * @return a Map of value: {win -> value} + */ + public static Map aggregateCountStreamsForDouble( + Map> stats) { + Map ret = new HashMap<>(); + for (Map.Entry> entry : stats.entrySet()) { + Map value = entry.getValue(); + Double sum = 0.0; + for (V num : value.values()) { + sum += num.doubleValue(); + } + ret.put(entry.getKey(), sum); + } + return ret; + } + /** * compute an weighted average from a list of average maps and a corresponding count maps * extracted from a list of ExecutorSummary @@ -954,6 +1025,7 @@ public static Map aggregateSpoutStreams(Map stats) { putKV(ret, FAILED, aggregateCountStreams(getMapByKey(stats, FAILED))); putKV(ret, EMITTED, aggregateCountStreams(getMapByKey(stats, EMITTED))); putKV(ret, TRANSFERRED, aggregateCountStreams(getMapByKey(stats, TRANSFERRED))); + putKV(ret, THROUGHPUT, aggregateCountStreamsForDouble(getMapByKey(stats, THROUGHPUT))); putKV(ret, COMP_LATENCIES, aggregateAvgStreams( getMapByKey(stats, COMP_LATENCIES), getMapByKey(stats, ACKED))); return ret; @@ -971,6 +1043,7 @@ public static Map aggregateBoltStreams(Map stats) { putKV(ret, FAILED, aggregateCountStreams(getMapByKey(stats, FAILED))); putKV(ret, EMITTED, aggregateCountStreams(getMapByKey(stats, EMITTED))); putKV(ret, TRANSFERRED, aggregateCountStreams(getMapByKey(stats, TRANSFERRED))); + putKV(ret, THROUGHPUT, aggregateCountStreamsForDouble(getMapByKey(stats, THROUGHPUT))); putKV(ret, EXECUTED, aggregateCountStreams(getMapByKey(stats, EXECUTED))); putKV(ret, PROC_LATENCIES, aggregateAvgStreams( getMapByKey(stats, PROC_LATENCIES), getMapByKey(stats, ACKED))); @@ -1009,6 +1082,11 @@ public static Map aggBoltExecWinStats( getMapByKey(accStats, WIN_TO_TRANSFERRED)); putKV(ret, WIN_TO_TRANSFERRED, win2transferred); + Map> throughput = getMapByKey(newStats, THROUGHPUT); + Map win2throughput = mergeWithSumDouble(aggregateCountStreamsForDouble(filterSysStreams(throughput, includeSys)), + getMapByKey(accStats, WIN_TO_THROUGHPUT)); + putKV(ret, WIN_TO_THROUGHPUT, win2throughput); + putKV(ret, WIN_TO_EXEC_LAT_WGT_AVG, mergeWithSumDouble( getMapByKey(accStats, WIN_TO_EXEC_LAT_WGT_AVG), win2execLatWgtAvg)); putKV(ret, WIN_TO_PROC_LAT_WGT_AVG, mergeWithSumDouble( @@ -1051,6 +1129,11 @@ public static Map aggSpoutExecWinStats( getMapByKey(accStats, WIN_TO_TRANSFERRED)); putKV(ret, WIN_TO_TRANSFERRED, win2transferred); + Map> throughput = getMapByKey(beat, THROUGHPUT); + Map win2throughput = mergeWithSumDouble(aggregateCountStreamsForDouble(filterSysStreams(throughput, includeSys)), + getMapByKey(accStats, WIN_TO_THROUGHPUT)); + putKV(ret, WIN_TO_THROUGHPUT, win2throughput); + putKV(ret, WIN_TO_COMP_LAT_WGT_AVG, mergeWithSumDouble( getMapByKey(accStats, WIN_TO_COMP_LAT_WGT_AVG), win2compLatWgtAvg)); putKV(ret, WIN_TO_ACKED, mergeWithSumLong( @@ -1092,6 +1175,36 @@ public static Map> aggregateCounts(List GlobalStreamId -> value} + */ + public static Map> aggregateCountsForDouble(List>> countsSeq) { + Map> ret = new HashMap<>(); + for (Map> counts : countsSeq) { + for (Map.Entry> entry : counts.entrySet()) { + String win = entry.getKey(); + Map stream2count = entry.getValue(); + + if (!ret.containsKey(win)) { + ret.put(win, stream2count); + } else { + Map existing = ret.get(win); + for (Map.Entry subEntry : stream2count.entrySet()) { + T stream = subEntry.getKey(); + if (!existing.containsKey(stream)) { + existing.put(stream, subEntry.getValue()); + } else { + existing.put(stream, subEntry.getValue() + existing.get(stream)); + } + } + } + } + } + return ret; + } + public static Map aggregateCompStats( String window, boolean includeSys, List> beats, String compType) { boolean isSpout = SPOUT.equals(compType); @@ -1101,6 +1214,7 @@ public static Map aggregateCompStats( putKV(initVal, WIN_TO_FAILED, new HashMap()); putKV(initVal, WIN_TO_EMITTED, new HashMap()); putKV(initVal, WIN_TO_TRANSFERRED, new HashMap()); + putKV(initVal, WIN_TO_THROUGHPUT, new HashMap<>()); Map stats = new HashMap(); putKV(stats, EXECUTOR_STATS, new ArrayList()); @@ -1171,6 +1285,7 @@ public static Map postAggregateCompStats(Map com putKV(ret, EXECUTOR_STATS, getByKey(stats, EXECUTOR_STATS)); putKV(ret, WIN_TO_EMITTED, mapKeyStr(getMapByKey(compStats, WIN_TO_EMITTED))); putKV(ret, WIN_TO_TRANSFERRED, mapKeyStr(getMapByKey(compStats, WIN_TO_TRANSFERRED))); + putKV(ret, WIN_TO_THROUGHPUT, mapKeyStr(getMapByKey(compStats, WIN_TO_THROUGHPUT))); putKV(ret, WIN_TO_ACKED, mapKeyStr(getMapByKey(compStats, WIN_TO_ACKED))); putKV(ret, WIN_TO_FAILED, mapKeyStr(getMapByKey(compStats, WIN_TO_FAILED))); @@ -1455,6 +1570,7 @@ public static Map convertExecutorStats(ExecutorStats stats) { putKV(ret, EMITTED, stats.get_emitted()); putKV(ret, TRANSFERRED, stats.get_transferred()); + putKV(ret, THROUGHPUT, stats.get_throughput()); putKV(ret, RATE, stats.get_rate()); if (stats.get_specific().is_set_bolt()) { @@ -2118,6 +2234,7 @@ private static ComponentAggregateStats thriftifyCommonAggStats(ComponentAggregat commonStats.set_num_executors(getByKeyOr0(m, NUM_EXECUTORS).intValue()); commonStats.set_emitted(getByKeyOr0(m, EMITTED).longValue()); commonStats.set_transferred(getByKeyOr0(m, TRANSFERRED).longValue()); + commonStats.set_throughput(getByKeyOr0(m, THROUGHPUT).doubleValue()); commonStats.set_acked(getByKeyOr0(m, ACKED).longValue()); commonStats.set_failed(getByKeyOr0(m, FAILED).longValue()); @@ -2133,6 +2250,7 @@ private static ComponentPageInfo thriftifyCompPageData( Map win2stats = new HashMap(); putKV(win2stats, EMITTED, getMapByKey(data, WIN_TO_EMITTED)); putKV(win2stats, TRANSFERRED, getMapByKey(data, WIN_TO_TRANSFERRED)); + putKV(win2stats, THROUGHPUT, getMapByKey(data, WIN_TO_THROUGHPUT)); putKV(win2stats, ACKED, getMapByKey(data, WIN_TO_ACKED)); putKV(win2stats, FAILED, getMapByKey(data, WIN_TO_FAILED)); @@ -2207,6 +2325,7 @@ public static ExecutorStats thriftifyExecutorStats(Map stats) { ret.set_emitted(windowSetConverter(getMapByKey(stats, EMITTED), TO_STRING, TO_STRING)); ret.set_transferred(windowSetConverter(getMapByKey(stats, TRANSFERRED), TO_STRING, TO_STRING)); + ret.set_throughput(windowSetConverter(getMapByKey(stats, THROUGHPUT), TO_STRING, TO_STRING)); ret.set_rate(((Number) getByKey(stats, RATE)).doubleValue()); return ret; @@ -2607,4 +2726,25 @@ public static Map windowSetConverter( } return ret; } + + public static Map convertCountsToThroughputs(Map> counts, long startTime) { + Map> ret = new HashMap<>(); + final long eclipsedTimeInMillis = System.currentTimeMillis() - startTime; + for(String key: counts.keySet()) { + final Map streamToThroughput = new HashMap<>(); + long bucketTimeInMillis; + if(key.equals(":all-time")) { + bucketTimeInMillis = eclipsedTimeInMillis; + } else { + bucketTimeInMillis = Math.min(eclipsedTimeInMillis, Long.parseLong(key) * 1000); + } + final Map streamToCount = counts.get(key); + for(String stream: streamToCount.keySet()) { + final double throughputInSecs = streamToCount.get(stream) / (double)Math.max(1, bucketTimeInMillis) * 1000; + streamToThroughput.put(stream, throughputInSecs); + } + ret.put(key, streamToThroughput); + } + return ret; + } } diff --git a/storm-core/src/py/storm/Nimbus.py b/storm-core/src/py/storm/Nimbus.py index 7e5470a26d9..b85b8ecc989 100644 --- a/storm-core/src/py/storm/Nimbus.py +++ b/storm-core/src/py/storm/Nimbus.py @@ -4797,11 +4797,11 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype724, _size721) = iprot.readListBegin() - for _i725 in xrange(_size721): - _elem726 = ProfileRequest() - _elem726.read(iprot) - self.success.append(_elem726) + (_etype751, _size748) = iprot.readListBegin() + for _i752 in xrange(_size748): + _elem753 = ProfileRequest() + _elem753.read(iprot) + self.success.append(_elem753) iprot.readListEnd() else: iprot.skip(ftype) @@ -4818,8 +4818,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRUCT, len(self.success)) - for iter727 in self.success: - iter727.write(oprot) + for iter754 in self.success: + iter754.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() diff --git a/storm-core/src/py/storm/ttypes.py b/storm-core/src/py/storm/ttypes.py index 4fac146150f..9b6e2c0e40a 100644 --- a/storm-core/src/py/storm/ttypes.py +++ b/storm-core/src/py/storm/ttypes.py @@ -3819,6 +3819,7 @@ class ExecutorStats: - transferred - specific - rate + - throughput """ thrift_spec = ( @@ -3827,13 +3828,15 @@ class ExecutorStats: (2, TType.MAP, 'transferred', (TType.STRING,None,TType.MAP,(TType.STRING,None,TType.I64,None)), None, ), # 2 (3, TType.STRUCT, 'specific', (ExecutorSpecificStats, ExecutorSpecificStats.thrift_spec), None, ), # 3 (4, TType.DOUBLE, 'rate', None, None, ), # 4 + (5, TType.MAP, 'throughput', (TType.STRING,None,TType.MAP,(TType.STRING,None,TType.DOUBLE,None)), None, ), # 5 ) - def __init__(self, emitted=None, transferred=None, specific=None, rate=None,): + def __init__(self, emitted=None, transferred=None, specific=None, rate=None, throughput=None,): self.emitted = emitted self.transferred = transferred self.specific = specific self.rate = rate + self.throughput = throughput def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -3889,6 +3892,23 @@ def read(self, iprot): self.rate = iprot.readDouble() else: iprot.skip(ftype) + elif fid == 5: + if ftype == TType.MAP: + self.throughput = {} + (_ktype290, _vtype291, _size289 ) = iprot.readMapBegin() + for _i293 in xrange(_size289): + _key294 = iprot.readString().decode('utf-8') + _val295 = {} + (_ktype297, _vtype298, _size296 ) = iprot.readMapBegin() + for _i300 in xrange(_size296): + _key301 = iprot.readString().decode('utf-8') + _val302 = iprot.readDouble() + _val295[_key301] = _val302 + iprot.readMapEnd() + self.throughput[_key294] = _val295 + iprot.readMapEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -3902,24 +3922,24 @@ def write(self, oprot): if self.emitted is not None: oprot.writeFieldBegin('emitted', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.emitted)) - for kiter289,viter290 in self.emitted.items(): - oprot.writeString(kiter289.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter290)) - for kiter291,viter292 in viter290.items(): - oprot.writeString(kiter291.encode('utf-8')) - oprot.writeI64(viter292) + for kiter303,viter304 in self.emitted.items(): + oprot.writeString(kiter303.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter304)) + for kiter305,viter306 in viter304.items(): + oprot.writeString(kiter305.encode('utf-8')) + oprot.writeI64(viter306) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.transferred is not None: oprot.writeFieldBegin('transferred', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.transferred)) - for kiter293,viter294 in self.transferred.items(): - oprot.writeString(kiter293.encode('utf-8')) - oprot.writeMapBegin(TType.STRING, TType.I64, len(viter294)) - for kiter295,viter296 in viter294.items(): - oprot.writeString(kiter295.encode('utf-8')) - oprot.writeI64(viter296) + for kiter307,viter308 in self.transferred.items(): + oprot.writeString(kiter307.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.I64, len(viter308)) + for kiter309,viter310 in viter308.items(): + oprot.writeString(kiter309.encode('utf-8')) + oprot.writeI64(viter310) oprot.writeMapEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -3931,6 +3951,18 @@ def write(self, oprot): oprot.writeFieldBegin('rate', TType.DOUBLE, 4) oprot.writeDouble(self.rate) oprot.writeFieldEnd() + if self.throughput is not None: + oprot.writeFieldBegin('throughput', TType.MAP, 5) + oprot.writeMapBegin(TType.STRING, TType.MAP, len(self.throughput)) + for kiter311,viter312 in self.throughput.items(): + oprot.writeString(kiter311.encode('utf-8')) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(viter312)) + for kiter313,viter314 in viter312.items(): + oprot.writeString(kiter313.encode('utf-8')) + oprot.writeDouble(viter314) + oprot.writeMapEnd() + oprot.writeMapEnd() + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -3952,6 +3984,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.transferred) value = (value * 31) ^ hash(self.specific) value = (value * 31) ^ hash(self.rate) + value = (value * 31) ^ hash(self.throughput) return value def __repr__(self): @@ -4864,11 +4897,11 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.executors = [] - (_etype300, _size297) = iprot.readListBegin() - for _i301 in xrange(_size297): - _elem302 = ExecutorSummary() - _elem302.read(iprot) - self.executors.append(_elem302) + (_etype318, _size315) = iprot.readListBegin() + for _i319 in xrange(_size315): + _elem320 = ExecutorSummary() + _elem320.read(iprot) + self.executors.append(_elem320) iprot.readListEnd() else: iprot.skip(ftype) @@ -4880,29 +4913,29 @@ def read(self, iprot): elif fid == 6: if ftype == TType.MAP: self.errors = {} - (_ktype304, _vtype305, _size303 ) = iprot.readMapBegin() - for _i307 in xrange(_size303): - _key308 = iprot.readString().decode('utf-8') - _val309 = [] - (_etype313, _size310) = iprot.readListBegin() - for _i314 in xrange(_size310): - _elem315 = ErrorInfo() - _elem315.read(iprot) - _val309.append(_elem315) + (_ktype322, _vtype323, _size321 ) = iprot.readMapBegin() + for _i325 in xrange(_size321): + _key326 = iprot.readString().decode('utf-8') + _val327 = [] + (_etype331, _size328) = iprot.readListBegin() + for _i332 in xrange(_size328): + _elem333 = ErrorInfo() + _elem333.read(iprot) + _val327.append(_elem333) iprot.readListEnd() - self.errors[_key308] = _val309 + self.errors[_key326] = _val327 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 7: if ftype == TType.MAP: self.component_debug = {} - (_ktype317, _vtype318, _size316 ) = iprot.readMapBegin() - for _i320 in xrange(_size316): - _key321 = iprot.readString().decode('utf-8') - _val322 = DebugOptions() - _val322.read(iprot) - self.component_debug[_key321] = _val322 + (_ktype335, _vtype336, _size334 ) = iprot.readMapBegin() + for _i338 in xrange(_size334): + _key339 = iprot.readString().decode('utf-8') + _val340 = DebugOptions() + _val340.read(iprot) + self.component_debug[_key339] = _val340 iprot.readMapEnd() else: iprot.skip(ftype) @@ -4976,8 +5009,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 4) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter323 in self.executors: - iter323.write(oprot) + for iter341 in self.executors: + iter341.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.status is not None: @@ -4987,20 +5020,20 @@ def write(self, oprot): if self.errors is not None: oprot.writeFieldBegin('errors', TType.MAP, 6) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.errors)) - for kiter324,viter325 in self.errors.items(): - oprot.writeString(kiter324.encode('utf-8')) - oprot.writeListBegin(TType.STRUCT, len(viter325)) - for iter326 in viter325: - iter326.write(oprot) + for kiter342,viter343 in self.errors.items(): + oprot.writeString(kiter342.encode('utf-8')) + oprot.writeListBegin(TType.STRUCT, len(viter343)) + for iter344 in viter343: + iter344.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() if self.component_debug is not None: oprot.writeFieldBegin('component_debug', TType.MAP, 7) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.component_debug)) - for kiter327,viter328 in self.component_debug.items(): - oprot.writeString(kiter327.encode('utf-8')) - viter328.write(oprot) + for kiter345,viter346 in self.component_debug.items(): + oprot.writeString(kiter345.encode('utf-8')) + viter346.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.sched_status is not None: @@ -5099,6 +5132,7 @@ class CommonAggregateStats: - acked - failed - resources_map + - throughput """ thrift_spec = ( @@ -5110,9 +5144,10 @@ class CommonAggregateStats: (5, TType.I64, 'acked', None, None, ), # 5 (6, TType.I64, 'failed', None, None, ), # 6 (7, TType.MAP, 'resources_map', (TType.STRING,None,TType.DOUBLE,None), None, ), # 7 + (8, TType.DOUBLE, 'throughput', None, None, ), # 8 ) - def __init__(self, num_executors=None, num_tasks=None, emitted=None, transferred=None, acked=None, failed=None, resources_map=None,): + def __init__(self, num_executors=None, num_tasks=None, emitted=None, transferred=None, acked=None, failed=None, resources_map=None, throughput=None,): self.num_executors = num_executors self.num_tasks = num_tasks self.emitted = emitted @@ -5120,6 +5155,7 @@ def __init__(self, num_executors=None, num_tasks=None, emitted=None, transferred self.acked = acked self.failed = failed self.resources_map = resources_map + self.throughput = throughput def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -5163,14 +5199,19 @@ def read(self, iprot): elif fid == 7: if ftype == TType.MAP: self.resources_map = {} - (_ktype330, _vtype331, _size329 ) = iprot.readMapBegin() - for _i333 in xrange(_size329): - _key334 = iprot.readString().decode('utf-8') - _val335 = iprot.readDouble() - self.resources_map[_key334] = _val335 + (_ktype348, _vtype349, _size347 ) = iprot.readMapBegin() + for _i351 in xrange(_size347): + _key352 = iprot.readString().decode('utf-8') + _val353 = iprot.readDouble() + self.resources_map[_key352] = _val353 iprot.readMapEnd() else: iprot.skip(ftype) + elif fid == 8: + if ftype == TType.DOUBLE: + self.throughput = iprot.readDouble() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -5208,11 +5249,15 @@ def write(self, oprot): if self.resources_map is not None: oprot.writeFieldBegin('resources_map', TType.MAP, 7) oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.resources_map)) - for kiter336,viter337 in self.resources_map.items(): - oprot.writeString(kiter336.encode('utf-8')) - oprot.writeDouble(viter337) + for kiter354,viter355 in self.resources_map.items(): + oprot.writeString(kiter354.encode('utf-8')) + oprot.writeDouble(viter355) oprot.writeMapEnd() oprot.writeFieldEnd() + if self.throughput is not None: + oprot.writeFieldBegin('throughput', TType.DOUBLE, 8) + oprot.writeDouble(self.throughput) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -5229,6 +5274,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.acked) value = (value * 31) ^ hash(self.failed) value = (value * 31) ^ hash(self.resources_map) + value = (value * 31) ^ hash(self.throughput) return value def __repr__(self): @@ -5606,6 +5652,7 @@ class TopologyStats: - window_to_complete_latencies_ms - window_to_acked - window_to_failed + - window_to_throughput """ thrift_spec = ( @@ -5615,14 +5662,16 @@ class TopologyStats: (3, TType.MAP, 'window_to_complete_latencies_ms', (TType.STRING,None,TType.DOUBLE,None), None, ), # 3 (4, TType.MAP, 'window_to_acked', (TType.STRING,None,TType.I64,None), None, ), # 4 (5, TType.MAP, 'window_to_failed', (TType.STRING,None,TType.I64,None), None, ), # 5 + (6, TType.MAP, 'window_to_throughput', (TType.STRING,None,TType.DOUBLE,None), None, ), # 6 ) - def __init__(self, window_to_emitted=None, window_to_transferred=None, window_to_complete_latencies_ms=None, window_to_acked=None, window_to_failed=None,): + def __init__(self, window_to_emitted=None, window_to_transferred=None, window_to_complete_latencies_ms=None, window_to_acked=None, window_to_failed=None, window_to_throughput=None,): self.window_to_emitted = window_to_emitted self.window_to_transferred = window_to_transferred self.window_to_complete_latencies_ms = window_to_complete_latencies_ms self.window_to_acked = window_to_acked self.window_to_failed = window_to_failed + self.window_to_throughput = window_to_throughput def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -5636,55 +5685,66 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.window_to_emitted = {} - (_ktype339, _vtype340, _size338 ) = iprot.readMapBegin() - for _i342 in xrange(_size338): - _key343 = iprot.readString().decode('utf-8') - _val344 = iprot.readI64() - self.window_to_emitted[_key343] = _val344 + (_ktype357, _vtype358, _size356 ) = iprot.readMapBegin() + for _i360 in xrange(_size356): + _key361 = iprot.readString().decode('utf-8') + _val362 = iprot.readI64() + self.window_to_emitted[_key361] = _val362 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.window_to_transferred = {} - (_ktype346, _vtype347, _size345 ) = iprot.readMapBegin() - for _i349 in xrange(_size345): - _key350 = iprot.readString().decode('utf-8') - _val351 = iprot.readI64() - self.window_to_transferred[_key350] = _val351 + (_ktype364, _vtype365, _size363 ) = iprot.readMapBegin() + for _i367 in xrange(_size363): + _key368 = iprot.readString().decode('utf-8') + _val369 = iprot.readI64() + self.window_to_transferred[_key368] = _val369 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.window_to_complete_latencies_ms = {} - (_ktype353, _vtype354, _size352 ) = iprot.readMapBegin() - for _i356 in xrange(_size352): - _key357 = iprot.readString().decode('utf-8') - _val358 = iprot.readDouble() - self.window_to_complete_latencies_ms[_key357] = _val358 + (_ktype371, _vtype372, _size370 ) = iprot.readMapBegin() + for _i374 in xrange(_size370): + _key375 = iprot.readString().decode('utf-8') + _val376 = iprot.readDouble() + self.window_to_complete_latencies_ms[_key375] = _val376 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.window_to_acked = {} - (_ktype360, _vtype361, _size359 ) = iprot.readMapBegin() - for _i363 in xrange(_size359): - _key364 = iprot.readString().decode('utf-8') - _val365 = iprot.readI64() - self.window_to_acked[_key364] = _val365 + (_ktype378, _vtype379, _size377 ) = iprot.readMapBegin() + for _i381 in xrange(_size377): + _key382 = iprot.readString().decode('utf-8') + _val383 = iprot.readI64() + self.window_to_acked[_key382] = _val383 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.MAP: self.window_to_failed = {} - (_ktype367, _vtype368, _size366 ) = iprot.readMapBegin() - for _i370 in xrange(_size366): - _key371 = iprot.readString().decode('utf-8') - _val372 = iprot.readI64() - self.window_to_failed[_key371] = _val372 + (_ktype385, _vtype386, _size384 ) = iprot.readMapBegin() + for _i388 in xrange(_size384): + _key389 = iprot.readString().decode('utf-8') + _val390 = iprot.readI64() + self.window_to_failed[_key389] = _val390 + iprot.readMapEnd() + else: + iprot.skip(ftype) + elif fid == 6: + if ftype == TType.MAP: + self.window_to_throughput = {} + (_ktype392, _vtype393, _size391 ) = iprot.readMapBegin() + for _i395 in xrange(_size391): + _key396 = iprot.readString().decode('utf-8') + _val397 = iprot.readDouble() + self.window_to_throughput[_key396] = _val397 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5701,41 +5761,49 @@ def write(self, oprot): if self.window_to_emitted is not None: oprot.writeFieldBegin('window_to_emitted', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.I64, len(self.window_to_emitted)) - for kiter373,viter374 in self.window_to_emitted.items(): - oprot.writeString(kiter373.encode('utf-8')) - oprot.writeI64(viter374) + for kiter398,viter399 in self.window_to_emitted.items(): + oprot.writeString(kiter398.encode('utf-8')) + oprot.writeI64(viter399) oprot.writeMapEnd() oprot.writeFieldEnd() if self.window_to_transferred is not None: oprot.writeFieldBegin('window_to_transferred', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.I64, len(self.window_to_transferred)) - for kiter375,viter376 in self.window_to_transferred.items(): - oprot.writeString(kiter375.encode('utf-8')) - oprot.writeI64(viter376) + for kiter400,viter401 in self.window_to_transferred.items(): + oprot.writeString(kiter400.encode('utf-8')) + oprot.writeI64(viter401) oprot.writeMapEnd() oprot.writeFieldEnd() if self.window_to_complete_latencies_ms is not None: oprot.writeFieldBegin('window_to_complete_latencies_ms', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.window_to_complete_latencies_ms)) - for kiter377,viter378 in self.window_to_complete_latencies_ms.items(): - oprot.writeString(kiter377.encode('utf-8')) - oprot.writeDouble(viter378) + for kiter402,viter403 in self.window_to_complete_latencies_ms.items(): + oprot.writeString(kiter402.encode('utf-8')) + oprot.writeDouble(viter403) oprot.writeMapEnd() oprot.writeFieldEnd() if self.window_to_acked is not None: oprot.writeFieldBegin('window_to_acked', TType.MAP, 4) oprot.writeMapBegin(TType.STRING, TType.I64, len(self.window_to_acked)) - for kiter379,viter380 in self.window_to_acked.items(): - oprot.writeString(kiter379.encode('utf-8')) - oprot.writeI64(viter380) + for kiter404,viter405 in self.window_to_acked.items(): + oprot.writeString(kiter404.encode('utf-8')) + oprot.writeI64(viter405) oprot.writeMapEnd() oprot.writeFieldEnd() if self.window_to_failed is not None: oprot.writeFieldBegin('window_to_failed', TType.MAP, 5) oprot.writeMapBegin(TType.STRING, TType.I64, len(self.window_to_failed)) - for kiter381,viter382 in self.window_to_failed.items(): - oprot.writeString(kiter381.encode('utf-8')) - oprot.writeI64(viter382) + for kiter406,viter407 in self.window_to_failed.items(): + oprot.writeString(kiter406.encode('utf-8')) + oprot.writeI64(viter407) + oprot.writeMapEnd() + oprot.writeFieldEnd() + if self.window_to_throughput is not None: + oprot.writeFieldBegin('window_to_throughput', TType.MAP, 6) + oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.window_to_throughput)) + for kiter408,viter409 in self.window_to_throughput.items(): + oprot.writeString(kiter408.encode('utf-8')) + oprot.writeDouble(viter409) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5752,6 +5820,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.window_to_complete_latencies_ms) value = (value * 31) ^ hash(self.window_to_acked) value = (value * 31) ^ hash(self.window_to_failed) + value = (value * 31) ^ hash(self.window_to_throughput) return value def __repr__(self): @@ -6374,11 +6443,11 @@ def read(self, iprot): elif fid == 7: if ftype == TType.MAP: self.component_to_num_tasks = {} - (_ktype384, _vtype385, _size383 ) = iprot.readMapBegin() - for _i387 in xrange(_size383): - _key388 = iprot.readString().decode('utf-8') - _val389 = iprot.readI64() - self.component_to_num_tasks[_key388] = _val389 + (_ktype411, _vtype412, _size410 ) = iprot.readMapBegin() + for _i414 in xrange(_size410): + _key415 = iprot.readString().decode('utf-8') + _val416 = iprot.readI64() + self.component_to_num_tasks[_key415] = _val416 iprot.readMapEnd() else: iprot.skip(ftype) @@ -6459,9 +6528,9 @@ def write(self, oprot): if self.component_to_num_tasks is not None: oprot.writeFieldBegin('component_to_num_tasks', TType.MAP, 7) oprot.writeMapBegin(TType.STRING, TType.I64, len(self.component_to_num_tasks)) - for kiter390,viter391 in self.component_to_num_tasks.items(): - oprot.writeString(kiter390.encode('utf-8')) - oprot.writeI64(viter391) + for kiter417,viter418 in self.component_to_num_tasks.items(): + oprot.writeString(kiter417.encode('utf-8')) + oprot.writeI64(viter418) oprot.writeMapEnd() oprot.writeFieldEnd() if self.time_secs is not None: @@ -6562,22 +6631,22 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.supervisor_summaries = [] - (_etype395, _size392) = iprot.readListBegin() - for _i396 in xrange(_size392): - _elem397 = SupervisorSummary() - _elem397.read(iprot) - self.supervisor_summaries.append(_elem397) + (_etype422, _size419) = iprot.readListBegin() + for _i423 in xrange(_size419): + _elem424 = SupervisorSummary() + _elem424.read(iprot) + self.supervisor_summaries.append(_elem424) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.LIST: self.worker_summaries = [] - (_etype401, _size398) = iprot.readListBegin() - for _i402 in xrange(_size398): - _elem403 = WorkerSummary() - _elem403.read(iprot) - self.worker_summaries.append(_elem403) + (_etype428, _size425) = iprot.readListBegin() + for _i429 in xrange(_size425): + _elem430 = WorkerSummary() + _elem430.read(iprot) + self.worker_summaries.append(_elem430) iprot.readListEnd() else: iprot.skip(ftype) @@ -6594,15 +6663,15 @@ def write(self, oprot): if self.supervisor_summaries is not None: oprot.writeFieldBegin('supervisor_summaries', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.supervisor_summaries)) - for iter404 in self.supervisor_summaries: - iter404.write(oprot) + for iter431 in self.supervisor_summaries: + iter431.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.worker_summaries is not None: oprot.writeFieldBegin('worker_summaries', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.worker_summaries)) - for iter405 in self.worker_summaries: - iter405.write(oprot) + for iter432 in self.worker_summaries: + iter432.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -7262,24 +7331,24 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.id_to_spout_agg_stats = {} - (_ktype407, _vtype408, _size406 ) = iprot.readMapBegin() - for _i410 in xrange(_size406): - _key411 = iprot.readString().decode('utf-8') - _val412 = ComponentAggregateStats() - _val412.read(iprot) - self.id_to_spout_agg_stats[_key411] = _val412 + (_ktype434, _vtype435, _size433 ) = iprot.readMapBegin() + for _i437 in xrange(_size433): + _key438 = iprot.readString().decode('utf-8') + _val439 = ComponentAggregateStats() + _val439.read(iprot) + self.id_to_spout_agg_stats[_key438] = _val439 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.MAP: self.id_to_bolt_agg_stats = {} - (_ktype414, _vtype415, _size413 ) = iprot.readMapBegin() - for _i417 in xrange(_size413): - _key418 = iprot.readString().decode('utf-8') - _val419 = ComponentAggregateStats() - _val419.read(iprot) - self.id_to_bolt_agg_stats[_key418] = _val419 + (_ktype441, _vtype442, _size440 ) = iprot.readMapBegin() + for _i444 in xrange(_size440): + _key445 = iprot.readString().decode('utf-8') + _val446 = ComponentAggregateStats() + _val446.read(iprot) + self.id_to_bolt_agg_stats[_key445] = _val446 iprot.readMapEnd() else: iprot.skip(ftype) @@ -7313,11 +7382,11 @@ def read(self, iprot): elif fid == 16: if ftype == TType.LIST: self.workers = [] - (_etype423, _size420) = iprot.readListBegin() - for _i424 in xrange(_size420): - _elem425 = WorkerSummary() - _elem425.read(iprot) - self.workers.append(_elem425) + (_etype450, _size447) = iprot.readListBegin() + for _i451 in xrange(_size447): + _elem452 = WorkerSummary() + _elem452.read(iprot) + self.workers.append(_elem452) iprot.readListEnd() else: iprot.skip(ftype) @@ -7396,17 +7465,17 @@ def write(self, oprot): if self.id_to_spout_agg_stats is not None: oprot.writeFieldBegin('id_to_spout_agg_stats', TType.MAP, 9) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.id_to_spout_agg_stats)) - for kiter426,viter427 in self.id_to_spout_agg_stats.items(): - oprot.writeString(kiter426.encode('utf-8')) - viter427.write(oprot) + for kiter453,viter454 in self.id_to_spout_agg_stats.items(): + oprot.writeString(kiter453.encode('utf-8')) + viter454.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.id_to_bolt_agg_stats is not None: oprot.writeFieldBegin('id_to_bolt_agg_stats', TType.MAP, 10) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.id_to_bolt_agg_stats)) - for kiter428,viter429 in self.id_to_bolt_agg_stats.items(): - oprot.writeString(kiter428.encode('utf-8')) - viter429.write(oprot) + for kiter455,viter456 in self.id_to_bolt_agg_stats.items(): + oprot.writeString(kiter455.encode('utf-8')) + viter456.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.sched_status is not None: @@ -7432,8 +7501,8 @@ def write(self, oprot): if self.workers is not None: oprot.writeFieldBegin('workers', TType.LIST, 16) oprot.writeListBegin(TType.STRUCT, len(self.workers)) - for iter430 in self.workers: - iter430.write(oprot) + for iter457 in self.workers: + iter457.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.requested_memonheap is not None: @@ -7687,59 +7756,59 @@ def read(self, iprot): elif fid == 7: if ftype == TType.MAP: self.window_to_stats = {} - (_ktype432, _vtype433, _size431 ) = iprot.readMapBegin() - for _i435 in xrange(_size431): - _key436 = iprot.readString().decode('utf-8') - _val437 = ComponentAggregateStats() - _val437.read(iprot) - self.window_to_stats[_key436] = _val437 + (_ktype459, _vtype460, _size458 ) = iprot.readMapBegin() + for _i462 in xrange(_size458): + _key463 = iprot.readString().decode('utf-8') + _val464 = ComponentAggregateStats() + _val464.read(iprot) + self.window_to_stats[_key463] = _val464 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 8: if ftype == TType.MAP: self.gsid_to_input_stats = {} - (_ktype439, _vtype440, _size438 ) = iprot.readMapBegin() - for _i442 in xrange(_size438): - _key443 = GlobalStreamId() - _key443.read(iprot) - _val444 = ComponentAggregateStats() - _val444.read(iprot) - self.gsid_to_input_stats[_key443] = _val444 + (_ktype466, _vtype467, _size465 ) = iprot.readMapBegin() + for _i469 in xrange(_size465): + _key470 = GlobalStreamId() + _key470.read(iprot) + _val471 = ComponentAggregateStats() + _val471.read(iprot) + self.gsid_to_input_stats[_key470] = _val471 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 9: if ftype == TType.MAP: self.sid_to_output_stats = {} - (_ktype446, _vtype447, _size445 ) = iprot.readMapBegin() - for _i449 in xrange(_size445): - _key450 = iprot.readString().decode('utf-8') - _val451 = ComponentAggregateStats() - _val451.read(iprot) - self.sid_to_output_stats[_key450] = _val451 + (_ktype473, _vtype474, _size472 ) = iprot.readMapBegin() + for _i476 in xrange(_size472): + _key477 = iprot.readString().decode('utf-8') + _val478 = ComponentAggregateStats() + _val478.read(iprot) + self.sid_to_output_stats[_key477] = _val478 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.LIST: self.exec_stats = [] - (_etype455, _size452) = iprot.readListBegin() - for _i456 in xrange(_size452): - _elem457 = ExecutorAggregateStats() - _elem457.read(iprot) - self.exec_stats.append(_elem457) + (_etype482, _size479) = iprot.readListBegin() + for _i483 in xrange(_size479): + _elem484 = ExecutorAggregateStats() + _elem484.read(iprot) + self.exec_stats.append(_elem484) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 11: if ftype == TType.LIST: self.errors = [] - (_etype461, _size458) = iprot.readListBegin() - for _i462 in xrange(_size458): - _elem463 = ErrorInfo() - _elem463.read(iprot) - self.errors.append(_elem463) + (_etype488, _size485) = iprot.readListBegin() + for _i489 in xrange(_size485): + _elem490 = ErrorInfo() + _elem490.read(iprot) + self.errors.append(_elem490) iprot.readListEnd() else: iprot.skip(ftype) @@ -7767,11 +7836,11 @@ def read(self, iprot): elif fid == 16: if ftype == TType.MAP: self.resources_map = {} - (_ktype465, _vtype466, _size464 ) = iprot.readMapBegin() - for _i468 in xrange(_size464): - _key469 = iprot.readString().decode('utf-8') - _val470 = iprot.readDouble() - self.resources_map[_key469] = _val470 + (_ktype492, _vtype493, _size491 ) = iprot.readMapBegin() + for _i495 in xrange(_size491): + _key496 = iprot.readString().decode('utf-8') + _val497 = iprot.readDouble() + self.resources_map[_key496] = _val497 iprot.readMapEnd() else: iprot.skip(ftype) @@ -7812,39 +7881,39 @@ def write(self, oprot): if self.window_to_stats is not None: oprot.writeFieldBegin('window_to_stats', TType.MAP, 7) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.window_to_stats)) - for kiter471,viter472 in self.window_to_stats.items(): - oprot.writeString(kiter471.encode('utf-8')) - viter472.write(oprot) + for kiter498,viter499 in self.window_to_stats.items(): + oprot.writeString(kiter498.encode('utf-8')) + viter499.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.gsid_to_input_stats is not None: oprot.writeFieldBegin('gsid_to_input_stats', TType.MAP, 8) oprot.writeMapBegin(TType.STRUCT, TType.STRUCT, len(self.gsid_to_input_stats)) - for kiter473,viter474 in self.gsid_to_input_stats.items(): - kiter473.write(oprot) - viter474.write(oprot) + for kiter500,viter501 in self.gsid_to_input_stats.items(): + kiter500.write(oprot) + viter501.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.sid_to_output_stats is not None: oprot.writeFieldBegin('sid_to_output_stats', TType.MAP, 9) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.sid_to_output_stats)) - for kiter475,viter476 in self.sid_to_output_stats.items(): - oprot.writeString(kiter475.encode('utf-8')) - viter476.write(oprot) + for kiter502,viter503 in self.sid_to_output_stats.items(): + oprot.writeString(kiter502.encode('utf-8')) + viter503.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.exec_stats is not None: oprot.writeFieldBegin('exec_stats', TType.LIST, 10) oprot.writeListBegin(TType.STRUCT, len(self.exec_stats)) - for iter477 in self.exec_stats: - iter477.write(oprot) + for iter504 in self.exec_stats: + iter504.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.errors is not None: oprot.writeFieldBegin('errors', TType.LIST, 11) oprot.writeListBegin(TType.STRUCT, len(self.errors)) - for iter478 in self.errors: - iter478.write(oprot) + for iter505 in self.errors: + iter505.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.eventlog_host is not None: @@ -7866,9 +7935,9 @@ def write(self, oprot): if self.resources_map is not None: oprot.writeFieldBegin('resources_map', TType.MAP, 16) oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.resources_map)) - for kiter479,viter480 in self.resources_map.items(): - oprot.writeString(kiter479.encode('utf-8')) - oprot.writeDouble(viter480) + for kiter506,viter507 in self.resources_map.items(): + oprot.writeString(kiter506.encode('utf-8')) + oprot.writeDouble(viter507) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8020,11 +8089,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.num_executors = {} - (_ktype482, _vtype483, _size481 ) = iprot.readMapBegin() - for _i485 in xrange(_size481): - _key486 = iprot.readString().decode('utf-8') - _val487 = iprot.readI32() - self.num_executors[_key486] = _val487 + (_ktype509, _vtype510, _size508 ) = iprot.readMapBegin() + for _i512 in xrange(_size508): + _key513 = iprot.readString().decode('utf-8') + _val514 = iprot.readI32() + self.num_executors[_key513] = _val514 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8049,9 +8118,9 @@ def write(self, oprot): if self.num_executors is not None: oprot.writeFieldBegin('num_executors', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.num_executors)) - for kiter488,viter489 in self.num_executors.items(): - oprot.writeString(kiter488.encode('utf-8')) - oprot.writeI32(viter489) + for kiter515,viter516 in self.num_executors.items(): + oprot.writeString(kiter515.encode('utf-8')) + oprot.writeI32(viter516) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8105,11 +8174,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.creds = {} - (_ktype491, _vtype492, _size490 ) = iprot.readMapBegin() - for _i494 in xrange(_size490): - _key495 = iprot.readString().decode('utf-8') - _val496 = iprot.readString().decode('utf-8') - self.creds[_key495] = _val496 + (_ktype518, _vtype519, _size517 ) = iprot.readMapBegin() + for _i521 in xrange(_size517): + _key522 = iprot.readString().decode('utf-8') + _val523 = iprot.readString().decode('utf-8') + self.creds[_key522] = _val523 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8126,9 +8195,9 @@ def write(self, oprot): if self.creds is not None: oprot.writeFieldBegin('creds', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.creds)) - for kiter497,viter498 in self.creds.items(): - oprot.writeString(kiter497.encode('utf-8')) - oprot.writeString(viter498.encode('utf-8')) + for kiter524,viter525 in self.creds.items(): + oprot.writeString(kiter524.encode('utf-8')) + oprot.writeString(viter525.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8361,11 +8430,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.acl = [] - (_etype502, _size499) = iprot.readListBegin() - for _i503 in xrange(_size499): - _elem504 = AccessControl() - _elem504.read(iprot) - self.acl.append(_elem504) + (_etype529, _size526) = iprot.readListBegin() + for _i530 in xrange(_size526): + _elem531 = AccessControl() + _elem531.read(iprot) + self.acl.append(_elem531) iprot.readListEnd() else: iprot.skip(ftype) @@ -8387,8 +8456,8 @@ def write(self, oprot): if self.acl is not None: oprot.writeFieldBegin('acl', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.acl)) - for iter505 in self.acl: - iter505.write(oprot) + for iter532 in self.acl: + iter532.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.replication_factor is not None: @@ -8533,10 +8602,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.keys = [] - (_etype509, _size506) = iprot.readListBegin() - for _i510 in xrange(_size506): - _elem511 = iprot.readString().decode('utf-8') - self.keys.append(_elem511) + (_etype536, _size533) = iprot.readListBegin() + for _i537 in xrange(_size533): + _elem538 = iprot.readString().decode('utf-8') + self.keys.append(_elem538) iprot.readListEnd() else: iprot.skip(ftype) @@ -8558,8 +8627,8 @@ def write(self, oprot): if self.keys is not None: oprot.writeFieldBegin('keys', TType.LIST, 1) oprot.writeListBegin(TType.STRING, len(self.keys)) - for iter512 in self.keys: - oprot.writeString(iter512.encode('utf-8')) + for iter539 in self.keys: + oprot.writeString(iter539.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() if self.session is not None: @@ -8754,31 +8823,31 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.used_ports = [] - (_etype516, _size513) = iprot.readListBegin() - for _i517 in xrange(_size513): - _elem518 = iprot.readI64() - self.used_ports.append(_elem518) + (_etype543, _size540) = iprot.readListBegin() + for _i544 in xrange(_size540): + _elem545 = iprot.readI64() + self.used_ports.append(_elem545) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.LIST: self.meta = [] - (_etype522, _size519) = iprot.readListBegin() - for _i523 in xrange(_size519): - _elem524 = iprot.readI64() - self.meta.append(_elem524) + (_etype549, _size546) = iprot.readListBegin() + for _i550 in xrange(_size546): + _elem551 = iprot.readI64() + self.meta.append(_elem551) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.MAP: self.scheduler_meta = {} - (_ktype526, _vtype527, _size525 ) = iprot.readMapBegin() - for _i529 in xrange(_size525): - _key530 = iprot.readString().decode('utf-8') - _val531 = iprot.readString().decode('utf-8') - self.scheduler_meta[_key530] = _val531 + (_ktype553, _vtype554, _size552 ) = iprot.readMapBegin() + for _i556 in xrange(_size552): + _key557 = iprot.readString().decode('utf-8') + _val558 = iprot.readString().decode('utf-8') + self.scheduler_meta[_key557] = _val558 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8795,11 +8864,11 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.resources_map = {} - (_ktype533, _vtype534, _size532 ) = iprot.readMapBegin() - for _i536 in xrange(_size532): - _key537 = iprot.readString().decode('utf-8') - _val538 = iprot.readDouble() - self.resources_map[_key537] = _val538 + (_ktype560, _vtype561, _size559 ) = iprot.readMapBegin() + for _i563 in xrange(_size559): + _key564 = iprot.readString().decode('utf-8') + _val565 = iprot.readDouble() + self.resources_map[_key564] = _val565 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8828,23 +8897,23 @@ def write(self, oprot): if self.used_ports is not None: oprot.writeFieldBegin('used_ports', TType.LIST, 4) oprot.writeListBegin(TType.I64, len(self.used_ports)) - for iter539 in self.used_ports: - oprot.writeI64(iter539) + for iter566 in self.used_ports: + oprot.writeI64(iter566) oprot.writeListEnd() oprot.writeFieldEnd() if self.meta is not None: oprot.writeFieldBegin('meta', TType.LIST, 5) oprot.writeListBegin(TType.I64, len(self.meta)) - for iter540 in self.meta: - oprot.writeI64(iter540) + for iter567 in self.meta: + oprot.writeI64(iter567) oprot.writeListEnd() oprot.writeFieldEnd() if self.scheduler_meta is not None: oprot.writeFieldBegin('scheduler_meta', TType.MAP, 6) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.scheduler_meta)) - for kiter541,viter542 in self.scheduler_meta.items(): - oprot.writeString(kiter541.encode('utf-8')) - oprot.writeString(viter542.encode('utf-8')) + for kiter568,viter569 in self.scheduler_meta.items(): + oprot.writeString(kiter568.encode('utf-8')) + oprot.writeString(viter569.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() if self.uptime_secs is not None: @@ -8858,9 +8927,9 @@ def write(self, oprot): if self.resources_map is not None: oprot.writeFieldBegin('resources_map', TType.MAP, 9) oprot.writeMapBegin(TType.STRING, TType.DOUBLE, len(self.resources_map)) - for kiter543,viter544 in self.resources_map.items(): - oprot.writeString(kiter543.encode('utf-8')) - oprot.writeDouble(viter544) + for kiter570,viter571 in self.resources_map.items(): + oprot.writeString(kiter570.encode('utf-8')) + oprot.writeDouble(viter571) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8932,10 +9001,10 @@ def read(self, iprot): elif fid == 2: if ftype == TType.SET: self.port = set() - (_etype548, _size545) = iprot.readSetBegin() - for _i549 in xrange(_size545): - _elem550 = iprot.readI64() - self.port.add(_elem550) + (_etype575, _size572) = iprot.readSetBegin() + for _i576 in xrange(_size572): + _elem577 = iprot.readI64() + self.port.add(_elem577) iprot.readSetEnd() else: iprot.skip(ftype) @@ -8956,8 +9025,8 @@ def write(self, oprot): if self.port is not None: oprot.writeFieldBegin('port', TType.SET, 2) oprot.writeSetBegin(TType.I64, len(self.port)) - for iter551 in self.port: - oprot.writeI64(iter551) + for iter578 in self.port: + oprot.writeI64(iter578) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9138,57 +9207,57 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.node_host = {} - (_ktype553, _vtype554, _size552 ) = iprot.readMapBegin() - for _i556 in xrange(_size552): - _key557 = iprot.readString().decode('utf-8') - _val558 = iprot.readString().decode('utf-8') - self.node_host[_key557] = _val558 + (_ktype580, _vtype581, _size579 ) = iprot.readMapBegin() + for _i583 in xrange(_size579): + _key584 = iprot.readString().decode('utf-8') + _val585 = iprot.readString().decode('utf-8') + self.node_host[_key584] = _val585 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.executor_node_port = {} - (_ktype560, _vtype561, _size559 ) = iprot.readMapBegin() - for _i563 in xrange(_size559): - _key564 = [] - (_etype569, _size566) = iprot.readListBegin() - for _i570 in xrange(_size566): - _elem571 = iprot.readI64() - _key564.append(_elem571) + (_ktype587, _vtype588, _size586 ) = iprot.readMapBegin() + for _i590 in xrange(_size586): + _key591 = [] + (_etype596, _size593) = iprot.readListBegin() + for _i597 in xrange(_size593): + _elem598 = iprot.readI64() + _key591.append(_elem598) iprot.readListEnd() - _val565 = NodeInfo() - _val565.read(iprot) - self.executor_node_port[_key564] = _val565 + _val592 = NodeInfo() + _val592.read(iprot) + self.executor_node_port[_key591] = _val592 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.executor_start_time_secs = {} - (_ktype573, _vtype574, _size572 ) = iprot.readMapBegin() - for _i576 in xrange(_size572): - _key577 = [] - (_etype582, _size579) = iprot.readListBegin() - for _i583 in xrange(_size579): - _elem584 = iprot.readI64() - _key577.append(_elem584) + (_ktype600, _vtype601, _size599 ) = iprot.readMapBegin() + for _i603 in xrange(_size599): + _key604 = [] + (_etype609, _size606) = iprot.readListBegin() + for _i610 in xrange(_size606): + _elem611 = iprot.readI64() + _key604.append(_elem611) iprot.readListEnd() - _val578 = iprot.readI64() - self.executor_start_time_secs[_key577] = _val578 + _val605 = iprot.readI64() + self.executor_start_time_secs[_key604] = _val605 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.MAP: self.worker_resources = {} - (_ktype586, _vtype587, _size585 ) = iprot.readMapBegin() - for _i589 in xrange(_size585): - _key590 = NodeInfo() - _key590.read(iprot) - _val591 = WorkerResources() - _val591.read(iprot) - self.worker_resources[_key590] = _val591 + (_ktype613, _vtype614, _size612 ) = iprot.readMapBegin() + for _i616 in xrange(_size612): + _key617 = NodeInfo() + _key617.read(iprot) + _val618 = WorkerResources() + _val618.read(iprot) + self.worker_resources[_key617] = _val618 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9209,39 +9278,39 @@ def write(self, oprot): if self.node_host is not None: oprot.writeFieldBegin('node_host', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.node_host)) - for kiter592,viter593 in self.node_host.items(): - oprot.writeString(kiter592.encode('utf-8')) - oprot.writeString(viter593.encode('utf-8')) + for kiter619,viter620 in self.node_host.items(): + oprot.writeString(kiter619.encode('utf-8')) + oprot.writeString(viter620.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() if self.executor_node_port is not None: oprot.writeFieldBegin('executor_node_port', TType.MAP, 3) oprot.writeMapBegin(TType.LIST, TType.STRUCT, len(self.executor_node_port)) - for kiter594,viter595 in self.executor_node_port.items(): - oprot.writeListBegin(TType.I64, len(kiter594)) - for iter596 in kiter594: - oprot.writeI64(iter596) + for kiter621,viter622 in self.executor_node_port.items(): + oprot.writeListBegin(TType.I64, len(kiter621)) + for iter623 in kiter621: + oprot.writeI64(iter623) oprot.writeListEnd() - viter595.write(oprot) + viter622.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.executor_start_time_secs is not None: oprot.writeFieldBegin('executor_start_time_secs', TType.MAP, 4) oprot.writeMapBegin(TType.LIST, TType.I64, len(self.executor_start_time_secs)) - for kiter597,viter598 in self.executor_start_time_secs.items(): - oprot.writeListBegin(TType.I64, len(kiter597)) - for iter599 in kiter597: - oprot.writeI64(iter599) + for kiter624,viter625 in self.executor_start_time_secs.items(): + oprot.writeListBegin(TType.I64, len(kiter624)) + for iter626 in kiter624: + oprot.writeI64(iter626) oprot.writeListEnd() - oprot.writeI64(viter598) + oprot.writeI64(viter625) oprot.writeMapEnd() oprot.writeFieldEnd() if self.worker_resources is not None: oprot.writeFieldBegin('worker_resources', TType.MAP, 5) oprot.writeMapBegin(TType.STRUCT, TType.STRUCT, len(self.worker_resources)) - for kiter600,viter601 in self.worker_resources.items(): - kiter600.write(oprot) - viter601.write(oprot) + for kiter627,viter628 in self.worker_resources.items(): + kiter627.write(oprot) + viter628.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9418,11 +9487,11 @@ def read(self, iprot): elif fid == 4: if ftype == TType.MAP: self.component_executors = {} - (_ktype603, _vtype604, _size602 ) = iprot.readMapBegin() - for _i606 in xrange(_size602): - _key607 = iprot.readString().decode('utf-8') - _val608 = iprot.readI32() - self.component_executors[_key607] = _val608 + (_ktype630, _vtype631, _size629 ) = iprot.readMapBegin() + for _i633 in xrange(_size629): + _key634 = iprot.readString().decode('utf-8') + _val635 = iprot.readI32() + self.component_executors[_key634] = _val635 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9450,12 +9519,12 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.component_debug = {} - (_ktype610, _vtype611, _size609 ) = iprot.readMapBegin() - for _i613 in xrange(_size609): - _key614 = iprot.readString().decode('utf-8') - _val615 = DebugOptions() - _val615.read(iprot) - self.component_debug[_key614] = _val615 + (_ktype637, _vtype638, _size636 ) = iprot.readMapBegin() + for _i640 in xrange(_size636): + _key641 = iprot.readString().decode('utf-8') + _val642 = DebugOptions() + _val642.read(iprot) + self.component_debug[_key641] = _val642 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9484,9 +9553,9 @@ def write(self, oprot): if self.component_executors is not None: oprot.writeFieldBegin('component_executors', TType.MAP, 4) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.component_executors)) - for kiter616,viter617 in self.component_executors.items(): - oprot.writeString(kiter616.encode('utf-8')) - oprot.writeI32(viter617) + for kiter643,viter644 in self.component_executors.items(): + oprot.writeString(kiter643.encode('utf-8')) + oprot.writeI32(viter644) oprot.writeMapEnd() oprot.writeFieldEnd() if self.launch_time_secs is not None: @@ -9508,9 +9577,9 @@ def write(self, oprot): if self.component_debug is not None: oprot.writeFieldBegin('component_debug', TType.MAP, 9) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.component_debug)) - for kiter618,viter619 in self.component_debug.items(): - oprot.writeString(kiter618.encode('utf-8')) - viter619.write(oprot) + for kiter645,viter646 in self.component_debug.items(): + oprot.writeString(kiter645.encode('utf-8')) + viter646.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9590,13 +9659,13 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.executor_stats = {} - (_ktype621, _vtype622, _size620 ) = iprot.readMapBegin() - for _i624 in xrange(_size620): - _key625 = ExecutorInfo() - _key625.read(iprot) - _val626 = ExecutorStats() - _val626.read(iprot) - self.executor_stats[_key625] = _val626 + (_ktype648, _vtype649, _size647 ) = iprot.readMapBegin() + for _i651 in xrange(_size647): + _key652 = ExecutorInfo() + _key652.read(iprot) + _val653 = ExecutorStats() + _val653.read(iprot) + self.executor_stats[_key652] = _val653 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9627,9 +9696,9 @@ def write(self, oprot): if self.executor_stats is not None: oprot.writeFieldBegin('executor_stats', TType.MAP, 2) oprot.writeMapBegin(TType.STRUCT, TType.STRUCT, len(self.executor_stats)) - for kiter627,viter628 in self.executor_stats.items(): - kiter627.write(oprot) - viter628.write(oprot) + for kiter654,viter655 in self.executor_stats.items(): + kiter654.write(oprot) + viter655.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.time_secs is not None: @@ -9782,12 +9851,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.serialized_parts = {} - (_ktype630, _vtype631, _size629 ) = iprot.readMapBegin() - for _i633 in xrange(_size629): - _key634 = iprot.readString().decode('utf-8') - _val635 = ThriftSerializedObject() - _val635.read(iprot) - self.serialized_parts[_key634] = _val635 + (_ktype657, _vtype658, _size656 ) = iprot.readMapBegin() + for _i660 in xrange(_size656): + _key661 = iprot.readString().decode('utf-8') + _val662 = ThriftSerializedObject() + _val662.read(iprot) + self.serialized_parts[_key661] = _val662 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9804,9 +9873,9 @@ def write(self, oprot): if self.serialized_parts is not None: oprot.writeFieldBegin('serialized_parts', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.serialized_parts)) - for kiter636,viter637 in self.serialized_parts.items(): - oprot.writeString(kiter636.encode('utf-8')) - viter637.write(oprot) + for kiter663,viter664 in self.serialized_parts.items(): + oprot.writeString(kiter663.encode('utf-8')) + viter664.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9871,11 +9940,11 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.executors = [] - (_etype641, _size638) = iprot.readListBegin() - for _i642 in xrange(_size638): - _elem643 = ExecutorInfo() - _elem643.read(iprot) - self.executors.append(_elem643) + (_etype668, _size665) = iprot.readListBegin() + for _i669 in xrange(_size665): + _elem670 = ExecutorInfo() + _elem670.read(iprot) + self.executors.append(_elem670) iprot.readListEnd() else: iprot.skip(ftype) @@ -9902,8 +9971,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 2) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter644 in self.executors: - iter644.write(oprot) + for iter671 in self.executors: + iter671.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.resources is not None: @@ -10032,11 +10101,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.approved_workers = {} - (_ktype646, _vtype647, _size645 ) = iprot.readMapBegin() - for _i649 in xrange(_size645): - _key650 = iprot.readString().decode('utf-8') - _val651 = iprot.readI32() - self.approved_workers[_key650] = _val651 + (_ktype673, _vtype674, _size672 ) = iprot.readMapBegin() + for _i676 in xrange(_size672): + _key677 = iprot.readString().decode('utf-8') + _val678 = iprot.readI32() + self.approved_workers[_key677] = _val678 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10053,9 +10122,9 @@ def write(self, oprot): if self.approved_workers is not None: oprot.writeFieldBegin('approved_workers', TType.MAP, 1) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.approved_workers)) - for kiter652,viter653 in self.approved_workers.items(): - oprot.writeString(kiter652.encode('utf-8')) - oprot.writeI32(viter653) + for kiter679,viter680 in self.approved_workers.items(): + oprot.writeString(kiter679.encode('utf-8')) + oprot.writeI32(viter680) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10109,12 +10178,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.assignments = {} - (_ktype655, _vtype656, _size654 ) = iprot.readMapBegin() - for _i658 in xrange(_size654): - _key659 = iprot.readI32() - _val660 = LocalAssignment() - _val660.read(iprot) - self.assignments[_key659] = _val660 + (_ktype682, _vtype683, _size681 ) = iprot.readMapBegin() + for _i685 in xrange(_size681): + _key686 = iprot.readI32() + _val687 = LocalAssignment() + _val687.read(iprot) + self.assignments[_key686] = _val687 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10131,9 +10200,9 @@ def write(self, oprot): if self.assignments is not None: oprot.writeFieldBegin('assignments', TType.MAP, 1) oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.assignments)) - for kiter661,viter662 in self.assignments.items(): - oprot.writeI32(kiter661) - viter662.write(oprot) + for kiter688,viter689 in self.assignments.items(): + oprot.writeI32(kiter688) + viter689.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10206,11 +10275,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.executors = [] - (_etype666, _size663) = iprot.readListBegin() - for _i667 in xrange(_size663): - _elem668 = ExecutorInfo() - _elem668.read(iprot) - self.executors.append(_elem668) + (_etype693, _size690) = iprot.readListBegin() + for _i694 in xrange(_size690): + _elem695 = ExecutorInfo() + _elem695.read(iprot) + self.executors.append(_elem695) iprot.readListEnd() else: iprot.skip(ftype) @@ -10240,8 +10309,8 @@ def write(self, oprot): if self.executors is not None: oprot.writeFieldBegin('executors', TType.LIST, 3) oprot.writeListBegin(TType.STRUCT, len(self.executors)) - for iter669 in self.executors: - iter669.write(oprot) + for iter696 in self.executors: + iter696.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.port is not None: @@ -10327,20 +10396,20 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.users = [] - (_etype673, _size670) = iprot.readListBegin() - for _i674 in xrange(_size670): - _elem675 = iprot.readString().decode('utf-8') - self.users.append(_elem675) + (_etype700, _size697) = iprot.readListBegin() + for _i701 in xrange(_size697): + _elem702 = iprot.readString().decode('utf-8') + self.users.append(_elem702) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.LIST: self.groups = [] - (_etype679, _size676) = iprot.readListBegin() - for _i680 in xrange(_size676): - _elem681 = iprot.readString().decode('utf-8') - self.groups.append(_elem681) + (_etype706, _size703) = iprot.readListBegin() + for _i707 in xrange(_size703): + _elem708 = iprot.readString().decode('utf-8') + self.groups.append(_elem708) iprot.readListEnd() else: iprot.skip(ftype) @@ -10365,15 +10434,15 @@ def write(self, oprot): if self.users is not None: oprot.writeFieldBegin('users', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.users)) - for iter682 in self.users: - oprot.writeString(iter682.encode('utf-8')) + for iter709 in self.users: + oprot.writeString(iter709.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() if self.groups is not None: oprot.writeFieldBegin('groups', TType.LIST, 4) oprot.writeListBegin(TType.STRING, len(self.groups)) - for iter683 in self.groups: - oprot.writeString(iter683.encode('utf-8')) + for iter710 in self.groups: + oprot.writeString(iter710.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10436,11 +10505,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.topo_history = [] - (_etype687, _size684) = iprot.readListBegin() - for _i688 in xrange(_size684): - _elem689 = LSTopoHistory() - _elem689.read(iprot) - self.topo_history.append(_elem689) + (_etype714, _size711) = iprot.readListBegin() + for _i715 in xrange(_size711): + _elem716 = LSTopoHistory() + _elem716.read(iprot) + self.topo_history.append(_elem716) iprot.readListEnd() else: iprot.skip(ftype) @@ -10457,8 +10526,8 @@ def write(self, oprot): if self.topo_history is not None: oprot.writeFieldBegin('topo_history', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.topo_history)) - for iter690 in self.topo_history: - iter690.write(oprot) + for iter717 in self.topo_history: + iter717.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10793,12 +10862,12 @@ def read(self, iprot): if fid == 2: if ftype == TType.MAP: self.named_logger_level = {} - (_ktype692, _vtype693, _size691 ) = iprot.readMapBegin() - for _i695 in xrange(_size691): - _key696 = iprot.readString().decode('utf-8') - _val697 = LogLevel() - _val697.read(iprot) - self.named_logger_level[_key696] = _val697 + (_ktype719, _vtype720, _size718 ) = iprot.readMapBegin() + for _i722 in xrange(_size718): + _key723 = iprot.readString().decode('utf-8') + _val724 = LogLevel() + _val724.read(iprot) + self.named_logger_level[_key723] = _val724 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10815,9 +10884,9 @@ def write(self, oprot): if self.named_logger_level is not None: oprot.writeFieldBegin('named_logger_level', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.named_logger_level)) - for kiter698,viter699 in self.named_logger_level.items(): - oprot.writeString(kiter698.encode('utf-8')) - viter699.write(oprot) + for kiter725,viter726 in self.named_logger_level.items(): + oprot.writeString(kiter725.encode('utf-8')) + viter726.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10869,10 +10938,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.topo_ids = [] - (_etype703, _size700) = iprot.readListBegin() - for _i704 in xrange(_size700): - _elem705 = iprot.readString().decode('utf-8') - self.topo_ids.append(_elem705) + (_etype730, _size727) = iprot.readListBegin() + for _i731 in xrange(_size727): + _elem732 = iprot.readString().decode('utf-8') + self.topo_ids.append(_elem732) iprot.readListEnd() else: iprot.skip(ftype) @@ -10889,8 +10958,8 @@ def write(self, oprot): if self.topo_ids is not None: oprot.writeFieldBegin('topo_ids', TType.LIST, 1) oprot.writeListBegin(TType.STRING, len(self.topo_ids)) - for iter706 in self.topo_ids: - oprot.writeString(iter706.encode('utf-8')) + for iter733 in self.topo_ids: + oprot.writeString(iter733.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -11174,11 +11243,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.pulses = [] - (_etype710, _size707) = iprot.readListBegin() - for _i711 in xrange(_size707): - _elem712 = HBPulse() - _elem712.read(iprot) - self.pulses.append(_elem712) + (_etype737, _size734) = iprot.readListBegin() + for _i738 in xrange(_size734): + _elem739 = HBPulse() + _elem739.read(iprot) + self.pulses.append(_elem739) iprot.readListEnd() else: iprot.skip(ftype) @@ -11195,8 +11264,8 @@ def write(self, oprot): if self.pulses is not None: oprot.writeFieldBegin('pulses', TType.LIST, 1) oprot.writeListBegin(TType.STRUCT, len(self.pulses)) - for iter713 in self.pulses: - iter713.write(oprot) + for iter740 in self.pulses: + iter740.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -11248,10 +11317,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.pulseIds = [] - (_etype717, _size714) = iprot.readListBegin() - for _i718 in xrange(_size714): - _elem719 = iprot.readString().decode('utf-8') - self.pulseIds.append(_elem719) + (_etype744, _size741) = iprot.readListBegin() + for _i745 in xrange(_size741): + _elem746 = iprot.readString().decode('utf-8') + self.pulseIds.append(_elem746) iprot.readListEnd() else: iprot.skip(ftype) @@ -11268,8 +11337,8 @@ def write(self, oprot): if self.pulseIds is not None: oprot.writeFieldBegin('pulseIds', TType.LIST, 1) oprot.writeListBegin(TType.STRING, len(self.pulseIds)) - for iter720 in self.pulseIds: - oprot.writeString(iter720.encode('utf-8')) + for iter747 in self.pulseIds: + oprot.writeString(iter747.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift index fc018ee337c..a3ac31895a7 100644 --- a/storm-core/src/storm.thrift +++ b/storm-core/src/storm.thrift @@ -226,6 +226,7 @@ struct ExecutorStats { 2: required map> transferred; 3: required ExecutorSpecificStats specific; 4: required double rate; + 5: optional map> throughput; } struct ExecutorInfo { @@ -274,6 +275,7 @@ struct CommonAggregateStats { 5: optional i64 acked; 6: optional i64 failed; 7: optional map resources_map; +8: optional double throughput; } struct SpoutAggregateStats { @@ -310,6 +312,7 @@ struct TopologyStats { 3: optional map window_to_complete_latencies_ms; 4: optional map window_to_acked; 5: optional map window_to_failed; +6: optional map window_to_throughput; } struct WorkerSummary { diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html index 0cde4db4d0e..f0c809cf35c 100644 --- a/storm-core/src/ui/public/component.html +++ b/storm-core/src/ui/public/component.html @@ -235,41 +235,41 @@

Storm UI

if(response["componentType"] == "spout") { componentStatsDetail.append(Mustache.render($(template).filter("#spout-stats-detail-template").html(),response)); - //window, emitted, transferred, complete latency, acked, failed + //window, emitted, transferred, complete latency, throughput, acked, failed $("#spout-stats-table").DataTable({ paging: false, info: false, searching: false, columnDefs: [ - {type: "num", targets: [1, 2, 3, 4, 5]}, + {type: "num", targets: [1, 2, 3, 4, 5, 6]}, {type: "time-str", targets: [0]} ] }); outputStats.append(Mustache.render($(template).filter("#output-stats-template").html(),response)); - //stream, emitted, transferred, compltete latency, acked, failed + //stream, emitted, transferred, compltete latency, throughput, acked, failed dtAutoPage("#output-stats-table", { columnDefs: [ - {type: "num", targets: [1, 2, 3, 4, 5]} + {type: "num", targets: [1, 2, 3, 4, 5, 6]} ] }); executorStats.append(Mustache.render($(template).filter("#executor-stats-template").html(),response)); - //id, uptime, host, port, actions, emitted, transferred, complete latency, acked, failed + //id, uptime, host, port, actions, emitted, transferred, complete latency, throughput, acked, failed dtAutoPage("#executor-stats-table", { columnDefs: [ {render: renderSupervisorPageLink, searchable: true, targets: [2]}, {render: renderActionCheckbox, searchable: false, targets: [4]}, - {type: "num", targets: [5, 6, 7, 8, 9]}, + {type: "num", targets: [5, 6, 7, 8, 9, 10]}, {type: "time-str", targets: [1]}, ] }).on("draw", function(e,s) {setWorkerActionCheckboxesClickCallback()}); } else { componentStatsDetail.append(Mustache.render($(template).filter("#bolt-stats-template").html(),response)); - //window, emitted, transferred, execute latency, executed, process latency, acked, failed + //window, emitted, transferred, execute latency, executed, process latency, throughput, acked, failed dtAutoPage("#bolt-stats-table", { columnDefs: [ - {type: "num", targets: [1, 2, 3, 4, 5, 6, 7]}, + {type: "num", targets: [1, 2, 3, 4, 5, 6, 7, 8]}, {type: "time-str", targets: [0]} ] }); @@ -291,12 +291,12 @@

Storm UI

}); executorStats.append(Mustache.render($(template).filter("#bolt-executor-template").html(),response)); - //id, uptime, host, port, actions, emitted, transferred, capacity, execute latency, executed, process latency, acked, failed + //id, uptime, host, port, actions, emitted, transferred, capacity, execute latency, executed, process latency, throughput, acked, failed dtAutoPage("#executor-stats-table", { columnDefs: [ {render: renderSupervisorPageLink, searchable: true, targets: [2]}, {render: renderActionCheckbox, searchable: false, targets: [4]}, - {type: "num", targets: [5, 6, 7, 8, 9, 10, 11, 12]}, + {type: "num", targets: [5, 6, 7, 8, 9, 10, 11, 12, 13]}, {type: "time-str", targets: [1]}, ] }).on("draw", function(e,s) {setWorkerActionCheckboxesClickCallback()}); diff --git a/storm-core/src/ui/public/templates/component-page-template.html b/storm-core/src/ui/public/templates/component-page-template.html index 634ef4793ad..6c930a4afc1 100644 --- a/storm-core/src/ui/public/templates/component-page-template.html +++ b/storm-core/src/ui/public/templates/component-page-template.html @@ -98,6 +98,11 @@

Spout stats

Transferred + + + Throughput (tuples/s) + + Complete latency (ms) @@ -121,6 +126,7 @@

Spout stats

{{windowPretty}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -149,6 +155,11 @@

Output stats ({{windowHint}})

Transferred + + + Throughput (tuples/s) + + Complete latency (ms) @@ -172,6 +183,7 @@

Output stats ({{windowHint}})

{{stream}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -220,6 +232,11 @@

Executors ({{windowHint}})

Transferred + + + Throughput (tuples/s) + + Complete latency (ms) @@ -247,6 +264,7 @@

Executors ({{windowHint}})

{{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -328,6 +346,11 @@

Bolt stats

Execute latency (ms) + + + Throughput (tuples/s) + + Executed @@ -357,6 +380,7 @@

Bolt stats

{{emitted}} {{transferred}} {{executeLatency}} + {{throughput}} {{executed}} {{processLatency}} {{acked}} @@ -506,6 +530,11 @@

Executors ({{windowHint}})

Execute latency (ms) + + + Throughput (tuples/s) + + Executed @@ -540,6 +569,7 @@

Executors ({{windowHint}})

{{transferred}} {{capacity}} {{executeLatency}} + {{throughput}} {{executed}} {{processLatency}} {{acked}} diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html index 2f7238a6c8c..a24684d2e17 100644 --- a/storm-core/src/ui/public/templates/topology-page-template.html +++ b/storm-core/src/ui/public/templates/topology-page-template.html @@ -182,6 +182,11 @@

Topology stats

Transferred + + + Throughput (tuples/s) + + Complete latency (ms) @@ -205,6 +210,7 @@

Topology stats

{{windowPretty}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -394,6 +400,11 @@

Spouts ({{windowHint}})

Transferred + + + Throughput (tupels/s) + + Complete latency (ms) @@ -428,6 +439,7 @@

Spouts ({{windowHint}})

{{/schedulerDisplayResource}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -501,6 +513,11 @@

Bolts ({{windowHint}})

Execute latency (ms) + + + Throughput (tuples/s) + + Executed @@ -541,6 +558,7 @@

Bolts ({{windowHint}})

{{transferred}} {{capacity}} {{executeLatency}} + {{throughput}} {{executed}} {{processLatency}} {{acked}}