You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by xi...@apache.org on 2016/12/13 03:14:22 UTC
[1/2] storm git commit: modified incorrect and broken links
Repository: storm
Updated Branches:
refs/heads/1.x-branch 0cd627f7c -> c149fe1e1
modified incorrect and broken links
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1bfff31d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1bfff31d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1bfff31d
Branch: refs/heads/1.x-branch
Commit: 1bfff31da87d6913a4cfff95a9c6f14f6f001dd7
Parents: cce525b
Author: marblejenka <ma...@10.0.1.22>
Authored: Sun Dec 11 18:48:51 2016 +0900
Committer: marblejenka <ma...@10.0.1.22>
Committed: Sun Dec 11 18:48:51 2016 +0900
----------------------------------------------------------------------
docs/Structure-of-the-codebase.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1bfff31d/docs/Structure-of-the-codebase.md
----------------------------------------------------------------------
diff --git a/docs/Structure-of-the-codebase.md b/docs/Structure-of-the-codebase.md
index a2c3d63..378c060 100644
--- a/docs/Structure-of-the-codebase.md
+++ b/docs/Structure-of-the-codebase.md
@@ -21,7 +21,7 @@ Storm uses [this fork](https://github.com/nathanmarz/thrift/tree/storm) of Thrif
Every spout or bolt in a topology is given a user-specified identifier called the "component id". The component id is used to specify subscriptions from a bolt to the output streams of other spouts or bolts. A [StormTopology]({{page.git-blob-base}}/storm-core/src/storm.thrift#L91) structure contains a map from component id to component for each type of component (spouts and bolts).
-Spouts and bolts have the same Thrift definition, so let's just take a look at the [Thrift definition for bolts]({{page.git-blob-base}}/storm-core/src/storm.thrift#L79). It contains a `ComponentObject` struct and a `ComponentCommon` struct.
+Spouts and bolts have the same Thrift definition, so let's just take a look at the [Thrift definition for bolts]({{page.git-blob-base}}/storm-core/src/storm.thrift#L102). It contains a `ComponentObject` struct and a `ComponentCommon` struct.
The `ComponentObject` defines the implementation for the bolt. It can be one of three types:
@@ -36,7 +36,7 @@ The `ComponentObject` defines the implementation for the bolt. It can be one of
3. The parallelism for this component
4. The component-specific [configuration](Configuration.html) for this component
-Note that the structure spouts also have a `ComponentCommon` field, and so spouts can also have declarations to consume other input streams. Yet the Storm Java API does not provide a way for spouts to consume other streams, and if you put any input declarations there for a spout you would get an error when you tried to submit the topology. The reason that spouts have an input declarations field is not for users to use, but for Storm itself to use. Storm adds implicit streams and bolts to the topology to set up the [acking framework](https://github.com/apache/storm/wiki/Guaranteeing-message-processing), and two of these implicit streams are from the acker bolt to each spout in the topology. The acker sends "ack" or "fail" messages along these streams whenever a tuple tree is detected to be completed or failed. The code that transforms the user's topology into the runtime topology is located [here]({{page.git-blob-base}}/storm-core/src/clj/org/apache/storm/daemon/common.clj#L279).
+Note that the structure spouts also have a `ComponentCommon` field, and so spouts can also have declarations to consume other input streams. Yet the Storm Java API does not provide a way for spouts to consume other streams, and if you put any input declarations there for a spout you would get an error when you tried to submit the topology. The reason that spouts have an input declarations field is not for users to use, but for Storm itself to use. Storm adds implicit streams and bolts to the topology to set up the [acking framework](Acking-framework-implementation.html), and two of these implicit streams are from the acker bolt to each spout in the topology. The acker sends "ack" or "fail" messages along these streams whenever a tuple tree is detected to be completed or failed. The code that transforms the user's topology into the runtime topology is located [here]({{page.git-blob-base}}/storm-core/src/clj/org/apache/storm/daemon/common.clj#L279).
### Java interfaces
[2/2] storm git commit: Merge branch
'1.x-branch-fixed-Structure-of-the-codebase' of
https://github.com/marblejenka/storm into 1.x-branch
Posted by xi...@apache.org.
Merge branch '1.x-branch-fixed-Structure-of-the-codebase' of https://github.com/marblejenka/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c149fe1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c149fe1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c149fe1e
Branch: refs/heads/1.x-branch
Commit: c149fe1e169e682c43981f6666fa02550afead5e
Parents: 0cd627f 1bfff31
Author: vesense <be...@163.com>
Authored: Tue Dec 13 11:09:30 2016 +0800
Committer: vesense <be...@163.com>
Committed: Tue Dec 13 11:09:30 2016 +0800
----------------------------------------------------------------------
docs/Structure-of-the-codebase.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------