You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2019/01/17 14:59:35 UTC
[flink] branch master updated: [hotfix][streaming-java] Add
override annotation to mergeWindows method of MergingWindowsAssigner
subclass
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 20ede03 [hotfix][streaming-java] Add override annotation to mergeWindows method of MergingWindowsAssigner subclass
20ede03 is described below
commit 20ede039a0622e496ca1f9c3502cd61d90a49f2a
Author: leesf <49...@qq.com>
AuthorDate: Thu Jan 17 22:59:28 2019 +0800
[hotfix][streaming-java] Add override annotation to mergeWindows method of MergingWindowsAssigner subclass
---
.../api/windowing/assigners/DynamicEventTimeSessionWindows.java | 1 +
.../api/windowing/assigners/DynamicProcessingTimeSessionWindows.java | 1 +
.../flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java | 1 +
.../streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java | 1 +
.../streaming/runtime/operators/windowing/MergingWindowSetTest.java | 1 +
5 files changed, 5 insertions(+)
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java
index bba59ed..b696b27 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java
@@ -97,6 +97,7 @@ public class DynamicEventTimeSessionWindows<T> extends MergingWindowAssigner<T,
/**
* Merge overlapping {@link TimeWindow}s.
*/
+ @Override
public void mergeWindows(Collection<TimeWindow> windows, MergeCallback<TimeWindow> c) {
TimeWindow.mergeWindows(windows, c);
}
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java
index 073cc05..cef195c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java
@@ -98,6 +98,7 @@ public class DynamicProcessingTimeSessionWindows<T> extends MergingWindowAssigne
/**
* Merge overlapping {@link TimeWindow}s.
*/
+ @Override
public void mergeWindows(Collection<TimeWindow> windows, MergeCallback<TimeWindow> c) {
TimeWindow.mergeWindows(windows, c);
}
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java
index a33b28a..51d606c 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java
@@ -106,6 +106,7 @@ public class EventTimeSessionWindows extends MergingWindowAssigner<Object, TimeW
/**
* Merge overlapping {@link TimeWindow}s.
*/
+ @Override
public void mergeWindows(Collection<TimeWindow> windows, MergingWindowAssigner.MergeCallback<TimeWindow> c) {
TimeWindow.mergeWindows(windows, c);
}
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java
index 8c5ab55..e23c7f4 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java
@@ -107,6 +107,7 @@ public class ProcessingTimeSessionWindows extends MergingWindowAssigner<Object,
/**
* Merge overlapping {@link TimeWindow}s.
*/
+ @Override
public void mergeWindows(Collection<TimeWindow> windows, MergeCallback<TimeWindow> c) {
TimeWindow.mergeWindows(windows, c);
}
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
index 6ed4bf7..2022397 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
@@ -505,6 +505,7 @@ public class MergingWindowSetTest {
/**
* Merge overlapping {@link TimeWindow}s.
*/
+ @Override
public void mergeWindows(Collection<TimeWindow> windows, MergingWindowAssigner.MergeCallback<TimeWindow> c) {
TimeWindow earliestStart = null;