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 4F235200C63 for ; Thu, 11 May 2017 23:56:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4DCB4160BC7; Thu, 11 May 2017 21:56:37 +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 BBA25160BB3 for ; Thu, 11 May 2017 23:56:36 +0200 (CEST) Received: (qmail 39526 invoked by uid 500); 11 May 2017 21:56:35 -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 39517 invoked by uid 99); 11 May 2017 21:56:35 -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; Thu, 11 May 2017 21:56:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CCDD9DFFB4; Thu, 11 May 2017 21:56:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tgroh@apache.org To: commits@beam.apache.org Date: Thu, 11 May 2017 21:56:35 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] beam git commit: This closes #3080 archived-at: Thu, 11 May 2017 21:56:37 -0000 Repository: beam Updated Branches: refs/heads/master e92ac6fed -> 171befaee This closes #3080 Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/171befae Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/171befae Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/171befae Branch: refs/heads/master Commit: 171befaee93eacaaed2a6c72fc0c8fc5ce21227e Parents: e92ac6f dbb850c Author: Thomas Groh Authored: Thu May 11 14:56:17 2017 -0700 Committer: Thomas Groh Committed: Thu May 11 14:56:17 2017 -0700 ---------------------------------------------------------------------- .../core/LateDataDroppingDoFnRunner.java | 2 +- .../apache/beam/runners/core/LateDataUtils.java | 33 ++++++- .../beam/runners/core/ReduceFnRunner.java | 43 +++------- .../beam/runners/core/SimpleDoFnRunner.java | 2 +- .../beam/runners/core/StatefulDoFnRunner.java | 6 +- .../apache/beam/runners/core/WatermarkHold.java | 9 +- .../beam/runners/core/LateDataUtilsTest.java | 90 ++++++++++++++++++++ .../beam/sdk/transforms/ReifyTimestamps.java | 6 ++ .../apache/beam/sdk/transforms/Reshuffle.java | 29 ++++--- .../sdk/transforms/ReifyTimestampsTest.java | 36 ++++++++ .../beam/sdk/transforms/ReshuffleTest.java | 27 ++++++ 11 files changed, 234 insertions(+), 49 deletions(-) ----------------------------------------------------------------------