You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/09/17 20:29:49 UTC

[4/7] storm git commit: STORM-3162: Cleanup heartbeats cache and make it thread safe

http://git-wip-us.apache.org/repos/asf/storm/blob/9d3feb0e/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java b/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
deleted file mode 100644
index d2af216..0000000
--- a/storm-client/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ /dev/null
@@ -1,2610 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.storm.stats;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.apache.storm.cluster.ExecutorBeat;
-import org.apache.storm.cluster.IStormClusterState;
-import org.apache.storm.generated.Bolt;
-import org.apache.storm.generated.BoltAggregateStats;
-import org.apache.storm.generated.BoltStats;
-import org.apache.storm.generated.ClusterWorkerHeartbeat;
-import org.apache.storm.generated.CommonAggregateStats;
-import org.apache.storm.generated.ComponentAggregateStats;
-import org.apache.storm.generated.ComponentPageInfo;
-import org.apache.storm.generated.ComponentType;
-import org.apache.storm.generated.ErrorInfo;
-import org.apache.storm.generated.ExecutorAggregateStats;
-import org.apache.storm.generated.ExecutorInfo;
-import org.apache.storm.generated.ExecutorSpecificStats;
-import org.apache.storm.generated.ExecutorStats;
-import org.apache.storm.generated.ExecutorSummary;
-import org.apache.storm.generated.GlobalStreamId;
-import org.apache.storm.generated.SpecificAggregateStats;
-import org.apache.storm.generated.SpoutAggregateStats;
-import org.apache.storm.generated.SpoutStats;
-import org.apache.storm.generated.StormTopology;
-import org.apache.storm.generated.SupervisorWorkerHeartbeat;
-import org.apache.storm.generated.TopologyPageInfo;
-import org.apache.storm.generated.TopologyStats;
-import org.apache.storm.generated.WorkerResources;
-import org.apache.storm.generated.WorkerSummary;
-import org.apache.storm.scheduler.WorkerSlot;
-import org.apache.storm.shade.com.google.common.collect.Lists;
-import org.apache.storm.utils.Time;
-import org.apache.storm.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("unchecked")
-public class StatsUtil {
-    public static final String TYPE = "type";
-    public static final String SPOUT = "spout";
-    public static final String BOLT = "bolt";
-    public static final int TEN_MIN_IN_SECONDS = 60 * 10;
-    public static final String TEN_MIN_IN_SECONDS_STR = TEN_MIN_IN_SECONDS + "";
-    public static final IdentityTransformer IDENTITY = new IdentityTransformer();
-    public static final ToGlobalStreamIdTransformer TO_GSID = new ToGlobalStreamIdTransformer();
-    private static final Logger LOG = LoggerFactory.getLogger(StatsUtil.class);
-    private static final String UPTIME = "uptime";
-    private static final String HOST = "host";
-    private static final String PORT = "port";
-    private static final String NUM_TASKS = "num-tasks";
-    private static final String NUM_EXECUTORS = "num-executors";
-    private static final String NUM_WORKERS = "num-workers";
-    private static final String CAPACITY = "capacity";
-    private static final String STATS = "stats";
-    private static final String EXECUTOR_STATS = "executor-stats";
-    private static final String EXECUTOR_ID = "executor-id";
-    private static final String LAST_ERROR = "lastError";
-    private static final String HEARTBEAT = "heartbeat";
-    private static final String TIME_SECS = "time-secs";
-    private static final String RATE = "rate";
-    private static final String ACKED = "acked";
-    private static final String FAILED = "failed";
-    private static final String EXECUTED = "executed";
-    private static final String EMITTED = "emitted";
-    private static final String TRANSFERRED = "transferred";
-    private static final String EXEC_LATENCIES = "execute-latencies";
-    private static final String PROC_LATENCIES = "process-latencies";
-    private static final String COMP_LATENCIES = "complete-latencies";
-    private static final String EXEC_LATENCY = "execute-latency";
-    private static final String PROC_LATENCY = "process-latency";
-    private static final String COMP_LATENCY = "complete-latency";
-    private static final String EXEC_LAT_TOTAL = "executeLatencyTotal";
-    private static final String PROC_LAT_TOTAL = "processLatencyTotal";
-    private static final String COMP_LAT_TOTAL = "completeLatencyTotal";
-    private static final String WIN_TO_EMITTED = "window->emitted";
-    private static final String WIN_TO_ACKED = "window->acked";
-    private static final String WIN_TO_FAILED = "window->failed";
-    private static final String WIN_TO_EXECUTED = "window->executed";
-    private static final String WIN_TO_TRANSFERRED = "window->transferred";
-    private static final String WIN_TO_EXEC_LAT = "window->execute-latency";
-    private static final String WIN_TO_PROC_LAT = "window->process-latency";
-    private static final String WIN_TO_COMP_LAT = "window->complete-latency";
-    private static final String WIN_TO_COMP_LAT_WGT_AVG = "window->comp-lat-wgt-avg";
-    private static final String WIN_TO_EXEC_LAT_WGT_AVG = "window->exec-lat-wgt-avg";
-    private static final String WIN_TO_PROC_LAT_WGT_AVG = "window->proc-lat-wgt-avg";
-    private static final String BOLT_TO_STATS = "bolt-id->stats";
-    private static final String SPOUT_TO_STATS = "spout-id->stats";
-    private static final String SID_TO_OUT_STATS = "sid->output-stats";
-    private static final String CID_SID_TO_IN_STATS = "cid+sid->input-stats";
-    private static final String WORKERS_SET = "workers-set";
-    private static final ToStringTransformer TO_STRING = new ToStringTransformer();
-    private static final FromGlobalStreamIdTransformer FROM_GSID = new FromGlobalStreamIdTransformer();
-
-
-    // =====================================================================================
-    // aggregation stats methods
-    // =====================================================================================
-
-    /**
-     * Aggregates number executed, process latency, and execute latency across all streams.
-     *
-     * @param id2execAvg { global stream id -> exec avg value }, e.g., {["split" "default"] 0.44313}
-     * @param id2procAvg { global stream id -> proc avg value }
-     * @param id2numExec { global stream id -> executed }
-     */
-    public static Map<String, Number> aggBoltLatAndCount(Map<List<String>, Double> id2execAvg,
-                                                         Map<List<String>, Double> id2procAvg,
-                                                         Map<List<String>, Long> id2numExec) {
-        Map<String, Number> ret = new HashMap<>();
-        putKV(ret, EXEC_LAT_TOTAL, weightAvgAndSum(id2execAvg, id2numExec));
-        putKV(ret, PROC_LAT_TOTAL, weightAvgAndSum(id2procAvg, id2numExec));
-        putKV(ret, EXECUTED, sumValues(id2numExec));
-
-        return ret;
-    }
-
-    /**
-     * aggregate number acked and complete latencies across all streams.
-     */
-    public static Map<String, Number> aggSpoutLatAndCount(Map<String, Double> id2compAvg,
-                                                          Map<String, Long> id2numAcked) {
-        Map<String, Number> ret = new HashMap<>();
-        putKV(ret, COMP_LAT_TOTAL, weightAvgAndSum(id2compAvg, id2numAcked));
-        putKV(ret, ACKED, sumValues(id2numAcked));
-
-        return ret;
-    }
-
-    /**
-     * aggregate number executed and process & execute latencies.
-     */
-    public static <K> Map<K, Map> aggBoltStreamsLatAndCount(Map<K, Double> id2execAvg,
-                                                            Map<K, Double> id2procAvg,
-                                                            Map<K, Long> id2numExec) {
-        Map<K, Map> ret = new HashMap<>();
-        if (id2execAvg == null || id2procAvg == null || id2numExec == null) {
-            return ret;
-        }
-        for (K k : id2execAvg.keySet()) {
-            Map<String, Object> subMap = new HashMap<>();
-            putKV(subMap, EXEC_LAT_TOTAL, weightAvg(id2execAvg, id2numExec, k));
-            putKV(subMap, PROC_LAT_TOTAL, weightAvg(id2procAvg, id2numExec, k));
-            putKV(subMap, EXECUTED, id2numExec.get(k));
-            ret.put(k, subMap);
-        }
-        return ret;
-    }
-
-    /**
-     * Aggregates number acked and complete latencies.
-     */
-    public static <K> Map<K, Map> aggSpoutStreamsLatAndCount(Map<K, Double> id2compAvg,
-                                                             Map<K, Long> id2acked) {
-        Map<K, Map> ret = new HashMap<>();
-        if (id2compAvg == null || id2acked == null) {
-            return ret;
-        }
-        for (K k : id2compAvg.keySet()) {
-            Map subMap = new HashMap();
-            putKV(subMap, COMP_LAT_TOTAL, weightAvg(id2compAvg, id2acked, k));
-            putKV(subMap, ACKED, id2acked.get(k));
-            ret.put(k, subMap);
-        }
-        return ret;
-    }
-
-    /**
-     * pre-merge component page bolt stats from an executor heartbeat 1. computes component capacity 2. converts map keys of stats 3.
-     * filters streams if necessary
-     *
-     * @param beat       executor heartbeat data
-     * @param window     specified window
-     * @param includeSys whether to include system streams
-     * @return per-merged stats
-     */
-    public static Map<String, Object> aggPreMergeCompPageBolt(Map<String, Object> beat, String window, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-
-        putKV(ret, EXECUTOR_ID, getByKey(beat, "exec-id"));
-        putKV(ret, HOST, getByKey(beat, HOST));
-        putKV(ret, PORT, getByKey(beat, PORT));
-        putKV(ret, UPTIME, getByKey(beat, UPTIME));
-        putKV(ret, NUM_EXECUTORS, 1);
-        putKV(ret, NUM_TASKS, getByKey(beat, NUM_TASKS));
-
-        Map stat2win2sid2num = getMapByKey(beat, STATS);
-        putKV(ret, CAPACITY, computeAggCapacity(stat2win2sid2num, getByKeyOr0(beat, UPTIME).intValue()));
-
-        // calc cid+sid->input_stats
-        Map inputStats = new HashMap();
-        Map sid2acked = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, ACKED), TO_STRING).get(window);
-        Map sid2failed = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, FAILED), TO_STRING).get(window);
-        putKV(inputStats, ACKED, sid2acked != null ? sid2acked : new HashMap());
-        putKV(inputStats, FAILED, sid2failed != null ? sid2failed : new HashMap());
-
-        inputStats = swapMapOrder(inputStats);
-
-        Map sid2execLat = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, EXEC_LATENCIES), TO_STRING).get(window);
-        Map sid2procLat = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, PROC_LATENCIES), TO_STRING).get(window);
-        Map sid2exec = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, EXECUTED), TO_STRING).get(window);
-        mergeMaps(inputStats, aggBoltStreamsLatAndCount(sid2execLat, sid2procLat, sid2exec));
-        putKV(ret, CID_SID_TO_IN_STATS, inputStats);
-
-        // calc sid->output_stats
-        Map outputStats = new HashMap();
-        Map sid2emitted = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, EMITTED), TO_STRING).get(window);
-        Map sid2transferred = (Map) windowSetConverter(getMapByKey(stat2win2sid2num, TRANSFERRED), TO_STRING).get(window);
-        if (sid2emitted != null) {
-            putKV(outputStats, EMITTED, filterSysStreams2Stat(sid2emitted, includeSys));
-        } else {
-            putKV(outputStats, EMITTED, new HashMap());
-        }
-        if (sid2transferred != null) {
-            putKV(outputStats, TRANSFERRED, filterSysStreams2Stat(sid2transferred, includeSys));
-        } else {
-            putKV(outputStats, TRANSFERRED, new HashMap());
-        }
-        outputStats = swapMapOrder(outputStats);
-        putKV(ret, SID_TO_OUT_STATS, outputStats);
-
-        return ret;
-    }
-
-    /**
-     * pre-merge component page spout stats from an executor heartbeat 1. computes component capacity 2. converts map keys of stats 3.
-     * filters streams if necessary
-     *
-     * @param beat       executor heartbeat data
-     * @param window     specified window
-     * @param includeSys whether to include system streams
-     * @return per-merged stats
-     */
-    public static Map<String, Object> aggPreMergeCompPageSpout(Map<String, Object> beat, String window, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-        putKV(ret, EXECUTOR_ID, getByKey(beat, "exec-id"));
-        putKV(ret, HOST, getByKey(beat, HOST));
-        putKV(ret, PORT, getByKey(beat, PORT));
-        putKV(ret, UPTIME, getByKey(beat, UPTIME));
-        putKV(ret, NUM_EXECUTORS, 1);
-        putKV(ret, NUM_TASKS, getByKey(beat, NUM_TASKS));
-
-        Map stat2win2sid2num = getMapByKey(beat, STATS);
-
-        // calc sid->output-stats
-        Map outputStats = new HashMap();
-        Map win2sid2acked = windowSetConverter(getMapByKey(stat2win2sid2num, ACKED), TO_STRING);
-        Map win2sid2failed = windowSetConverter(getMapByKey(stat2win2sid2num, FAILED), TO_STRING);
-        Map win2sid2emitted = windowSetConverter(getMapByKey(stat2win2sid2num, EMITTED), TO_STRING);
-        Map win2sid2transferred = windowSetConverter(getMapByKey(stat2win2sid2num, TRANSFERRED), TO_STRING);
-        Map win2sid2compLat = windowSetConverter(getMapByKey(stat2win2sid2num, COMP_LATENCIES), TO_STRING);
-
-        putKV(outputStats, ACKED, win2sid2acked.get(window));
-        putKV(outputStats, FAILED, win2sid2failed.get(window));
-        Map<String, Long> sid2emitted = (Map) win2sid2emitted.get(window);
-        if (sid2emitted == null) {
-            sid2emitted = new HashMap<>();
-        }
-        putKV(outputStats, EMITTED, filterSysStreams2Stat(sid2emitted, includeSys));
-
-        Map<String, Long> sid2transferred = (Map) win2sid2transferred.get(window);
-        if (sid2transferred == null) {
-            sid2transferred = new HashMap<>();
-        }
-        putKV(outputStats, TRANSFERRED, filterSysStreams2Stat(sid2transferred, includeSys));
-        outputStats = swapMapOrder(outputStats);
-
-        Map sid2compLat = (Map) win2sid2compLat.get(window);
-        Map sid2acked = (Map) win2sid2acked.get(window);
-        mergeMaps(outputStats, aggSpoutStreamsLatAndCount(sid2compLat, sid2acked));
-        putKV(ret, SID_TO_OUT_STATS, outputStats);
-
-        return ret;
-    }
-
-    /**
-     * pre-merge component stats of specified bolt id
-     *
-     * @param beat       executor heartbeat data
-     * @param window     specified window
-     * @param includeSys whether to include system streams
-     * @return { comp id -> comp-stats }
-     */
-    public static <K, V extends Number> Map<String, Object> aggPreMergeTopoPageBolt(
-        Map<String, Object> beat, String window, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map<String, Object> subRet = new HashMap<>();
-        putKV(subRet, NUM_EXECUTORS, 1);
-        putKV(subRet, NUM_TASKS, getByKey(beat, NUM_TASKS));
-
-        Map<String, Object> stat2win2sid2num = getMapByKey(beat, STATS);
-        putKV(subRet, CAPACITY, computeAggCapacity(stat2win2sid2num, getByKeyOr0(beat, UPTIME).intValue()));
-
-        for (String key : new String[]{ EMITTED, TRANSFERRED, ACKED, FAILED }) {
-            Map<String, Map<K, V>> stat = windowSetConverter(getMapByKey(stat2win2sid2num, key), TO_STRING);
-            if (EMITTED.equals(key) || TRANSFERRED.equals(key)) {
-                stat = filterSysStreams(stat, includeSys);
-            }
-            Map<K, V> winStat = stat.get(window);
-            long sum = 0;
-            if (winStat != null) {
-                for (V v : winStat.values()) {
-                    sum += v.longValue();
-                }
-            }
-            putKV(subRet, key, sum);
-        }
-
-        Map<String, Map<List<String>, Double>> win2sid2execLat =
-            windowSetConverter(getMapByKey(stat2win2sid2num, EXEC_LATENCIES), TO_STRING);
-        Map<String, Map<List<String>, Double>> win2sid2procLat =
-            windowSetConverter(getMapByKey(stat2win2sid2num, PROC_LATENCIES), TO_STRING);
-        Map<String, Map<List<String>, Long>> win2sid2exec =
-            windowSetConverter(getMapByKey(stat2win2sid2num, EXECUTED), TO_STRING);
-        subRet.putAll(aggBoltLatAndCount(
-            win2sid2execLat.get(window), win2sid2procLat.get(window), win2sid2exec.get(window)));
-
-        ret.put((String) getByKey(beat, "comp-id"), subRet);
-        return ret;
-    }
-
-    /**
-     * pre-merge component stats of specified spout id and returns { comp id -> comp-stats }
-     */
-    public static <K, V extends Number> Map<String, Object> aggPreMergeTopoPageSpout(
-        Map<String, Object> m, String window, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map<String, Object> subRet = new HashMap<>();
-        putKV(subRet, NUM_EXECUTORS, 1);
-        putKV(subRet, NUM_TASKS, getByKey(m, NUM_TASKS));
-
-        // no capacity for spout
-        Map<String, Map<String, Map<String, V>>> stat2win2sid2num = getMapByKey(m, STATS);
-        for (String key : new String[]{ EMITTED, TRANSFERRED, FAILED }) {
-            Map<String, Map<K, V>> stat = windowSetConverter(stat2win2sid2num.get(key), TO_STRING);
-            if (EMITTED.equals(key) || TRANSFERRED.equals(key)) {
-                stat = filterSysStreams(stat, includeSys);
-            }
-            Map<K, V> winStat = stat.get(window);
-            long sum = 0;
-            if (winStat != null) {
-                for (V v : winStat.values()) {
-                    sum += v.longValue();
-                }
-            }
-            putKV(subRet, key, sum);
-        }
-
-        Map<String, Map<String, Double>> win2sid2compLat =
-            windowSetConverter(getMapByKey(stat2win2sid2num, COMP_LATENCIES), TO_STRING);
-        Map<String, Map<String, Long>> win2sid2acked =
-            windowSetConverter(getMapByKey(stat2win2sid2num, ACKED), TO_STRING);
-        subRet.putAll(aggSpoutLatAndCount(win2sid2compLat.get(window), win2sid2acked.get(window)));
-
-        ret.put((String) getByKey(m, "comp-id"), subRet);
-        return ret;
-    }
-
-    /**
-     * merge accumulated bolt stats with pre-merged component stats
-     *
-     * @param accBoltStats accumulated bolt stats
-     * @param boltStats    pre-merged component stats
-     * @return merged stats
-     */
-    public static Map<String, Object> mergeAggCompStatsCompPageBolt(
-        Map<String, Object> accBoltStats, Map<String, Object> boltStats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map<List<String>, Map<String, ?>> accIn = getMapByKey(accBoltStats, CID_SID_TO_IN_STATS);
-        Map<String, Map<String, ?>> accOut = getMapByKey(accBoltStats, SID_TO_OUT_STATS);
-        Map<List<String>, Map<String, ?>> boltIn = getMapByKey(boltStats, CID_SID_TO_IN_STATS);
-        Map<String, Map<String, ?>> boltOut = getMapByKey(boltStats, SID_TO_OUT_STATS);
-
-        int numExecutors = getByKeyOr0(accBoltStats, NUM_EXECUTORS).intValue();
-        putKV(ret, NUM_EXECUTORS, numExecutors + 1);
-        putKV(ret, NUM_TASKS, sumOr0(
-            getByKeyOr0(accBoltStats, NUM_TASKS), getByKeyOr0(boltStats, NUM_TASKS)));
-
-        // (merge-with (partial merge-with sum-or-0) acc-out spout-out)
-        putKV(ret, SID_TO_OUT_STATS, fullMergeWithSum(accOut, boltOut));
-        // {component id -> metric -> value}, note that input may contain both long and double values
-        putKV(ret, CID_SID_TO_IN_STATS, fullMergeWithSum(accIn, boltIn));
-
-        long executed = sumStreamsLong(boltIn, EXECUTED);
-        putKV(ret, EXECUTED, executed);
-
-        Map<String, Object> executorStats = new HashMap<>();
-        putKV(executorStats, EXECUTOR_ID, boltStats.get(EXECUTOR_ID));
-        putKV(executorStats, UPTIME, boltStats.get(UPTIME));
-        putKV(executorStats, HOST, boltStats.get(HOST));
-        putKV(executorStats, PORT, boltStats.get(PORT));
-        putKV(executorStats, CAPACITY, boltStats.get(CAPACITY));
-
-        putKV(executorStats, EMITTED, sumStreamsLong(boltOut, EMITTED));
-        putKV(executorStats, TRANSFERRED, sumStreamsLong(boltOut, TRANSFERRED));
-        putKV(executorStats, ACKED, sumStreamsLong(boltIn, ACKED));
-        putKV(executorStats, FAILED, sumStreamsLong(boltIn, FAILED));
-        putKV(executorStats, EXECUTED, executed);
-
-        if (executed > 0) {
-            putKV(executorStats, EXEC_LATENCY, sumStreamsDouble(boltIn, EXEC_LAT_TOTAL) / executed);
-            putKV(executorStats, PROC_LATENCY, sumStreamsDouble(boltIn, PROC_LAT_TOTAL) / executed);
-        } else {
-            putKV(executorStats, EXEC_LATENCY, null);
-            putKV(executorStats, PROC_LATENCY, null);
-        }
-        List executorStatsList = ((List) getByKey(accBoltStats, EXECUTOR_STATS));
-        executorStatsList.add(executorStats);
-        putKV(ret, EXECUTOR_STATS, executorStatsList);
-
-        return ret;
-    }
-
-    /**
-     * merge accumulated bolt stats with pre-merged component stats
-     */
-    public static Map<String, Object> mergeAggCompStatsCompPageSpout(
-        Map<String, Object> accSpoutStats, Map<String, Object> spoutStats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        // {stream id -> metric -> value}, note that sid->out-stats may contain both long and double values
-        Map<String, Map<String, ?>> accOut = getMapByKey(accSpoutStats, SID_TO_OUT_STATS);
-        Map<String, Map<String, ?>> spoutOut = getMapByKey(spoutStats, SID_TO_OUT_STATS);
-
-        int numExecutors = getByKeyOr0(accSpoutStats, NUM_EXECUTORS).intValue();
-        putKV(ret, NUM_EXECUTORS, numExecutors + 1);
-        putKV(ret, NUM_TASKS, sumOr0(
-            getByKeyOr0(accSpoutStats, NUM_TASKS), getByKeyOr0(spoutStats, NUM_TASKS)));
-        putKV(ret, SID_TO_OUT_STATS, fullMergeWithSum(accOut, spoutOut));
-
-        Map executorStats = new HashMap();
-        putKV(executorStats, EXECUTOR_ID, getByKey(spoutStats, EXECUTOR_ID));
-        putKV(executorStats, UPTIME, getByKey(spoutStats, UPTIME));
-        putKV(executorStats, HOST, getByKey(spoutStats, HOST));
-        putKV(executorStats, PORT, getByKey(spoutStats, PORT));
-
-        putKV(executorStats, EMITTED, sumStreamsLong(spoutOut, EMITTED));
-        putKV(executorStats, TRANSFERRED, sumStreamsLong(spoutOut, TRANSFERRED));
-        putKV(executorStats, FAILED, sumStreamsLong(spoutOut, FAILED));
-        long acked = sumStreamsLong(spoutOut, ACKED);
-        putKV(executorStats, ACKED, acked);
-        if (acked > 0) {
-            putKV(executorStats, COMP_LATENCY, sumStreamsDouble(spoutOut, COMP_LAT_TOTAL) / acked);
-        } else {
-            putKV(executorStats, COMP_LATENCY, null);
-        }
-        List executorStatsList = ((List) getByKey(accSpoutStats, EXECUTOR_STATS));
-        executorStatsList.add(executorStats);
-        putKV(ret, EXECUTOR_STATS, executorStatsList);
-
-        return ret;
-    }
-
-    /**
-     * merge accumulated bolt stats with new bolt stats
-     *
-     * @param accBoltStats accumulated bolt stats
-     * @param boltStats    new input bolt stats
-     * @return merged bolt stats
-     */
-    public static Map<String, Object> mergeAggCompStatsTopoPageBolt(Map<String, Object> accBoltStats,
-                                                                    Map<String, Object> boltStats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Integer numExecutors = getByKeyOr0(accBoltStats, NUM_EXECUTORS).intValue();
-        putKV(ret, NUM_EXECUTORS, numExecutors + 1);
-        putKV(ret, NUM_TASKS,
-              sumOr0(getByKeyOr0(accBoltStats, NUM_TASKS), getByKeyOr0(boltStats, NUM_TASKS)));
-        putKV(ret, EMITTED,
-              sumOr0(getByKeyOr0(accBoltStats, EMITTED), getByKeyOr0(boltStats, EMITTED)));
-        putKV(ret, TRANSFERRED,
-              sumOr0(getByKeyOr0(accBoltStats, TRANSFERRED), getByKeyOr0(boltStats, TRANSFERRED)));
-        putKV(ret, EXEC_LAT_TOTAL,
-              sumOr0(getByKeyOr0(accBoltStats, EXEC_LAT_TOTAL), getByKeyOr0(boltStats, EXEC_LAT_TOTAL)));
-        putKV(ret, PROC_LAT_TOTAL,
-              sumOr0(getByKeyOr0(accBoltStats, PROC_LAT_TOTAL), getByKeyOr0(boltStats, PROC_LAT_TOTAL)));
-        putKV(ret, EXECUTED,
-              sumOr0(getByKeyOr0(accBoltStats, EXECUTED), getByKeyOr0(boltStats, EXECUTED)));
-        putKV(ret, ACKED,
-              sumOr0(getByKeyOr0(accBoltStats, ACKED), getByKeyOr0(boltStats, ACKED)));
-        putKV(ret, FAILED,
-              sumOr0(getByKeyOr0(accBoltStats, FAILED), getByKeyOr0(boltStats, FAILED)));
-        putKV(ret, CAPACITY,
-              maxOr0(getByKeyOr0(accBoltStats, CAPACITY), getByKeyOr0(boltStats, CAPACITY)));
-
-        return ret;
-    }
-
-    /**
-     * merge accumulated bolt stats with new bolt stats
-     */
-    public static Map<String, Object> mergeAggCompStatsTopoPageSpout(Map<String, Object> accSpoutStats,
-                                                                     Map<String, Object> spoutStats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Integer numExecutors = getByKeyOr0(accSpoutStats, NUM_EXECUTORS).intValue();
-        putKV(ret, NUM_EXECUTORS, numExecutors + 1);
-        putKV(ret, NUM_TASKS,
-              sumOr0(getByKeyOr0(accSpoutStats, NUM_TASKS), getByKeyOr0(spoutStats, NUM_TASKS)));
-        putKV(ret, EMITTED,
-              sumOr0(getByKeyOr0(accSpoutStats, EMITTED), getByKeyOr0(spoutStats, EMITTED)));
-        putKV(ret, TRANSFERRED,
-              sumOr0(getByKeyOr0(accSpoutStats, TRANSFERRED), getByKeyOr0(spoutStats, TRANSFERRED)));
-        putKV(ret, COMP_LAT_TOTAL,
-              sumOr0(getByKeyOr0(accSpoutStats, COMP_LAT_TOTAL), getByKeyOr0(spoutStats, COMP_LAT_TOTAL)));
-        putKV(ret, ACKED,
-              sumOr0(getByKeyOr0(accSpoutStats, ACKED), getByKeyOr0(spoutStats, ACKED)));
-        putKV(ret, FAILED,
-              sumOr0(getByKeyOr0(accSpoutStats, FAILED), getByKeyOr0(spoutStats, FAILED)));
-
-        return ret;
-    }
-
-    /**
-     * A helper function that does the common work to aggregate stats of one executor with the given map for the topology page.
-     */
-    public static Map<String, Object> aggTopoExecStats(
-        String window, boolean includeSys, Map<String, Object> accStats, Map<String, Object> beat, String compType) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Set workerSet = (Set) accStats.get(WORKERS_SET);
-        Map bolt2stats = getMapByKey(accStats, BOLT_TO_STATS);
-        Map spout2stats = getMapByKey(accStats, SPOUT_TO_STATS);
-        Map win2emitted = getMapByKey(accStats, WIN_TO_EMITTED);
-        Map win2transferred = getMapByKey(accStats, WIN_TO_TRANSFERRED);
-        Map win2compLatWgtAvg = getMapByKey(accStats, WIN_TO_COMP_LAT_WGT_AVG);
-        Map win2acked = getMapByKey(accStats, WIN_TO_ACKED);
-        Map win2failed = getMapByKey(accStats, WIN_TO_FAILED);
-
-        boolean isSpout = compType.equals(SPOUT);
-        // component id -> stats
-        Map<String, Object> cid2stats;
-        if (isSpout) {
-            cid2stats = aggPreMergeTopoPageSpout(beat, window, includeSys);
-        } else {
-            cid2stats = aggPreMergeTopoPageBolt(beat, window, includeSys);
-        }
-
-        Map stats = getMapByKey(beat, STATS);
-        Map w2compLatWgtAvg, w2acked;
-        Map compLatStats = getMapByKey(stats, COMP_LATENCIES);
-        if (isSpout) { // agg spout stats
-            Map mm = new HashMap();
-
-            Map acked = getMapByKey(stats, ACKED);
-            for (Object win : acked.keySet()) {
-                mm.put(win, aggSpoutLatAndCount((Map) compLatStats.get(win), (Map) acked.get(win)));
-            }
-            mm = swapMapOrder(mm);
-            w2compLatWgtAvg = getMapByKey(mm, COMP_LAT_TOTAL);
-            w2acked = getMapByKey(mm, ACKED);
-        } else {
-            w2compLatWgtAvg = null;
-            w2acked = aggregateCountStreams(getMapByKey(stats, ACKED));
-        }
-
-        workerSet.add(Lists.newArrayList(getByKey(beat, HOST), getByKey(beat, PORT)));
-        putKV(ret, WORKERS_SET, workerSet);
-        putKV(ret, BOLT_TO_STATS, bolt2stats);
-        putKV(ret, SPOUT_TO_STATS, spout2stats);
-        putKV(ret, WIN_TO_EMITTED, mergeWithSumLong(win2emitted, aggregateCountStreams(
-            filterSysStreams(getMapByKey(stats, EMITTED), includeSys))));
-        putKV(ret, WIN_TO_TRANSFERRED, mergeWithSumLong(win2transferred, aggregateCountStreams(
-            filterSysStreams(getMapByKey(stats, TRANSFERRED), includeSys))));
-        putKV(ret, WIN_TO_COMP_LAT_WGT_AVG, mergeWithSumDouble(win2compLatWgtAvg, w2compLatWgtAvg));
-
-        //boolean isSpoutStat = SPOUT.equals(((Keyword) getByKey(stats, TYPE)).getName());
-        putKV(ret, WIN_TO_ACKED, isSpout ? mergeWithSumLong(win2acked, w2acked) : win2acked);
-        putKV(ret, WIN_TO_FAILED, isSpout ?
-            mergeWithSumLong(aggregateCountStreams(getMapByKey(stats, FAILED)), win2failed) : win2failed);
-        putKV(ret, TYPE, getByKey(stats, TYPE));
-
-        // (merge-with merge-agg-comp-stats-topo-page-bolt/spout (acc-stats comp-key) cid->statk->num)
-        // (acc-stats comp-key) ==> bolt2stats/spout2stats
-        if (isSpout) {
-            for (String spout : cid2stats.keySet()) {
-                spout2stats.put(spout, mergeAggCompStatsTopoPageSpout((Map) spout2stats.get(spout), (Map) cid2stats.get(spout)));
-            }
-        } else {
-            for (String bolt : cid2stats.keySet()) {
-                bolt2stats.put(bolt, mergeAggCompStatsTopoPageBolt((Map) bolt2stats.get(bolt), (Map) cid2stats.get(bolt)));
-            }
-        }
-
-        return ret;
-    }
-
-    /**
-     * aggregate topo executors stats
-     *
-     * @param topologyId     topology id
-     * @param exec2nodePort  executor -> host+port
-     * @param task2component task -> component
-     * @param beats          executor[start, end] -> executor heartbeat
-     * @param topology       storm topology
-     * @param window         the window to be aggregated
-     * @param includeSys     whether to include system streams
-     * @param clusterState   cluster state
-     * @return TopologyPageInfo thrift structure
-     */
-    public static TopologyPageInfo aggTopoExecsStats(
-        String topologyId, Map exec2nodePort, Map task2component, Map<List<Integer>, Map<String, Object>> beats,
-        StormTopology topology, String window, boolean includeSys, IStormClusterState clusterState) {
-        List<Map<String, Object>> beatList = extractDataFromHb(exec2nodePort, task2component, beats, includeSys, topology);
-        Map<String, Object> topoStats = aggregateTopoStats(window, includeSys, beatList);
-        return postAggregateTopoStats(task2component, exec2nodePort, topoStats, topologyId, clusterState);
-    }
-
-    public static Map<String, Object> aggregateTopoStats(String win, boolean includeSys, List<Map<String, Object>> heartbeats) {
-        Map<String, Object> initVal = new HashMap<>();
-        putKV(initVal, WORKERS_SET, new HashSet());
-        putKV(initVal, BOLT_TO_STATS, new HashMap());
-        putKV(initVal, SPOUT_TO_STATS, new HashMap());
-        putKV(initVal, WIN_TO_EMITTED, new HashMap());
-        putKV(initVal, WIN_TO_TRANSFERRED, new HashMap());
-        putKV(initVal, WIN_TO_COMP_LAT_WGT_AVG, new HashMap());
-        putKV(initVal, WIN_TO_ACKED, new HashMap());
-        putKV(initVal, WIN_TO_FAILED, new HashMap());
-
-        for (Map<String, Object> heartbeat : heartbeats) {
-            String compType = (String) getByKey(heartbeat, TYPE);
-            initVal = aggTopoExecStats(win, includeSys, initVal, heartbeat, compType);
-        }
-
-        return initVal;
-    }
-
-    public static TopologyPageInfo postAggregateTopoStats(Map task2comp, Map exec2nodePort, Map<String, Object> accData,
-                                                          String topologyId, IStormClusterState clusterState) {
-        TopologyPageInfo ret = new TopologyPageInfo(topologyId);
-
-        ret.set_num_tasks(task2comp.size());
-        ret.set_num_workers(((Set) getByKey(accData, WORKERS_SET)).size());
-        ret.set_num_executors(exec2nodePort != null ? exec2nodePort.size() : 0);
-
-        Map bolt2stats = getMapByKey(accData, BOLT_TO_STATS);
-        Map<String, ComponentAggregateStats> aggBolt2stats = new HashMap<>();
-        for (Object o : bolt2stats.entrySet()) {
-            Map.Entry e = (Map.Entry) o;
-            String id = (String) e.getKey();
-            Map m = (Map) e.getValue();
-            long executed = getByKeyOr0(m, EXECUTED).longValue();
-            if (executed > 0) {
-                double execLatencyTotal = getByKeyOr0(m, EXEC_LAT_TOTAL).doubleValue();
-                putKV(m, EXEC_LATENCY, execLatencyTotal / executed);
-
-                double procLatencyTotal = getByKeyOr0(m, PROC_LAT_TOTAL).doubleValue();
-                putKV(m, PROC_LATENCY, procLatencyTotal / executed);
-            }
-            remove(m, EXEC_LAT_TOTAL);
-            remove(m, PROC_LAT_TOTAL);
-            putKV(m, "last-error", getLastError(clusterState, topologyId, id));
-
-            aggBolt2stats.put(id, thriftifyBoltAggStats(m));
-        }
-
-        Map spout2stats = getMapByKey(accData, SPOUT_TO_STATS);
-        Map<String, ComponentAggregateStats> aggSpout2stats = new HashMap<>();
-        for (Object o : spout2stats.entrySet()) {
-            Map.Entry e = (Map.Entry) o;
-            String id = (String) e.getKey();
-            Map m = (Map) e.getValue();
-            long acked = getByKeyOr0(m, ACKED).longValue();
-            if (acked > 0) {
-                double compLatencyTotal = getByKeyOr0(m, COMP_LAT_TOTAL).doubleValue();
-                putKV(m, COMP_LATENCY, compLatencyTotal / acked);
-            }
-            remove(m, COMP_LAT_TOTAL);
-            putKV(m, "last-error", getLastError(clusterState, topologyId, id));
-
-            aggSpout2stats.put(id, thriftifySpoutAggStats(m));
-        }
-
-        TopologyStats topologyStats = new TopologyStats();
-        topologyStats.set_window_to_acked(mapKeyStr(getMapByKey(accData, WIN_TO_ACKED)));
-        topologyStats.set_window_to_emitted(mapKeyStr(getMapByKey(accData, WIN_TO_EMITTED)));
-        topologyStats.set_window_to_failed(mapKeyStr(getMapByKey(accData, WIN_TO_FAILED)));
-        topologyStats.set_window_to_transferred(mapKeyStr(getMapByKey(accData, WIN_TO_TRANSFERRED)));
-        topologyStats.set_window_to_complete_latencies_ms(computeWeightedAveragesPerWindow(
-            accData, WIN_TO_COMP_LAT_WGT_AVG, WIN_TO_ACKED));
-
-        ret.set_topology_stats(topologyStats);
-        ret.set_id_to_spout_agg_stats(aggSpout2stats);
-        ret.set_id_to_bolt_agg_stats(aggBolt2stats);
-
-        return ret;
-    }
-
-    /**
-     * aggregate bolt stats
-     *
-     * @param statsSeq   a seq of ExecutorStats
-     * @param includeSys whether to include system streams
-     * @return aggregated bolt stats: {metric -> win -> global stream id -> value}
-     */
-    public static <T> Map<String, Map> aggregateBoltStats(List<ExecutorSummary> statsSeq, boolean includeSys) {
-        Map<String, Map> ret = new HashMap<>();
-
-        Map<String, Map<String, Map<T, Long>>> commonStats = aggregateCommonStats(statsSeq);
-        // filter sys streams if necessary
-        commonStats = preProcessStreamSummary(commonStats, includeSys);
-
-        List<Map<String, Map<GlobalStreamId, Long>>> acked = new ArrayList<>();
-        List<Map<String, Map<GlobalStreamId, Long>>> failed = new ArrayList<>();
-        List<Map<String, Map<GlobalStreamId, Long>>> executed = new ArrayList<>();
-        List<Map<String, Map<GlobalStreamId, Double>>> processLatencies = new ArrayList<>();
-        List<Map<String, Map<GlobalStreamId, Double>>> executeLatencies = new ArrayList<>();
-        for (ExecutorSummary summary : statsSeq) {
-            ExecutorStats stat = summary.get_stats();
-            acked.add(stat.get_specific().get_bolt().get_acked());
-            failed.add(stat.get_specific().get_bolt().get_failed());
-            executed.add(stat.get_specific().get_bolt().get_executed());
-            processLatencies.add(stat.get_specific().get_bolt().get_process_ms_avg());
-            executeLatencies.add(stat.get_specific().get_bolt().get_execute_ms_avg());
-        }
-        mergeMaps(ret, commonStats);
-        putKV(ret, ACKED, aggregateCounts(acked));
-        putKV(ret, FAILED, aggregateCounts(failed));
-        putKV(ret, EXECUTED, aggregateCounts(executed));
-        putKV(ret, PROC_LATENCIES, aggregateAverages(processLatencies, acked));
-        putKV(ret, EXEC_LATENCIES, aggregateAverages(executeLatencies, executed));
-
-        return ret;
-    }
-
-    /**
-     * aggregate spout stats
-     *
-     * @param statsSeq   a seq of ExecutorStats
-     * @param includeSys whether to include system streams
-     * @return aggregated spout stats: {metric -> win -> global stream id -> value}
-     */
-    public static Map<String, Map> aggregateSpoutStats(List<ExecutorSummary> statsSeq, boolean includeSys) {
-        // actually Map<String, Map<String, Map<String, Long/Double>>>
-        Map<String, Map> ret = new HashMap<>();
-
-        Map<String, Map<String, Map<String, Long>>> commonStats = aggregateCommonStats(statsSeq);
-        // filter sys streams if necessary
-        commonStats = preProcessStreamSummary(commonStats, includeSys);
-
-        List<Map<String, Map<String, Long>>> acked = new ArrayList<>();
-        List<Map<String, Map<String, Long>>> failed = new ArrayList<>();
-        List<Map<String, Map<String, Double>>> completeLatencies = new ArrayList<>();
-        for (ExecutorSummary summary : statsSeq) {
-            ExecutorStats stats = summary.get_stats();
-            acked.add(stats.get_specific().get_spout().get_acked());
-            failed.add(stats.get_specific().get_spout().get_failed());
-            completeLatencies.add(stats.get_specific().get_spout().get_complete_ms_avg());
-        }
-        ret.putAll(commonStats);
-        putKV(ret, ACKED, aggregateCounts(acked));
-        putKV(ret, FAILED, aggregateCounts(failed));
-        putKV(ret, COMP_LATENCIES, aggregateAverages(completeLatencies, acked));
-
-        return ret;
-    }
-
-    /**
-     * aggregate common stats from a spout/bolt, called in aggregateSpoutStats/aggregateBoltStats
-     */
-    public static <T> Map<String, Map<String, Map<T, Long>>> aggregateCommonStats(List<ExecutorSummary> statsSeq) {
-        Map<String, Map<String, Map<T, Long>>> ret = new HashMap<>();
-
-        List<Map<String, Map<String, Long>>> emitted = new ArrayList<>();
-        List<Map<String, Map<String, Long>>> transferred = new ArrayList<>();
-        for (ExecutorSummary summ : statsSeq) {
-            emitted.add(summ.get_stats().get_emitted());
-            transferred.add(summ.get_stats().get_transferred());
-        }
-        putKV(ret, EMITTED, aggregateCounts(emitted));
-        putKV(ret, TRANSFERRED, aggregateCounts(transferred));
-
-        return ret;
-    }
-
-    /**
-     * filter system streams of aggregated spout/bolt stats if necessary
-     */
-    public static <T> Map<String, Map<String, Map<T, Long>>> preProcessStreamSummary(
-        Map<String, Map<String, Map<T, Long>>> streamSummary, boolean includeSys) {
-        Map<String, Map<T, Long>> emitted = getMapByKey(streamSummary, EMITTED);
-        Map<String, Map<T, Long>> transferred = getMapByKey(streamSummary, TRANSFERRED);
-
-        putKV(streamSummary, EMITTED, filterSysStreams(emitted, includeSys));
-        putKV(streamSummary, TRANSFERRED, filterSysStreams(transferred, includeSys));
-
-        return streamSummary;
-    }
-
-    /**
-     * aggregate count streams by window
-     *
-     * @param stats a Map of value: {win -> stream -> value}
-     * @return a Map of value: {win -> value}
-     */
-    public static <K, V extends Number> Map<String, Long> aggregateCountStreams(
-        Map<String, Map<K, V>> stats) {
-        Map<String, Long> ret = new HashMap<>();
-        for (Map.Entry<String, Map<K, V>> entry : stats.entrySet()) {
-            Map<K, V> value = entry.getValue();
-            long sum = 0l;
-            for (V num : value.values()) {
-                sum += num.longValue();
-            }
-            ret.put(entry.getKey(), sum);
-        }
-        return ret;
-    }
-
-    /**
-     * compute an weighted average from a list of average maps and a corresponding count maps extracted from a list of ExecutorSummary
-     *
-     * @param avgSeq   a list of {win -> global stream id -> avg value}
-     * @param countSeq a list of {win -> global stream id -> count value}
-     * @return a Map of {win -> global stream id -> weighted avg value}
-     */
-    public static <K> Map<String, Map<K, Double>> aggregateAverages(List<Map<String, Map<K, Double>>> avgSeq,
-                                                                    List<Map<String, Map<K, Long>>> countSeq) {
-        Map<String, Map<K, Double>> ret = new HashMap<>();
-
-        Map<String, Map<K, List>> expands = expandAveragesSeq(avgSeq, countSeq);
-        for (Map.Entry<String, Map<K, List>> entry : expands.entrySet()) {
-            String k = entry.getKey();
-
-            Map<K, Double> tmp = new HashMap<>();
-            Map<K, List> inner = entry.getValue();
-            for (K kk : inner.keySet()) {
-                List vv = inner.get(kk);
-                tmp.put(kk, valAvg(((Number) vv.get(0)).doubleValue(), ((Number) vv.get(1)).longValue()));
-            }
-            ret.put(k, tmp);
-        }
-
-        return ret;
-    }
-
-    /**
-     * aggregate weighted average of all streams
-     *
-     * @param avgs   a Map of {win -> stream -> average value}
-     * @param counts a Map of {win -> stream -> count value}
-     * @return a Map of {win -> aggregated value}
-     */
-    public static <K> Map<String, Double> aggregateAvgStreams(Map<String, Map<K, Double>> avgs,
-                                                              Map<String, Map<K, Long>> counts) {
-        Map<String, Double> ret = new HashMap<>();
-
-        Map<String, Map<K, List>> expands = expandAverages(avgs, counts);
-        for (Map.Entry<String, Map<K, List>> entry : expands.entrySet()) {
-            String win = entry.getKey();
-
-            double avgTotal = 0.0;
-            long cntTotal = 0l;
-            Map<K, List> inner = entry.getValue();
-            for (K kk : inner.keySet()) {
-                List vv = inner.get(kk);
-                avgTotal += ((Number) vv.get(0)).doubleValue();
-                cntTotal += ((Number) vv.get(1)).longValue();
-            }
-            ret.put(win, valAvg(avgTotal, cntTotal));
-        }
-
-        return ret;
-    }
-
-    /**
-     * aggregates spout stream stats, returns a Map of {metric -> win -> aggregated value}
-     */
-    public static Map<String, Map> spoutStreamsStats(List<ExecutorSummary> summs, boolean includeSys) {
-        if (summs == null) {
-            return new HashMap<>();
-        }
-        // filter ExecutorSummary's with empty stats
-        List<ExecutorSummary> statsSeq = getFilledStats(summs);
-        return aggregateSpoutStreams(aggregateSpoutStats(statsSeq, includeSys));
-    }
-
-    /**
-     * aggregates bolt stream stats, returns a Map of {metric -> win -> aggregated value}
-     */
-    public static Map<String, Map> boltStreamsStats(List<ExecutorSummary> summs, boolean includeSys) {
-        if (summs == null) {
-            return new HashMap<>();
-        }
-        List<ExecutorSummary> statsSeq = getFilledStats(summs);
-        return aggregateBoltStreams(aggregateBoltStats(statsSeq, includeSys));
-    }
-
-    /**
-     * aggregate all spout streams
-     *
-     * @param stats a Map of {metric -> win -> stream id -> value}
-     * @return a Map of {metric -> win -> aggregated value}
-     */
-    public static Map<String, Map> aggregateSpoutStreams(Map<String, Map> stats) {
-        // actual ret is Map<String, Map<String, Long/Double>>
-        Map<String, Map> ret = new HashMap<>();
-        putKV(ret, ACKED, aggregateCountStreams(getMapByKey(stats, ACKED)));
-        putKV(ret, FAILED, aggregateCountStreams(getMapByKey(stats, FAILED)));
-        putKV(ret, EMITTED, aggregateCountStreams(getMapByKey(stats, EMITTED)));
-        putKV(ret, TRANSFERRED, aggregateCountStreams(getMapByKey(stats, TRANSFERRED)));
-        putKV(ret, COMP_LATENCIES, aggregateAvgStreams(
-            getMapByKey(stats, COMP_LATENCIES), getMapByKey(stats, ACKED)));
-        return ret;
-    }
-
-    /**
-     * aggregate all bolt streams
-     *
-     * @param stats a Map of {metric -> win -> stream id -> value}
-     * @return a Map of {metric -> win -> aggregated value}
-     */
-    public static Map<String, Map> aggregateBoltStreams(Map<String, Map> stats) {
-        Map<String, Map> ret = new HashMap<>();
-        putKV(ret, ACKED, aggregateCountStreams(getMapByKey(stats, ACKED)));
-        putKV(ret, FAILED, aggregateCountStreams(getMapByKey(stats, FAILED)));
-        putKV(ret, EMITTED, aggregateCountStreams(getMapByKey(stats, EMITTED)));
-        putKV(ret, TRANSFERRED, aggregateCountStreams(getMapByKey(stats, TRANSFERRED)));
-        putKV(ret, EXECUTED, aggregateCountStreams(getMapByKey(stats, EXECUTED)));
-        putKV(ret, PROC_LATENCIES, aggregateAvgStreams(
-            getMapByKey(stats, PROC_LATENCIES), getMapByKey(stats, ACKED)));
-        putKV(ret, EXEC_LATENCIES, aggregateAvgStreams(
-            getMapByKey(stats, EXEC_LATENCIES), getMapByKey(stats, EXECUTED)));
-        return ret;
-    }
-
-    /**
-     * aggregate windowed stats from a bolt executor stats with a Map of accumulated stats
-     */
-    public static Map<String, Object> aggBoltExecWinStats(
-        Map<String, Object> accStats, Map<String, Object> newStats, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map<String, Map<String, Number>> m = new HashMap<>();
-        for (Object win : getMapByKey(newStats, EXECUTED).keySet()) {
-            m.put((String) win, aggBoltLatAndCount(
-                (Map) (getMapByKey(newStats, EXEC_LATENCIES)).get(win),
-                (Map) (getMapByKey(newStats, PROC_LATENCIES)).get(win),
-                (Map) (getMapByKey(newStats, EXECUTED)).get(win)));
-        }
-        m = swapMapOrder(m);
-
-        Map<String, Double> win2execLatWgtAvg = getMapByKey(m, EXEC_LAT_TOTAL);
-        Map<String, Double> win2procLatWgtAvg = getMapByKey(m, PROC_LAT_TOTAL);
-        Map<String, Long> win2executed = getMapByKey(m, EXECUTED);
-
-        Map<String, Map<String, Long>> emitted = getMapByKey(newStats, EMITTED);
-        Map<String, Long> win2emitted = mergeWithSumLong(aggregateCountStreams(filterSysStreams(emitted, includeSys)),
-                                                         getMapByKey(accStats, WIN_TO_EMITTED));
-        putKV(ret, WIN_TO_EMITTED, win2emitted);
-
-        Map<String, Map<String, Long>> transferred = getMapByKey(newStats, TRANSFERRED);
-        Map<String, Long> win2transferred = mergeWithSumLong(aggregateCountStreams(filterSysStreams(transferred, includeSys)),
-                                                             getMapByKey(accStats, WIN_TO_TRANSFERRED));
-        putKV(ret, WIN_TO_TRANSFERRED, win2transferred);
-
-        putKV(ret, WIN_TO_EXEC_LAT_WGT_AVG, mergeWithSumDouble(
-            getMapByKey(accStats, WIN_TO_EXEC_LAT_WGT_AVG), win2execLatWgtAvg));
-        putKV(ret, WIN_TO_PROC_LAT_WGT_AVG, mergeWithSumDouble(
-            getMapByKey(accStats, WIN_TO_PROC_LAT_WGT_AVG), win2procLatWgtAvg));
-        putKV(ret, WIN_TO_EXECUTED, mergeWithSumLong(
-            getMapByKey(accStats, WIN_TO_EXECUTED), win2executed));
-        putKV(ret, WIN_TO_ACKED, mergeWithSumLong(
-            aggregateCountStreams(getMapByKey(newStats, ACKED)), getMapByKey(accStats, WIN_TO_ACKED)));
-        putKV(ret, WIN_TO_FAILED, mergeWithSumLong(
-            aggregateCountStreams(getMapByKey(newStats, FAILED)), getMapByKey(accStats, WIN_TO_FAILED)));
-
-        return ret;
-    }
-
-    /**
-     * aggregate windowed stats from a spout executor stats with a Map of accumulated stats
-     */
-    public static Map<String, Object> aggSpoutExecWinStats(
-        Map<String, Object> accStats, Map<String, Object> beat, boolean includeSys) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map<String, Map<String, Number>> m = new HashMap<>();
-        for (Object win : getMapByKey(beat, ACKED).keySet()) {
-            m.put((String) win, aggSpoutLatAndCount(
-                (Map<String, Double>) (getMapByKey(beat, COMP_LATENCIES)).get(win),
-                (Map<String, Long>) (getMapByKey(beat, ACKED)).get(win)));
-        }
-        m = swapMapOrder(m);
-
-        Map<String, Double> win2compLatWgtAvg = getMapByKey(m, COMP_LAT_TOTAL);
-        Map<String, Long> win2acked = getMapByKey(m, ACKED);
-
-        Map<String, Map<String, Long>> emitted = getMapByKey(beat, EMITTED);
-        Map<String, Long> win2emitted = mergeWithSumLong(aggregateCountStreams(filterSysStreams(emitted, includeSys)),
-                                                         getMapByKey(accStats, WIN_TO_EMITTED));
-        putKV(ret, WIN_TO_EMITTED, win2emitted);
-
-        Map<String, Map<String, Long>> transferred = getMapByKey(beat, TRANSFERRED);
-        Map<String, Long> win2transferred = mergeWithSumLong(aggregateCountStreams(filterSysStreams(transferred, includeSys)),
-                                                             getMapByKey(accStats, WIN_TO_TRANSFERRED));
-        putKV(ret, WIN_TO_TRANSFERRED, win2transferred);
-
-        putKV(ret, WIN_TO_COMP_LAT_WGT_AVG, mergeWithSumDouble(
-            getMapByKey(accStats, WIN_TO_COMP_LAT_WGT_AVG), win2compLatWgtAvg));
-        putKV(ret, WIN_TO_ACKED, mergeWithSumLong(
-            getMapByKey(accStats, WIN_TO_ACKED), win2acked));
-        putKV(ret, WIN_TO_FAILED, mergeWithSumLong(
-            aggregateCountStreams(getMapByKey(beat, FAILED)), getMapByKey(accStats, WIN_TO_FAILED)));
-
-        return ret;
-    }
-
-
-    /**
-     * aggregate a list of count maps into one map
-     *
-     * @param countsSeq a seq of {win -> GlobalStreamId -> value}
-     */
-    public static <T> Map<String, Map<T, Long>> aggregateCounts(List<Map<String, Map<T, Long>>> countsSeq) {
-        Map<String, Map<T, Long>> ret = new HashMap<>();
-        for (Map<String, Map<T, Long>> counts : countsSeq) {
-            for (Map.Entry<String, Map<T, Long>> entry : counts.entrySet()) {
-                String win = entry.getKey();
-                Map<T, Long> stream2count = entry.getValue();
-
-                if (!ret.containsKey(win)) {
-                    ret.put(win, stream2count);
-                } else {
-                    Map<T, Long> existing = ret.get(win);
-                    for (Map.Entry<T, Long> subEntry : stream2count.entrySet()) {
-                        T stream = subEntry.getKey();
-                        if (!existing.containsKey(stream)) {
-                            existing.put(stream, subEntry.getValue());
-                        } else {
-                            existing.put(stream, subEntry.getValue() + existing.get(stream));
-                        }
-                    }
-                }
-            }
-        }
-        return ret;
-    }
-
-    public static Map<String, Object> aggregateCompStats(
-        String window, boolean includeSys, List<Map<String, Object>> beats, String compType) {
-        boolean isSpout = SPOUT.equals(compType);
-
-        Map<String, Object> initVal = new HashMap<>();
-        putKV(initVal, WIN_TO_ACKED, new HashMap());
-        putKV(initVal, WIN_TO_FAILED, new HashMap());
-        putKV(initVal, WIN_TO_EMITTED, new HashMap());
-        putKV(initVal, WIN_TO_TRANSFERRED, new HashMap());
-
-        Map<String, Object> stats = new HashMap();
-        putKV(stats, EXECUTOR_STATS, new ArrayList());
-        putKV(stats, SID_TO_OUT_STATS, new HashMap());
-        if (isSpout) {
-            putKV(initVal, TYPE, SPOUT);
-            putKV(initVal, WIN_TO_COMP_LAT_WGT_AVG, new HashMap());
-        } else {
-            putKV(initVal, TYPE, BOLT);
-            putKV(initVal, WIN_TO_EXECUTED, new HashMap());
-            putKV(stats, CID_SID_TO_IN_STATS, new HashMap());
-            putKV(initVal, WIN_TO_EXEC_LAT_WGT_AVG, new HashMap());
-            putKV(initVal, WIN_TO_PROC_LAT_WGT_AVG, new HashMap());
-        }
-        putKV(initVal, STATS, stats);
-
-        // iterate through all executor heartbeats
-        for (Map<String, Object> beat : beats) {
-            initVal = aggCompExecStats(window, includeSys, initVal, beat, compType);
-        }
-
-        return initVal;
-    }
-
-    /**
-     * Combines the aggregate stats of one executor with the given map, selecting the appropriate window and including system components as
-     * specified.
-     */
-    public static Map<String, Object> aggCompExecStats(String window, boolean includeSys, Map<String, Object> accStats,
-                                                       Map<String, Object> beat, String compType) {
-        Map<String, Object> ret = new HashMap<>();
-        if (SPOUT.equals(compType)) {
-            ret.putAll(aggSpoutExecWinStats(accStats, getMapByKey(beat, STATS), includeSys));
-            putKV(ret, STATS, mergeAggCompStatsCompPageSpout(
-                getMapByKey(accStats, STATS),
-                aggPreMergeCompPageSpout(beat, window, includeSys)));
-        } else {
-            ret.putAll(aggBoltExecWinStats(accStats, getMapByKey(beat, STATS), includeSys));
-            putKV(ret, STATS, mergeAggCompStatsCompPageBolt(
-                getMapByKey(accStats, STATS),
-                aggPreMergeCompPageBolt(beat, window, includeSys)));
-        }
-        putKV(ret, TYPE, compType);
-
-        return ret;
-    }
-
-    /**
-     * post aggregate component stats: 1. computes execute-latency/process-latency from execute/process latency total 2. computes windowed
-     * weight avgs 3. transform Map keys
-     *
-     * @param compStats accumulated comp stats
-     */
-    public static Map<String, Object> postAggregateCompStats(Map<String, Object> compStats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        String compType = (String) compStats.get(TYPE);
-        Map stats = getMapByKey(compStats, STATS);
-        Integer numTasks = getByKeyOr0(stats, NUM_TASKS).intValue();
-        Integer numExecutors = getByKeyOr0(stats, NUM_EXECUTORS).intValue();
-        Map outStats = getMapByKey(stats, SID_TO_OUT_STATS);
-
-        putKV(ret, TYPE, compType);
-        putKV(ret, NUM_TASKS, numTasks);
-        putKV(ret, NUM_EXECUTORS, numExecutors);
-        putKV(ret, EXECUTOR_STATS, getByKey(stats, EXECUTOR_STATS));
-        putKV(ret, WIN_TO_EMITTED, mapKeyStr(getMapByKey(compStats, WIN_TO_EMITTED)));
-        putKV(ret, WIN_TO_TRANSFERRED, mapKeyStr(getMapByKey(compStats, WIN_TO_TRANSFERRED)));
-        putKV(ret, WIN_TO_ACKED, mapKeyStr(getMapByKey(compStats, WIN_TO_ACKED)));
-        putKV(ret, WIN_TO_FAILED, mapKeyStr(getMapByKey(compStats, WIN_TO_FAILED)));
-
-        if (BOLT.equals(compType)) {
-            Map inStats = getMapByKey(stats, CID_SID_TO_IN_STATS);
-
-            Map inStats2 = new HashMap();
-            for (Object o : inStats.entrySet()) {
-                Map.Entry e = (Map.Entry) o;
-                Object k = e.getKey();
-                Map v = (Map) e.getValue();
-                long executed = getByKeyOr0(v, EXECUTED).longValue();
-                if (executed > 0) {
-                    double executeLatencyTotal = getByKeyOr0(v, EXEC_LAT_TOTAL).doubleValue();
-                    double processLatencyTotal = getByKeyOr0(v, PROC_LAT_TOTAL).doubleValue();
-                    putKV(v, EXEC_LATENCY, executeLatencyTotal / executed);
-                    putKV(v, PROC_LATENCY, processLatencyTotal / executed);
-                } else {
-                    putKV(v, EXEC_LATENCY, 0.0);
-                    putKV(v, PROC_LATENCY, 0.0);
-                }
-                remove(v, EXEC_LAT_TOTAL);
-                remove(v, PROC_LAT_TOTAL);
-                inStats2.put(k, v);
-            }
-            putKV(ret, CID_SID_TO_IN_STATS, inStats2);
-
-            putKV(ret, SID_TO_OUT_STATS, outStats);
-            putKV(ret, WIN_TO_EXECUTED, mapKeyStr(getMapByKey(compStats, WIN_TO_EXECUTED)));
-            putKV(ret, WIN_TO_EXEC_LAT, computeWeightedAveragesPerWindow(
-                compStats, WIN_TO_EXEC_LAT_WGT_AVG, WIN_TO_EXECUTED));
-            putKV(ret, WIN_TO_PROC_LAT, computeWeightedAveragesPerWindow(
-                compStats, WIN_TO_PROC_LAT_WGT_AVG, WIN_TO_EXECUTED));
-        } else {
-            Map outStats2 = new HashMap();
-            for (Object o : outStats.entrySet()) {
-                Map.Entry e = (Map.Entry) o;
-                Object k = e.getKey();
-                Map v = (Map) e.getValue();
-                long acked = getByKeyOr0(v, ACKED).longValue();
-                if (acked > 0) {
-                    double compLatencyTotal = getByKeyOr0(v, COMP_LAT_TOTAL).doubleValue();
-                    putKV(v, COMP_LATENCY, compLatencyTotal / acked);
-                } else {
-                    putKV(v, COMP_LATENCY, 0.0);
-                }
-                remove(v, COMP_LAT_TOTAL);
-                outStats2.put(k, v);
-            }
-            putKV(ret, SID_TO_OUT_STATS, outStats2);
-            putKV(ret, WIN_TO_COMP_LAT, computeWeightedAveragesPerWindow(
-                compStats, WIN_TO_COMP_LAT_WGT_AVG, WIN_TO_ACKED));
-        }
-
-        return ret;
-    }
-
-    /**
-     * aggregate component executor stats
-     *
-     * @param exec2hostPort  a Map of {executor -> host+port}
-     * @param task2component a Map of {task id -> component}
-     * @param beats          a converted HashMap of executor heartbeats, {executor -> heartbeat}
-     * @param window         specified window
-     * @param includeSys     whether to include system streams
-     * @param topologyId     topology id
-     * @param topology       storm topology
-     * @param componentId    component id
-     * @return ComponentPageInfo thrift structure
-     */
-    public static ComponentPageInfo aggCompExecsStats(
-        Map exec2hostPort, Map task2component, Map<List<Integer>, Map<String, Object>> beats,
-        String window, boolean includeSys, String topologyId, StormTopology topology, String componentId) {
-
-        List<Map<String, Object>> beatList =
-            extractDataFromHb(exec2hostPort, task2component, beats, includeSys, topology, componentId);
-        Map<String, Object> compStats = aggregateCompStats(window, includeSys, beatList, componentType(topology, componentId));
-        compStats = postAggregateCompStats(compStats);
-        return thriftifyCompPageData(topologyId, topology, componentId, compStats);
-    }
-
-    /**
-     * aggregate statistics per worker for a topology. Optionally filtering on specific supervisors
-     *
-     * @param stormId          topology id
-     * @param stormName        storm topology
-     * @param task2Component   a Map of {task id -> component}
-     * @param beats            a converted HashMap of executor heartbeats, {executor -> heartbeat}
-     * @param exec2NodePort    a Map of {executor -> host+port}
-     * @param includeSys       whether to include system streams
-     * @param userAuthorized   whether the user is authorized to view topology info
-     * @param filterSupervisor if not null, only return WorkerSummaries for that supervisor
-     * @return List<WorkerSummary> thrift structures
-     */
-    public static List<WorkerSummary> aggWorkerStats(String stormId, String stormName,
-                                                     Map<Integer, String> task2Component,
-                                                     Map<List<Integer>, Map<String, Object>> beats,
-                                                     Map<List<Long>, List<Object>> exec2NodePort,
-                                                     Map<String, String> nodeHost,
-                                                     Map<WorkerSlot, WorkerResources> worker2Resources,
-                                                     boolean includeSys, boolean userAuthorized, String filterSupervisor) {
-
-        // host,port => WorkerSummary
-        HashMap<WorkerSlot, WorkerSummary> workerSummaryMap = new HashMap<>();
-
-        if (exec2NodePort != null) {
-            // for each executor -> node+port pair
-            for (Map.Entry<List<Long>, List<Object>> execNodePort : exec2NodePort.entrySet()) {
-                List<Object> nodePort = execNodePort.getValue();
-                String node = (String) nodePort.get(0);
-                Long port = (Long) nodePort.get(1);
-                String host = nodeHost.get(node);
-                WorkerSlot slot = new WorkerSlot(node, port);
-                WorkerResources resources = worker2Resources.get(slot);
-
-                if (filterSupervisor == null || node.equals(filterSupervisor)) {
-                    WorkerSummary ws = workerSummaryMap.get(slot);
-
-                    if (ws == null) {
-                        ws = new WorkerSummary();
-                        ws.set_host(host);
-                        ws.set_port(port.intValue());
-                        ws.set_supervisor_id(node);
-                        ws.set_topology_id(stormId);
-                        ws.set_topology_name(stormName);
-                        ws.set_num_executors(0);
-                        if (resources != null) {
-                            ws.set_assigned_memonheap(resources.get_mem_on_heap());
-                            ws.set_assigned_memoffheap(resources.get_mem_off_heap());
-                            ws.set_assigned_cpu(resources.get_cpu());
-                        } else {
-                            ws.set_assigned_memonheap(0);
-                            ws.set_assigned_memoffheap(0);
-                            ws.set_assigned_cpu(0);
-                        }
-                        ws.set_component_to_num_tasks(new HashMap<String, Long>());
-                        workerSummaryMap.put(slot, ws);
-                    }
-                    Map<String, Long> componentToNumTasks = ws.get_component_to_num_tasks();
-
-                    // gets min/max task pairs (executors): [1 1] [2 3] ...
-                    List<Long> exec = execNodePort.getKey();
-                    // get executor heartbeat
-                    int hbeatSecs = 0;
-                    if (beats != null) {
-                        Map<String, Object> beat = beats.get(convertExecutor(exec));
-                        hbeatSecs = beat == null ? 0 : (int) beat.get("uptime");
-                    }
-                    ws.set_uptime_secs(hbeatSecs);
-                    ws.set_num_executors(ws.get_num_executors() + 1);
-
-                    // get tasks if the user is authorized for this topology
-                    if (userAuthorized) {
-                        int firstTask = exec.get(0).intValue();
-                        int lastTask = exec.get(1).intValue();
-
-                        // get per task components
-                        for (int task = firstTask; task <= lastTask; task++) {
-                            String component = task2Component.get(task);
-                            // if the component is a system (__*) component and we are hiding
-                            // them in UI, keep going
-                            if (!includeSys && Utils.isSystemId(component)) {
-                                continue;
-                            }
-
-                            // good to go, increment # of tasks this component is being executed on
-                            Long counter = componentToNumTasks.get(component);
-                            if (counter == null) {
-                                counter = new Long(0);
-                            }
-                            componentToNumTasks.put(component, counter + 1);
-                        }
-                    }
-                }
-            }
-        }
-        return new ArrayList<WorkerSummary>(workerSummaryMap.values());
-    }
-
-    /**
-     * Aggregate statistics per worker for a topology. Optionally filtering on specific supervisors
-     *
-     * Convenience overload when called from the topology page code (in that case we want data for all workers in the topology, not filtered
-     * by supervisor)
-     *
-     * @param stormId        topology id
-     * @param stormName      storm topology
-     * @param task2Component a Map of {task id -> component}
-     * @param beats          a converted HashMap of executor heartbeats, {executor -> heartbeat}
-     * @param exec2NodePort  a Map of {executor -> host+port}
-     * @param includeSys     whether to include system streams
-     * @param userAuthorized whether the user is authorized to view topology info
-     * @return List<WorkerSummary> thrift structures
-     */
-    public static List<WorkerSummary> aggWorkerStats(String stormId, String stormName,
-                                                     Map<Integer, String> task2Component,
-                                                     Map<List<Integer>, Map<String, Object>> beats,
-                                                     Map<List<Long>, List<Object>> exec2NodePort,
-                                                     Map<String, String> nodeHost,
-                                                     Map<WorkerSlot, WorkerResources> worker2Resources,
-                                                     boolean includeSys, boolean userAuthorized) {
-        return aggWorkerStats(stormId, stormName,
-                              task2Component, beats, exec2NodePort, nodeHost, worker2Resources,
-                              includeSys, userAuthorized, null);
-    }
-
-    // =====================================================================================
-    // convert thrift stats to java maps
-    // =====================================================================================
-
-    /**
-     * convert thrift executor heartbeats into a java HashMap
-     */
-    public static Map<List<Integer>, Map<String, Object>> convertExecutorBeats(Map<ExecutorInfo, ExecutorBeat> beats) {
-        Map<List<Integer>, Map<String, Object>> ret = new HashMap<>();
-        for (Map.Entry<ExecutorInfo, ExecutorBeat> beat : beats.entrySet()) {
-            ExecutorInfo executorInfo = beat.getKey();
-            ExecutorBeat executorBeat = beat.getValue();
-            ret.put(Lists.newArrayList(executorInfo.get_task_start(), executorInfo.get_task_end()),
-                    convertZkExecutorHb(executorBeat));
-        }
-
-        return ret;
-    }
-
-    /**
-     * convert {@link SupervisorWorkerHeartbeat} to nimbus local report executor heartbeats
-     *
-     * @param workerHeartbeat
-     * @return
-     */
-    public static Map<List<Integer>, Map<String, Object>> convertWorkerBeats(SupervisorWorkerHeartbeat workerHeartbeat) {
-        Map<List<Integer>, Map<String, Object>> ret = new HashMap<>();
-        for (ExecutorInfo executorInfo : workerHeartbeat.get_executors()) {
-            Map<String, Object> reportBeat = new HashMap<>();
-            reportBeat.put(TIME_SECS, workerHeartbeat.get_time_secs());
-            ret.put(Lists.newArrayList(executorInfo.get_task_start(), executorInfo.get_task_end()),
-                    reportBeat);
-        }
-
-        return ret;
-    }
-
-    /**
-     * convert thrift ExecutorBeat into a java HashMap
-     */
-    public static Map<String, Object> convertZkExecutorHb(ExecutorBeat beat) {
-        Map<String, Object> ret = new HashMap<>();
-        if (beat != null) {
-            ret.put(TIME_SECS, beat.getTimeSecs());
-            ret.put(UPTIME, beat.getUptime());
-            ret.put(STATS, convertExecutorStats(beat.getStats()));
-        }
-
-        return ret;
-    }
-
-    /**
-     * convert a thrift worker heartbeat into a java HashMap
-     *
-     * @param workerHb
-     * @return
-     */
-    public static Map<String, Object> convertZkWorkerHb(ClusterWorkerHeartbeat workerHb) {
-        Map<String, Object> ret = new HashMap<>();
-        if (workerHb != null) {
-            ret.put("storm-id", workerHb.get_storm_id());
-            ret.put(EXECUTOR_STATS, convertExecutorsStats(workerHb.get_executor_stats()));
-            ret.put(UPTIME, workerHb.get_uptime_secs());
-            ret.put(TIME_SECS, workerHb.get_time_secs());
-        }
-        return ret;
-    }
-
-    /**
-     * convert executors stats into a HashMap, note that ExecutorStats are remained unchanged
-     */
-    public static Map<List<Integer>, ExecutorStats> convertExecutorsStats(Map<ExecutorInfo, ExecutorStats> stats) {
-        Map<List<Integer>, ExecutorStats> ret = new HashMap<>();
-        for (Map.Entry<ExecutorInfo, ExecutorStats> entry : stats.entrySet()) {
-            ExecutorInfo executorInfo = entry.getKey();
-            ExecutorStats executorStats = entry.getValue();
-
-            ret.put(Lists.newArrayList(executorInfo.get_task_start(), executorInfo.get_task_end()),
-                    executorStats);
-        }
-        return ret;
-    }
-
-    /**
-     * convert thrift ExecutorStats structure into a java HashMap
-     */
-    public static Map<String, Object> convertExecutorStats(ExecutorStats stats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        putKV(ret, EMITTED, stats.get_emitted());
-        putKV(ret, TRANSFERRED, stats.get_transferred());
-        putKV(ret, RATE, stats.get_rate());
-
-        if (stats.get_specific().is_set_bolt()) {
-            ret.putAll(convertSpecificStats(stats.get_specific().get_bolt()));
-            putKV(ret, TYPE, BOLT);
-        } else {
-            ret.putAll(convertSpecificStats(stats.get_specific().get_spout()));
-            putKV(ret, TYPE, SPOUT);
-        }
-
-        return ret;
-    }
-
-    private static Map<String, Object> convertSpecificStats(SpoutStats stats) {
-        Map<String, Object> ret = new HashMap<>();
-        putKV(ret, ACKED, stats.get_acked());
-        putKV(ret, FAILED, stats.get_failed());
-        putKV(ret, COMP_LATENCIES, stats.get_complete_ms_avg());
-
-        return ret;
-    }
-
-    private static Map<String, Object> convertSpecificStats(BoltStats stats) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Map acked = windowSetConverter(stats.get_acked(), FROM_GSID, IDENTITY);
-        Map failed = windowSetConverter(stats.get_failed(), FROM_GSID, IDENTITY);
-        Map processAvg = windowSetConverter(stats.get_process_ms_avg(), FROM_GSID, IDENTITY);
-        Map executed = windowSetConverter(stats.get_executed(), FROM_GSID, IDENTITY);
-        Map executeAvg = windowSetConverter(stats.get_execute_ms_avg(), FROM_GSID, IDENTITY);
-
-        putKV(ret, ACKED, acked);
-        putKV(ret, FAILED, failed);
-        putKV(ret, PROC_LATENCIES, processAvg);
-        putKV(ret, EXECUTED, executed);
-        putKV(ret, EXEC_LATENCIES, executeAvg);
-
-        return ret;
-    }
-
-    /**
-     * extract a list of host port info for specified component
-     *
-     * @param exec2hostPort  {executor -> host+port}
-     * @param task2component {task id -> component}
-     * @param includeSys     whether to include system streams
-     * @param compId         component id
-     * @return a list of host+port
-     */
-    public static List<Map<String, Object>> extractNodeInfosFromHbForComp(
-        Map<List<? extends Number>, List<Object>> exec2hostPort, Map<Integer, String> task2component, boolean includeSys, String compId) {
-        List<Map<String, Object>> ret = new ArrayList<>();
-
-        Set<List> hostPorts = new HashSet<>();
-        for (Entry<List<? extends Number>, List<Object>> entry : exec2hostPort.entrySet()) {
-            List<? extends Number> key = entry.getKey();
-            List<Object> value = entry.getValue();
-
-            Integer start = key.get(0).intValue();
-            String host = (String) value.get(0);
-            Integer port = (Integer) value.get(1);
-            String comp = task2component.get(start);
-            if ((compId == null || compId.equals(comp)) && (includeSys || !Utils.isSystemId(comp))) {
-                hostPorts.add(Lists.newArrayList(host, port));
-            }
-        }
-
-        for (List hostPort : hostPorts) {
-            Map<String, Object> m = new HashMap<>();
-            putKV(m, HOST, hostPort.get(0));
-            putKV(m, PORT, hostPort.get(1));
-            ret.add(m);
-        }
-
-        return ret;
-    }
-
-    /**
-     * update all executor heart beats (legacy ZK heartbeat compatibility)
-     *
-     * @param cache         existing heart beats cache
-     * @param executorBeats new heart beats
-     * @param executors     all executors
-     * @param timeout       timeout
-     * @return a HashMap of updated executor heart beats
-     */
-    public static Map<List<Integer>, Map<String, Object>> updateHeartbeatCacheFromZkHeartbeat(Map<List<Integer>, Map<String, Object>> cache,
-                                                                                              Map<List<Integer>, Map<String, Object>>
-                                                                                                  executorBeats,
-                                                                                              Set<List<Integer>> executors,
-                                                                                              Integer timeout) {
-        Map<List<Integer>, Map<String, Object>> ret = new HashMap<>();
-        if (cache == null && executorBeats == null) {
-            return ret;
-        }
-
-        if (cache == null) {
-            cache = new HashMap<>();
-        }
-        if (executorBeats == null) {
-            executorBeats = new HashMap<>();
-        }
-
-        for (List<Integer> executor : executors) {
-            ret.put(executor, updateExecutorCache(cache.get(executor), executorBeats.get(executor), timeout));
-        }
-
-        return ret;
-    }
-
-
-    // =====================================================================================
-    // heartbeats related
-    // =====================================================================================
-
-    /**
-     * update all executor heart beats. TODO: should move this method to nimbus when nimbus.clj is translated
-     *
-     * @param cache         existing heart beats cache
-     * @param executorBeats new heart beats
-     * @param executors     all executors
-     * @param timeout       timeout
-     */
-    public static void updateHeartbeatCache(Map<List<Integer>, Map<String, Object>> cache,
-                                            Map<List<Integer>, Map<String, Object>> executorBeats, Set<List<Integer>> executors,
-                                            Integer timeout) {
-        //if not executor beats, refresh is-timed-out of the cache which is done by master
-        if (executorBeats == null) {
-            for (Map.Entry<List<Integer>, Map<String, Object>> executorbeat : cache.entrySet()) {
-                Map<String, Object> beat = executorbeat.getValue();
-                beat.put("is-timed-out", Time.deltaSecs((Integer) beat.get("nimbus-time")) >= timeout);
-            }
-            return;
-        }
-        //else refresh nimbus-time and executor-reported-time by heartbeats reporting
-        for (List<Integer> executor : executors) {
-            cache.put(executor, updateExecutorCache(cache.get(executor), executorBeats.get(executor), timeout));
-        }
-    }
-
-    // TODO: should move this method to nimbus when nimbus.clj is translated
-    public static Map<String, Object> updateExecutorCache(
-        Map<String, Object> currBeat, Map<String, Object> newBeat, Integer timeout) {
-        Map<String, Object> ret = new HashMap<>();
-
-        Integer lastNimbusTime = null, lastReportedTime = null;
-        if (currBeat != null) {
-            lastNimbusTime = (Integer) currBeat.get("nimbus-time");
-            lastReportedTime = (Integer) currBeat.get("executor-reported-time");
-        }
-
-        Integer reportedTime = null;
-        if (newBeat != null) {
-            reportedTime = (Integer) newBeat.get(TIME_SECS);
-        }
-
-        if (reportedTime == null) {
-            if (lastReportedTime != null) {
-                reportedTime = lastReportedTime;
-            } else {
-                reportedTime = lastReportedTime = 0;
-            }
-        }
-
-        if (lastNimbusTime == null || !reportedTime.equals(lastReportedTime)) {
-            lastNimbusTime = Time.currentTimeSecs();
-        }
-
-        ret.put("is-timed-out", Time.deltaSecs(lastNimbusTime) >= timeout);
-        ret.put("nimbus-time", lastNimbusTime);
-        ret.put("executor-reported-time", reportedTime);
-
-        return ret;
-    }
-
-
-    /**
-     * extracts a list of executor data from heart beats
-     */
-    public static List<Map<String, Object>> extractDataFromHb(Map executor2hostPort, Map task2component,
-                                                              Map<List<Integer>, Map<String, Object>> beats,
-                                                              boolean includeSys, StormTopology topology) {
-        return extractDataFromHb(executor2hostPort, task2component, beats, includeSys, topology, null);
-    }
-
-    public static List<Map<String, Object>> extractDataFromHb(Map executor2hostPort, Map task2component,
-                                                              Map<List<Integer>, Map<String, Object>> beats,
-                                                              boolean includeSys, StormTopology topology, String compId) {
-        List<Map<String, Object>> ret = new ArrayList<>();
-        if (executor2hostPort == null || beats == null) {
-            return ret;
-        }
-        for (Object o : executor2hostPort.entrySet()) {
-            Map.Entry entry = (Map.Entry) o;
-            List executor = (List) entry.getKey();
-            List hostPort = (List) entry.getValue();
-
-            Integer start = ((Number) executor.get(0)).intValue();
-            Integer end = ((Number) executor.get(1)).intValue();
-
-            String host = (String) hostPort.get(0);
-            Integer port = ((Number) hostPort.get(1)).intValue();
-
-            Map<String, Object> beat = beats.get(convertExecutor(executor));
-            if (beat == null) {
-                continue;
-            }
-            String id = (String) task2component.get(start);
-
-            Map<String, Object> m = new HashMap<>();
-            if ((compId == null || compId.equals(id)) && (includeSys || !Utils.isSystemId(id))) {
-                putKV(m, "exec-id", entry.getKey());
-                putKV(m, "comp-id", id);
-                putKV(m, NUM_TASKS, end - start + 1);
-                putKV(m, HOST, host);
-                putKV(m, PORT, port);
-
-                Map stats = getMapByKey(beat, STATS);
-                putKV(m, UPTIME, beat.get(UPTIME));
-                putKV(m, STATS, stats);
-
-                String type = componentType(topology, compId);
-                if (type != null) {
-                    putKV(m, TYPE, type);
-                } else {
-                    putKV(m, TYPE, stats.get(TYPE));
-                }
-                ret.add(m);
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * compute weighted avg from a Map of stats and given avg/count keys
-     *
-     * @param accData    a Map of {win -> key -> value}
-     * @param wgtAvgKey  weighted average key
-     * @param divisorKey count key
-     * @return a Map of {win -> weighted avg value}
-     */
-    private static Map<String, Double> computeWeightedAveragesPerWindow(Map<String, Object> accData,
-                                                                        String wgtAvgKey, String divisorKey) {
-        Map<String, Double> ret = new HashMap<>();
-        for (Object o : getMapByKey(accData, wgtAvgKey).entrySet()) {
-            Map.Entry e = (Map.Entry) o;
-            Object window = e.getKey();
-            double wgtAvg = ((Number) e.getValue()).doubleValue();
-            long divisor = ((Number) getMapByKey(accData, divisorKey).get(window)).longValue();
-            if (divisor > 0) {
-                ret.put(window.toString(), wgtAvg / divisor);
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * convert a List<Long> executor to java List<Integer>
-     */
-    public static List<Integer> convertExecutor(List<Long> executor) {
-        return Lists.newArrayList(executor.get(0).intValue(), executor.get(1).intValue());
-    }
-
-    /**
-     * computes max bolt capacity
-     *
-     * @param executorSumms a list of ExecutorSummary
-     * @return max bolt capacity
-     */
-    public static double computeBoltCapacity(List<ExecutorSummary> executorSumms) {
-        double max = 0.0;
-        for (ExecutorSummary summary : executorSumms) {
-            double capacity = computeExecutorCapacity(summary);
-            if (capacity > max) {
-                max = capacity;
-            }
-        }
-        return max;
-    }
-
-    public static double computeExecutorCapacity(ExecutorSummary summary) {
-        ExecutorStats stats = summary.get_stats();
-        if (stats == null) {
-            return 0.0;
-        } else {
-            // actual value of m is: Map<String, Map<String/GlobalStreamId, Long/Double>> ({win -> stream -> value})
-            Map<String, Map> m = aggregateBoltStats(Lists.newArrayList(summary), true);
-            // {metric -> win -> value} ==> {win -> metric -> value}
-            m = swapMapOrder(aggregateBoltStreams(m));
-            // {metric -> value}
-            Map data = getMapByKey(m, TEN_MIN_IN_SECONDS_STR);
-
-            int uptime = summary.get_uptime_secs();
-            int win = Math.min(uptime, TEN_MIN_IN_SECONDS);
-            long executed = getByKeyOr0(data, EXECUTED).longValue();
-            double latency = getByKeyOr0(data, EXEC_LATENCIES).doubleValue();
-            if (win > 0) {
-                return executed * latency / (1000 * win);
-            }
-            return 0.0;
-        }
-    }
-
-    /**
-     * filter ExecutorSummary whose stats is null
-     *
-     * @param summs a list of ExecutorSummary
-     * @return filtered summs
-     */
-    public static List<ExecutorSummary> getFilledStats(List<ExecutorSummary> summs) {
-        List<ExecutorSummary> ret = new ArrayList<>();
-        for (ExecutorSummary summ : summs) {
-            if (summ.get_stats() != null) {
-                ret.add(summ);
-            }
-        }
-        return ret;
-    }
-
-    private static <K, V> Map<String, V> mapKeyStr(Map<K, V> m) {
-        Map<String, V> ret = new HashMap<>();
-        for (Map.Entry<K, V> entry : m.entrySet()) {
-            ret.put(entry.getKey().toString(), entry.getValue());
-        }
-        return ret;
-    }
-
-    private static <K1, K2> long sumStreamsLong(Map<K1, Map<K2, ?>> m, String key) {
-        long sum = 0;
-        if (m == null) {
-            return sum;
-        }
-        for (Map<K2, ?> v : m.values()) {
-            for (Map.Entry<K2, ?> entry : v.entrySet()) {
-                if (entry.getKey().equals(key)) {
-                    sum += ((Number) entry.getValue()).longValue();
-                }
-            }
-        }
-        return sum;
-    }
-
-    private static <K1, K2> double sumStreamsDouble(Map<K1, Map<K2, ?>> m, String key) {
-        double sum = 0;
-        if (m == null) {
-            return sum;
-        }
-        for (Map<K2, ?> v : m.values()) {
-            for (Map.Entry<K2, ?> entry : v.entrySet()) {
-                if (entry.getKey().equals(key)) {
-                    sum += ((Number) entry.getValue()).doubleValue();
-                }
-            }
-        }
-        return sum;
-    }
-
-    /**
-     * same as clojure's (merge-with merge m1 m2)
-     */
-    private static Map mergeMaps(Map m1, Map m2) {
-        if (m2 == null) {
-            return m1;
-        }
-        for (Object o : m2.entrySet()) {
-            Map.Entry entry = (Map.Entry) o;
-            Object k = entry.getKey();
-
-            Map existing = (Map) m1.get(k);
-            if (existing == null) {
-                m1.put(k, entry.getValue());
-            } else {
-                existing.putAll((Map) m2.get(k));
-            }
-        }
-        return m1;
-    }
-
-
-    /**
-     * filter system streams from stats
-     *
-     * @param stream2stat { stream id -> value }
-     * @param includeSys  whether to filter system streams
-     * @return filtered stats
-     */
-    private static <K, V> Map<K, V> filterSysStreams2Stat(Map<K, V> stream2stat, boolean includeSys) {
-        LOG.trace("Filter Sys Streams2Stat {}", stream2stat);
-        if (!includeSys) {
-            for (Iterator itr = stream2stat.keySet().iterator(); itr.hasNext(); ) {
-                Object key = itr.next();
-                if (key instanceof String && Utils.isSystemId((String) key)) {
-                    itr.remove();
-                }
-            }
-        }
-        return stream2stat;
-    }
-
-    /**
-     * filter system streams from stats
-     *
-     * @param stats      { win -> stream id -> value }
-     * @param includeSys whether to filter system streams
-     * @return filtered stats
-     */
-    private static <K, V> Map<String, Map<K, V>> filterSysStreams(Map<String, Map<K, V>> stats, boolean includeSys) {
-        LOG.trace("Filter Sys Streams {}", stats);
-        if (!includeSys) {
-            for (Iterator<String> itr = stats.keySet().iterator(); itr.hasNext(); ) {
-                String winOrStream = itr.next();
-                Map<K, V> stream2stat = stats.get(winOrStream);
-                for (Iterator subItr = stream2stat.keySet().iterator(); subItr.hasNext(); ) {
-                    Object key = subItr.next();
-                    if (key instanceof String && Utils.isSystemId((String) key)) {
-                        subItr.remove();
-                    }
-                }
-            }
-        }
-        return stats;
-    }
-
-    /**
-     * equals to clojure's: (merge-with (partial merge-with sum-or-0) acc-out spout-out)
-     */
-    private static <K1, K2> Map<K1, Map<K2, Number>> fullMergeWithSum(Map<K1, Map<K2, ?>> m1,
-                                                                      Map<K1, Map<K2, ?>> m2) {
-        Set<K1> allKeys = new HashSet<>();
-        if (m1 != null) {
-            allKeys.addAll(m1.keySet());
-        }
-        if (m2 != null) {
-            allKeys.addAll(m2.keySet());
-        }
-
-        Map<K1, Map<K2, Number>> ret = new HashMap<>();
-        for (K1 k : allKeys) {
-            Map<K2, ?> mm1 = null, mm2 = null;
-            if (m1 != null) {
-                mm1 = m1.get(k);
-            }
-            if (m2 != null) {
-                mm2 = m2.get(k);
-            }
-            ret.put(k, mergeWithSum(mm1, mm2));
-        }
-
-        return ret;
-    }
-
-    private static <K> Map<K, Number> mergeWithSum(Map<K, ?> m1, Map<K, ?> m2) {
-        Map<K, Number> ret = new HashMap<>();
-
-        Set<K> allKeys = new HashSet<>();
-        if (m1 != null) {
-            allKeys.addAll(m1.keySet());
-        }
-        if (m2 != null) {
-            allKeys.addAll(m2.keySet());
-        }
-
-        for (K k : allKeys) {
-            Number n1 = getOr0(m1, k);
-            Number n2 = getOr0(m2, k);
-            if (n1 instanceof Long) {
-                ret

<TRUNCATED>