You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2016/06/21 10:17:21 UTC
[4/6] flink git commit: [FLINK-3714] Rename getCleanupTimeForWindow
to cleanupTime in WindowOperator
[FLINK-3714] Rename getCleanupTimeForWindow to cleanupTime in WindowOperator
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/62c5a3c0
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/62c5a3c0
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/62c5a3c0
Branch: refs/heads/master
Commit: 62c5a3c07f8e10bad305316b2a1bf6d91620e9b4
Parents: 0104a92
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Mon Jun 20 16:39:52 2016 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Tue Jun 21 12:16:26 2016 +0200
----------------------------------------------------------------------
.../runtime/operators/windowing/WindowOperator.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/62c5a3c0/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
index 95ad1b0..bad1a22 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
@@ -323,7 +323,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
}
});
- // check if the window is already inactive
+ // drop if the window is already late
if (isLate(actualWindow)) {
LOG.info("Dropped element " + element+ " for window " + actualWindow + " due to lateness.");
continue;
@@ -352,7 +352,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
} else {
for (W window: elementWindows) {
- // check if the window is already inactive
+ // drop if the window is already late
if (isLate(window)) {
LOG.info("Dropped element " + element + " for window " + window + " due to lateness.");
continue;
@@ -528,7 +528,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
* considered when triggering.
*/
protected boolean isLate(W window) {
- return (windowAssigner.isEventTime() && (getCleanupTimeForWindow(window) <= currentWatermark));
+ return (windowAssigner.isEventTime() && (cleanupTime(window) <= currentWatermark));
}
/**
@@ -537,7 +537,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
* the window whose state to discard
*/
protected void registerCleanupTimer(W window) {
- long cleanupTime = getCleanupTimeForWindow(window);
+ long cleanupTime = cleanupTime(window);
if (windowAssigner.isEventTime()) {
context.registerEventTimeTimer(cleanupTime);
} else {
@@ -551,7 +551,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
* the window whose state to discard
*/
protected void deleteCleanupTimer(W window) {
- long cleanupTime = getCleanupTimeForWindow(window);
+ long cleanupTime = cleanupTime(window);
if (windowAssigner.isEventTime()) {
context.deleteEventTimeTimer(cleanupTime);
} else {
@@ -568,7 +568,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
*
* @param window the window whose cleanup time we are computing.
*/
- private long getCleanupTimeForWindow(W window) {
+ private long cleanupTime(W window) {
long cleanupTime = window.maxTimestamp() + allowedLateness;
return cleanupTime >= window.maxTimestamp() ? cleanupTime : Long.MAX_VALUE;
}
@@ -585,7 +585,7 @@ public class WindowOperator<K, IN, ACC, OUT, W extends Window>
* @return {@code true} if it is time to clean up the window state, {@code false} otherwise.
*/
protected final boolean isCleanupTime(W window, long time) {
- long cleanupTime = getCleanupTimeForWindow(window);
+ long cleanupTime = cleanupTime(window);
return cleanupTime == time;
}