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 D6834200B25 for ; Wed, 8 Jun 2016 18:15:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D52AF160A0E; Wed, 8 Jun 2016 16:15:50 +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 28FB2160A2E for ; Wed, 8 Jun 2016 18:15:50 +0200 (CEST) Received: (qmail 75658 invoked by uid 500); 8 Jun 2016 16:15:49 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 75649 invoked by uid 99); 8 Jun 2016 16:15:49 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2016 16:15:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id AA453C0560 for ; Wed, 8 Jun 2016 16:15:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id o05Uhif6SRh1 for ; Wed, 8 Jun 2016 16:15:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id E44B05FB23 for ; Wed, 8 Jun 2016 16:15:46 +0000 (UTC) Received: (qmail 75510 invoked by uid 99); 8 Jun 2016 16:15:46 -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; Wed, 08 Jun 2016 16:15:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3FD2DFBA8; Wed, 8 Jun 2016 16:15:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.incubator.apache.org Date: Wed, 08 Jun 2016 16:15:45 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-beam git commit: Remove Unnecessary Fn cloning archived-at: Wed, 08 Jun 2016 16:15:51 -0000 Repository: incubator-beam Updated Branches: refs/heads/master cc448e976 -> 9a3896d69 Remove Unnecessary Fn cloning The ParDoInProcessEvaluator is provided clones of a DoFn when appropriate, and should not serialize them. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0cf17302 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0cf17302 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0cf17302 Branch: refs/heads/master Commit: 0cf17302f605aefde22c48e65e17da6e3cfc6238 Parents: 2173000 Author: Thomas Groh Authored: Fri Jun 3 17:57:24 2016 -0700 Committer: Thomas Groh Committed: Tue Jun 7 14:20:42 2016 -0700 ---------------------------------------------------------------------- .../org/apache/beam/runners/direct/ParDoInProcessEvaluator.java | 3 +-- .../apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0cf17302/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoInProcessEvaluator.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoInProcessEvaluator.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoInProcessEvaluator.java index 2cdf6cb..a3e2f18 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoInProcessEvaluator.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoInProcessEvaluator.java @@ -27,7 +27,6 @@ import org.apache.beam.sdk.util.DoFnRunners; import org.apache.beam.sdk.util.DoFnRunners.OutputManager; import org.apache.beam.sdk.util.PushbackSideInputDoFnRunner; import org.apache.beam.sdk.util.ReadyCheckingSideInputReader; -import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.util.UserCodeException; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.common.CounterSet; @@ -74,7 +73,7 @@ class ParDoInProcessEvaluator implements TransformEvaluator { DoFnRunner underlying = DoFnRunners.createDefault( evaluationContext.getPipelineOptions(), - SerializableUtils.clone(fn), + fn, sideInputReader, BundleOutputManager.create(outputBundles), mainOutputTag, http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0cf17302/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java index 1127ed2..0f7afa1 100644 --- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java +++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoInProcessEvaluatorTest.java @@ -128,7 +128,7 @@ public class ParDoInProcessEvaluatorTest { Matchers.>containsInAnyOrder( second, WindowedValue.of(1, new Instant(2468L), nonGlobalWindow, PaneInfo.NO_FIRING))); assertThat(result.getOutputBundles(), Matchers.>contains(outputBundle)); - assertThat(RecorderFn.processed, containsInAnyOrder(1, 3)); + assertThat(fn.processed, containsInAnyOrder(1, 3)); assertThat( Iterables.getOnlyElement(result.getOutputBundles()).commit(Instant.now()).getElements(), Matchers.>containsInAnyOrder( @@ -170,7 +170,7 @@ public class ParDoInProcessEvaluatorTest { } private static class RecorderFn extends DoFn { - private static Collection processed; + private Collection processed; private final PCollectionView view; public RecorderFn(PCollectionView view) {