Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BCB119748 for ; Fri, 8 Apr 2016 13:56:21 +0000 (UTC) Received: (qmail 60855 invoked by uid 500); 8 Apr 2016 13:56:21 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 60818 invoked by uid 500); 8 Apr 2016 13:56:20 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 60809 invoked by uid 99); 8 Apr 2016 13:56:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2016 13:56:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99878DFC74; Fri, 8 Apr 2016 13:56:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aljoscha@apache.org To: commits@flink.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-3688] WindowOperator.trigger() does not emit Watermark anymore Date: Fri, 8 Apr 2016 13:56:20 +0000 (UTC) Repository: flink Updated Branches: refs/heads/release-1.0 43093e3b1 -> 1554c9b42 [FLINK-3688] WindowOperator.trigger() does not emit Watermark anymore Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1554c9b4 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1554c9b4 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1554c9b4 Branch: refs/heads/release-1.0 Commit: 1554c9b42f9b76c197ed0a8c2144d31ea965080b Parents: 43093e3 Author: Konstantin Knauf Authored: Sun Apr 3 13:57:35 2016 +0200 Committer: Aljoscha Krettek Committed: Fri Apr 8 15:54:39 2016 +0200 ---------------------------------------------------------------------- .../runtime/operators/windowing/WindowOperator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/1554c9b4/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 9b7b347..b370117 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 @@ -269,7 +269,14 @@ public class WindowOperator @Override public final void processWatermark(Watermark mark) throws Exception { + processTriggersFor(mark); + output.emitWatermark(mark); + + this.currentWatermark = mark.getTimestamp(); + } + + private void processTriggersFor(Watermark mark) throws Exception { boolean fire; do { @@ -289,10 +296,6 @@ public class WindowOperator fire = false; } } while (fire); - - output.emitWatermark(mark); - - this.currentWatermark = mark.getTimestamp(); } @Override @@ -320,7 +323,7 @@ public class WindowOperator // Also check any watermark timers. We might have some in here since // Context.registerEventTimeTimer sets a trigger if an event-time trigger is registered // that is already behind the watermark. - processWatermark(new Watermark(currentWatermark)); + processTriggersFor(new Watermark(currentWatermark)); } /**