diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj index 2436048b3ac..84da888e616 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj @@ -41,7 +41,8 @@ [cluster :as cluster] [disruptor :as disruptor] [stats :as stats]]) (:require [org.apache.storm.daemon [task :as task]]) (:require [org.apache.storm.daemon.builtin-metrics :as builtin-metrics]) - (:require [clojure.set :as set])) + (:require [clojure.set :as set] + [org.apache.storm.util :as util])) (defn- mk-fields-grouper [^Fields out-fields ^Fields group-fields ^List target-tasks] @@ -277,6 +278,7 @@ :spout-throttling-metrics (if (= executor-type :spout) (builtin-metrics/make-spout-throttling-data) nil) + :start-time-in-secs (util/current-time-secs) ;; TODO: add in the executor-specific stuff in a :specific... or make a spout-data, bolt-data function? ))) @@ -395,7 +397,7 @@ (reify RunningExecutor (render-stats [this] - (stats/render-stats! (:stats executor-data))) + (stats/render-stats! (:stats executor-data) (:start-time-in-secs executor-data))) (get-executor-id [this] executor-id) (credentials-changed [this creds] diff --git a/storm-core/src/clj/org/apache/storm/stats.clj b/storm-core/src/clj/org/apache/storm/stats.clj index 17d0219426d..f09ad376dbe 100644 --- a/storm-core/src/clj/org/apache/storm/stats.clj +++ b/storm-core/src/clj/org/apache/storm/stats.clj @@ -205,15 +205,35 @@ (value-stats stats SPOUT-FIELDS) {:type :spout})) +(defn update-values [m f & args] + (into {} (for [[k v] m] [k (apply f v args)]))) + +(defn values-divided-by [kv-pairs t] + (update-values kv-pairs / (max 1.0 (double t)))) + +(defn convert-count-to-throughput + [stat eclipsed-time-in-secs] + (into {} (for [[time buckets] stat] + [time (values-divided-by buckets (if (= time ":all-time") eclipsed-time-in-secs (min (Integer/parseInt time) eclipsed-time-in-secs)))]))) + +(defn remove-component-id [buckets] + (into {} (for [[time pair] buckets] + {time (into {} (for [[[component stream] v] pair] + {stream v}))}))) + (defmulti render-stats! class-selector) (defmethod render-stats! SpoutExecutorStats - [stats] - (value-spout-stats! stats)) + [stats start-time-in-secs] + (let [stats (value-spout-stats! stats) + eclipsed-time-in-secs (- (current-time-secs) start-time-in-secs)] + (assoc stats :throughput (convert-count-to-throughput (:emitted stats) eclipsed-time-in-secs)))) (defmethod render-stats! BoltExecutorStats - [stats] - (value-bolt-stats! stats)) + [stats start-time-in-secs] + (let [stats (value-bolt-stats! stats) + eclipsed-time-in-secs (- (current-time-secs) start-time-in-secs)] + (assoc stats :throughput (remove-component-id (convert-count-to-throughput (:executed stats) eclipsed-time-in-secs))))) (defmulti cleanup-stats! class-selector) @@ -271,8 +291,8 @@ ; worker heart beat does not store the BoltExecutorStats or SpoutExecutorStats , instead it stores the result returned by render-stats! ; which flattens the BoltExecutorStats/SpoutExecutorStats by extracting values from all atoms and merging all values inside :common to top ;level map we are pretty much doing the same here. - (dissoc (merge common-stats {:type :bolt} (apply ->BoltExecutorStats (into [nil] specific-stats))) :common) - (dissoc (merge common-stats {:type :spout} (apply ->SpoutExecutorStats (into [nil] specific-stats))) :common) + (dissoc (merge common-stats {:type :bolt} {:throughput (.get_throughput stats)} (apply ->BoltExecutorStats (into [nil] specific-stats))) :common) + (dissoc (merge common-stats {:type :spout} {:throughput (.get_throughput stats)} (apply ->SpoutExecutorStats (into [nil] specific-stats))) :common) ))) (defmethod thriftify-specific-stats :bolt @@ -295,11 +315,13 @@ (defn thriftify-executor-stats [stats] (let [specific-stats (thriftify-specific-stats stats) - rate (:rate stats)] - (ExecutorStats. (window-set-converter (:emitted stats) str) - (window-set-converter (:transferred stats) str) - specific-stats - rate))) + rate (:rate stats) + executor-stats (ExecutorStats. (window-set-converter (:emitted stats) str) + (window-set-converter (:transferred stats) str) + specific-stats + rate)] + (.set_throughput executor-stats(window-set-converter (:throughput stats) str)) + executor-stats)) (defn valid-number? "Returns true if x is a number that is not NaN or Infinity, false otherwise" @@ -481,7 +503,12 @@ :transferred str-key (get window) - handle-sys-components-fn)})})) + handle-sys-components-fn) + :throughput (-> statk->w->sid->num + :throughput + str-key + (get window) + handle-sys-components-fn)})})) (defn agg-pre-merge-comp-page-spout [{exec-id :exec-id @@ -526,11 +553,11 @@ str-key (get window) handle-sys-components-fn) - :transferred (-> statk->w->sid->num - :transferred - str-key - (get window) - handle-sys-components-fn)}))})) + :throughput (-> statk->w->sid->num + :throughput + str-key + (get window) + handle-sys-components-fn)}))})) (defn agg-pre-merge-topo-page-bolt [{comp-id :comp-id @@ -571,6 +598,13 @@ handle-sys-components-fn vals sum) + :throughput (-> statk->w->sid->num + :throughput + str-key + (get window) + handle-sys-components-fn + vals + sum) :capacity (compute-agg-capacity statk->w->sid->num uptime) :acked (-> statk->w->sid->num :acked @@ -619,6 +653,13 @@ handle-sys-components-fn vals sum) + :throughput (-> statk->w->sid->num + :throughput + str-key + (get window) + handle-sys-components-fn + vals + sum) :failed (-> statk->w->sid->num :failed str-key @@ -650,6 +691,7 @@ [:executor-id :uptime :host :port :capacity]) {:emitted (sum-streams bolt-out :emitted) :transferred (sum-streams bolt-out :transferred) + :throughput (sum-streams bolt-out :throughput) :acked (sum-streams bolt-in :acked) :failed (sum-streams bolt-in :failed) :executed executed} @@ -679,6 +721,7 @@ (select-keys spout-stats [:executor-id :uptime :host :port]) {:emitted (sum-streams spout-out :emitted) :transferred (sum-streams spout-out :transferred) + :throughput (sum-streams spout-out :throughput) :acked acked :failed (sum-streams spout-out :failed)} {:complete-latency (if (and acked (pos? acked)) @@ -694,6 +737,8 @@ :emitted (sum-or-0 (:emitted acc-bolt-stats) (:emitted bolt-stats)) :transferred (sum-or-0 (:transferred acc-bolt-stats) (:transferred bolt-stats)) + :throughput (sum-or-0 (:throughput acc-bolt-stats) + (:throughput bolt-stats)) :capacity (max-or-0 (:capacity acc-bolt-stats) (:capacity bolt-stats)) ;; We sum average latency totals here to avoid dividing at each step. ;; Compute the average latencies by dividing the total by the count. @@ -711,6 +756,7 @@ :num-tasks (sum-or-0 (:num-tasks acc-spout-stats) (:num-tasks spout-stats)) :emitted (sum-or-0 (:emitted acc-spout-stats) (:emitted spout-stats)) :transferred (sum-or-0 (:transferred acc-spout-stats) (:transferred spout-stats)) + :throughput (sum-or-0 (:throughput acc-spout-stats) (:throughput spout-stats)) ;; We sum average latency totals here to avoid dividing at each step. ;; Compute the average latencies by dividing the total by the count. :completeLatencyTotal (sum-or-0 (:completeLatencyTotal acc-spout-stats) @@ -733,6 +779,7 @@ spout-id->stats window->emitted window->transferred + window->throughput window->comp-lat-wgt-avg window->acked window->failed] :as acc-stats} @@ -765,6 +812,10 @@ (map-val handle-sys-components-fn) aggregate-count-streams (merge-with + window->transferred)) + :window->throughput (->> (:throughput stats) + (map-val handle-sys-components-fn) + aggregate-count-streams + (merge-with + window->throughput)) :window->comp-lat-wgt-avg (merge-with + window->comp-lat-wgt-avg w->compLatWgtAvg) @@ -864,6 +915,7 @@ :spout-id->stats {} :window->emitted {} :window->transferred {} + :window->throughput {} :window->comp-lat-wgt-avg {} :window->acked {} :window->failed {}} @@ -914,6 +966,7 @@ (assoc :lastError (last-err-fn id)))])) :window->emitted (map-key str (:window->emitted acc-data)) :window->transferred (map-key str (:window->transferred acc-data)) + :throughput (map-key str (:window->throughput acc-data)) :window->complete-latency (compute-weighted-averages-per-window acc-data :window->comp-lat-wgt-avg @@ -926,6 +979,7 @@ {:keys [num-tasks emitted transferred + throughput acked failed num-executors] :as statk->num}] @@ -934,6 +988,7 @@ (and num-tasks (.set_num_tasks cas num-tasks)) (and emitted (.set_emitted cas emitted)) (and transferred (.set_transferred cas transferred)) + (and throughput (.set_throughput cas throughput)) (and acked (.set_acked cas acked)) (and failed (.set_failed cas failed)) (.set_common_stats s cas))) @@ -983,6 +1038,7 @@ bolt-id->stats window->emitted window->transferred + window->throughput window->complete-latency window->acked window->failed]} data @@ -999,6 +1055,7 @@ topology-stats (doto (TopologyStats.) (.set_window_to_emitted window->emitted) (.set_window_to_transferred window->transferred) + (.set_window_to_throughput window->throughput) (.set_window_to_complete_latencies_ms window->complete-latency) (.set_window_to_acked window->acked) @@ -1101,6 +1158,10 @@ (map-val handle-sys-components-fn) aggregate-count-streams (merge-with + (:window->transferred acc-stats))) + :window->throughput (->> (:throughput new-stats) + (map-val handle-sys-components-fn) + aggregate-count-streams + (merge-with + (:window->throughput acc-stats))) :window->exec-lat-wgt-avg (merge-with + (:window->exec-lat-wgt-avg acc-stats) w->execLatWgtAvg) @@ -1130,6 +1191,10 @@ (map-val handle-sys-components-fn) aggregate-count-streams (merge-with + (:window->emitted acc-stats))) + :window->throughput (->> (:throughput new-stats) + (map-val handle-sys-components-fn) + aggregate-count-streams + (merge-with + (:window->throughput acc-stats))) :window->transferred (->> (:transferred new-stats) (map-val handle-sys-components-fn) aggregate-count-streams @@ -1183,6 +1248,7 @@ :executor-stats [] :window->emitted {} :window->transferred {} + :window->throughput {} :window->exec-lat-wgt-avg {} :window->executed {} :window->proc-lat-wgt-avg {} @@ -1196,6 +1262,7 @@ :sid->output-stats {} :executor-stats [] :window->emitted {} + :window->throughput {} :window->transferred {} :window->comp-lat-wgt-avg {} :window->acked {} @@ -1237,6 +1304,7 @@ :executor-stats (:executor-stats (:stats acc-data)) :window->emitted (map-key str (:window->emitted acc-data)) :window->transferred (map-key str (:window->transferred acc-data)) + :window->throughput (map-key str (:window->throughput acc-data)) :window->execute-latency (compute-weighted-averages-per-window acc-data :window->exec-lat-wgt-avg @@ -1271,6 +1339,7 @@ :executor-stats (:executor-stats (:stats acc-data)) :window->emitted (map-key str (:window->emitted acc-data)) :window->transferred (map-key str (:window->transferred acc-data)) + :window->throughput (map-key str (:window->throughput acc-data)) :window->complete-latency (compute-weighted-averages-per-window acc-data :window->comp-lat-wgt-avg @@ -1313,6 +1382,7 @@ (merge {:emitted (:window->emitted data) :transferred (:window->transferred data) + :throughput (:window->throughput data) :acked (:window->acked data) :failed (:window->failed data)} (condp = (:type data) @@ -1422,6 +1492,9 @@ transferred (:transferred stream-summary) transferred (into {} (for [[window stat] transferred] {window (filter-key filter-fn stat)})) + throughput (:throughput stream-summary) + throughput (into {} (for [[window stat] throughput] + {window (filter-key filter-fn stat)})) stream-summary (-> stream-summary (dissoc :emitted) (assoc :emitted emitted)) stream-summary (-> stream-summary (dissoc :transferred) (assoc :transferred transferred))] stream-summary)) @@ -1437,7 +1510,8 @@ (defn aggregate-common-stats [stats-seq] {:emitted (aggregate-counts (map #(.get_emitted ^ExecutorStats %) stats-seq)) - :transferred (aggregate-counts (map #(.get_transferred ^ExecutorStats %) stats-seq))}) + :transferred (aggregate-counts (map #(.get_transferred ^ExecutorStats %) stats-seq)) + :throughput (aggregate-counts (map #(.get_throughput ^ExecutorStats %) stats-seq))}) (defn aggregate-bolt-stats [stats-seq include-sys?] @@ -1491,6 +1565,7 @@ :failed (aggregate-count-streams (:failed stats)) :emitted (aggregate-count-streams (:emitted stats)) :transferred (aggregate-count-streams (:transferred stats)) + :throughput (aggregate-count-streams (:throughput stats)) :complete-latencies (aggregate-avg-streams (:complete-latencies stats) (:acked stats))}) @@ -1507,6 +1582,7 @@ :failed (aggregate-count-streams (:failed stats)) :emitted (aggregate-count-streams (:emitted stats)) :transferred (aggregate-count-streams (:transferred stats)) + :throughput (aggregate-count-streams (:throughput stats)) :process-latencies (aggregate-avg-streams (:process-latencies stats) (:acked stats)) :executed (aggregate-count-streams (:executed stats)) @@ -1554,7 +1630,7 @@ ;; Include only keys that will be used. We want to count acked and ;; failed only for the "tuple trees," so we do not include those keys ;; from the bolt executors. - [:emitted :transferred]) + [:emitted :transferred :throughput]) agg-spout-stats))) (defn error-subset 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 4cb01f9110f..651dbac09ae 100644 --- a/storm-core/src/clj/org/apache/storm/ui/core.clj +++ b/storm-core/src/clj/org/apache/storm/ui/core.clj @@ -234,6 +234,13 @@ (get-in (spout-streams-stats spout-summs true) [:complete-latencies window])) + :throughput (if bolt-summs + (get-in + (bolt-streams-stats bolt-summs true) + [:throughput window]) + (get-in + (spout-streams-stats spout-summs true) + [:throughput window])) :transferred (or (get-in (spout-streams-stats spout-summs true) @@ -527,6 +534,7 @@ "emitted" (get-in stats [:emitted w]) "transferred" (get-in stats [:transferred w]) "completeLatency" (float-str (get-in stats [:complete-latencies w])) + "throughput" (float-str (get-in stats [:throughput w])) "acked" (get-in stats [:acked w]) "failed" (get-in stats [:failed w])}))) @@ -572,6 +580,7 @@ "tasks" (.get_num_tasks common-stats) "emitted" (.get_emitted common-stats) "transferred" (.get_transferred common-stats) + "throughput" (float-str (.get_throughput common-stats)) "acked" (.get_acked common-stats) "failed" (.get_failed common-stats)}) @@ -613,6 +622,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) @@ -810,6 +820,7 @@ "windowPretty" (window-hint window) "emitted" (.get_emitted comm-s) "transferred" (.get_transferred comm-s) + "throughput" (float-str (.get_throughput comm-s)) "acked" (.get_acked comm-s) "failed" (.get_failed comm-s) "executeLatency" (float-str (.get_execute_latency_ms bolt-s)) @@ -826,6 +837,7 @@ "windowPretty" (window-hint window) "emitted" (.get_emitted comm-s) "transferred" (.get_transferred comm-s) + "throughput" (float-str (.get_throughput comm-s)) "acked" (.get_acked comm-s) "failed" (.get_failed comm-s) "completeLatency" (float-str (.get_complete_latency_ms spout-s))})) @@ -853,7 +865,8 @@ (let [^CommonAggregateStats cas (.get_common_stats stats)] {"stream" stream-id "emitted" (nil-to-zero (.get_emitted cas)) - "transferred" (nil-to-zero (.get_transferred cas))})) + "transferred" (nil-to-zero (.get_transferred cas)) + "throughput" (float-str (.get_throughput cas))})) (defmethod unpack-comp-output-stat ComponentType/SPOUT [[stream-id ^ComponentAggregateStats stats]] @@ -863,6 +876,7 @@ {"stream" stream-id "emitted" (nil-to-zero (.get_emitted cas)) "transferred" (nil-to-zero (.get_transferred cas)) + "throughput" (float-str (.get_throughput cas)) "completeLatency" (float-str (.get_complete_latency_ms spout-s)) "acked" (nil-to-zero (.get_acked cas)) "failed" (nil-to-zero (.get_failed cas))})) @@ -890,6 +904,7 @@ "port" port "emitted" (nil-to-zero (.get_emitted cas)) "transferred" (nil-to-zero (.get_transferred cas)) + "throughput" (float-str (.get_throughput cas)) "capacity" (float-str (nil-to-zero (.get_capacity bas))) "executeLatency" (float-str (.get_execute_latency_ms bas)) "executed" (nil-to-zero (.get_executed bas)) @@ -918,6 +933,7 @@ "port" port "emitted" (nil-to-zero (.get_emitted cas)) "transferred" (nil-to-zero (.get_transferred cas)) + "throughput" (float-str (.get_throughput cas)) "completeLatency" (float-str (.get_complete_latency_ms sas)) "acked" (nil-to-zero (.get_acked cas)) "failed" (nil-to-zero (.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 95623e42a22..7b0be4eb854 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 _map598 = iprot.readMapBegin(); - struct.node_host = new HashMap(2*_map598.size); - String _key599; - String _val600; - for (int _i601 = 0; _i601 < _map598.size; ++_i601) + org.apache.thrift.protocol.TMap _map628 = iprot.readMapBegin(); + struct.node_host = new HashMap(2*_map628.size); + String _key629; + String _val630; + for (int _i631 = 0; _i631 < _map628.size; ++_i631) { - _key599 = iprot.readString(); - _val600 = iprot.readString(); - struct.node_host.put(_key599, _val600); + _key629 = iprot.readString(); + _val630 = iprot.readString(); + struct.node_host.put(_key629, _val630); } 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 _map602 = iprot.readMapBegin(); - struct.executor_node_port = new HashMap,NodeInfo>(2*_map602.size); - List _key603; - NodeInfo _val604; - for (int _i605 = 0; _i605 < _map602.size; ++_i605) + org.apache.thrift.protocol.TMap _map632 = iprot.readMapBegin(); + struct.executor_node_port = new HashMap,NodeInfo>(2*_map632.size); + List _key633; + NodeInfo _val634; + for (int _i635 = 0; _i635 < _map632.size; ++_i635) { { - org.apache.thrift.protocol.TList _list606 = iprot.readListBegin(); - _key603 = new ArrayList(_list606.size); - long _elem607; - for (int _i608 = 0; _i608 < _list606.size; ++_i608) + org.apache.thrift.protocol.TList _list636 = iprot.readListBegin(); + _key633 = new ArrayList(_list636.size); + long _elem637; + for (int _i638 = 0; _i638 < _list636.size; ++_i638) { - _elem607 = iprot.readI64(); - _key603.add(_elem607); + _elem637 = iprot.readI64(); + _key633.add(_elem637); } iprot.readListEnd(); } - _val604 = new NodeInfo(); - _val604.read(iprot); - struct.executor_node_port.put(_key603, _val604); + _val634 = new NodeInfo(); + _val634.read(iprot); + struct.executor_node_port.put(_key633, _val634); } 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 _map609 = iprot.readMapBegin(); - struct.executor_start_time_secs = new HashMap,Long>(2*_map609.size); - List _key610; - long _val611; - for (int _i612 = 0; _i612 < _map609.size; ++_i612) + org.apache.thrift.protocol.TMap _map639 = iprot.readMapBegin(); + struct.executor_start_time_secs = new HashMap,Long>(2*_map639.size); + List _key640; + long _val641; + for (int _i642 = 0; _i642 < _map639.size; ++_i642) { { - org.apache.thrift.protocol.TList _list613 = iprot.readListBegin(); - _key610 = new ArrayList(_list613.size); - long _elem614; - for (int _i615 = 0; _i615 < _list613.size; ++_i615) + org.apache.thrift.protocol.TList _list643 = iprot.readListBegin(); + _key640 = new ArrayList(_list643.size); + long _elem644; + for (int _i645 = 0; _i645 < _list643.size; ++_i645) { - _elem614 = iprot.readI64(); - _key610.add(_elem614); + _elem644 = iprot.readI64(); + _key640.add(_elem644); } iprot.readListEnd(); } - _val611 = iprot.readI64(); - struct.executor_start_time_secs.put(_key610, _val611); + _val641 = iprot.readI64(); + struct.executor_start_time_secs.put(_key640, _val641); } 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 _map616 = iprot.readMapBegin(); - struct.worker_resources = new HashMap(2*_map616.size); - NodeInfo _key617; - WorkerResources _val618; - for (int _i619 = 0; _i619 < _map616.size; ++_i619) + org.apache.thrift.protocol.TMap _map646 = iprot.readMapBegin(); + struct.worker_resources = new HashMap(2*_map646.size); + NodeInfo _key647; + WorkerResources _val648; + for (int _i649 = 0; _i649 < _map646.size; ++_i649) { - _key617 = new NodeInfo(); - _key617.read(iprot); - _val618 = new WorkerResources(); - _val618.read(iprot); - struct.worker_resources.put(_key617, _val618); + _key647 = new NodeInfo(); + _key647.read(iprot); + _val648 = new WorkerResources(); + _val648.read(iprot); + struct.worker_resources.put(_key647, _val648); } 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 _iter620 : struct.node_host.entrySet()) + for (Map.Entry _iter650 : struct.node_host.entrySet()) { - oprot.writeString(_iter620.getKey()); - oprot.writeString(_iter620.getValue()); + oprot.writeString(_iter650.getKey()); + oprot.writeString(_iter650.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> _iter621 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter651 : struct.executor_node_port.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter621.getKey().size())); - for (long _iter622 : _iter621.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter651.getKey().size())); + for (long _iter652 : _iter651.getKey()) { - oprot.writeI64(_iter622); + oprot.writeI64(_iter652); } oprot.writeListEnd(); } - _iter621.getValue().write(oprot); + _iter651.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> _iter623 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter653 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter623.getKey().size())); - for (long _iter624 : _iter623.getKey()) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, _iter653.getKey().size())); + for (long _iter654 : _iter653.getKey()) { - oprot.writeI64(_iter624); + oprot.writeI64(_iter654); } oprot.writeListEnd(); } - oprot.writeI64(_iter623.getValue()); + oprot.writeI64(_iter653.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 _iter625 : struct.worker_resources.entrySet()) + for (Map.Entry _iter655 : struct.worker_resources.entrySet()) { - _iter625.getKey().write(oprot); - _iter625.getValue().write(oprot); + _iter655.getKey().write(oprot); + _iter655.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 _iter626 : struct.node_host.entrySet()) + for (Map.Entry _iter656 : struct.node_host.entrySet()) { - oprot.writeString(_iter626.getKey()); - oprot.writeString(_iter626.getValue()); + oprot.writeString(_iter656.getKey()); + oprot.writeString(_iter656.getValue()); } } } if (struct.is_set_executor_node_port()) { { oprot.writeI32(struct.executor_node_port.size()); - for (Map.Entry, NodeInfo> _iter627 : struct.executor_node_port.entrySet()) + for (Map.Entry, NodeInfo> _iter657 : struct.executor_node_port.entrySet()) { { - oprot.writeI32(_iter627.getKey().size()); - for (long _iter628 : _iter627.getKey()) + oprot.writeI32(_iter657.getKey().size()); + for (long _iter658 : _iter657.getKey()) { - oprot.writeI64(_iter628); + oprot.writeI64(_iter658); } } - _iter627.getValue().write(oprot); + _iter657.getValue().write(oprot); } } } if (struct.is_set_executor_start_time_secs()) { { oprot.writeI32(struct.executor_start_time_secs.size()); - for (Map.Entry, Long> _iter629 : struct.executor_start_time_secs.entrySet()) + for (Map.Entry, Long> _iter659 : struct.executor_start_time_secs.entrySet()) { { - oprot.writeI32(_iter629.getKey().size()); - for (long _iter630 : _iter629.getKey()) + oprot.writeI32(_iter659.getKey().size()); + for (long _iter660 : _iter659.getKey()) { - oprot.writeI64(_iter630); + oprot.writeI64(_iter660); } } - oprot.writeI64(_iter629.getValue()); + oprot.writeI64(_iter659.getValue()); } } } if (struct.is_set_worker_resources()) { { oprot.writeI32(struct.worker_resources.size()); - for (Map.Entry _iter631 : struct.worker_resources.entrySet()) + for (Map.Entry _iter661 : struct.worker_resources.entrySet()) { - _iter631.getKey().write(oprot); - _iter631.getValue().write(oprot); + _iter661.getKey().write(oprot); + _iter661.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 _map632 = 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*_map632.size); - String _key633; - String _val634; - for (int _i635 = 0; _i635 < _map632.size; ++_i635) + org.apache.thrift.protocol.TMap _map662 = 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*_map662.size); + String _key663; + String _val664; + for (int _i665 = 0; _i665 < _map662.size; ++_i665) { - _key633 = iprot.readString(); - _val634 = iprot.readString(); - struct.node_host.put(_key633, _val634); + _key663 = iprot.readString(); + _val664 = iprot.readString(); + struct.node_host.put(_key663, _val664); } } struct.set_node_host_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map636 = 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*_map636.size); - List _key637; - NodeInfo _val638; - for (int _i639 = 0; _i639 < _map636.size; ++_i639) + org.apache.thrift.protocol.TMap _map666 = 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*_map666.size); + List _key667; + NodeInfo _val668; + for (int _i669 = 0; _i669 < _map666.size; ++_i669) { { - org.apache.thrift.protocol.TList _list640 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key637 = new ArrayList(_list640.size); - long _elem641; - for (int _i642 = 0; _i642 < _list640.size; ++_i642) + org.apache.thrift.protocol.TList _list670 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key667 = new ArrayList(_list670.size); + long _elem671; + for (int _i672 = 0; _i672 < _list670.size; ++_i672) { - _elem641 = iprot.readI64(); - _key637.add(_elem641); + _elem671 = iprot.readI64(); + _key667.add(_elem671); } } - _val638 = new NodeInfo(); - _val638.read(iprot); - struct.executor_node_port.put(_key637, _val638); + _val668 = new NodeInfo(); + _val668.read(iprot); + struct.executor_node_port.put(_key667, _val668); } } struct.set_executor_node_port_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map643 = 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*_map643.size); - List _key644; - long _val645; - for (int _i646 = 0; _i646 < _map643.size; ++_i646) + org.apache.thrift.protocol.TMap _map673 = 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*_map673.size); + List _key674; + long _val675; + for (int _i676 = 0; _i676 < _map673.size; ++_i676) { { - org.apache.thrift.protocol.TList _list647 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - _key644 = new ArrayList(_list647.size); - long _elem648; - for (int _i649 = 0; _i649 < _list647.size; ++_i649) + org.apache.thrift.protocol.TList _list677 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + _key674 = new ArrayList(_list677.size); + long _elem678; + for (int _i679 = 0; _i679 < _list677.size; ++_i679) { - _elem648 = iprot.readI64(); - _key644.add(_elem648); + _elem678 = iprot.readI64(); + _key674.add(_elem678); } } - _val645 = iprot.readI64(); - struct.executor_start_time_secs.put(_key644, _val645); + _val675 = iprot.readI64(); + struct.executor_start_time_secs.put(_key674, _val675); } } struct.set_executor_start_time_secs_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map650 = 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*_map650.size); - NodeInfo _key651; - WorkerResources _val652; - for (int _i653 = 0; _i653 < _map650.size; ++_i653) + org.apache.thrift.protocol.TMap _map680 = 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*_map680.size); + NodeInfo _key681; + WorkerResources _val682; + for (int _i683 = 0; _i683 < _map680.size; ++_i683) { - _key651 = new NodeInfo(); - _key651.read(iprot); - _val652 = new WorkerResources(); - _val652.read(iprot); - struct.worker_resources.put(_key651, _val652); + _key681 = new NodeInfo(); + _key681.read(iprot); + _val682 = new WorkerResources(); + _val682.read(iprot); + struct.worker_resources.put(_key681, _val682); } } 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 8a725326281..9b64c45d4a7 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 _map674 = iprot.readMapBegin(); - struct.executor_stats = new HashMap(2*_map674.size); - ExecutorInfo _key675; - ExecutorStats _val676; - for (int _i677 = 0; _i677 < _map674.size; ++_i677) + org.apache.thrift.protocol.TMap _map704 = iprot.readMapBegin(); + struct.executor_stats = new HashMap(2*_map704.size); + ExecutorInfo _key705; + ExecutorStats _val706; + for (int _i707 = 0; _i707 < _map704.size; ++_i707) { - _key675 = new ExecutorInfo(); - _key675.read(iprot); - _val676 = new ExecutorStats(); - _val676.read(iprot); - struct.executor_stats.put(_key675, _val676); + _key705 = new ExecutorInfo(); + _key705.read(iprot); + _val706 = new ExecutorStats(); + _val706.read(iprot); + struct.executor_stats.put(_key705, _val706); } 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 _iter678 : struct.executor_stats.entrySet()) + for (Map.Entry _iter708 : struct.executor_stats.entrySet()) { - _iter678.getKey().write(oprot); - _iter678.getValue().write(oprot); + _iter708.getKey().write(oprot); + _iter708.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 _iter679 : struct.executor_stats.entrySet()) + for (Map.Entry _iter709 : struct.executor_stats.entrySet()) { - _iter679.getKey().write(oprot); - _iter679.getValue().write(oprot); + _iter709.getKey().write(oprot); + _iter709.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 _map680 = 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*_map680.size); - ExecutorInfo _key681; - ExecutorStats _val682; - for (int _i683 = 0; _i683 < _map680.size; ++_i683) + org.apache.thrift.protocol.TMap _map710 = 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*_map710.size); + ExecutorInfo _key711; + ExecutorStats _val712; + for (int _i713 = 0; _i713 < _map710.size; ++_i713) { - _key681 = new ExecutorInfo(); - _key681.read(iprot); - _val682 = new ExecutorStats(); - _val682.read(iprot); - struct.executor_stats.put(_key681, _val682); + _key711 = new ExecutorInfo(); + _key711.read(iprot); + _val712 = new ExecutorStats(); + _val712.read(iprot); + struct.executor_stats.put(_key711, _val712); } } 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 93bcb171d8f..8d2cf4d3968 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java +++ b/storm-core/src/jvm/org/apache/storm/generated/CommonAggregateStats.java @@ -61,6 +61,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -74,6 +75,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase byName = new HashMap(); @@ -109,6 +112,8 @@ public static _Fields findByThriftId(int fieldId) { return ACKED; case 6: // FAILED return FAILED; + case 7: // THROUGHPUT + return THROUGHPUT; default: return null; } @@ -155,8 +160,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}; + private static final _Fields optionals[] = {_Fields.NUM_EXECUTORS,_Fields.NUM_TASKS,_Fields.EMITTED,_Fields.TRANSFERRED,_Fields.ACKED,_Fields.FAILED,_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); @@ -172,6 +178,8 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.FAILED, new org.apache.thrift.meta_data.FieldMetaData("failed", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + 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); } @@ -190,6 +198,7 @@ public CommonAggregateStats(CommonAggregateStats other) { this.transferred = other.transferred; this.acked = other.acked; this.failed = other.failed; + this.throughput = other.throughput; } public CommonAggregateStats deepCopy() { @@ -210,6 +219,8 @@ public void clear() { this.acked = 0; set_failed_isSet(false); this.failed = 0; + set_throughput_isSet(false); + this.throughput = 0.0; } public int get_num_executors() { @@ -344,6 +355,28 @@ public void set_failed_isSet(boolean value) { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FAILED_ISSET_ID, 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: @@ -394,6 +427,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case THROUGHPUT: + if (value == null) { + unset_throughput(); + } else { + set_throughput((Double)value); + } + break; + } } @@ -417,6 +458,9 @@ public Object getFieldValue(_Fields field) { case FAILED: return get_failed(); + case THROUGHPUT: + return get_throughput(); + } throw new IllegalStateException(); } @@ -440,6 +484,8 @@ public boolean isSet(_Fields field) { return is_set_acked(); case FAILED: return is_set_failed(); + case THROUGHPUT: + return is_set_throughput(); } throw new IllegalStateException(); } @@ -511,6 +557,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; } @@ -548,6 +603,11 @@ public int hashCode() { if (present_failed) list.add(failed); + boolean present_throughput = true && (is_set_throughput()); + list.add(present_throughput); + if (present_throughput) + list.add(throughput); + return list.hashCode(); } @@ -619,6 +679,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; } @@ -674,6 +744,12 @@ public String toString() { sb.append(this.failed); first = false; } + if (is_set_throughput()) { + if (!first) sb.append(", "); + sb.append("throughput:"); + sb.append(this.throughput); + first = false; + } sb.append(")"); return sb.toString(); } @@ -767,6 +843,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CommonAggregateStat org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // 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); } @@ -810,6 +894,11 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CommonAggregateSta oprot.writeI64(struct.failed); oprot.writeFieldEnd(); } + if (struct.is_set_throughput()) { + oprot.writeFieldBegin(THROUGHPUT_FIELD_DESC); + oprot.writeDouble(struct.throughput); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -846,7 +935,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStat if (struct.is_set_failed()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.is_set_throughput()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.is_set_num_executors()) { oprot.writeI32(struct.num_executors); } @@ -865,12 +957,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStat if (struct.is_set_failed()) { oprot.writeI64(struct.failed); } + 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(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.num_executors = iprot.readI32(); struct.set_num_executors_isSet(true); @@ -895,6 +990,10 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CommonAggregateStats struct.failed = iprot.readI64(); struct.set_failed_isSet(true); } + if (incoming.get(6)) { + 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 80ca0524795..b87c9283653 100644 --- a/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java +++ b/storm-core/src/jvm/org/apache/storm/generated/ComponentPageInfo.java @@ -1657,16 +1657,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 _map472 = iprot.readMapBegin(); - struct.window_to_stats = new HashMap(2*_map472.size); - String _key473; - ComponentAggregateStats _val474; - for (int _i475 = 0; _i475 < _map472.size; ++_i475) + org.apache.thrift.protocol.TMap _map502 = iprot.readMapBegin(); + struct.window_to_stats = new HashMap(2*_map502.size); + String _key503; + ComponentAggregateStats _val504; + for (int _i505 = 0; _i505 < _map502.size; ++_i505) { - _key473 = iprot.readString(); - _val474 = new ComponentAggregateStats(); - _val474.read(iprot); - struct.window_to_stats.put(_key473, _val474); + _key503 = iprot.readString(); + _val504 = new ComponentAggregateStats(); + _val504.read(iprot); + struct.window_to_stats.put(_key503, _val504); } iprot.readMapEnd(); } @@ -1678,17 +1678,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 _map476 = iprot.readMapBegin(); - struct.gsid_to_input_stats = new HashMap(2*_map476.size); - GlobalStreamId _key477; - ComponentAggregateStats _val478; - for (int _i479 = 0; _i479 < _map476.size; ++_i479) + org.apache.thrift.protocol.TMap _map506 = iprot.readMapBegin(); + struct.gsid_to_input_stats = new HashMap(2*_map506.size); + GlobalStreamId _key507; + ComponentAggregateStats _val508; + for (int _i509 = 0; _i509 < _map506.size; ++_i509) { - _key477 = new GlobalStreamId(); - _key477.read(iprot); - _val478 = new ComponentAggregateStats(); - _val478.read(iprot); - struct.gsid_to_input_stats.put(_key477, _val478); + _key507 = new GlobalStreamId(); + _key507.read(iprot); + _val508 = new ComponentAggregateStats(); + _val508.read(iprot); + struct.gsid_to_input_stats.put(_key507, _val508); } iprot.readMapEnd(); } @@ -1700,16 +1700,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 _map480 = iprot.readMapBegin(); - struct.sid_to_output_stats = new HashMap(2*_map480.size); - String _key481; - ComponentAggregateStats _val482; - for (int _i483 = 0; _i483 < _map480.size; ++_i483) + org.apache.thrift.protocol.TMap _map510 = iprot.readMapBegin(); + struct.sid_to_output_stats = new HashMap(2*_map510.size); + String _key511; + ComponentAggregateStats _val512; + for (int _i513 = 0; _i513 < _map510.size; ++_i513) { - _key481 = iprot.readString(); - _val482 = new ComponentAggregateStats(); - _val482.read(iprot); - struct.sid_to_output_stats.put(_key481, _val482); + _key511 = iprot.readString(); + _val512 = new ComponentAggregateStats(); + _val512.read(iprot); + struct.sid_to_output_stats.put(_key511, _val512); } iprot.readMapEnd(); } @@ -1721,14 +1721,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 _list484 = iprot.readListBegin(); - struct.exec_stats = new ArrayList(_list484.size); - ExecutorAggregateStats _elem485; - for (int _i486 = 0; _i486 < _list484.size; ++_i486) + org.apache.thrift.protocol.TList _list514 = iprot.readListBegin(); + struct.exec_stats = new ArrayList(_list514.size); + ExecutorAggregateStats _elem515; + for (int _i516 = 0; _i516 < _list514.size; ++_i516) { - _elem485 = new ExecutorAggregateStats(); - _elem485.read(iprot); - struct.exec_stats.add(_elem485); + _elem515 = new ExecutorAggregateStats(); + _elem515.read(iprot); + struct.exec_stats.add(_elem515); } iprot.readListEnd(); } @@ -1740,14 +1740,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 _list487 = iprot.readListBegin(); - struct.errors = new ArrayList(_list487.size); - ErrorInfo _elem488; - for (int _i489 = 0; _i489 < _list487.size; ++_i489) + org.apache.thrift.protocol.TList _list517 = iprot.readListBegin(); + struct.errors = new ArrayList(_list517.size); + ErrorInfo _elem518; + for (int _i519 = 0; _i519 < _list517.size; ++_i519) { - _elem488 = new ErrorInfo(); - _elem488.read(iprot); - struct.errors.add(_elem488); + _elem518 = new ErrorInfo(); + _elem518.read(iprot); + struct.errors.add(_elem518); } iprot.readListEnd(); } @@ -1841,10 +1841,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 _iter490 : struct.window_to_stats.entrySet()) + for (Map.Entry _iter520 : struct.window_to_stats.entrySet()) { - oprot.writeString(_iter490.getKey()); - _iter490.getValue().write(oprot); + oprot.writeString(_iter520.getKey()); + _iter520.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1856,10 +1856,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 _iter491 : struct.gsid_to_input_stats.entrySet()) + for (Map.Entry _iter521 : struct.gsid_to_input_stats.entrySet()) { - _iter491.getKey().write(oprot); - _iter491.getValue().write(oprot); + _iter521.getKey().write(oprot); + _iter521.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1871,10 +1871,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 _iter492 : struct.sid_to_output_stats.entrySet()) + for (Map.Entry _iter522 : struct.sid_to_output_stats.entrySet()) { - oprot.writeString(_iter492.getKey()); - _iter492.getValue().write(oprot); + oprot.writeString(_iter522.getKey()); + _iter522.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -1886,9 +1886,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 _iter493 : struct.exec_stats) + for (ExecutorAggregateStats _iter523 : struct.exec_stats) { - _iter493.write(oprot); + _iter523.write(oprot); } oprot.writeListEnd(); } @@ -1900,9 +1900,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 _iter494 : struct.errors) + for (ErrorInfo _iter524 : struct.errors) { - _iter494.write(oprot); + _iter524.write(oprot); } oprot.writeListEnd(); } @@ -2010,48 +2010,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 _iter495 : struct.window_to_stats.entrySet()) + for (Map.Entry _iter525 : struct.window_to_stats.entrySet()) { - oprot.writeString(_iter495.getKey()); - _iter495.getValue().write(oprot); + oprot.writeString(_iter525.getKey()); + _iter525.getValue().write(oprot); } } } if (struct.is_set_gsid_to_input_stats()) { { oprot.writeI32(struct.gsid_to_input_stats.size()); - for (Map.Entry _iter496 : struct.gsid_to_input_stats.entrySet()) + for (Map.Entry _iter526 : struct.gsid_to_input_stats.entrySet()) { - _iter496.getKey().write(oprot); - _iter496.getValue().write(oprot); + _iter526.getKey().write(oprot); + _iter526.getValue().write(oprot); } } } if (struct.is_set_sid_to_output_stats()) { { oprot.writeI32(struct.sid_to_output_stats.size()); - for (Map.Entry _iter497 : struct.sid_to_output_stats.entrySet()) + for (Map.Entry _iter527 : struct.sid_to_output_stats.entrySet()) { - oprot.writeString(_iter497.getKey()); - _iter497.getValue().write(oprot); + oprot.writeString(_iter527.getKey()); + _iter527.getValue().write(oprot); } } } if (struct.is_set_exec_stats()) { { oprot.writeI32(struct.exec_stats.size()); - for (ExecutorAggregateStats _iter498 : struct.exec_stats) + for (ExecutorAggregateStats _iter528 : struct.exec_stats) { - _iter498.write(oprot); + _iter528.write(oprot); } } } if (struct.is_set_errors()) { { oprot.writeI32(struct.errors.size()); - for (ErrorInfo _iter499 : struct.errors) + for (ErrorInfo _iter529 : struct.errors) { - _iter499.write(oprot); + _iter529.write(oprot); } } } @@ -2095,77 +2095,77 @@ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentPageInfo st } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map500 = 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*_map500.size); - String _key501; - ComponentAggregateStats _val502; - for (int _i503 = 0; _i503 < _map500.size; ++_i503) + org.apache.thrift.protocol.TMap _map530 = 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*_map530.size); + String _key531; + ComponentAggregateStats _val532; + for (int _i533 = 0; _i533 < _map530.size; ++_i533) { - _key501 = iprot.readString(); - _val502 = new ComponentAggregateStats(); - _val502.read(iprot); - struct.window_to_stats.put(_key501, _val502); + _key531 = iprot.readString(); + _val532 = new ComponentAggregateStats(); + _val532.read(iprot); + struct.window_to_stats.put(_key531, _val532); } } struct.set_window_to_stats_isSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map504 = 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*_map504.size); - GlobalStreamId _key505; - ComponentAggregateStats _val506; - for (int _i507 = 0; _i507 < _map504.size; ++_i507) + org.apache.thrift.protocol.TMap _map534 = 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*_map534.size); + GlobalStreamId _key535; + ComponentAggregateStats _val536; + for (int _i537 = 0; _i537 < _map534.size; ++_i537) { - _key505 = new GlobalStreamId(); - _key505.read(iprot); - _val506 = new ComponentAggregateStats(); - _val506.read(iprot); - struct.gsid_to_input_stats.put(_key505, _val506); + _key535 = new GlobalStreamId(); + _key535.read(iprot); + _val536 = new ComponentAggregateStats(); + _val536.read(iprot); + struct.gsid_to_input_stats.put(_key535, _val536); } } struct.set_gsid_to_input_stats_isSet(true); } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map508 = 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*_map508.size); - String _key509; - ComponentAggregateStats _val510; - for (int _i511 = 0; _i511 < _map508.size; ++_i511) + org.apache.thrift.protocol.TMap _map538 = 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*_map538.size); + String _key539; + ComponentAggregateStats _val540; + for (int _i541 = 0; _i541 < _map538.size; ++_i541) { - _key509 = iprot.readString(); - _val510 = new ComponentAggregateStats(); - _val510.read(iprot); - struct.sid_to_output_stats.put(_key509, _val510); + _key539 = iprot.readString(); + _val540 = new ComponentAggregateStats(); + _val540.read(iprot); + struct.sid_to_output_stats.put(_key539, _val540); } } struct.set_sid_to_output_stats_isSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TList _list512 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.exec_stats = new ArrayList(_list512.size); - ExecutorAggregateStats _elem513; - for (int _i514 = 0; _i514 < _list512.size; ++_i514) + org.apache.thrift.protocol.TList _list542 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.exec_stats = new ArrayList(_list542.size); + ExecutorAggregateStats _elem543; + for (int _i544 = 0; _i544 < _list542.size; ++_i544) { - _elem513 = new ExecutorAggregateStats(); - _elem513.read(iprot); - struct.exec_stats.add(_elem513); + _elem543 = new ExecutorAggregateStats(); + _elem543.read(iprot); + struct.exec_stats.add(_elem543); } } struct.set_exec_stats_isSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TList _list515 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.errors = new ArrayList(_list515.size); - ErrorInfo _elem516; - for (int _i517 = 0; _i517 < _list515.size; ++_i517) + org.apache.thrift.protocol.TList _list545 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.errors = new ArrayList(_list545.size); + ErrorInfo _elem546; + for (int _i547 = 0; _i547 < _list545.size; ++_i547) { - _elem516 = new ErrorInfo(); - _elem516.read(iprot); - struct.errors.add(_elem516); + _elem546 = new ErrorInfo(); + _elem546.read(iprot); + struct.errors.add(_elem546); } } struct.set_errors_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 7bd38bb6ac9..3aa72179d0e 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 _map528 = iprot.readMapBegin(); - struct.creds = new HashMap(2*_map528.size); - String _key529; - String _val530; - for (int _i531 = 0; _i531 < _map528.size; ++_i531) + org.apache.thrift.protocol.TMap _map558 = iprot.readMapBegin(); + struct.creds = new HashMap(2*_map558.size); + String _key559; + String _val560; + for (int _i561 = 0; _i561 < _map558.size; ++_i561) { - _key529 = iprot.readString(); - _val530 = iprot.readString(); - struct.creds.put(_key529, _val530); + _key559 = iprot.readString(); + _val560 = iprot.readString(); + struct.creds.put(_key559, _val560); } 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 _iter532 : struct.creds.entrySet()) + for (Map.Entry _iter562 : struct.creds.entrySet()) { - oprot.writeString(_iter532.getKey()); - oprot.writeString(_iter532.getValue()); + oprot.writeString(_iter562.getKey()); + oprot.writeString(_iter562.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 _iter533 : struct.creds.entrySet()) + for (Map.Entry _iter563 : struct.creds.entrySet()) { - oprot.writeString(_iter533.getKey()); - oprot.writeString(_iter533.getValue()); + oprot.writeString(_iter563.getKey()); + oprot.writeString(_iter563.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 _map534 = 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*_map534.size); - String _key535; - String _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.STRING, iprot.readI32()); + struct.creds = new HashMap(2*_map564.size); + String _key565; + String _val566; + for (int _i567 = 0; _i567 < _map564.size; ++_i567) { - _key535 = iprot.readString(); - _val536 = iprot.readString(); - struct.creds.put(_key535, _val536); + _key565 = iprot.readString(); + _val566 = iprot.readString(); + struct.creds.put(_key565, _val566); } } 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 8b9bf08fed4..b7c8d77526d 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 _list780 = iprot.readListBegin(); - struct.pulseIds = new ArrayList(_list780.size); - String _elem781; - for (int _i782 = 0; _i782 < _list780.size; ++_i782) + org.apache.thrift.protocol.TList _list810 = iprot.readListBegin(); + struct.pulseIds = new ArrayList(_list810.size); + String _elem811; + for (int _i812 = 0; _i812 < _list810.size; ++_i812) { - _elem781 = iprot.readString(); - struct.pulseIds.add(_elem781); + _elem811 = iprot.readString(); + struct.pulseIds.add(_elem811); } 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 _iter783 : struct.pulseIds) + for (String _iter813 : struct.pulseIds) { - oprot.writeString(_iter783); + oprot.writeString(_iter813); } 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 _iter784 : struct.pulseIds) + for (String _iter814 : struct.pulseIds) { - oprot.writeString(_iter784); + oprot.writeString(_iter814); } } } @@ -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 _list785 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.pulseIds = new ArrayList(_list785.size); - String _elem786; - for (int _i787 = 0; _i787 < _list785.size; ++_i787) + org.apache.thrift.protocol.TList _list815 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.pulseIds = new ArrayList(_list815.size); + String _elem816; + for (int _i817 = 0; _i817 < _list815.size; ++_i817) { - _elem786 = iprot.readString(); - struct.pulseIds.add(_elem786); + _elem816 = iprot.readString(); + struct.pulseIds.add(_elem816); } } 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 de7cfbf72bb..b9dc9a37508 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 _list772 = iprot.readListBegin(); - struct.pulses = new ArrayList(_list772.size); - HBPulse _elem773; - for (int _i774 = 0; _i774 < _list772.size; ++_i774) + org.apache.thrift.protocol.TList _list802 = iprot.readListBegin(); + struct.pulses = new ArrayList(_list802.size); + HBPulse _elem803; + for (int _i804 = 0; _i804 < _list802.size; ++_i804) { - _elem773 = new HBPulse(); - _elem773.read(iprot); - struct.pulses.add(_elem773); + _elem803 = new HBPulse(); + _elem803.read(iprot); + struct.pulses.add(_elem803); } 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 _iter775 : struct.pulses) + for (HBPulse _iter805 : struct.pulses) { - _iter775.write(oprot); + _iter805.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 _iter776 : struct.pulses) + for (HBPulse _iter806 : struct.pulses) { - _iter776.write(oprot); + _iter806.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 _list777 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.pulses = new ArrayList(_list777.size); - HBPulse _elem778; - for (int _i779 = 0; _i779 < _list777.size; ++_i779) + org.apache.thrift.protocol.TList _list807 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.pulses = new ArrayList(_list807.size); + HBPulse _elem808; + for (int _i809 = 0; _i809 < _list807.size; ++_i809) { - _elem778 = new HBPulse(); - _elem778.read(iprot); - struct.pulses.add(_elem778); + _elem808 = new HBPulse(); + _elem808.read(iprot); + struct.pulses.add(_elem808); } } 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 ef7a589948d..b311075aad8 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 _map702 = iprot.readMapBegin(); - struct.approved_workers = new HashMap(2*_map702.size); - String _key703; - int _val704; - for (int _i705 = 0; _i705 < _map702.size; ++_i705) + org.apache.thrift.protocol.TMap _map732 = iprot.readMapBegin(); + struct.approved_workers = new HashMap(2*_map732.size); + String _key733; + int _val734; + for (int _i735 = 0; _i735 < _map732.size; ++_i735) { - _key703 = iprot.readString(); - _val704 = iprot.readI32(); - struct.approved_workers.put(_key703, _val704); + _key733 = iprot.readString(); + _val734 = iprot.readI32(); + struct.approved_workers.put(_key733, _val734); } 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 _iter706 : struct.approved_workers.entrySet()) + for (Map.Entry _iter736 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter706.getKey()); - oprot.writeI32(_iter706.getValue()); + oprot.writeString(_iter736.getKey()); + oprot.writeI32(_iter736.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 _iter707 : struct.approved_workers.entrySet()) + for (Map.Entry _iter737 : struct.approved_workers.entrySet()) { - oprot.writeString(_iter707.getKey()); - oprot.writeI32(_iter707.getValue()); + oprot.writeString(_iter737.getKey()); + oprot.writeI32(_iter737.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 _map708 = 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*_map708.size); - String _key709; - int _val710; - for (int _i711 = 0; _i711 < _map708.size; ++_i711) + org.apache.thrift.protocol.TMap _map738 = 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*_map738.size); + String _key739; + int _val740; + for (int _i741 = 0; _i741 < _map738.size; ++_i741) { - _key709 = iprot.readString(); - _val710 = iprot.readI32(); - struct.approved_workers.put(_key709, _val710); + _key739 = iprot.readString(); + _val740 = iprot.readI32(); + struct.approved_workers.put(_key739, _val740); } } 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 a86b7f3ae79..f267a218049 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 _map712 = iprot.readMapBegin(); - struct.assignments = new HashMap(2*_map712.size); - int _key713; - LocalAssignment _val714; - for (int _i715 = 0; _i715 < _map712.size; ++_i715) + org.apache.thrift.protocol.TMap _map742 = iprot.readMapBegin(); + struct.assignments = new HashMap(2*_map742.size); + int _key743; + LocalAssignment _val744; + for (int _i745 = 0; _i745 < _map742.size; ++_i745) { - _key713 = iprot.readI32(); - _val714 = new LocalAssignment(); - _val714.read(iprot); - struct.assignments.put(_key713, _val714); + _key743 = iprot.readI32(); + _val744 = new LocalAssignment(); + _val744.read(iprot); + struct.assignments.put(_key743, _val744); } 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 _iter716 : struct.assignments.entrySet()) + for (Map.Entry _iter746 : struct.assignments.entrySet()) { - oprot.writeI32(_iter716.getKey()); - _iter716.getValue().write(oprot); + oprot.writeI32(_iter746.getKey()); + _iter746.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 _iter717 : struct.assignments.entrySet()) + for (Map.Entry _iter747 : struct.assignments.entrySet()) { - oprot.writeI32(_iter717.getKey()); - _iter717.getValue().write(oprot); + oprot.writeI32(_iter747.getKey()); + _iter747.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 _map718 = 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*_map718.size); - int _key719; - LocalAssignment _val720; - for (int _i721 = 0; _i721 < _map718.size; ++_i721) + org.apache.thrift.protocol.TMap _map748 = 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*_map748.size); + int _key749; + LocalAssignment _val750; + for (int _i751 = 0; _i751 < _map748.size; ++_i751) { - _key719 = iprot.readI32(); - _val720 = new LocalAssignment(); - _val720.read(iprot); - struct.assignments.put(_key719, _val720); + _key749 = iprot.readI32(); + _val750 = new LocalAssignment(); + _val750.read(iprot); + struct.assignments.put(_key749, _val750); } } 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 f74d5820acd..620f2491346 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 _list730 = iprot.readListBegin(); - struct.users = new ArrayList(_list730.size); - String _elem731; - for (int _i732 = 0; _i732 < _list730.size; ++_i732) + org.apache.thrift.protocol.TList _list760 = iprot.readListBegin(); + struct.users = new ArrayList(_list760.size); + String _elem761; + for (int _i762 = 0; _i762 < _list760.size; ++_i762) { - _elem731 = iprot.readString(); - struct.users.add(_elem731); + _elem761 = iprot.readString(); + struct.users.add(_elem761); } 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 _list733 = iprot.readListBegin(); - struct.groups = new ArrayList(_list733.size); - String _elem734; - for (int _i735 = 0; _i735 < _list733.size; ++_i735) + org.apache.thrift.protocol.TList _list763 = iprot.readListBegin(); + struct.groups = new ArrayList(_list763.size); + String _elem764; + for (int _i765 = 0; _i765 < _list763.size; ++_i765) { - _elem734 = iprot.readString(); - struct.groups.add(_elem734); + _elem764 = iprot.readString(); + struct.groups.add(_elem764); } 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 _iter736 : struct.users) + for (String _iter766 : struct.users) { - oprot.writeString(_iter736); + oprot.writeString(_iter766); } 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 _iter737 : struct.groups) + for (String _iter767 : struct.groups) { - oprot.writeString(_iter737); + oprot.writeString(_iter767); } 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 _iter738 : struct.users) + for (String _iter768 : struct.users) { - oprot.writeString(_iter738); + oprot.writeString(_iter768); } } { oprot.writeI32(struct.groups.size()); - for (String _iter739 : struct.groups) + for (String _iter769 : struct.groups) { - oprot.writeString(_iter739); + oprot.writeString(_iter769); } } } @@ -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 _list740 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.users = new ArrayList(_list740.size); - String _elem741; - for (int _i742 = 0; _i742 < _list740.size; ++_i742) + org.apache.thrift.protocol.TList _list770 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.users = new ArrayList(_list770.size); + String _elem771; + for (int _i772 = 0; _i772 < _list770.size; ++_i772) { - _elem741 = iprot.readString(); - struct.users.add(_elem741); + _elem771 = iprot.readString(); + struct.users.add(_elem771); } } struct.set_users_isSet(true); { - org.apache.thrift.protocol.TList _list743 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.groups = new ArrayList(_list743.size); - String _elem744; - for (int _i745 = 0; _i745 < _list743.size; ++_i745) + org.apache.thrift.protocol.TList _list773 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.groups = new ArrayList(_list773.size); + String _elem774; + for (int _i775 = 0; _i775 < _list773.size; ++_i775) { - _elem744 = iprot.readString(); - struct.groups.add(_elem744); + _elem774 = iprot.readString(); + struct.groups.add(_elem774); } } 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 1f694eb51ac..478f23d0c4a 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 _list746 = iprot.readListBegin(); - struct.topo_history = new ArrayList(_list746.size); - LSTopoHistory _elem747; - for (int _i748 = 0; _i748 < _list746.size; ++_i748) + org.apache.thrift.protocol.TList _list776 = iprot.readListBegin(); + struct.topo_history = new ArrayList(_list776.size); + LSTopoHistory _elem777; + for (int _i778 = 0; _i778 < _list776.size; ++_i778) { - _elem747 = new LSTopoHistory(); - _elem747.read(iprot); - struct.topo_history.add(_elem747); + _elem777 = new LSTopoHistory(); + _elem777.read(iprot); + struct.topo_history.add(_elem777); } 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 _iter749 : struct.topo_history) + for (LSTopoHistory _iter779 : struct.topo_history) { - _iter749.write(oprot); + _iter779.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 _iter750 : struct.topo_history) + for (LSTopoHistory _iter780 : struct.topo_history) { - _iter750.write(oprot); + _iter780.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 _list751 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.topo_history = new ArrayList(_list751.size); - LSTopoHistory _elem752; - for (int _i753 = 0; _i753 < _list751.size; ++_i753) + org.apache.thrift.protocol.TList _list781 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.topo_history = new ArrayList(_list781.size); + LSTopoHistory _elem782; + for (int _i783 = 0; _i783 < _list781.size; ++_i783) { - _elem752 = new LSTopoHistory(); - _elem752.read(iprot); - struct.topo_history.add(_elem752); + _elem782 = new LSTopoHistory(); + _elem782.read(iprot); + struct.topo_history.add(_elem782); } } 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 77d7aab56b3..7b95c7a69ab 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 _list722 = iprot.readListBegin(); - struct.executors = new ArrayList(_list722.size); - ExecutorInfo _elem723; - for (int _i724 = 0; _i724 < _list722.size; ++_i724) + org.apache.thrift.protocol.TList _list752 = iprot.readListBegin(); + struct.executors = new ArrayList(_list752.size); + ExecutorInfo _elem753; + for (int _i754 = 0; _i754 < _list752.size; ++_i754) { - _elem723 = new ExecutorInfo(); - _elem723.read(iprot); - struct.executors.add(_elem723); + _elem753 = new ExecutorInfo(); + _elem753.read(iprot); + struct.executors.add(_elem753); } 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 _iter725 : struct.executors) + for (ExecutorInfo _iter755 : struct.executors) { - _iter725.write(oprot); + _iter755.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 _iter726 : struct.executors) + for (ExecutorInfo _iter756 : struct.executors) { - _iter726.write(oprot); + _iter756.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 _list727 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list727.size); - ExecutorInfo _elem728; - for (int _i729 = 0; _i729 < _list727.size; ++_i729) + org.apache.thrift.protocol.TList _list757 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list757.size); + ExecutorInfo _elem758; + for (int _i759 = 0; _i759 < _list757.size; ++_i759) { - _elem728 = new ExecutorInfo(); - _elem728.read(iprot); - struct.executors.add(_elem728); + _elem758 = new ExecutorInfo(); + _elem758.read(iprot); + struct.executors.add(_elem758); } } 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 244bedaafca..bf127fcb2b4 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 _list546 = iprot.readListBegin(); - struct.keys = new ArrayList(_list546.size); - String _elem547; - for (int _i548 = 0; _i548 < _list546.size; ++_i548) + org.apache.thrift.protocol.TList _list576 = iprot.readListBegin(); + struct.keys = new ArrayList(_list576.size); + String _elem577; + for (int _i578 = 0; _i578 < _list576.size; ++_i578) { - _elem547 = iprot.readString(); - struct.keys.add(_elem547); + _elem577 = iprot.readString(); + struct.keys.add(_elem577); } 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 _iter549 : struct.keys) + for (String _iter579 : struct.keys) { - oprot.writeString(_iter549); + oprot.writeString(_iter579); } 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 _iter550 : struct.keys) + for (String _iter580 : struct.keys) { - oprot.writeString(_iter550); + oprot.writeString(_iter580); } } 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 _list551 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.keys = new ArrayList(_list551.size); - String _elem552; - for (int _i553 = 0; _i553 < _list551.size; ++_i553) + org.apache.thrift.protocol.TList _list581 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.keys = new ArrayList(_list581.size); + String _elem582; + for (int _i583 = 0; _i583 < _list581.size; ++_i583) { - _elem552 = iprot.readString(); - struct.keys.add(_elem552); + _elem582 = iprot.readString(); + struct.keys.add(_elem582); } } 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 471e67fb39d..647cbd5e10f 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 _list694 = iprot.readListBegin(); - struct.executors = new ArrayList(_list694.size); - ExecutorInfo _elem695; - for (int _i696 = 0; _i696 < _list694.size; ++_i696) + org.apache.thrift.protocol.TList _list724 = iprot.readListBegin(); + struct.executors = new ArrayList(_list724.size); + ExecutorInfo _elem725; + for (int _i726 = 0; _i726 < _list724.size; ++_i726) { - _elem695 = new ExecutorInfo(); - _elem695.read(iprot); - struct.executors.add(_elem695); + _elem725 = new ExecutorInfo(); + _elem725.read(iprot); + struct.executors.add(_elem725); } 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 _iter697 : struct.executors) + for (ExecutorInfo _iter727 : struct.executors) { - _iter697.write(oprot); + _iter727.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 _iter698 : struct.executors) + for (ExecutorInfo _iter728 : struct.executors) { - _iter698.write(oprot); + _iter728.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 _list699 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.executors = new ArrayList(_list699.size); - ExecutorInfo _elem700; - for (int _i701 = 0; _i701 < _list699.size; ++_i701) + org.apache.thrift.protocol.TList _list729 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.executors = new ArrayList(_list729.size); + ExecutorInfo _elem730; + for (int _i731 = 0; _i731 < _list729.size; ++_i731) { - _elem700 = new ExecutorInfo(); - _elem700.read(iprot); - struct.executors.add(_elem700); + _elem730 = new ExecutorInfo(); + _elem730.read(iprot); + struct.executors.add(_elem730); } } 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 0393fa995e1..8716b201397 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 _map684 = iprot.readMapBegin(); - struct.serialized_parts = new HashMap(2*_map684.size); - String _key685; - ThriftSerializedObject _val686; - for (int _i687 = 0; _i687 < _map684.size; ++_i687) + org.apache.thrift.protocol.TMap _map714 = iprot.readMapBegin(); + struct.serialized_parts = new HashMap(2*_map714.size); + String _key715; + ThriftSerializedObject _val716; + for (int _i717 = 0; _i717 < _map714.size; ++_i717) { - _key685 = iprot.readString(); - _val686 = new ThriftSerializedObject(); - _val686.read(iprot); - struct.serialized_parts.put(_key685, _val686); + _key715 = iprot.readString(); + _val716 = new ThriftSerializedObject(); + _val716.read(iprot); + struct.serialized_parts.put(_key715, _val716); } 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 _iter688 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter718 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter688.getKey()); - _iter688.getValue().write(oprot); + oprot.writeString(_iter718.getKey()); + _iter718.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 _iter689 : struct.serialized_parts.entrySet()) + for (Map.Entry _iter719 : struct.serialized_parts.entrySet()) { - oprot.writeString(_iter689.getKey()); - _iter689.getValue().write(oprot); + oprot.writeString(_iter719.getKey()); + _iter719.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 _map690 = 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*_map690.size); - String _key691; - ThriftSerializedObject _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.serialized_parts = new HashMap(2*_map720.size); + String _key721; + ThriftSerializedObject _val722; + for (int _i723 = 0; _i723 < _map720.size; ++_i723) { - _key691 = iprot.readString(); - _val692 = new ThriftSerializedObject(); - _val692.read(iprot); - struct.serialized_parts.put(_key691, _val692); + _key721 = iprot.readString(); + _val722 = new ThriftSerializedObject(); + _val722.read(iprot); + struct.serialized_parts.put(_key721, _val722); } } 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 19c4f5ef221..838e57478dc 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 _map754 = iprot.readMapBegin(); - struct.named_logger_level = new HashMap(2*_map754.size); - String _key755; - LogLevel _val756; - for (int _i757 = 0; _i757 < _map754.size; ++_i757) + org.apache.thrift.protocol.TMap _map784 = iprot.readMapBegin(); + struct.named_logger_level = new HashMap(2*_map784.size); + String _key785; + LogLevel _val786; + for (int _i787 = 0; _i787 < _map784.size; ++_i787) { - _key755 = iprot.readString(); - _val756 = new LogLevel(); - _val756.read(iprot); - struct.named_logger_level.put(_key755, _val756); + _key785 = iprot.readString(); + _val786 = new LogLevel(); + _val786.read(iprot); + struct.named_logger_level.put(_key785, _val786); } 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 _iter758 : struct.named_logger_level.entrySet()) + for (Map.Entry _iter788 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter758.getKey()); - _iter758.getValue().write(oprot); + oprot.writeString(_iter788.getKey()); + _iter788.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 _iter759 : struct.named_logger_level.entrySet()) + for (Map.Entry _iter789 : struct.named_logger_level.entrySet()) { - oprot.writeString(_iter759.getKey()); - _iter759.getValue().write(oprot); + oprot.writeString(_iter789.getKey()); + _iter789.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 _map760 = 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*_map760.size); - String _key761; - LogLevel _val762; - for (int _i763 = 0; _i763 < _map760.size; ++_i763) + org.apache.thrift.protocol.TMap _map790 = 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*_map790.size); + String _key791; + LogLevel _val792; + for (int _i793 = 0; _i793 < _map790.size; ++_i793) { - _key761 = iprot.readString(); - _val762 = new LogLevel(); - _val762.read(iprot); - struct.named_logger_level.put(_key761, _val762); + _key791 = iprot.readString(); + _val792 = new LogLevel(); + _val792.read(iprot); + struct.named_logger_level.put(_key791, _val792); } } 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 8feac31b01c..e52022854ba 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 _list788 = iprot.readListBegin(); - struct.success = new ArrayList(_list788.size); - ProfileRequest _elem789; - for (int _i790 = 0; _i790 < _list788.size; ++_i790) + org.apache.thrift.protocol.TList _list818 = iprot.readListBegin(); + struct.success = new ArrayList(_list818.size); + ProfileRequest _elem819; + for (int _i820 = 0; _i820 < _list818.size; ++_i820) { - _elem789 = new ProfileRequest(); - _elem789.read(iprot); - struct.success.add(_elem789); + _elem819 = new ProfileRequest(); + _elem819.read(iprot); + struct.success.add(_elem819); } 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 _iter791 : struct.success) + for (ProfileRequest _iter821 : struct.success) { - _iter791.write(oprot); + _iter821.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 _iter792 : struct.success) + for (ProfileRequest _iter822 : struct.success) { - _iter792.write(oprot); + _iter822.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 _list793 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list793.size); - ProfileRequest _elem794; - for (int _i795 = 0; _i795 < _list793.size; ++_i795) + org.apache.thrift.protocol.TList _list823 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list823.size); + ProfileRequest _elem824; + for (int _i825 = 0; _i825 < _list823.size; ++_i825) { - _elem794 = new ProfileRequest(); - _elem794.read(iprot); - struct.success.add(_elem794); + _elem824 = new ProfileRequest(); + _elem824.read(iprot); + struct.success.add(_elem824); } } 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 4bf01965ee8..075194f1fc3 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 _set590 = iprot.readSetBegin(); - struct.port = new HashSet(2*_set590.size); - long _elem591; - for (int _i592 = 0; _i592 < _set590.size; ++_i592) + org.apache.thrift.protocol.TSet _set620 = iprot.readSetBegin(); + struct.port = new HashSet(2*_set620.size); + long _elem621; + for (int _i622 = 0; _i622 < _set620.size; ++_i622) { - _elem591 = iprot.readI64(); - struct.port.add(_elem591); + _elem621 = iprot.readI64(); + struct.port.add(_elem621); } 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 _iter593 : struct.port) + for (long _iter623 : struct.port) { - oprot.writeI64(_iter593); + oprot.writeI64(_iter623); } 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 _iter594 : struct.port) + for (long _iter624 : struct.port) { - oprot.writeI64(_iter594); + oprot.writeI64(_iter624); } } } @@ -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 _set595 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.port = new HashSet(2*_set595.size); - long _elem596; - for (int _i597 = 0; _i597 < _set595.size; ++_i597) + org.apache.thrift.protocol.TSet _set625 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.port = new HashSet(2*_set625.size); + long _elem626; + for (int _i627 = 0; _i627 < _set625.size; ++_i627) { - _elem596 = iprot.readI64(); - struct.port.add(_elem596); + _elem626 = iprot.readI64(); + struct.port.add(_elem626); } } 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 6835cb403f7..6362d7798e7 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 _map518 = iprot.readMapBegin(); - struct.num_executors = new HashMap(2*_map518.size); - String _key519; - int _val520; - for (int _i521 = 0; _i521 < _map518.size; ++_i521) + org.apache.thrift.protocol.TMap _map548 = iprot.readMapBegin(); + struct.num_executors = new HashMap(2*_map548.size); + String _key549; + int _val550; + for (int _i551 = 0; _i551 < _map548.size; ++_i551) { - _key519 = iprot.readString(); - _val520 = iprot.readI32(); - struct.num_executors.put(_key519, _val520); + _key549 = iprot.readString(); + _val550 = iprot.readI32(); + struct.num_executors.put(_key549, _val550); } 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 _iter522 : struct.num_executors.entrySet()) + for (Map.Entry _iter552 : struct.num_executors.entrySet()) { - oprot.writeString(_iter522.getKey()); - oprot.writeI32(_iter522.getValue()); + oprot.writeString(_iter552.getKey()); + oprot.writeI32(_iter552.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 _iter523 : struct.num_executors.entrySet()) + for (Map.Entry _iter553 : struct.num_executors.entrySet()) { - oprot.writeString(_iter523.getKey()); - oprot.writeI32(_iter523.getValue()); + oprot.writeString(_iter553.getKey()); + oprot.writeI32(_iter553.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 _map524 = 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*_map524.size); - String _key525; - int _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.I32, iprot.readI32()); + struct.num_executors = new HashMap(2*_map554.size); + String _key555; + int _val556; + for (int _i557 = 0; _i557 < _map554.size; ++_i557) { - _key525 = iprot.readString(); - _val526 = iprot.readI32(); - struct.num_executors.put(_key525, _val526); + _key555 = iprot.readString(); + _val556 = iprot.readI32(); + struct.num_executors.put(_key555, _val556); } } 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 5cfea0d5464..4fd9ce670bc 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 _list538 = iprot.readListBegin(); - struct.acl = new ArrayList(_list538.size); - AccessControl _elem539; - for (int _i540 = 0; _i540 < _list538.size; ++_i540) + org.apache.thrift.protocol.TList _list568 = iprot.readListBegin(); + struct.acl = new ArrayList(_list568.size); + AccessControl _elem569; + for (int _i570 = 0; _i570 < _list568.size; ++_i570) { - _elem539 = new AccessControl(); - _elem539.read(iprot); - struct.acl.add(_elem539); + _elem569 = new AccessControl(); + _elem569.read(iprot); + struct.acl.add(_elem569); } 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 _iter541 : struct.acl) + for (AccessControl _iter571 : struct.acl) { - _iter541.write(oprot); + _iter571.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 _iter542 : struct.acl) + for (AccessControl _iter572 : struct.acl) { - _iter542.write(oprot); + _iter572.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 _list543 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.acl = new ArrayList(_list543.size); - AccessControl _elem544; - for (int _i545 = 0; _i545 < _list543.size; ++_i545) + org.apache.thrift.protocol.TList _list573 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.acl = new ArrayList(_list573.size); + AccessControl _elem574; + for (int _i575 = 0; _i575 < _list573.size; ++_i575) { - _elem544 = new AccessControl(); - _elem544.read(iprot); - struct.acl.add(_elem544); + _elem574 = new AccessControl(); + _elem574.read(iprot); + struct.acl.add(_elem574); } } 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 92d7eb409f3..624babcb8d7 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 _map654 = iprot.readMapBegin(); - struct.component_executors = new HashMap(2*_map654.size); - String _key655; - int _val656; - for (int _i657 = 0; _i657 < _map654.size; ++_i657) + org.apache.thrift.protocol.TMap _map684 = iprot.readMapBegin(); + struct.component_executors = new HashMap(2*_map684.size); + String _key685; + int _val686; + for (int _i687 = 0; _i687 < _map684.size; ++_i687) { - _key655 = iprot.readString(); - _val656 = iprot.readI32(); - struct.component_executors.put(_key655, _val656); + _key685 = iprot.readString(); + _val686 = iprot.readI32(); + struct.component_executors.put(_key685, _val686); } 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 _map658 = iprot.readMapBegin(); - struct.component_debug = new HashMap(2*_map658.size); - String _key659; - DebugOptions _val660; - for (int _i661 = 0; _i661 < _map658.size; ++_i661) + org.apache.thrift.protocol.TMap _map688 = iprot.readMapBegin(); + struct.component_debug = new HashMap(2*_map688.size); + String _key689; + DebugOptions _val690; + for (int _i691 = 0; _i691 < _map688.size; ++_i691) { - _key659 = iprot.readString(); - _val660 = new DebugOptions(); - _val660.read(iprot); - struct.component_debug.put(_key659, _val660); + _key689 = iprot.readString(); + _val690 = new DebugOptions(); + _val690.read(iprot); + struct.component_debug.put(_key689, _val690); } 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 _iter662 : struct.component_executors.entrySet()) + for (Map.Entry _iter692 : struct.component_executors.entrySet()) { - oprot.writeString(_iter662.getKey()); - oprot.writeI32(_iter662.getValue()); + oprot.writeString(_iter692.getKey()); + oprot.writeI32(_iter692.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 _iter663 : struct.component_debug.entrySet()) + for (Map.Entry _iter693 : struct.component_debug.entrySet()) { - oprot.writeString(_iter663.getKey()); - _iter663.getValue().write(oprot); + oprot.writeString(_iter693.getKey()); + _iter693.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 _iter664 : struct.component_executors.entrySet()) + for (Map.Entry _iter694 : struct.component_executors.entrySet()) { - oprot.writeString(_iter664.getKey()); - oprot.writeI32(_iter664.getValue()); + oprot.writeString(_iter694.getKey()); + oprot.writeI32(_iter694.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 _iter665 : struct.component_debug.entrySet()) + for (Map.Entry _iter695 : struct.component_debug.entrySet()) { - oprot.writeString(_iter665.getKey()); - _iter665.getValue().write(oprot); + oprot.writeString(_iter695.getKey()); + _iter695.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 _map666 = 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*_map666.size); - String _key667; - int _val668; - for (int _i669 = 0; _i669 < _map666.size; ++_i669) + org.apache.thrift.protocol.TMap _map696 = 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*_map696.size); + String _key697; + int _val698; + for (int _i699 = 0; _i699 < _map696.size; ++_i699) { - _key667 = iprot.readString(); - _val668 = iprot.readI32(); - struct.component_executors.put(_key667, _val668); + _key697 = iprot.readString(); + _val698 = iprot.readI32(); + struct.component_executors.put(_key697, _val698); } } 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 _map670 = 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*_map670.size); - String _key671; - DebugOptions _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.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.component_debug = new HashMap(2*_map700.size); + String _key701; + DebugOptions _val702; + for (int _i703 = 0; _i703 < _map700.size; ++_i703) { - _key671 = iprot.readString(); - _val672 = new DebugOptions(); - _val672.read(iprot); - struct.component_debug.put(_key671, _val672); + _key701 = iprot.readString(); + _val702 = new DebugOptions(); + _val702.read(iprot); + struct.component_debug.put(_key701, _val702); } } 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 64b2d7d0839..a9aaf4a38f4 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 _list554 = iprot.readListBegin(); - struct.used_ports = new ArrayList(_list554.size); - long _elem555; - for (int _i556 = 0; _i556 < _list554.size; ++_i556) + org.apache.thrift.protocol.TList _list584 = iprot.readListBegin(); + struct.used_ports = new ArrayList(_list584.size); + long _elem585; + for (int _i586 = 0; _i586 < _list584.size; ++_i586) { - _elem555 = iprot.readI64(); - struct.used_ports.add(_elem555); + _elem585 = iprot.readI64(); + struct.used_ports.add(_elem585); } 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 _list557 = iprot.readListBegin(); - struct.meta = new ArrayList(_list557.size); - long _elem558; - for (int _i559 = 0; _i559 < _list557.size; ++_i559) + org.apache.thrift.protocol.TList _list587 = iprot.readListBegin(); + struct.meta = new ArrayList(_list587.size); + long _elem588; + for (int _i589 = 0; _i589 < _list587.size; ++_i589) { - _elem558 = iprot.readI64(); - struct.meta.add(_elem558); + _elem588 = iprot.readI64(); + struct.meta.add(_elem588); } 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 _map560 = iprot.readMapBegin(); - struct.scheduler_meta = new HashMap(2*_map560.size); - String _key561; - String _val562; - for (int _i563 = 0; _i563 < _map560.size; ++_i563) + org.apache.thrift.protocol.TMap _map590 = iprot.readMapBegin(); + struct.scheduler_meta = new HashMap(2*_map590.size); + String _key591; + String _val592; + for (int _i593 = 0; _i593 < _map590.size; ++_i593) { - _key561 = iprot.readString(); - _val562 = iprot.readString(); - struct.scheduler_meta.put(_key561, _val562); + _key591 = iprot.readString(); + _val592 = iprot.readString(); + struct.scheduler_meta.put(_key591, _val592); } 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 _map564 = iprot.readMapBegin(); - struct.resources_map = new HashMap(2*_map564.size); - String _key565; - double _val566; - for (int _i567 = 0; _i567 < _map564.size; ++_i567) + org.apache.thrift.protocol.TMap _map594 = iprot.readMapBegin(); + struct.resources_map = new HashMap(2*_map594.size); + String _key595; + double _val596; + for (int _i597 = 0; _i597 < _map594.size; ++_i597) { - _key565 = iprot.readString(); - _val566 = iprot.readDouble(); - struct.resources_map.put(_key565, _val566); + _key595 = iprot.readString(); + _val596 = iprot.readDouble(); + struct.resources_map.put(_key595, _val596); } 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 _iter568 : struct.used_ports) + for (long _iter598 : struct.used_ports) { - oprot.writeI64(_iter568); + oprot.writeI64(_iter598); } 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 _iter569 : struct.meta) + for (long _iter599 : struct.meta) { - oprot.writeI64(_iter569); + oprot.writeI64(_iter599); } 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 _iter570 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter600 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter570.getKey()); - oprot.writeString(_iter570.getValue()); + oprot.writeString(_iter600.getKey()); + oprot.writeString(_iter600.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 _iter571 : struct.resources_map.entrySet()) + for (Map.Entry _iter601 : struct.resources_map.entrySet()) { - oprot.writeString(_iter571.getKey()); - oprot.writeDouble(_iter571.getValue()); + oprot.writeString(_iter601.getKey()); + oprot.writeDouble(_iter601.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 _iter572 : struct.used_ports) + for (long _iter602 : struct.used_ports) { - oprot.writeI64(_iter572); + oprot.writeI64(_iter602); } } } if (struct.is_set_meta()) { { oprot.writeI32(struct.meta.size()); - for (long _iter573 : struct.meta) + for (long _iter603 : struct.meta) { - oprot.writeI64(_iter573); + oprot.writeI64(_iter603); } } } if (struct.is_set_scheduler_meta()) { { oprot.writeI32(struct.scheduler_meta.size()); - for (Map.Entry _iter574 : struct.scheduler_meta.entrySet()) + for (Map.Entry _iter604 : struct.scheduler_meta.entrySet()) { - oprot.writeString(_iter574.getKey()); - oprot.writeString(_iter574.getValue()); + oprot.writeString(_iter604.getKey()); + oprot.writeString(_iter604.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 _iter575 : struct.resources_map.entrySet()) + for (Map.Entry _iter605 : struct.resources_map.entrySet()) { - oprot.writeString(_iter575.getKey()); - oprot.writeDouble(_iter575.getValue()); + oprot.writeString(_iter605.getKey()); + oprot.writeDouble(_iter605.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 _list576 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.used_ports = new ArrayList(_list576.size); - long _elem577; - for (int _i578 = 0; _i578 < _list576.size; ++_i578) + org.apache.thrift.protocol.TList _list606 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.used_ports = new ArrayList(_list606.size); + long _elem607; + for (int _i608 = 0; _i608 < _list606.size; ++_i608) { - _elem577 = iprot.readI64(); - struct.used_ports.add(_elem577); + _elem607 = iprot.readI64(); + struct.used_ports.add(_elem607); } } struct.set_used_ports_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list579 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.meta = new ArrayList(_list579.size); - long _elem580; - for (int _i581 = 0; _i581 < _list579.size; ++_i581) + org.apache.thrift.protocol.TList _list609 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.meta = new ArrayList(_list609.size); + long _elem610; + for (int _i611 = 0; _i611 < _list609.size; ++_i611) { - _elem580 = iprot.readI64(); - struct.meta.add(_elem580); + _elem610 = iprot.readI64(); + struct.meta.add(_elem610); } } struct.set_meta_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map582 = 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*_map582.size); - String _key583; - String _val584; - for (int _i585 = 0; _i585 < _map582.size; ++_i585) + org.apache.thrift.protocol.TMap _map612 = 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*_map612.size); + String _key613; + String _val614; + for (int _i615 = 0; _i615 < _map612.size; ++_i615) { - _key583 = iprot.readString(); - _val584 = iprot.readString(); - struct.scheduler_meta.put(_key583, _val584); + _key613 = iprot.readString(); + _val614 = iprot.readString(); + struct.scheduler_meta.put(_key613, _val614); } } 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 _map586 = 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*_map586.size); - String _key587; - double _val588; - for (int _i589 = 0; _i589 < _map586.size; ++_i589) + org.apache.thrift.protocol.TMap _map616 = 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*_map616.size); + String _key617; + double _val618; + for (int _i619 = 0; _i619 < _map616.size; ++_i619) { - _key587 = iprot.readString(); - _val588 = iprot.readDouble(); - struct.resources_map.put(_key587, _val588); + _key617 = iprot.readString(); + _val618 = iprot.readDouble(); + struct.resources_map.put(_key617, _val618); } } 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 03a5e8ff247..f91f0bb812d 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 _list428 = iprot.readListBegin(); - struct.supervisor_summaries = new ArrayList(_list428.size); - SupervisorSummary _elem429; - for (int _i430 = 0; _i430 < _list428.size; ++_i430) + org.apache.thrift.protocol.TList _list458 = iprot.readListBegin(); + struct.supervisor_summaries = new ArrayList(_list458.size); + SupervisorSummary _elem459; + for (int _i460 = 0; _i460 < _list458.size; ++_i460) { - _elem429 = new SupervisorSummary(); - _elem429.read(iprot); - struct.supervisor_summaries.add(_elem429); + _elem459 = new SupervisorSummary(); + _elem459.read(iprot); + struct.supervisor_summaries.add(_elem459); } 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 _list431 = iprot.readListBegin(); - struct.worker_summaries = new ArrayList(_list431.size); - WorkerSummary _elem432; - for (int _i433 = 0; _i433 < _list431.size; ++_i433) + org.apache.thrift.protocol.TList _list461 = iprot.readListBegin(); + struct.worker_summaries = new ArrayList(_list461.size); + WorkerSummary _elem462; + for (int _i463 = 0; _i463 < _list461.size; ++_i463) { - _elem432 = new WorkerSummary(); - _elem432.read(iprot); - struct.worker_summaries.add(_elem432); + _elem462 = new WorkerSummary(); + _elem462.read(iprot); + struct.worker_summaries.add(_elem462); } 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 _iter434 : struct.supervisor_summaries) + for (SupervisorSummary _iter464 : struct.supervisor_summaries) { - _iter434.write(oprot); + _iter464.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 _iter435 : struct.worker_summaries) + for (WorkerSummary _iter465 : struct.worker_summaries) { - _iter435.write(oprot); + _iter465.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 _iter436 : struct.supervisor_summaries) + for (SupervisorSummary _iter466 : struct.supervisor_summaries) { - _iter436.write(oprot); + _iter466.write(oprot); } } } if (struct.is_set_worker_summaries()) { { oprot.writeI32(struct.worker_summaries.size()); - for (WorkerSummary _iter437 : struct.worker_summaries) + for (WorkerSummary _iter467 : struct.worker_summaries) { - _iter437.write(oprot); + _iter467.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 _list438 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.supervisor_summaries = new ArrayList(_list438.size); - SupervisorSummary _elem439; - for (int _i440 = 0; _i440 < _list438.size; ++_i440) + org.apache.thrift.protocol.TList _list468 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + 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); } } struct.set_supervisor_summaries_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list441 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.worker_summaries = new ArrayList(_list441.size); - WorkerSummary _elem442; - for (int _i443 = 0; _i443 < _list441.size; ++_i443) + org.apache.thrift.protocol.TList _list471 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + 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); } } 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 27671aa4068..6f18145df9b 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 _list764 = iprot.readListBegin(); - struct.topo_ids = new ArrayList(_list764.size); - String _elem765; - for (int _i766 = 0; _i766 < _list764.size; ++_i766) + org.apache.thrift.protocol.TList _list794 = iprot.readListBegin(); + struct.topo_ids = new ArrayList(_list794.size); + String _elem795; + for (int _i796 = 0; _i796 < _list794.size; ++_i796) { - _elem765 = iprot.readString(); - struct.topo_ids.add(_elem765); + _elem795 = iprot.readString(); + struct.topo_ids.add(_elem795); } 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 _iter767 : struct.topo_ids) + for (String _iter797 : struct.topo_ids) { - oprot.writeString(_iter767); + oprot.writeString(_iter797); } 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 _iter768 : struct.topo_ids) + for (String _iter798 : struct.topo_ids) { - oprot.writeString(_iter768); + oprot.writeString(_iter798); } } } @@ -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 _list769 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.topo_ids = new ArrayList(_list769.size); - String _elem770; - for (int _i771 = 0; _i771 < _list769.size; ++_i771) + org.apache.thrift.protocol.TList _list799 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.topo_ids = new ArrayList(_list799.size); + String _elem800; + for (int _i801 = 0; _i801 < _list799.size; ++_i801) { - _elem770 = iprot.readString(); - struct.topo_ids.add(_elem770); + _elem800 = iprot.readString(); + struct.topo_ids.add(_elem800); } } 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 a400af2bc66..e0e8838b9bd 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 _map444 = iprot.readMapBegin(); - struct.id_to_spout_agg_stats = new HashMap(2*_map444.size); - String _key445; - ComponentAggregateStats _val446; - for (int _i447 = 0; _i447 < _map444.size; ++_i447) + org.apache.thrift.protocol.TMap _map474 = iprot.readMapBegin(); + struct.id_to_spout_agg_stats = new HashMap(2*_map474.size); + String _key475; + ComponentAggregateStats _val476; + for (int _i477 = 0; _i477 < _map474.size; ++_i477) { - _key445 = iprot.readString(); - _val446 = new ComponentAggregateStats(); - _val446.read(iprot); - struct.id_to_spout_agg_stats.put(_key445, _val446); + _key475 = iprot.readString(); + _val476 = new ComponentAggregateStats(); + _val476.read(iprot); + struct.id_to_spout_agg_stats.put(_key475, _val476); } 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 _map448 = iprot.readMapBegin(); - struct.id_to_bolt_agg_stats = new HashMap(2*_map448.size); - String _key449; - ComponentAggregateStats _val450; - for (int _i451 = 0; _i451 < _map448.size; ++_i451) + org.apache.thrift.protocol.TMap _map478 = iprot.readMapBegin(); + struct.id_to_bolt_agg_stats = new HashMap(2*_map478.size); + String _key479; + ComponentAggregateStats _val480; + for (int _i481 = 0; _i481 < _map478.size; ++_i481) { - _key449 = iprot.readString(); - _val450 = new ComponentAggregateStats(); - _val450.read(iprot); - struct.id_to_bolt_agg_stats.put(_key449, _val450); + _key479 = iprot.readString(); + _val480 = new ComponentAggregateStats(); + _val480.read(iprot); + struct.id_to_bolt_agg_stats.put(_key479, _val480); } 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 _list452 = iprot.readListBegin(); - struct.workers = new ArrayList(_list452.size); - WorkerSummary _elem453; - for (int _i454 = 0; _i454 < _list452.size; ++_i454) + org.apache.thrift.protocol.TList _list482 = iprot.readListBegin(); + struct.workers = new ArrayList(_list482.size); + WorkerSummary _elem483; + for (int _i484 = 0; _i484 < _list482.size; ++_i484) { - _elem453 = new WorkerSummary(); - _elem453.read(iprot); - struct.workers.add(_elem453); + _elem483 = new WorkerSummary(); + _elem483.read(iprot); + struct.workers.add(_elem483); } 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 _iter455 : struct.id_to_spout_agg_stats.entrySet()) + for (Map.Entry _iter485 : struct.id_to_spout_agg_stats.entrySet()) { - oprot.writeString(_iter455.getKey()); - _iter455.getValue().write(oprot); + oprot.writeString(_iter485.getKey()); + _iter485.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 _iter456 : struct.id_to_bolt_agg_stats.entrySet()) + for (Map.Entry _iter486 : struct.id_to_bolt_agg_stats.entrySet()) { - oprot.writeString(_iter456.getKey()); - _iter456.getValue().write(oprot); + oprot.writeString(_iter486.getKey()); + _iter486.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 _iter457 : struct.workers) + for (WorkerSummary _iter487 : struct.workers) { - _iter457.write(oprot); + _iter487.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 _iter458 : struct.id_to_spout_agg_stats.entrySet()) + for (Map.Entry _iter488 : struct.id_to_spout_agg_stats.entrySet()) { - oprot.writeString(_iter458.getKey()); - _iter458.getValue().write(oprot); + oprot.writeString(_iter488.getKey()); + _iter488.getValue().write(oprot); } } } if (struct.is_set_id_to_bolt_agg_stats()) { { oprot.writeI32(struct.id_to_bolt_agg_stats.size()); - for (Map.Entry _iter459 : struct.id_to_bolt_agg_stats.entrySet()) + for (Map.Entry _iter489 : struct.id_to_bolt_agg_stats.entrySet()) { - oprot.writeString(_iter459.getKey()); - _iter459.getValue().write(oprot); + oprot.writeString(_iter489.getKey()); + _iter489.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 _iter460 : struct.workers) + for (WorkerSummary _iter490 : struct.workers) { - _iter460.write(oprot); + _iter490.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 _map461 = 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*_map461.size); - String _key462; - ComponentAggregateStats _val463; - for (int _i464 = 0; _i464 < _map461.size; ++_i464) + org.apache.thrift.protocol.TMap _map491 = 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*_map491.size); + String _key492; + ComponentAggregateStats _val493; + for (int _i494 = 0; _i494 < _map491.size; ++_i494) { - _key462 = iprot.readString(); - _val463 = new ComponentAggregateStats(); - _val463.read(iprot); - struct.id_to_spout_agg_stats.put(_key462, _val463); + _key492 = iprot.readString(); + _val493 = new ComponentAggregateStats(); + _val493.read(iprot); + struct.id_to_spout_agg_stats.put(_key492, _val493); } } struct.set_id_to_spout_agg_stats_isSet(true); } if (incoming.get(8)) { { - org.apache.thrift.protocol.TMap _map465 = 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*_map465.size); - String _key466; - ComponentAggregateStats _val467; - for (int _i468 = 0; _i468 < _map465.size; ++_i468) + org.apache.thrift.protocol.TMap _map495 = 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*_map495.size); + String _key496; + ComponentAggregateStats _val497; + for (int _i498 = 0; _i498 < _map495.size; ++_i498) { - _key466 = iprot.readString(); - _val467 = new ComponentAggregateStats(); - _val467.read(iprot); - struct.id_to_bolt_agg_stats.put(_key466, _val467); + _key496 = iprot.readString(); + _val497 = new ComponentAggregateStats(); + _val497.read(iprot); + struct.id_to_bolt_agg_stats.put(_key496, _val497); } } 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 _list469 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.workers = new ArrayList(_list469.size); - WorkerSummary _elem470; - for (int _i471 = 0; _i471 < _list469.size; ++_i471) + org.apache.thrift.protocol.TList _list499 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.workers = new ArrayList(_list499.size); + WorkerSummary _elem500; + for (int _i501 = 0; _i501 < _list499.size; ++_i501) { - _elem470 = new WorkerSummary(); - _elem470.read(iprot); - struct.workers.add(_elem470); + _elem500 = new WorkerSummary(); + _elem500.read(iprot); + struct.workers.add(_elem500); } } 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 a60f056ff79..7999d5784e0 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 _map368 = iprot.readMapBegin(); - struct.window_to_emitted = new HashMap(2*_map368.size); - String _key369; - long _val370; - for (int _i371 = 0; _i371 < _map368.size; ++_i371) + org.apache.thrift.protocol.TMap _map388 = iprot.readMapBegin(); + struct.window_to_emitted = new HashMap(2*_map388.size); + String _key389; + long _val390; + for (int _i391 = 0; _i391 < _map388.size; ++_i391) { - _key369 = iprot.readString(); - _val370 = iprot.readI64(); - struct.window_to_emitted.put(_key369, _val370); + _key389 = iprot.readString(); + _val390 = iprot.readI64(); + struct.window_to_emitted.put(_key389, _val390); } 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 _map372 = iprot.readMapBegin(); - struct.window_to_transferred = new HashMap(2*_map372.size); - String _key373; - long _val374; - for (int _i375 = 0; _i375 < _map372.size; ++_i375) + org.apache.thrift.protocol.TMap _map392 = iprot.readMapBegin(); + struct.window_to_transferred = new HashMap(2*_map392.size); + String _key393; + long _val394; + for (int _i395 = 0; _i395 < _map392.size; ++_i395) { - _key373 = iprot.readString(); - _val374 = iprot.readI64(); - struct.window_to_transferred.put(_key373, _val374); + _key393 = iprot.readString(); + _val394 = iprot.readI64(); + struct.window_to_transferred.put(_key393, _val394); } 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 _map376 = iprot.readMapBegin(); - struct.window_to_complete_latencies_ms = new HashMap(2*_map376.size); - String _key377; - double _val378; - for (int _i379 = 0; _i379 < _map376.size; ++_i379) + org.apache.thrift.protocol.TMap _map396 = iprot.readMapBegin(); + struct.window_to_complete_latencies_ms = new HashMap(2*_map396.size); + String _key397; + double _val398; + for (int _i399 = 0; _i399 < _map396.size; ++_i399) { - _key377 = iprot.readString(); - _val378 = iprot.readDouble(); - struct.window_to_complete_latencies_ms.put(_key377, _val378); + _key397 = iprot.readString(); + _val398 = iprot.readDouble(); + struct.window_to_complete_latencies_ms.put(_key397, _val398); } 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 _map380 = iprot.readMapBegin(); - struct.window_to_acked = new HashMap(2*_map380.size); - String _key381; - long _val382; - for (int _i383 = 0; _i383 < _map380.size; ++_i383) + org.apache.thrift.protocol.TMap _map400 = iprot.readMapBegin(); + struct.window_to_acked = new HashMap(2*_map400.size); + String _key401; + long _val402; + for (int _i403 = 0; _i403 < _map400.size; ++_i403) { - _key381 = iprot.readString(); - _val382 = iprot.readI64(); - struct.window_to_acked.put(_key381, _val382); + _key401 = iprot.readString(); + _val402 = iprot.readI64(); + struct.window_to_acked.put(_key401, _val402); } 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 _map384 = iprot.readMapBegin(); - struct.window_to_failed = new HashMap(2*_map384.size); - String _key385; - long _val386; - for (int _i387 = 0; _i387 < _map384.size; ++_i387) + org.apache.thrift.protocol.TMap _map404 = iprot.readMapBegin(); + struct.window_to_failed = new HashMap(2*_map404.size); + String _key405; + long _val406; + for (int _i407 = 0; _i407 < _map404.size; ++_i407) { - _key385 = iprot.readString(); - _val386 = iprot.readI64(); - struct.window_to_failed.put(_key385, _val386); + _key405 = iprot.readString(); + _val406 = iprot.readI64(); + struct.window_to_failed.put(_key405, _val406); } 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 _map408 = iprot.readMapBegin(); + struct.window_to_throughput = new HashMap(2*_map408.size); + String _key409; + double _val410; + for (int _i411 = 0; _i411 < _map408.size; ++_i411) + { + _key409 = iprot.readString(); + _val410 = iprot.readDouble(); + struct.window_to_throughput.put(_key409, _val410); + } + 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 _iter388 : struct.window_to_emitted.entrySet()) + for (Map.Entry _iter412 : struct.window_to_emitted.entrySet()) { - oprot.writeString(_iter388.getKey()); - oprot.writeI64(_iter388.getValue()); + oprot.writeString(_iter412.getKey()); + oprot.writeI64(_iter412.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 _iter389 : struct.window_to_transferred.entrySet()) + for (Map.Entry _iter413 : struct.window_to_transferred.entrySet()) { - oprot.writeString(_iter389.getKey()); - oprot.writeI64(_iter389.getValue()); + oprot.writeString(_iter413.getKey()); + oprot.writeI64(_iter413.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 _iter390 : struct.window_to_complete_latencies_ms.entrySet()) + for (Map.Entry _iter414 : struct.window_to_complete_latencies_ms.entrySet()) { - oprot.writeString(_iter390.getKey()); - oprot.writeDouble(_iter390.getValue()); + oprot.writeString(_iter414.getKey()); + oprot.writeDouble(_iter414.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 _iter391 : struct.window_to_acked.entrySet()) + for (Map.Entry _iter415 : struct.window_to_acked.entrySet()) { - oprot.writeString(_iter391.getKey()); - oprot.writeI64(_iter391.getValue()); + oprot.writeString(_iter415.getKey()); + oprot.writeI64(_iter415.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 _iter392 : struct.window_to_failed.entrySet()) + for (Map.Entry _iter416 : struct.window_to_failed.entrySet()) { - oprot.writeString(_iter392.getKey()); - oprot.writeI64(_iter392.getValue()); + oprot.writeString(_iter416.getKey()); + oprot.writeI64(_iter416.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 _iter417 : struct.window_to_throughput.entrySet()) + { + oprot.writeString(_iter417.getKey()); + oprot.writeDouble(_iter417.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 _iter393 : struct.window_to_emitted.entrySet()) + for (Map.Entry _iter418 : struct.window_to_emitted.entrySet()) { - oprot.writeString(_iter393.getKey()); - oprot.writeI64(_iter393.getValue()); + oprot.writeString(_iter418.getKey()); + oprot.writeI64(_iter418.getValue()); } } } if (struct.is_set_window_to_transferred()) { { oprot.writeI32(struct.window_to_transferred.size()); - for (Map.Entry _iter394 : struct.window_to_transferred.entrySet()) + for (Map.Entry _iter419 : struct.window_to_transferred.entrySet()) { - oprot.writeString(_iter394.getKey()); - oprot.writeI64(_iter394.getValue()); + oprot.writeString(_iter419.getKey()); + oprot.writeI64(_iter419.getValue()); } } } if (struct.is_set_window_to_complete_latencies_ms()) { { oprot.writeI32(struct.window_to_complete_latencies_ms.size()); - for (Map.Entry _iter395 : struct.window_to_complete_latencies_ms.entrySet()) + for (Map.Entry _iter420 : struct.window_to_complete_latencies_ms.entrySet()) { - oprot.writeString(_iter395.getKey()); - oprot.writeDouble(_iter395.getValue()); + oprot.writeString(_iter420.getKey()); + oprot.writeDouble(_iter420.getValue()); } } } if (struct.is_set_window_to_acked()) { { oprot.writeI32(struct.window_to_acked.size()); - for (Map.Entry _iter396 : struct.window_to_acked.entrySet()) + for (Map.Entry _iter421 : struct.window_to_acked.entrySet()) { - oprot.writeString(_iter396.getKey()); - oprot.writeI64(_iter396.getValue()); + oprot.writeString(_iter421.getKey()); + oprot.writeI64(_iter421.getValue()); } } } if (struct.is_set_window_to_failed()) { { oprot.writeI32(struct.window_to_failed.size()); - for (Map.Entry _iter397 : struct.window_to_failed.entrySet()) + for (Map.Entry _iter422 : struct.window_to_failed.entrySet()) + { + oprot.writeString(_iter422.getKey()); + oprot.writeI64(_iter422.getValue()); + } + } + } + if (struct.is_set_window_to_throughput()) { + { + oprot.writeI32(struct.window_to_throughput.size()); + for (Map.Entry _iter423 : struct.window_to_throughput.entrySet()) { - oprot.writeString(_iter397.getKey()); - oprot.writeI64(_iter397.getValue()); + oprot.writeString(_iter423.getKey()); + oprot.writeDouble(_iter423.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 _map398 = 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*_map398.size); - String _key399; - long _val400; - for (int _i401 = 0; _i401 < _map398.size; ++_i401) + 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_emitted = new HashMap(2*_map424.size); + String _key425; + long _val426; + for (int _i427 = 0; _i427 < _map424.size; ++_i427) { - _key399 = iprot.readString(); - _val400 = iprot.readI64(); - struct.window_to_emitted.put(_key399, _val400); + _key425 = iprot.readString(); + _val426 = iprot.readI64(); + struct.window_to_emitted.put(_key425, _val426); } } struct.set_window_to_emitted_isSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map402 = 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*_map402.size); - String _key403; - long _val404; - for (int _i405 = 0; _i405 < _map402.size; ++_i405) + org.apache.thrift.protocol.TMap _map428 = 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*_map428.size); + String _key429; + long _val430; + for (int _i431 = 0; _i431 < _map428.size; ++_i431) { - _key403 = iprot.readString(); - _val404 = iprot.readI64(); - struct.window_to_transferred.put(_key403, _val404); + _key429 = iprot.readString(); + _val430 = iprot.readI64(); + struct.window_to_transferred.put(_key429, _val430); } } struct.set_window_to_transferred_isSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map406 = 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*_map406.size); - String _key407; - double _val408; - for (int _i409 = 0; _i409 < _map406.size; ++_i409) + org.apache.thrift.protocol.TMap _map432 = 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*_map432.size); + String _key433; + double _val434; + for (int _i435 = 0; _i435 < _map432.size; ++_i435) { - _key407 = iprot.readString(); - _val408 = iprot.readDouble(); - struct.window_to_complete_latencies_ms.put(_key407, _val408); + _key433 = iprot.readString(); + _val434 = iprot.readDouble(); + struct.window_to_complete_latencies_ms.put(_key433, _val434); } } struct.set_window_to_complete_latencies_ms_isSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map410 = 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*_map410.size); - String _key411; - long _val412; - for (int _i413 = 0; _i413 < _map410.size; ++_i413) + org.apache.thrift.protocol.TMap _map436 = 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*_map436.size); + String _key437; + long _val438; + for (int _i439 = 0; _i439 < _map436.size; ++_i439) { - _key411 = iprot.readString(); - _val412 = iprot.readI64(); - struct.window_to_acked.put(_key411, _val412); + _key437 = iprot.readString(); + _val438 = iprot.readI64(); + struct.window_to_acked.put(_key437, _val438); } } struct.set_window_to_acked_isSet(true); } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map414 = 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*_map414.size); - String _key415; - long _val416; - for (int _i417 = 0; _i417 < _map414.size; ++_i417) + org.apache.thrift.protocol.TMap _map440 = 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*_map440.size); + String _key441; + long _val442; + for (int _i443 = 0; _i443 < _map440.size; ++_i443) { - _key415 = iprot.readString(); - _val416 = iprot.readI64(); - struct.window_to_failed.put(_key415, _val416); + _key441 = iprot.readString(); + _val442 = iprot.readI64(); + struct.window_to_failed.put(_key441, _val442); } } struct.set_window_to_failed_isSet(true); } + if (incoming.get(5)) { + { + org.apache.thrift.protocol.TMap _map444 = 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*_map444.size); + String _key445; + double _val446; + for (int _i447 = 0; _i447 < _map444.size; ++_i447) + { + _key445 = iprot.readString(); + _val446 = iprot.readDouble(); + struct.window_to_throughput.put(_key445, _val446); + } + } + 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 b1079abd2fa..807f795d9cb 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 _map418 = iprot.readMapBegin(); - struct.component_to_num_tasks = new HashMap(2*_map418.size); - String _key419; - long _val420; - for (int _i421 = 0; _i421 < _map418.size; ++_i421) + org.apache.thrift.protocol.TMap _map448 = iprot.readMapBegin(); + struct.component_to_num_tasks = new HashMap(2*_map448.size); + String _key449; + long _val450; + for (int _i451 = 0; _i451 < _map448.size; ++_i451) { - _key419 = iprot.readString(); - _val420 = iprot.readI64(); - struct.component_to_num_tasks.put(_key419, _val420); + _key449 = iprot.readString(); + _val450 = iprot.readI64(); + struct.component_to_num_tasks.put(_key449, _val450); } 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 _iter422 : struct.component_to_num_tasks.entrySet()) + for (Map.Entry _iter452 : struct.component_to_num_tasks.entrySet()) { - oprot.writeString(_iter422.getKey()); - oprot.writeI64(_iter422.getValue()); + oprot.writeString(_iter452.getKey()); + oprot.writeI64(_iter452.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 _iter423 : struct.component_to_num_tasks.entrySet()) + for (Map.Entry _iter453 : struct.component_to_num_tasks.entrySet()) { - oprot.writeString(_iter423.getKey()); - oprot.writeI64(_iter423.getValue()); + oprot.writeString(_iter453.getKey()); + oprot.writeI64(_iter453.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 _map424 = 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*_map424.size); - String _key425; - long _val426; - for (int _i427 = 0; _i427 < _map424.size; ++_i427) + org.apache.thrift.protocol.TMap _map454 = 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*_map454.size); + String _key455; + long _val456; + for (int _i457 = 0; _i457 < _map454.size; ++_i457) { - _key425 = iprot.readString(); - _val426 = iprot.readI64(); - struct.component_to_num_tasks.put(_key425, _val426); + _key455 = iprot.readString(); + _val456 = iprot.readI64(); + struct.component_to_num_tasks.put(_key455, _val456); } } struct.set_component_to_num_tasks_isSet(true); diff --git a/storm-core/src/py/storm/Nimbus.py b/storm-core/src/py/storm/Nimbus.py index 7c1c06b0213..369210df07e 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 = [] - (_etype706, _size703) = iprot.readListBegin() - for _i707 in xrange(_size703): - _elem708 = ProfileRequest() - _elem708.read(iprot) - self.success.append(_elem708) + (_etype733, _size730) = iprot.readListBegin() + for _i734 in xrange(_size730): + _elem735 = ProfileRequest() + _elem735.read(iprot) + self.success.append(_elem735) 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 iter709 in self.success: - iter709.write(oprot) + for iter736 in self.success: + iter736.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 68056270f3a..38cb494f40a 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: @@ -5098,6 +5131,7 @@ class CommonAggregateStats: - transferred - acked - failed + - throughput """ thrift_spec = ( @@ -5108,15 +5142,17 @@ class CommonAggregateStats: (4, TType.I64, 'transferred', None, None, ), # 4 (5, TType.I64, 'acked', None, None, ), # 5 (6, TType.I64, 'failed', None, None, ), # 6 + (7, TType.DOUBLE, 'throughput', None, None, ), # 7 ) - def __init__(self, num_executors=None, num_tasks=None, emitted=None, transferred=None, acked=None, failed=None,): + def __init__(self, num_executors=None, num_tasks=None, emitted=None, transferred=None, acked=None, failed=None, throughput=None,): self.num_executors = num_executors self.num_tasks = num_tasks self.emitted = emitted self.transferred = transferred self.acked = acked self.failed = failed + 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: @@ -5157,6 +5193,11 @@ def read(self, iprot): self.failed = iprot.readI64() else: iprot.skip(ftype) + elif fid == 7: + if ftype == TType.DOUBLE: + self.throughput = iprot.readDouble() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -5191,6 +5232,10 @@ def write(self, oprot): oprot.writeFieldBegin('failed', TType.I64, 6) oprot.writeI64(self.failed) oprot.writeFieldEnd() + if self.throughput is not None: + oprot.writeFieldBegin('throughput', TType.DOUBLE, 7) + oprot.writeDouble(self.throughput) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -5206,6 +5251,7 @@ def __hash__(self): value = (value * 31) ^ hash(self.transferred) value = (value * 31) ^ hash(self.acked) value = (value * 31) ^ hash(self.failed) + value = (value * 31) ^ hash(self.throughput) return value def __repr__(self): @@ -5583,6 +5629,7 @@ class TopologyStats: - window_to_complete_latencies_ms - window_to_acked - window_to_failed + - window_to_throughput """ thrift_spec = ( @@ -5592,14 +5639,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: @@ -5613,55 +5662,66 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.window_to_emitted = {} - (_ktype330, _vtype331, _size329 ) = iprot.readMapBegin() - for _i333 in xrange(_size329): - _key334 = iprot.readString().decode('utf-8') - _val335 = iprot.readI64() - self.window_to_emitted[_key334] = _val335 + (_ktype348, _vtype349, _size347 ) = iprot.readMapBegin() + for _i351 in xrange(_size347): + _key352 = iprot.readString().decode('utf-8') + _val353 = iprot.readI64() + self.window_to_emitted[_key352] = _val353 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.window_to_transferred = {} - (_ktype337, _vtype338, _size336 ) = iprot.readMapBegin() - for _i340 in xrange(_size336): - _key341 = iprot.readString().decode('utf-8') - _val342 = iprot.readI64() - self.window_to_transferred[_key341] = _val342 + (_ktype355, _vtype356, _size354 ) = iprot.readMapBegin() + for _i358 in xrange(_size354): + _key359 = iprot.readString().decode('utf-8') + _val360 = iprot.readI64() + self.window_to_transferred[_key359] = _val360 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.window_to_complete_latencies_ms = {} - (_ktype344, _vtype345, _size343 ) = iprot.readMapBegin() - for _i347 in xrange(_size343): - _key348 = iprot.readString().decode('utf-8') - _val349 = iprot.readDouble() - self.window_to_complete_latencies_ms[_key348] = _val349 + (_ktype362, _vtype363, _size361 ) = iprot.readMapBegin() + for _i365 in xrange(_size361): + _key366 = iprot.readString().decode('utf-8') + _val367 = iprot.readDouble() + self.window_to_complete_latencies_ms[_key366] = _val367 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.window_to_acked = {} - (_ktype351, _vtype352, _size350 ) = iprot.readMapBegin() - for _i354 in xrange(_size350): - _key355 = iprot.readString().decode('utf-8') - _val356 = iprot.readI64() - self.window_to_acked[_key355] = _val356 + (_ktype369, _vtype370, _size368 ) = iprot.readMapBegin() + for _i372 in xrange(_size368): + _key373 = iprot.readString().decode('utf-8') + _val374 = iprot.readI64() + self.window_to_acked[_key373] = _val374 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.MAP: self.window_to_failed = {} - (_ktype358, _vtype359, _size357 ) = iprot.readMapBegin() - for _i361 in xrange(_size357): - _key362 = iprot.readString().decode('utf-8') - _val363 = iprot.readI64() - self.window_to_failed[_key362] = _val363 + (_ktype376, _vtype377, _size375 ) = iprot.readMapBegin() + for _i379 in xrange(_size375): + _key380 = iprot.readString().decode('utf-8') + _val381 = iprot.readI64() + self.window_to_failed[_key380] = _val381 + iprot.readMapEnd() + else: + iprot.skip(ftype) + elif fid == 6: + if ftype == TType.MAP: + self.window_to_throughput = {} + (_ktype383, _vtype384, _size382 ) = iprot.readMapBegin() + for _i386 in xrange(_size382): + _key387 = iprot.readString().decode('utf-8') + _val388 = iprot.readDouble() + self.window_to_throughput[_key387] = _val388 iprot.readMapEnd() else: iprot.skip(ftype) @@ -5678,41 +5738,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 kiter364,viter365 in self.window_to_emitted.items(): - oprot.writeString(kiter364.encode('utf-8')) - oprot.writeI64(viter365) + for kiter389,viter390 in self.window_to_emitted.items(): + oprot.writeString(kiter389.encode('utf-8')) + oprot.writeI64(viter390) 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 kiter366,viter367 in self.window_to_transferred.items(): - oprot.writeString(kiter366.encode('utf-8')) - oprot.writeI64(viter367) + for kiter391,viter392 in self.window_to_transferred.items(): + oprot.writeString(kiter391.encode('utf-8')) + oprot.writeI64(viter392) 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 kiter368,viter369 in self.window_to_complete_latencies_ms.items(): - oprot.writeString(kiter368.encode('utf-8')) - oprot.writeDouble(viter369) + for kiter393,viter394 in self.window_to_complete_latencies_ms.items(): + oprot.writeString(kiter393.encode('utf-8')) + oprot.writeDouble(viter394) 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 kiter370,viter371 in self.window_to_acked.items(): - oprot.writeString(kiter370.encode('utf-8')) - oprot.writeI64(viter371) + for kiter395,viter396 in self.window_to_acked.items(): + oprot.writeString(kiter395.encode('utf-8')) + oprot.writeI64(viter396) 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 kiter372,viter373 in self.window_to_failed.items(): - oprot.writeString(kiter372.encode('utf-8')) - oprot.writeI64(viter373) + for kiter397,viter398 in self.window_to_failed.items(): + oprot.writeString(kiter397.encode('utf-8')) + oprot.writeI64(viter398) + 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 kiter399,viter400 in self.window_to_throughput.items(): + oprot.writeString(kiter399.encode('utf-8')) + oprot.writeDouble(viter400) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -5729,6 +5797,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): @@ -6351,11 +6420,11 @@ def read(self, iprot): elif fid == 7: if ftype == TType.MAP: self.component_to_num_tasks = {} - (_ktype375, _vtype376, _size374 ) = iprot.readMapBegin() - for _i378 in xrange(_size374): - _key379 = iprot.readString().decode('utf-8') - _val380 = iprot.readI64() - self.component_to_num_tasks[_key379] = _val380 + (_ktype402, _vtype403, _size401 ) = iprot.readMapBegin() + for _i405 in xrange(_size401): + _key406 = iprot.readString().decode('utf-8') + _val407 = iprot.readI64() + self.component_to_num_tasks[_key406] = _val407 iprot.readMapEnd() else: iprot.skip(ftype) @@ -6436,9 +6505,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 kiter381,viter382 in self.component_to_num_tasks.items(): - oprot.writeString(kiter381.encode('utf-8')) - oprot.writeI64(viter382) + for kiter408,viter409 in self.component_to_num_tasks.items(): + oprot.writeString(kiter408.encode('utf-8')) + oprot.writeI64(viter409) oprot.writeMapEnd() oprot.writeFieldEnd() if self.time_secs is not None: @@ -6539,22 +6608,22 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.supervisor_summaries = [] - (_etype386, _size383) = iprot.readListBegin() - for _i387 in xrange(_size383): - _elem388 = SupervisorSummary() - _elem388.read(iprot) - self.supervisor_summaries.append(_elem388) + (_etype413, _size410) = iprot.readListBegin() + for _i414 in xrange(_size410): + _elem415 = SupervisorSummary() + _elem415.read(iprot) + self.supervisor_summaries.append(_elem415) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.LIST: self.worker_summaries = [] - (_etype392, _size389) = iprot.readListBegin() - for _i393 in xrange(_size389): - _elem394 = WorkerSummary() - _elem394.read(iprot) - self.worker_summaries.append(_elem394) + (_etype419, _size416) = iprot.readListBegin() + for _i420 in xrange(_size416): + _elem421 = WorkerSummary() + _elem421.read(iprot) + self.worker_summaries.append(_elem421) iprot.readListEnd() else: iprot.skip(ftype) @@ -6571,15 +6640,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 iter395 in self.supervisor_summaries: - iter395.write(oprot) + for iter422 in self.supervisor_summaries: + iter422.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 iter396 in self.worker_summaries: - iter396.write(oprot) + for iter423 in self.worker_summaries: + iter423.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -7239,24 +7308,24 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.id_to_spout_agg_stats = {} - (_ktype398, _vtype399, _size397 ) = iprot.readMapBegin() - for _i401 in xrange(_size397): - _key402 = iprot.readString().decode('utf-8') - _val403 = ComponentAggregateStats() - _val403.read(iprot) - self.id_to_spout_agg_stats[_key402] = _val403 + (_ktype425, _vtype426, _size424 ) = iprot.readMapBegin() + for _i428 in xrange(_size424): + _key429 = iprot.readString().decode('utf-8') + _val430 = ComponentAggregateStats() + _val430.read(iprot) + self.id_to_spout_agg_stats[_key429] = _val430 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.MAP: self.id_to_bolt_agg_stats = {} - (_ktype405, _vtype406, _size404 ) = iprot.readMapBegin() - for _i408 in xrange(_size404): - _key409 = iprot.readString().decode('utf-8') - _val410 = ComponentAggregateStats() - _val410.read(iprot) - self.id_to_bolt_agg_stats[_key409] = _val410 + (_ktype432, _vtype433, _size431 ) = iprot.readMapBegin() + for _i435 in xrange(_size431): + _key436 = iprot.readString().decode('utf-8') + _val437 = ComponentAggregateStats() + _val437.read(iprot) + self.id_to_bolt_agg_stats[_key436] = _val437 iprot.readMapEnd() else: iprot.skip(ftype) @@ -7290,11 +7359,11 @@ def read(self, iprot): elif fid == 16: if ftype == TType.LIST: self.workers = [] - (_etype414, _size411) = iprot.readListBegin() - for _i415 in xrange(_size411): - _elem416 = WorkerSummary() - _elem416.read(iprot) - self.workers.append(_elem416) + (_etype441, _size438) = iprot.readListBegin() + for _i442 in xrange(_size438): + _elem443 = WorkerSummary() + _elem443.read(iprot) + self.workers.append(_elem443) iprot.readListEnd() else: iprot.skip(ftype) @@ -7373,17 +7442,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 kiter417,viter418 in self.id_to_spout_agg_stats.items(): - oprot.writeString(kiter417.encode('utf-8')) - viter418.write(oprot) + for kiter444,viter445 in self.id_to_spout_agg_stats.items(): + oprot.writeString(kiter444.encode('utf-8')) + viter445.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 kiter419,viter420 in self.id_to_bolt_agg_stats.items(): - oprot.writeString(kiter419.encode('utf-8')) - viter420.write(oprot) + for kiter446,viter447 in self.id_to_bolt_agg_stats.items(): + oprot.writeString(kiter446.encode('utf-8')) + viter447.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.sched_status is not None: @@ -7409,8 +7478,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 iter421 in self.workers: - iter421.write(oprot) + for iter448 in self.workers: + iter448.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.requested_memonheap is not None: @@ -7661,59 +7730,59 @@ def read(self, iprot): elif fid == 7: if ftype == TType.MAP: self.window_to_stats = {} - (_ktype423, _vtype424, _size422 ) = iprot.readMapBegin() - for _i426 in xrange(_size422): - _key427 = iprot.readString().decode('utf-8') - _val428 = ComponentAggregateStats() - _val428.read(iprot) - self.window_to_stats[_key427] = _val428 + (_ktype450, _vtype451, _size449 ) = iprot.readMapBegin() + for _i453 in xrange(_size449): + _key454 = iprot.readString().decode('utf-8') + _val455 = ComponentAggregateStats() + _val455.read(iprot) + self.window_to_stats[_key454] = _val455 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 8: if ftype == TType.MAP: self.gsid_to_input_stats = {} - (_ktype430, _vtype431, _size429 ) = iprot.readMapBegin() - for _i433 in xrange(_size429): - _key434 = GlobalStreamId() - _key434.read(iprot) - _val435 = ComponentAggregateStats() - _val435.read(iprot) - self.gsid_to_input_stats[_key434] = _val435 + (_ktype457, _vtype458, _size456 ) = iprot.readMapBegin() + for _i460 in xrange(_size456): + _key461 = GlobalStreamId() + _key461.read(iprot) + _val462 = ComponentAggregateStats() + _val462.read(iprot) + self.gsid_to_input_stats[_key461] = _val462 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 9: if ftype == TType.MAP: self.sid_to_output_stats = {} - (_ktype437, _vtype438, _size436 ) = iprot.readMapBegin() - for _i440 in xrange(_size436): - _key441 = iprot.readString().decode('utf-8') - _val442 = ComponentAggregateStats() - _val442.read(iprot) - self.sid_to_output_stats[_key441] = _val442 + (_ktype464, _vtype465, _size463 ) = iprot.readMapBegin() + for _i467 in xrange(_size463): + _key468 = iprot.readString().decode('utf-8') + _val469 = ComponentAggregateStats() + _val469.read(iprot) + self.sid_to_output_stats[_key468] = _val469 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.LIST: self.exec_stats = [] - (_etype446, _size443) = iprot.readListBegin() - for _i447 in xrange(_size443): - _elem448 = ExecutorAggregateStats() - _elem448.read(iprot) - self.exec_stats.append(_elem448) + (_etype473, _size470) = iprot.readListBegin() + for _i474 in xrange(_size470): + _elem475 = ExecutorAggregateStats() + _elem475.read(iprot) + self.exec_stats.append(_elem475) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 11: if ftype == TType.LIST: self.errors = [] - (_etype452, _size449) = iprot.readListBegin() - for _i453 in xrange(_size449): - _elem454 = ErrorInfo() - _elem454.read(iprot) - self.errors.append(_elem454) + (_etype479, _size476) = iprot.readListBegin() + for _i480 in xrange(_size476): + _elem481 = ErrorInfo() + _elem481.read(iprot) + self.errors.append(_elem481) iprot.readListEnd() else: iprot.skip(ftype) @@ -7775,39 +7844,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 kiter455,viter456 in self.window_to_stats.items(): - oprot.writeString(kiter455.encode('utf-8')) - viter456.write(oprot) + for kiter482,viter483 in self.window_to_stats.items(): + oprot.writeString(kiter482.encode('utf-8')) + viter483.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 kiter457,viter458 in self.gsid_to_input_stats.items(): - kiter457.write(oprot) - viter458.write(oprot) + for kiter484,viter485 in self.gsid_to_input_stats.items(): + kiter484.write(oprot) + viter485.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 kiter459,viter460 in self.sid_to_output_stats.items(): - oprot.writeString(kiter459.encode('utf-8')) - viter460.write(oprot) + for kiter486,viter487 in self.sid_to_output_stats.items(): + oprot.writeString(kiter486.encode('utf-8')) + viter487.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 iter461 in self.exec_stats: - iter461.write(oprot) + for iter488 in self.exec_stats: + iter488.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 iter462 in self.errors: - iter462.write(oprot) + for iter489 in self.errors: + iter489.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.eventlog_host is not None: @@ -7974,11 +8043,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.MAP: self.num_executors = {} - (_ktype464, _vtype465, _size463 ) = iprot.readMapBegin() - for _i467 in xrange(_size463): - _key468 = iprot.readString().decode('utf-8') - _val469 = iprot.readI32() - self.num_executors[_key468] = _val469 + (_ktype491, _vtype492, _size490 ) = iprot.readMapBegin() + for _i494 in xrange(_size490): + _key495 = iprot.readString().decode('utf-8') + _val496 = iprot.readI32() + self.num_executors[_key495] = _val496 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8003,9 +8072,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 kiter470,viter471 in self.num_executors.items(): - oprot.writeString(kiter470.encode('utf-8')) - oprot.writeI32(viter471) + for kiter497,viter498 in self.num_executors.items(): + oprot.writeString(kiter497.encode('utf-8')) + oprot.writeI32(viter498) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8059,11 +8128,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.creds = {} - (_ktype473, _vtype474, _size472 ) = iprot.readMapBegin() - for _i476 in xrange(_size472): - _key477 = iprot.readString().decode('utf-8') - _val478 = iprot.readString().decode('utf-8') - self.creds[_key477] = _val478 + (_ktype500, _vtype501, _size499 ) = iprot.readMapBegin() + for _i503 in xrange(_size499): + _key504 = iprot.readString().decode('utf-8') + _val505 = iprot.readString().decode('utf-8') + self.creds[_key504] = _val505 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8080,9 +8149,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 kiter479,viter480 in self.creds.items(): - oprot.writeString(kiter479.encode('utf-8')) - oprot.writeString(viter480.encode('utf-8')) + for kiter506,viter507 in self.creds.items(): + oprot.writeString(kiter506.encode('utf-8')) + oprot.writeString(viter507.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8315,11 +8384,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.acl = [] - (_etype484, _size481) = iprot.readListBegin() - for _i485 in xrange(_size481): - _elem486 = AccessControl() - _elem486.read(iprot) - self.acl.append(_elem486) + (_etype511, _size508) = iprot.readListBegin() + for _i512 in xrange(_size508): + _elem513 = AccessControl() + _elem513.read(iprot) + self.acl.append(_elem513) iprot.readListEnd() else: iprot.skip(ftype) @@ -8341,8 +8410,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 iter487 in self.acl: - iter487.write(oprot) + for iter514 in self.acl: + iter514.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.replication_factor is not None: @@ -8487,10 +8556,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.keys = [] - (_etype491, _size488) = iprot.readListBegin() - for _i492 in xrange(_size488): - _elem493 = iprot.readString().decode('utf-8') - self.keys.append(_elem493) + (_etype518, _size515) = iprot.readListBegin() + for _i519 in xrange(_size515): + _elem520 = iprot.readString().decode('utf-8') + self.keys.append(_elem520) iprot.readListEnd() else: iprot.skip(ftype) @@ -8512,8 +8581,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 iter494 in self.keys: - oprot.writeString(iter494.encode('utf-8')) + for iter521 in self.keys: + oprot.writeString(iter521.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() if self.session is not None: @@ -8708,31 +8777,31 @@ def read(self, iprot): elif fid == 4: if ftype == TType.LIST: self.used_ports = [] - (_etype498, _size495) = iprot.readListBegin() - for _i499 in xrange(_size495): - _elem500 = iprot.readI64() - self.used_ports.append(_elem500) + (_etype525, _size522) = iprot.readListBegin() + for _i526 in xrange(_size522): + _elem527 = iprot.readI64() + self.used_ports.append(_elem527) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.LIST: self.meta = [] - (_etype504, _size501) = iprot.readListBegin() - for _i505 in xrange(_size501): - _elem506 = iprot.readI64() - self.meta.append(_elem506) + (_etype531, _size528) = iprot.readListBegin() + for _i532 in xrange(_size528): + _elem533 = iprot.readI64() + self.meta.append(_elem533) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.MAP: self.scheduler_meta = {} - (_ktype508, _vtype509, _size507 ) = iprot.readMapBegin() - for _i511 in xrange(_size507): - _key512 = iprot.readString().decode('utf-8') - _val513 = iprot.readString().decode('utf-8') - self.scheduler_meta[_key512] = _val513 + (_ktype535, _vtype536, _size534 ) = iprot.readMapBegin() + for _i538 in xrange(_size534): + _key539 = iprot.readString().decode('utf-8') + _val540 = iprot.readString().decode('utf-8') + self.scheduler_meta[_key539] = _val540 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8749,11 +8818,11 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.resources_map = {} - (_ktype515, _vtype516, _size514 ) = iprot.readMapBegin() - for _i518 in xrange(_size514): - _key519 = iprot.readString().decode('utf-8') - _val520 = iprot.readDouble() - self.resources_map[_key519] = _val520 + (_ktype542, _vtype543, _size541 ) = iprot.readMapBegin() + for _i545 in xrange(_size541): + _key546 = iprot.readString().decode('utf-8') + _val547 = iprot.readDouble() + self.resources_map[_key546] = _val547 iprot.readMapEnd() else: iprot.skip(ftype) @@ -8782,23 +8851,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 iter521 in self.used_ports: - oprot.writeI64(iter521) + for iter548 in self.used_ports: + oprot.writeI64(iter548) oprot.writeListEnd() oprot.writeFieldEnd() if self.meta is not None: oprot.writeFieldBegin('meta', TType.LIST, 5) oprot.writeListBegin(TType.I64, len(self.meta)) - for iter522 in self.meta: - oprot.writeI64(iter522) + for iter549 in self.meta: + oprot.writeI64(iter549) 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 kiter523,viter524 in self.scheduler_meta.items(): - oprot.writeString(kiter523.encode('utf-8')) - oprot.writeString(viter524.encode('utf-8')) + for kiter550,viter551 in self.scheduler_meta.items(): + oprot.writeString(kiter550.encode('utf-8')) + oprot.writeString(viter551.encode('utf-8')) oprot.writeMapEnd() oprot.writeFieldEnd() if self.uptime_secs is not None: @@ -8812,9 +8881,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 kiter525,viter526 in self.resources_map.items(): - oprot.writeString(kiter525.encode('utf-8')) - oprot.writeDouble(viter526) + for kiter552,viter553 in self.resources_map.items(): + oprot.writeString(kiter552.encode('utf-8')) + oprot.writeDouble(viter553) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8886,10 +8955,10 @@ def read(self, iprot): elif fid == 2: if ftype == TType.SET: self.port = set() - (_etype530, _size527) = iprot.readSetBegin() - for _i531 in xrange(_size527): - _elem532 = iprot.readI64() - self.port.add(_elem532) + (_etype557, _size554) = iprot.readSetBegin() + for _i558 in xrange(_size554): + _elem559 = iprot.readI64() + self.port.add(_elem559) iprot.readSetEnd() else: iprot.skip(ftype) @@ -8910,8 +8979,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 iter533 in self.port: - oprot.writeI64(iter533) + for iter560 in self.port: + oprot.writeI64(iter560) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9092,57 +9161,57 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.node_host = {} - (_ktype535, _vtype536, _size534 ) = iprot.readMapBegin() - for _i538 in xrange(_size534): - _key539 = iprot.readString().decode('utf-8') - _val540 = iprot.readString().decode('utf-8') - self.node_host[_key539] = _val540 + (_ktype562, _vtype563, _size561 ) = iprot.readMapBegin() + for _i565 in xrange(_size561): + _key566 = iprot.readString().decode('utf-8') + _val567 = iprot.readString().decode('utf-8') + self.node_host[_key566] = _val567 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.executor_node_port = {} - (_ktype542, _vtype543, _size541 ) = iprot.readMapBegin() - for _i545 in xrange(_size541): - _key546 = [] - (_etype551, _size548) = iprot.readListBegin() - for _i552 in xrange(_size548): - _elem553 = iprot.readI64() - _key546.append(_elem553) + (_ktype569, _vtype570, _size568 ) = iprot.readMapBegin() + for _i572 in xrange(_size568): + _key573 = [] + (_etype578, _size575) = iprot.readListBegin() + for _i579 in xrange(_size575): + _elem580 = iprot.readI64() + _key573.append(_elem580) iprot.readListEnd() - _val547 = NodeInfo() - _val547.read(iprot) - self.executor_node_port[_key546] = _val547 + _val574 = NodeInfo() + _val574.read(iprot) + self.executor_node_port[_key573] = _val574 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.MAP: self.executor_start_time_secs = {} - (_ktype555, _vtype556, _size554 ) = iprot.readMapBegin() - for _i558 in xrange(_size554): - _key559 = [] - (_etype564, _size561) = iprot.readListBegin() - for _i565 in xrange(_size561): - _elem566 = iprot.readI64() - _key559.append(_elem566) + (_ktype582, _vtype583, _size581 ) = iprot.readMapBegin() + for _i585 in xrange(_size581): + _key586 = [] + (_etype591, _size588) = iprot.readListBegin() + for _i592 in xrange(_size588): + _elem593 = iprot.readI64() + _key586.append(_elem593) iprot.readListEnd() - _val560 = iprot.readI64() - self.executor_start_time_secs[_key559] = _val560 + _val587 = iprot.readI64() + self.executor_start_time_secs[_key586] = _val587 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.MAP: self.worker_resources = {} - (_ktype568, _vtype569, _size567 ) = iprot.readMapBegin() - for _i571 in xrange(_size567): - _key572 = NodeInfo() - _key572.read(iprot) - _val573 = WorkerResources() - _val573.read(iprot) - self.worker_resources[_key572] = _val573 + (_ktype595, _vtype596, _size594 ) = iprot.readMapBegin() + for _i598 in xrange(_size594): + _key599 = NodeInfo() + _key599.read(iprot) + _val600 = WorkerResources() + _val600.read(iprot) + self.worker_resources[_key599] = _val600 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9163,39 +9232,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 kiter574,viter575 in self.node_host.items(): - oprot.writeString(kiter574.encode('utf-8')) - oprot.writeString(viter575.encode('utf-8')) + for kiter601,viter602 in self.node_host.items(): + oprot.writeString(kiter601.encode('utf-8')) + oprot.writeString(viter602.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 kiter576,viter577 in self.executor_node_port.items(): - oprot.writeListBegin(TType.I64, len(kiter576)) - for iter578 in kiter576: - oprot.writeI64(iter578) + for kiter603,viter604 in self.executor_node_port.items(): + oprot.writeListBegin(TType.I64, len(kiter603)) + for iter605 in kiter603: + oprot.writeI64(iter605) oprot.writeListEnd() - viter577.write(oprot) + viter604.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 kiter579,viter580 in self.executor_start_time_secs.items(): - oprot.writeListBegin(TType.I64, len(kiter579)) - for iter581 in kiter579: - oprot.writeI64(iter581) + for kiter606,viter607 in self.executor_start_time_secs.items(): + oprot.writeListBegin(TType.I64, len(kiter606)) + for iter608 in kiter606: + oprot.writeI64(iter608) oprot.writeListEnd() - oprot.writeI64(viter580) + oprot.writeI64(viter607) 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 kiter582,viter583 in self.worker_resources.items(): - kiter582.write(oprot) - viter583.write(oprot) + for kiter609,viter610 in self.worker_resources.items(): + kiter609.write(oprot) + viter610.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9372,11 +9441,11 @@ def read(self, iprot): elif fid == 4: if ftype == TType.MAP: self.component_executors = {} - (_ktype585, _vtype586, _size584 ) = iprot.readMapBegin() - for _i588 in xrange(_size584): - _key589 = iprot.readString().decode('utf-8') - _val590 = iprot.readI32() - self.component_executors[_key589] = _val590 + (_ktype612, _vtype613, _size611 ) = iprot.readMapBegin() + for _i615 in xrange(_size611): + _key616 = iprot.readString().decode('utf-8') + _val617 = iprot.readI32() + self.component_executors[_key616] = _val617 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9404,12 +9473,12 @@ def read(self, iprot): elif fid == 9: if ftype == TType.MAP: self.component_debug = {} - (_ktype592, _vtype593, _size591 ) = iprot.readMapBegin() - for _i595 in xrange(_size591): - _key596 = iprot.readString().decode('utf-8') - _val597 = DebugOptions() - _val597.read(iprot) - self.component_debug[_key596] = _val597 + (_ktype619, _vtype620, _size618 ) = iprot.readMapBegin() + for _i622 in xrange(_size618): + _key623 = iprot.readString().decode('utf-8') + _val624 = DebugOptions() + _val624.read(iprot) + self.component_debug[_key623] = _val624 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9438,9 +9507,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 kiter598,viter599 in self.component_executors.items(): - oprot.writeString(kiter598.encode('utf-8')) - oprot.writeI32(viter599) + for kiter625,viter626 in self.component_executors.items(): + oprot.writeString(kiter625.encode('utf-8')) + oprot.writeI32(viter626) oprot.writeMapEnd() oprot.writeFieldEnd() if self.launch_time_secs is not None: @@ -9462,9 +9531,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 kiter600,viter601 in self.component_debug.items(): - oprot.writeString(kiter600.encode('utf-8')) - viter601.write(oprot) + for kiter627,viter628 in self.component_debug.items(): + oprot.writeString(kiter627.encode('utf-8')) + viter628.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9544,13 +9613,13 @@ def read(self, iprot): elif fid == 2: if ftype == TType.MAP: self.executor_stats = {} - (_ktype603, _vtype604, _size602 ) = iprot.readMapBegin() - for _i606 in xrange(_size602): - _key607 = ExecutorInfo() - _key607.read(iprot) - _val608 = ExecutorStats() - _val608.read(iprot) - self.executor_stats[_key607] = _val608 + (_ktype630, _vtype631, _size629 ) = iprot.readMapBegin() + for _i633 in xrange(_size629): + _key634 = ExecutorInfo() + _key634.read(iprot) + _val635 = ExecutorStats() + _val635.read(iprot) + self.executor_stats[_key634] = _val635 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9581,9 +9650,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 kiter609,viter610 in self.executor_stats.items(): - kiter609.write(oprot) - viter610.write(oprot) + for kiter636,viter637 in self.executor_stats.items(): + kiter636.write(oprot) + viter637.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() if self.time_secs is not None: @@ -9736,12 +9805,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.serialized_parts = {} - (_ktype612, _vtype613, _size611 ) = iprot.readMapBegin() - for _i615 in xrange(_size611): - _key616 = iprot.readString().decode('utf-8') - _val617 = ThriftSerializedObject() - _val617.read(iprot) - self.serialized_parts[_key616] = _val617 + (_ktype639, _vtype640, _size638 ) = iprot.readMapBegin() + for _i642 in xrange(_size638): + _key643 = iprot.readString().decode('utf-8') + _val644 = ThriftSerializedObject() + _val644.read(iprot) + self.serialized_parts[_key643] = _val644 iprot.readMapEnd() else: iprot.skip(ftype) @@ -9758,9 +9827,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 kiter618,viter619 in self.serialized_parts.items(): - oprot.writeString(kiter618.encode('utf-8')) - viter619.write(oprot) + for kiter645,viter646 in self.serialized_parts.items(): + oprot.writeString(kiter645.encode('utf-8')) + viter646.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9825,11 +9894,11 @@ def read(self, iprot): elif fid == 2: if ftype == TType.LIST: self.executors = [] - (_etype623, _size620) = iprot.readListBegin() - for _i624 in xrange(_size620): - _elem625 = ExecutorInfo() - _elem625.read(iprot) - self.executors.append(_elem625) + (_etype650, _size647) = iprot.readListBegin() + for _i651 in xrange(_size647): + _elem652 = ExecutorInfo() + _elem652.read(iprot) + self.executors.append(_elem652) iprot.readListEnd() else: iprot.skip(ftype) @@ -9856,8 +9925,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 iter626 in self.executors: - iter626.write(oprot) + for iter653 in self.executors: + iter653.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.resources is not None: @@ -9986,11 +10055,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.approved_workers = {} - (_ktype628, _vtype629, _size627 ) = iprot.readMapBegin() - for _i631 in xrange(_size627): - _key632 = iprot.readString().decode('utf-8') - _val633 = iprot.readI32() - self.approved_workers[_key632] = _val633 + (_ktype655, _vtype656, _size654 ) = iprot.readMapBegin() + for _i658 in xrange(_size654): + _key659 = iprot.readString().decode('utf-8') + _val660 = iprot.readI32() + self.approved_workers[_key659] = _val660 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10007,9 +10076,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 kiter634,viter635 in self.approved_workers.items(): - oprot.writeString(kiter634.encode('utf-8')) - oprot.writeI32(viter635) + for kiter661,viter662 in self.approved_workers.items(): + oprot.writeString(kiter661.encode('utf-8')) + oprot.writeI32(viter662) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10063,12 +10132,12 @@ def read(self, iprot): if fid == 1: if ftype == TType.MAP: self.assignments = {} - (_ktype637, _vtype638, _size636 ) = iprot.readMapBegin() - for _i640 in xrange(_size636): - _key641 = iprot.readI32() - _val642 = LocalAssignment() - _val642.read(iprot) - self.assignments[_key641] = _val642 + (_ktype664, _vtype665, _size663 ) = iprot.readMapBegin() + for _i667 in xrange(_size663): + _key668 = iprot.readI32() + _val669 = LocalAssignment() + _val669.read(iprot) + self.assignments[_key668] = _val669 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10085,9 +10154,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 kiter643,viter644 in self.assignments.items(): - oprot.writeI32(kiter643) - viter644.write(oprot) + for kiter670,viter671 in self.assignments.items(): + oprot.writeI32(kiter670) + viter671.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10160,11 +10229,11 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.executors = [] - (_etype648, _size645) = iprot.readListBegin() - for _i649 in xrange(_size645): - _elem650 = ExecutorInfo() - _elem650.read(iprot) - self.executors.append(_elem650) + (_etype675, _size672) = iprot.readListBegin() + for _i676 in xrange(_size672): + _elem677 = ExecutorInfo() + _elem677.read(iprot) + self.executors.append(_elem677) iprot.readListEnd() else: iprot.skip(ftype) @@ -10194,8 +10263,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 iter651 in self.executors: - iter651.write(oprot) + for iter678 in self.executors: + iter678.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.port is not None: @@ -10281,20 +10350,20 @@ def read(self, iprot): elif fid == 3: if ftype == TType.LIST: self.users = [] - (_etype655, _size652) = iprot.readListBegin() - for _i656 in xrange(_size652): - _elem657 = iprot.readString().decode('utf-8') - self.users.append(_elem657) + (_etype682, _size679) = iprot.readListBegin() + for _i683 in xrange(_size679): + _elem684 = iprot.readString().decode('utf-8') + self.users.append(_elem684) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.LIST: self.groups = [] - (_etype661, _size658) = iprot.readListBegin() - for _i662 in xrange(_size658): - _elem663 = iprot.readString().decode('utf-8') - self.groups.append(_elem663) + (_etype688, _size685) = iprot.readListBegin() + for _i689 in xrange(_size685): + _elem690 = iprot.readString().decode('utf-8') + self.groups.append(_elem690) iprot.readListEnd() else: iprot.skip(ftype) @@ -10319,15 +10388,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 iter664 in self.users: - oprot.writeString(iter664.encode('utf-8')) + for iter691 in self.users: + oprot.writeString(iter691.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 iter665 in self.groups: - oprot.writeString(iter665.encode('utf-8')) + for iter692 in self.groups: + oprot.writeString(iter692.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10390,11 +10459,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.topo_history = [] - (_etype669, _size666) = iprot.readListBegin() - for _i670 in xrange(_size666): - _elem671 = LSTopoHistory() - _elem671.read(iprot) - self.topo_history.append(_elem671) + (_etype696, _size693) = iprot.readListBegin() + for _i697 in xrange(_size693): + _elem698 = LSTopoHistory() + _elem698.read(iprot) + self.topo_history.append(_elem698) iprot.readListEnd() else: iprot.skip(ftype) @@ -10411,8 +10480,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 iter672 in self.topo_history: - iter672.write(oprot) + for iter699 in self.topo_history: + iter699.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10747,12 +10816,12 @@ def read(self, iprot): if fid == 2: if ftype == TType.MAP: self.named_logger_level = {} - (_ktype674, _vtype675, _size673 ) = iprot.readMapBegin() - for _i677 in xrange(_size673): - _key678 = iprot.readString().decode('utf-8') - _val679 = LogLevel() - _val679.read(iprot) - self.named_logger_level[_key678] = _val679 + (_ktype701, _vtype702, _size700 ) = iprot.readMapBegin() + for _i704 in xrange(_size700): + _key705 = iprot.readString().decode('utf-8') + _val706 = LogLevel() + _val706.read(iprot) + self.named_logger_level[_key705] = _val706 iprot.readMapEnd() else: iprot.skip(ftype) @@ -10769,9 +10838,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 kiter680,viter681 in self.named_logger_level.items(): - oprot.writeString(kiter680.encode('utf-8')) - viter681.write(oprot) + for kiter707,viter708 in self.named_logger_level.items(): + oprot.writeString(kiter707.encode('utf-8')) + viter708.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10823,10 +10892,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.topo_ids = [] - (_etype685, _size682) = iprot.readListBegin() - for _i686 in xrange(_size682): - _elem687 = iprot.readString().decode('utf-8') - self.topo_ids.append(_elem687) + (_etype712, _size709) = iprot.readListBegin() + for _i713 in xrange(_size709): + _elem714 = iprot.readString().decode('utf-8') + self.topo_ids.append(_elem714) iprot.readListEnd() else: iprot.skip(ftype) @@ -10843,8 +10912,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 iter688 in self.topo_ids: - oprot.writeString(iter688.encode('utf-8')) + for iter715 in self.topo_ids: + oprot.writeString(iter715.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -11128,11 +11197,11 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.pulses = [] - (_etype692, _size689) = iprot.readListBegin() - for _i693 in xrange(_size689): - _elem694 = HBPulse() - _elem694.read(iprot) - self.pulses.append(_elem694) + (_etype719, _size716) = iprot.readListBegin() + for _i720 in xrange(_size716): + _elem721 = HBPulse() + _elem721.read(iprot) + self.pulses.append(_elem721) iprot.readListEnd() else: iprot.skip(ftype) @@ -11149,8 +11218,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 iter695 in self.pulses: - iter695.write(oprot) + for iter722 in self.pulses: + iter722.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -11202,10 +11271,10 @@ def read(self, iprot): if fid == 1: if ftype == TType.LIST: self.pulseIds = [] - (_etype699, _size696) = iprot.readListBegin() - for _i700 in xrange(_size696): - _elem701 = iprot.readString().decode('utf-8') - self.pulseIds.append(_elem701) + (_etype726, _size723) = iprot.readListBegin() + for _i727 in xrange(_size723): + _elem728 = iprot.readString().decode('utf-8') + self.pulseIds.append(_elem728) iprot.readListEnd() else: iprot.skip(ftype) @@ -11222,8 +11291,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 iter702 in self.pulseIds: - oprot.writeString(iter702.encode('utf-8')) + for iter729 in self.pulseIds: + oprot.writeString(iter729.encode('utf-8')) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift index 9ba2d984ca0..283967e970d 100644 --- a/storm-core/src/storm.thrift +++ b/storm-core/src/storm.thrift @@ -1,5 +1,4 @@ #!/usr/local/bin/thrift --gen java:beans,nocamel,hashcode - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -226,6 +225,7 @@ struct ExecutorStats { 2: required map> transferred; 3: required ExecutorSpecificStats specific; 4: required double rate; + 5: optional map> throughput; } struct ExecutorInfo { @@ -273,6 +273,7 @@ struct CommonAggregateStats { 4: optional i64 transferred; 5: optional i64 acked; 6: optional i64 failed; +7: optional double throughput; } struct SpoutAggregateStats { @@ -309,6 +310,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 942b12d1669..f07806a925e 100644 --- a/storm-core/src/ui/public/component.html +++ b/storm-core/src/ui/public/component.html @@ -251,41 +251,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]} ] }); @@ -307,12 +307,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/js/visualization.js b/storm-core/src/ui/public/js/visualization.js index 4daadc2e045..955bf5bcb1e 100644 --- a/storm-core/src/ui/public/js/visualization.js +++ b/storm-core/src/ui/public/js/visualization.js @@ -127,13 +127,13 @@ function renderGraph(elem) { } var w = Math.max(55, 25 + gfx.textWidth(node.name)); - + gfx.oval(pt.x - w/2, pt.y - w/2, w, w, {fill: col}); gfx.text(node.name, pt.x, pt.y+3, {color:"white", align:"center", font:"Arial", size:12}); gfx.text(node.name, pt.x, pt.y+3, {color:"white", align:"center", font:"Arial", size:12}); gfx.text(parseFloat(node.data[":latency"]).toFixed(2) + " ms", pt.x, pt.y + 17, {color:"white", align:"center", font:"Arial", size:12}); - + }); // Draw gradient sidebar 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 472a769bfbf..8ecbbb045fe 100644 --- a/storm-core/src/ui/public/templates/component-page-template.html +++ b/storm-core/src/ui/public/templates/component-page-template.html @@ -77,7 +77,12 @@

Spout stats

- + + Throughput (tuples/s) + + + + Complete latency (ms) @@ -99,6 +104,7 @@

Spout stats

{{windowPretty}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -128,7 +134,12 @@

Output stats ({{windowHint}})

 - + + Throughput (tuples/s) + + + + Complete latency (ms) @@ -150,6 +161,7 @@

Output stats ({{windowHint}})

{{stream}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -199,7 +211,12 @@

Executors ({{windowHint}})

 - + + Throughput (tuples/s) + + + + Complete latency (ms) @@ -225,6 +242,7 @@

Executors ({{windowHint}})

{{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -307,7 +325,12 @@

Bolt stats

 - + + Throughput (tuples/s) + + + + Executed @@ -335,6 +358,7 @@

Bolt stats

{{emitted}} {{transferred}} {{executeLatency}} + {{throughput}} {{executed}} {{processLatency}} {{acked}} @@ -485,7 +509,12 @@

Executors ({{windowHint}})

 - + + Throughput (tuples/s) + + + + Executed @@ -518,6 +547,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 4aaebf7601c..793d6d6ab6b 100644 --- a/storm-core/src/ui/public/templates/topology-page-template.html +++ b/storm-core/src/ui/public/templates/topology-page-template.html @@ -377,6 +377,11 @@

Spouts ({{windowHint}})

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

Spouts ({{windowHint}})

{{tasks}} {{emitted}} {{transferred}} + {{throughput}} {{completeLatency}} {{acked}} {{failed}} @@ -466,6 +472,11 @@

Bolts ({{windowHint}})

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

Bolts ({{windowHint}})

{{transferred}} {{capacity}} {{executeLatency}} + {{throughput}} {{executed}} {{processLatency}} {{acked}} diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html index 852e9dba179..4d63b96df0a 100644 --- a/storm-core/src/ui/public/topology.html +++ b/storm-core/src/ui/public/topology.html @@ -321,18 +321,18 @@

Topology resources

}); spoutStats.append(Mustache.render($(template).filter("#spout-stats-template").html(),response)); - //id, executors, tasks, emitted, transferred, complete latency, acked, failed, Last error + //id, executors, tasks, emitted, transferred, complete latency, throughput, acked, failed, Last error dtAutoPage("#spout-stats-table", { columnDefs: [ - {type: "num", targets: [1, 2, 3, 4, 5, 6, 7]} + {type: "num", targets: [1, 2, 3, 4, 5, 6, 7, 8]} ] }); boltStats.append(Mustache.render($(template).filter("#bolt-stats-template").html(),response)); - //id, executors, tasks, emitted, transferred, capacity, execute latency, executed, process latency, acked, failed, last error + //id, executors, tasks, emitted, transferred, capacity, execute latency, executed, process latency, throughput, acked, failed, last error dtAutoPage("#bolt-stats-table", { columnDefs: [ - {type: "num", targets: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]} + {type: "num", targets: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]} ] });