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 7D9BD200CDE for ; Mon, 24 Jul 2017 15:55:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7C195163A9B; 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 CA5DB163A9C for ; Mon, 24 Jul 2017 15:55:27 +0200 (CEST) Received: (qmail 36636 invoked by uid 500); 24 Jul 2017 13:55:26 -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 36419 invoked by uid 99); 24 Jul 2017 13:55:23 -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:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD8BEE96A5; 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:23 -0000 Message-Id: In-Reply-To: <36140ae2c23b4b748c2d71cdf9d98915@git.apache.org> References: <36140ae2c23b4b748c2d71cdf9d98915@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] beam git commit: [BEAM-2571] Change DoFnOperator to use Long.MAX_VALUE as max watermark archived-at: Mon, 24 Jul 2017 13:55:28 -0000 [BEAM-2571] Change DoFnOperator to use Long.MAX_VALUE as max watermark This is in line with what Flink does and what BoundedSourceWrapper and UnboundedSourceWrapper do. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1686805d Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1686805d Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1686805d Branch: refs/heads/release-2.1.0 Commit: 1686805d84316f2a8438c642214cdabe5b579381 Parents: 608de07 Author: Aljoscha Krettek Authored: Wed Jul 12 14:42:37 2017 +0200 Committer: Aljoscha Krettek Committed: Mon Jul 24 14:29:55 2017 +0200 ---------------------------------------------------------------------- .../flink/translation/wrappers/streaming/DoFnOperator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/1686805d/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 350f323..751eba1 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 @@ -334,7 +334,7 @@ public class DoFnOperator protected final long getPushbackWatermarkHold() { // if we don't have side inputs we never hold the watermark if (sideInputs.isEmpty()) { - return BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis(); + return Long.MAX_VALUE; } try { @@ -353,7 +353,7 @@ public class DoFnOperator BagState> pushedBack = pushbackStateInternals.state(StateNamespaces.global(), pushedBackTag); - long min = BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis(); + long min = Long.MAX_VALUE; for (WindowedValue value : pushedBack.read()) { min = Math.min(min, value.getTimestamp().getMillis()); } @@ -426,7 +426,7 @@ public class DoFnOperator } pushedBack.clear(); - long min = BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis(); + long min = Long.MAX_VALUE; for (WindowedValue pushedBackValue : newPushedBack) { min = Math.min(min, pushedBackValue.getTimestamp().getMillis()); pushedBack.add(pushedBackValue); @@ -524,7 +524,7 @@ public class DoFnOperator pushedBack.clear(); - setPushedBackWatermark(BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis()); + setPushedBackWatermark(Long.MAX_VALUE); pushbackDoFnRunner.finishBundle(); }