You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/05/15 20:56:28 UTC
[02/12] storm git commit: Change sources->grouping to
source->stream->grouping in JSON context.
Change sources->grouping to source->stream->grouping in JSON context.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6961be7d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6961be7d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6961be7d
Branch: refs/heads/0.10.x-branch
Commit: 6961be7d18f6c0a772a5fbd69f18c7ff51523179
Parents: 5fad1b1
Author: Dan Blanchard <da...@parsely.com>
Authored: Fri Apr 17 11:00:21 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 14:03:54 2015 -0400
----------------------------------------------------------------------
.../src/jvm/backtype/storm/task/TopologyContext.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6961be7d/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
index 4855f4e..c35d9db 100644
--- a/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
+++ b/storm-core/src/jvm/backtype/storm/task/TopologyContext.java
@@ -260,12 +260,17 @@ public class TopologyContext extends WorkerTopologyContext implements IMetricsCo
}
obj.put("stream->target->grouping", stringTargets);
// Convert sources to a JSON serializable format
- Map<String, String> stringSources = new HashMap<String, String>();
+ Map<String, Map<String, Object>> stringSources = new HashMap<String, Map<String, Object>>();
for (Map.Entry<GlobalStreamId, Grouping> entry : this.getThisSources().entrySet()) {
- Map stringSourceMap = new HashMap<String, Object>();
- stringSourceMap.put(entry.getKey().toString(), groupingToJSONableObject(entry.getValue()));
+ GlobalStreamId gid = entry.getKey();
+ Map<String, Object> stringSourceMap = stringSources.get(gid.get_componentId());
+ if (stringSourceMap == null) {
+ stringSourceMap = new HashMap<String, Object>();
+ stringSources.put(gid.get_componentId(), stringSourceMap);
+ }
+ stringSourceMap.put(gid.get_streamId(), groupingToJSONableObject(entry.getValue()));
}
- obj.put("sources->grouping", stringSources);
+ obj.put("source->stream->grouping", stringSources);
return JSONValue.toJSONString(obj);
}