You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/01/25 00:29:25 UTC
[17/50] storm git commit: resolve merge conclicts
resolve merge conclicts
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ad75f190
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ad75f190
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ad75f190
Branch: refs/heads/1.x-branch
Commit: ad75f190e0383932a5f4d95368cdcbc728190ed9
Parents: b5181c2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jan 19 22:31:59 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jan 19 22:31:59 2016 -0500
----------------------------------------------------------------------
.../jvm/org/apache/storm/trident/Stream.java | 30 ++++++--------------
1 file changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ad75f190/storm-core/src/jvm/org/apache/storm/trident/Stream.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/trident/Stream.java b/storm-core/src/jvm/org/apache/storm/trident/Stream.java
index 4bf559a..c680828 100644
--- a/storm-core/src/jvm/org/apache/storm/trident/Stream.java
+++ b/storm-core/src/jvm/org/apache/storm/trident/Stream.java
@@ -246,7 +246,14 @@ public class Stream implements IAggregatableStream {
return _topology.addSourcedNode(this, new PartitionNode(_node.streamId, _name, getOutputFields(), grouping));
}
}
-
+
+ /**
+ * Applies an `Assembly` to this `Stream`.
+ *
+ * @see org.apache.storm.trident.operation.Assembly
+ * @param assembly
+ * @return
+ */
public Stream applyAssembly(Assembly assembly) {
return assembly.apply(this);
}
@@ -261,27 +268,6 @@ public class Stream implements IAggregatableStream {
functionFields,
new EachProcessor(inputFields, function)));
}
-
- public Stream each(Function function, Fields functionFields) {
- return each(null, function, functionFields);
- }
-
- public Stream each(Fields inputFields, Filter filter) {
- return each(inputFields, new FilterExecutor(filter), new Fields());
- }
-
-
- /**
- * Applies an `Assembly` to this `Stream`.
- *
- * @see storm.trident.operation.Assembly
- * @param assembly
- * @return
- */
- public Stream applyAssembly(Assembly assembly) {
- return assembly.apply(this);
- }
-
//creates brand new tuples with brand new fields
@Override
public Stream partitionAggregate(Fields inputFields, Aggregator agg, Fields functionFields) {