Merge branch 'APEXCORE-276' of https://github.com/davidyan74/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/3f76dcbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/3f76dcbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/3f76dcbf Branch: refs/heads/master Commit: 3f76dcbfa04d74ca34da0d360b533f8f3d4536f3 Parents: 5879124 845796a Author: Thomas Weise <[email protected]> Authored: Wed Dec 30 16:51:07 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Wed Dec 30 16:51:07 2015 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/api/AutoMetric.java | 19 ++++++ .../main/java/com/datatorrent/api/Context.java | 6 +- .../metric/AutoMetricBuiltInTransport.java | 67 +++++++++++++++++++ .../stram/PubSubWebSocketMetricTransport.java | 68 ++++++++++++++++++++ .../stram/StreamingAppMasterService.java | 2 +- .../stram/WebsocketAppDataPusher.java | 65 ------------------- .../datatorrent/stram/api/AppDataPusher.java | 34 ---------- .../stram/appdata/AppDataPushAgent.java | 34 +++++----- .../stram/StreamingContainerManagerTest.java | 62 ++++++++++++++---- 9 files changed, 225 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/3f76dcbf/engine/src/main/java/com/datatorrent/stram/appdata/AppDataPushAgent.java ---------------------------------------------------------------------- diff --cc engine/src/main/java/com/datatorrent/stram/appdata/AppDataPushAgent.java index b47dc41,7fd4c3c..9297f89 --- a/engine/src/main/java/com/datatorrent/stram/appdata/AppDataPushAgent.java +++ b/engine/src/main/java/com/datatorrent/stram/appdata/AppDataPushAgent.java @@@ -41,13 -41,13 +41,14 @@@ import com.google.common.collect.Maps import com.datatorrent.api.AutoMetric; import com.datatorrent.api.Context.DAGContext; + import com.datatorrent.api.StringCodec; + import com.datatorrent.common.metric.AutoMetricBuiltInTransport; import com.datatorrent.common.util.Pair; + import com.datatorrent.stram.PubSubWebSocketMetricTransport; import com.datatorrent.stram.StramAppContext; import com.datatorrent.stram.StreamingContainerManager; - import com.datatorrent.stram.WebsocketAppDataPusher; - import com.datatorrent.stram.api.AppDataPusher; import com.datatorrent.stram.plan.logical.LogicalPlan; +import com.datatorrent.stram.plan.logical.MetricAggregatorMeta; import com.datatorrent.stram.webapp.LogicalOperatorInfo; /**
