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 2014/05/19 23:27:19 UTC
[1/3] git commit: STORM-245: implement Stream.localOrShuffle() for
trident
Repository: incubator-storm
Updated Branches:
refs/heads/master f06d81b97 -> 80f4f7d3f
STORM-245: implement Stream.localOrShuffle() for trident
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/80ab3625
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/80ab3625
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/80ab3625
Branch: refs/heads/master
Commit: 80ab3625e9802fbd8bff16c706fc788cf7aed17c
Parents: 254ec13
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Feb 26 11:30:15 2014 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Feb 26 11:30:15 2014 -0500
----------------------------------------------------------------------
storm-core/src/jvm/storm/trident/Stream.java | 5 ++++-
storm-core/test/clj/storm/trident/integration_test.clj | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/80ab3625/storm-core/src/jvm/storm/trident/Stream.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/Stream.java b/storm-core/src/jvm/storm/trident/Stream.java
index e847eee..c308745 100644
--- a/storm-core/src/jvm/storm/trident/Stream.java
+++ b/storm-core/src/jvm/storm/trident/Stream.java
@@ -100,7 +100,10 @@ public class Stream implements IAggregatableStream {
public Stream shuffle() {
return partition(Grouping.shuffle(new NullStruct()));
}
-
+
+ public Stream localOrShuffle() {
+ return partition(Grouping.local_or_shuffle(new NullStruct()));
+ }
public Stream global() {
// use this instead of storm's built in one so that we can specify a singleemitbatchtopartition
// without knowledge of storm's internals
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/80ab3625/storm-core/test/clj/storm/trident/integration_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/storm/trident/integration_test.clj b/storm-core/test/clj/storm/trident/integration_test.clj
index ec8d49f..ac3bbea 100644
--- a/storm-core/test/clj/storm/trident/integration_test.clj
+++ b/storm-core/test/clj/storm/trident/integration_test.clj
@@ -192,7 +192,7 @@
(bind topo (TridentTopology.))
(bind drpc-stream (-> topo (.newDRPCStream "tester" drpc)
(.each (fields "args") (Split.) (fields "word"))
- (.shuffle)
+ (.localOrShuffle)
(.shuffle)
(.aggregate (CountAsAggregator.) (fields "count"))
))
[3/3] git commit: Added STORM-245 to Changelog
Posted by bo...@apache.org.
Added STORM-245 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/80f4f7d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/80f4f7d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/80f4f7d3
Branch: refs/heads/master
Commit: 80f4f7d3f88f8d733bfa4a4bf1c06f77b678b372
Parents: db79ab6
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon May 19 21:25:35 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon May 19 21:25:35 2014 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/80f4f7d3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3053bb..773caf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-245: implement Stream.localOrShuffle() for trident
* STORM-317: Add SECURITY.md to release binaries
* STORM-310: Change Twitter authentication
* STORM-305: Create developer documentation
[2/3] git commit: Merge branch 'trident-local-or-shuffle' of
https://github.com/ptgoetz/incubator-storm into STORM-245
Posted by bo...@apache.org.
Merge branch 'trident-local-or-shuffle' of https://github.com/ptgoetz/incubator-storm into STORM-245
STORM-245: implement Stream.localOrShuffle() for trident
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/db79ab6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/db79ab6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/db79ab6e
Branch: refs/heads/master
Commit: db79ab6e66e437388c2b095b6ceaa01fc2e2f28a
Parents: f06d81b 80ab362
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon May 19 21:25:12 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon May 19 21:25:12 2014 +0000
----------------------------------------------------------------------
storm-core/src/jvm/storm/trident/Stream.java | 5 ++++-
storm-core/test/clj/storm/trident/integration_test.clj | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------