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 0F716200CCF for ; Mon, 24 Jul 2017 15:55:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0DD89163A9D; Mon, 24 Jul 2017 13:55:28 +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 5390B163A98 for ; Mon, 24 Jul 2017 15:55:27 +0200 (CEST) Received: (qmail 36476 invoked by uid 500); 24 Jul 2017 13:55:25 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 36154 invoked by uid 99); 24 Jul 2017 13:55:22 -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; Mon, 24 Jul 2017 13:55:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA3B3E9690; Mon, 24 Jul 2017 13:55:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbonofre@apache.org To: commits@beam.apache.org Date: Mon, 24 Jul 2017 13:55:22 -0000 Message-Id: <36140ae2c23b4b748c2d71cdf9d98915@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] beam git commit: [BEAM-2571] Clarify pushedback variable name in DoFnOperator archived-at: Mon, 24 Jul 2017 13:55:28 -0000 Repository: beam Updated Branches: refs/heads/release-2.1.0 608de07e4 -> 1cf560b4b [BEAM-2571] Clarify pushedback variable name in DoFnOperator Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5c4a95aa Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5c4a95aa Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5c4a95aa Branch: refs/heads/release-2.1.0 Commit: 5c4a95aa63da23027b619a50928ebebe5beb05c2 Parents: 1686805 Author: Aljoscha Krettek Authored: Wed Jul 12 14:39:58 2017 +0200 Committer: Aljoscha Krettek Committed: Mon Jul 24 14:29:55 2017 +0200 ---------------------------------------------------------------------- .../flink/translation/wrappers/streaming/DoFnOperator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/5c4a95aa/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java ---------------------------------------------------------------------- diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java index 751eba1..8da8de5 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java @@ -470,15 +470,15 @@ public class DoFnOperator setCurrentInputWatermark(mark.getTimestamp()); // hold back by the pushed back values waiting for side inputs - long actualInputWatermark = Math.min(getPushbackWatermarkHold(), mark.getTimestamp()); + long pushedBackInputWatermark = Math.min(getPushbackWatermarkHold(), mark.getTimestamp()); - timerService.advanceWatermark(actualInputWatermark); + timerService.advanceWatermark(pushedBackInputWatermark); Instant watermarkHold = stateInternals.watermarkHold(); long combinedWatermarkHold = Math.min(watermarkHold.getMillis(), getPushbackWatermarkHold()); - long potentialOutputWatermark = Math.min(currentInputWatermark, combinedWatermarkHold); + long potentialOutputWatermark = Math.min(pushedBackInputWatermark, combinedWatermarkHold); if (potentialOutputWatermark > currentOutputWatermark) { setCurrentOutputWatermark(potentialOutputWatermark);