You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/03/28 07:11:26 UTC
[04/11] storm git commit: STORM-676 Addressed review comments on API
aligning with core window API
STORM-676 Addressed review comments on API aligning with core window API
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4ade8f40
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4ade8f40
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4ade8f40
Branch: refs/heads/master
Commit: 4ade8f403f680432716f80cde3a100501e50dce1
Parents: 2494df6
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Tue Mar 15 14:18:30 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Wed Mar 23 12:20:55 2016 +0530
----------------------------------------------------------------------
.../jvm/org/apache/storm/trident/Stream.java | 22 ++++----------------
1 file changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4ade8f40/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 b3a4446..47b087a 100644
--- a/storm-core/src/jvm/org/apache/storm/trident/Stream.java
+++ b/storm-core/src/jvm/org/apache/storm/trident/Stream.java
@@ -611,20 +611,6 @@ public class Stream implements IAggregatableStream, ResourceDeclarer<Stream> {
/**
* Returns a stream of tuples which are aggregated results of a tumbling window with every {@code windowCount} of tuples.
*
- * @param windowCount represents window tuples count
- * @param inputFields projected fields for aggregator
- * @param aggregator aggregator to run on the window of tuples to compute the result and emit to the stream.
- * @param functionFields fields of values to emit with aggregation.
- *
- * @return
- */
- public Stream tumblingCountWindow(int windowCount, Fields inputFields, Aggregator aggregator, Fields functionFields) {
- return window(TumblingCountWindow.of(windowCount), inputFields, aggregator, functionFields);
- }
-
- /**
- * Returns a stream of tuples which are aggregated results of a tumbling window with every {@code windowCount} of tuples.
- *
* @param windowCount represents no of tuples in the window
* @param windowStoreFactory intermediary tuple store for storing windowing tuples
* @param inputFields projected fields for aggregator
@@ -633,7 +619,7 @@ public class Stream implements IAggregatableStream, ResourceDeclarer<Stream> {
*
* @return
*/
- public Stream tumblingCountWindow(int windowCount, WindowsStoreFactory windowStoreFactory,
+ public Stream tumblingWindow(int windowCount, WindowsStoreFactory windowStoreFactory,
Fields inputFields, Aggregator aggregator, Fields functionFields) {
return window(TumblingCountWindow.of(windowCount), windowStoreFactory, inputFields, aggregator, functionFields);
}
@@ -651,7 +637,7 @@ public class Stream implements IAggregatableStream, ResourceDeclarer<Stream> {
*
* @return
*/
- public Stream slidingCountWindow(int windowCount, int slideCount, WindowsStoreFactory windowStoreFactory,
+ public Stream slidingWindow(int windowCount, int slideCount, WindowsStoreFactory windowStoreFactory,
Fields inputFields, Aggregator aggregator, Fields functionFields) {
return window(SlidingCountWindow.of(windowCount, slideCount), windowStoreFactory, inputFields, aggregator, functionFields);
}
@@ -667,7 +653,7 @@ public class Stream implements IAggregatableStream, ResourceDeclarer<Stream> {
*
* @return
*/
- public Stream tumblingTimeWindow(BaseWindowedBolt.Duration windowDuration, WindowsStoreFactory windowStoreFactory,
+ public Stream tumblingWindow(BaseWindowedBolt.Duration windowDuration, WindowsStoreFactory windowStoreFactory,
Fields inputFields, Aggregator aggregator, Fields functionFields) {
return window(TumblingDurationWindow.of(windowDuration), windowStoreFactory, inputFields, aggregator, functionFields);
}
@@ -685,7 +671,7 @@ public class Stream implements IAggregatableStream, ResourceDeclarer<Stream> {
*
* @return
*/
- public Stream slidingTimeWindow(BaseWindowedBolt.Duration windowDuration, BaseWindowedBolt.Duration slideDuration,
+ public Stream slidingWindow(BaseWindowedBolt.Duration windowDuration, BaseWindowedBolt.Duration slideDuration,
WindowsStoreFactory windowStoreFactory, Fields inputFields, Aggregator aggregator, Fields functionFields) {
return window(SlidingDurationWindow.of(windowDuration, slideDuration), windowStoreFactory, inputFields, aggregator, functionFields);
}