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 99904200C85 for ; Mon, 24 Apr 2017 23:52:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 98438160B99; Mon, 24 Apr 2017 21:52:47 +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 DD023160BB5 for ; Mon, 24 Apr 2017 23:52:46 +0200 (CEST) Received: (qmail 29385 invoked by uid 500); 24 Apr 2017 21:52:46 -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 29200 invoked by uid 99); 24 Apr 2017 21:52: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; Mon, 24 Apr 2017 21:52:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4F61DFFAB; Mon, 24 Apr 2017 21:52:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertwb@apache.org To: commits@beam.apache.org Date: Mon, 24 Apr 2017 21:52:50 -0000 Message-Id: <25748ffaedb940b2b5ed9371d26126ac@git.apache.org> In-Reply-To: <0047196a737848a1874b5a57fc0feec5@git.apache.org> References: <0047196a737848a1874b5a57fc0feec5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] beam git commit: Adapt to PR #2505 changes to protos. archived-at: Mon, 24 Apr 2017 21:52:47 -0000 Adapt to PR #2505 changes to protos. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/488f3c67 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/488f3c67 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/488f3c67 Branch: refs/heads/master Commit: 488f3c6730edd4a22005132f5d8c819fa2deb3a1 Parents: fbeb7e1 Author: Robert Bradshaw Authored: Fri Apr 21 14:22:07 2017 -0700 Committer: Robert Bradshaw Committed: Mon Apr 24 14:52:28 2017 -0700 ---------------------------------------------------------------------- sdks/python/apache_beam/pipeline.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/488f3c67/sdks/python/apache_beam/pipeline.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/pipeline.py b/sdks/python/apache_beam/pipeline.py index 8e811bc..0f4c8db 100644 --- a/sdks/python/apache_beam/pipeline.py +++ b/sdks/python/apache_beam/pipeline.py @@ -336,7 +336,7 @@ class Pipeline(object): # argument evaluation order. root_transform_id = context.transforms.get_id(self._root_transform()) proto = beam_runner_api_pb2.Pipeline( - root_transform_id=root_transform_id, + root_transform_ids=[root_transform_id], components=context.to_runner_api()) return proto @@ -345,8 +345,9 @@ class Pipeline(object): p = Pipeline(runner=runner, options=options) from apache_beam.runners import pipeline_context context = pipeline_context.PipelineContext(proto.components) + root_transform_id, = proto.root_transform_ids p.transforms_stack = [ - context.transforms.get_by_id(proto.root_transform_id)] + context.transforms.get_by_id(root_transform_id)] # TODO(robertwb): These are only needed to continue construction. Omit? p.applied_labels = set([ t.unique_name for t in proto.components.transforms.values()])