Return-Path: X-Original-To: apmail-beam-commits-archive@minotaur.apache.org Delivered-To: apmail-beam-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E20419131 for ; Tue, 5 Apr 2016 20:56:38 +0000 (UTC) Received: (qmail 52330 invoked by uid 500); 5 Apr 2016 20:56:38 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 52261 invoked by uid 500); 5 Apr 2016 20:56:38 -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 52184 invoked by uid 99); 5 Apr 2016 20:56:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 20:56:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 743FD1A4903 for ; Tue, 5 Apr 2016 20:56:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 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=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id ZB5MT6dQeTlq for ; Tue, 5 Apr 2016 20:56:36 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 067605F3DC for ; Tue, 5 Apr 2016 20:56:35 +0000 (UTC) Received: (qmail 52082 invoked by uid 99); 5 Apr 2016 20: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; Tue, 05 Apr 2016 20:56:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 56AC1E0663; Tue, 5 Apr 2016 20:56:35 +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: Tue, 05 Apr 2016 20:56:39 -0000 Message-Id: <994ab436cbc74c338910a80218ba1ef2@git.apache.org> In-Reply-To: <0bfd11b9ee87446b96e68e5f99e06252@git.apache.org> References: <0bfd11b9ee87446b96e68e5f99e06252@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/8] incubator-beam git commit: fixup! Move GroupByKey expansion into DirectPipelineRunner fixup! Move GroupByKey expansion into DirectPipelineRunner Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/bf4dd82d Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/bf4dd82d Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/bf4dd82d Branch: refs/heads/master Commit: bf4dd82d2d30ede3df13abfc70db453943ce54cc Parents: bcc010c Author: Kenneth Knowles Authored: Mon Mar 28 12:35:36 2016 -0700 Committer: Kenneth Knowles Committed: Mon Mar 28 12:35:36 2016 -0700 ---------------------------------------------------------------------- .../cloud/dataflow/sdk/runners/DirectPipelineRunner.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bf4dd82d/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java index 3940d32..417420a 100644 --- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java +++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java @@ -1208,7 +1208,7 @@ public class DirectPipelineRunner Coder keyCoder = GroupByKey.getKeyCoder(input.getCoder()); - Map, List> groupingMap = new HashMap<>(); + Map, List> groupingMap = new HashMap<>(); for (ValueWithMetadata> elem : inputElems) { K key = elem.getValue().getKey(); @@ -1224,7 +1224,7 @@ public class DirectPipelineRunner " using " + keyCoder, exn); } - DirectPipelineRunner.GroupingKey groupingKey = + GroupingKey groupingKey = new GroupingKey<>(key, encodedKey); List values = groupingMap.get(groupingKey); if (values == null) { @@ -1236,8 +1236,8 @@ public class DirectPipelineRunner List>>> outputElems = new ArrayList<>(); - for (Map.Entry, List> entry : groupingMap.entrySet()) { - DirectPipelineRunner.GroupingKey groupingKey = entry.getKey(); + for (Map.Entry, List> entry : groupingMap.entrySet()) { + GroupingKey groupingKey = entry.getKey(); K key = groupingKey.getKey(); List values = entry.getValue(); values = context.randomizeIfUnordered(values, true /* inPlaceAllowed */); @@ -1266,7 +1266,7 @@ public class DirectPipelineRunner } static { - DirectPipelineRunner.registerGroupByKeyOnly(); + registerGroupByKeyOnly(); } }