Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 666CD200B17 for ; Tue, 21 Jun 2016 12:17:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 64F40160A4F; Tue, 21 Jun 2016 10:17:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AAA48160A36 for ; Tue, 21 Jun 2016 12:17:24 +0200 (CEST) Received: (qmail 2244 invoked by uid 500); 21 Jun 2016 10:17:18 -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 2160 invoked by uid 99); 21 Jun 2016 10:17:18 -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; Tue, 21 Jun 2016 10:17:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6C69E07FE; Tue, 21 Jun 2016 10:17:18 +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 Date: Tue, 21 Jun 2016 10:17:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] flink git commit: [FLINK-3714] Remove Unneccesary Timer in EventTimeTrigger archived-at: Tue, 21 Jun 2016 10:17:25 -0000 [FLINK-3714] Remove Unneccesary Timer in EventTimeTrigger In onElement() we registered a timer for the case where the watermark is already past the end of the window and we're firing anyways. Now, only add a timer if the watermark is not already past the end of the window. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0104a926 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0104a926 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0104a926 Branch: refs/heads/master Commit: 0104a9260353e9a044504b65d480c83a7d3799fc Parents: 34a8b03 Author: Aljoscha Krettek Authored: Mon Jun 20 16:38:22 2016 +0200 Committer: Aljoscha Krettek Committed: Tue Jun 21 12:16:19 2016 +0200 ---------------------------------------------------------------------- .../api/windowing/triggers/EventTimeTrigger.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/0104a926/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java index a87e436..96e862f 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java @@ -35,11 +35,13 @@ public class EventTimeTrigger extends Trigger { @Override public TriggerResult onElement(Object element, long timestamp, TimeWindow window, TriggerContext ctx) throws Exception { - ctx.registerEventTimeTimer(window.maxTimestamp()); - - return (window.maxTimestamp() <= ctx.getCurrentWatermark()) ? - TriggerResult.FIRE_AND_PURGE : - TriggerResult.CONTINUE; + if (window.maxTimestamp() <= ctx.getCurrentWatermark()) { + // if the watermark is already past the window fire immediately + return TriggerResult.FIRE_AND_PURGE; + } else { + ctx.registerEventTimeTimer(window.maxTimestamp()); + return TriggerResult.CONTINUE; + } } @Override