You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2015/12/25 06:22:43 UTC
[1/3] storm git commit: some fixes for storm-windowing
Repository: storm
Updated Branches:
refs/heads/master 3f08d7b24 -> b7ba06327
some fixes for storm-windowing
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/040bbd70
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/040bbd70
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/040bbd70
Branch: refs/heads/master
Commit: 040bbd70cbf3a24389107428fcf4676ef7cdf8b5
Parents: a998c4e
Author: Xin Wang <be...@163.com>
Authored: Thu Dec 24 20:25:56 2015 +0800
Committer: vesense <be...@163.com>
Committed: Thu Dec 24 21:39:53 2015 +0800
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/windowing/EventImpl.java | 2 +-
storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java | 2 +-
.../jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/040bbd70/storm-core/src/jvm/backtype/storm/windowing/EventImpl.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/windowing/EventImpl.java b/storm-core/src/jvm/backtype/storm/windowing/EventImpl.java
index 035f41b..b518e42 100644
--- a/storm-core/src/jvm/backtype/storm/windowing/EventImpl.java
+++ b/storm-core/src/jvm/backtype/storm/windowing/EventImpl.java
@@ -17,7 +17,7 @@
*/
package backtype.storm.windowing;
-class EventImpl<T> implements Event<T> {
+public class EventImpl<T> implements Event<T> {
private final T event;
private long ts;
http://git-wip-us.apache.org/repos/asf/storm/blob/040bbd70/storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java b/storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java
index a32cb4d..e1d23fd 100644
--- a/storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java
+++ b/storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java
@@ -43,7 +43,7 @@ public class TimeTriggerPolicy<T> implements TriggerPolicy<T> {
this(millis, handler, null);
}
- public TimeTriggerPolicy(long millis, TriggerHandler handler, EvictionPolicy evictionPolicy) {
+ public TimeTriggerPolicy(long millis, TriggerHandler handler, EvictionPolicy<T> evictionPolicy) {
this.duration = millis;
this.handler = handler;
this.executor = Executors.newSingleThreadScheduledExecutor();
http://git-wip-us.apache.org/repos/asf/storm/blob/040bbd70/storm-core/src/jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java b/storm-core/src/jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java
index 8b5cd60..68286f2 100644
--- a/storm-core/src/jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java
+++ b/storm-core/src/jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java
@@ -32,7 +32,7 @@ public class WatermarkTimeTriggerPolicy<T> implements TriggerPolicy<T> {
private final WindowManager<T> windowManager;
private long nextWindowEndTs = 0;
- public WatermarkTimeTriggerPolicy(long slidingIntervalMs, TriggerHandler handler, EvictionPolicy evictionPolicy,
+ public WatermarkTimeTriggerPolicy(long slidingIntervalMs, TriggerHandler handler, EvictionPolicy<T> evictionPolicy,
WindowManager<T> windowManager) {
this.slidingIntervalMs = slidingIntervalMs;
this.handler = handler;
[2/3] storm git commit: Merge branch 'patch-16' of
https://github.com/vesense/storm into STORM-1411
Posted by ar...@apache.org.
Merge branch 'patch-16' of https://github.com/vesense/storm into STORM-1411
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d5f15aec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d5f15aec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d5f15aec
Branch: refs/heads/master
Commit: d5f15aece7ae2cd281534fc504badf6a52a6eda7
Parents: 3f08d7b 040bbd7
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Thu Dec 24 23:13:15 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Thu Dec 24 23:13:15 2015 +0530
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/windowing/EventImpl.java | 2 +-
storm-core/src/jvm/backtype/storm/windowing/TimeTriggerPolicy.java | 2 +-
.../jvm/backtype/storm/windowing/WatermarkTimeTriggerPolicy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1411 to Changelog.
Posted by ar...@apache.org.
Added STORM-1411 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b7ba0632
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b7ba0632
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b7ba0632
Branch: refs/heads/master
Commit: b7ba063276b0bea82cd74dc1f9d7c7a65454b66d
Parents: d5f15ae
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Thu Dec 24 23:20:54 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Thu Dec 24 23:20:54 2015 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b7ba0632/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235bfb7..9adb3f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1411: Some fixes for storm-windowing
* STORM-1399: Blobstore tests should write data to `target` so it gets removed when running `mvn clean`
* STORM-1398: Add back in TopologyDetails.getTopology
* STORM-898: Add priorities and per user resource guarantees to Resource Aware Scheduler