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 E6EF1200B9C for ; Mon, 10 Oct 2016 21:05:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E5CB0160AF7; Mon, 10 Oct 2016 19:05:16 +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 41222160AE1 for ; Mon, 10 Oct 2016 21:05:16 +0200 (CEST) Received: (qmail 62883 invoked by uid 500); 10 Oct 2016 19:05:15 -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 62873 invoked by uid 99); 10 Oct 2016 19:05:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Oct 2016 19:05:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 0EBC4C0185 for ; Mon, 10 Oct 2016 19:05:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 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=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id H6hLXrj0Og0e for ; Mon, 10 Oct 2016 19:05:13 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 1F7DC5FB6C for ; Mon, 10 Oct 2016 19:05:11 +0000 (UTC) Received: (qmail 62708 invoked by uid 99); 10 Oct 2016 19:05:11 -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, 10 Oct 2016 19:05:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 066ACE04AF; Mon, 10 Oct 2016 19:05:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertwb@apache.org To: commits@beam.incubator.apache.org Date: Mon, 10 Oct 2016 19:05:14 -0000 Message-Id: In-Reply-To: <1597aec48af24e84b763332072d1388d@git.apache.org> References: <1597aec48af24e84b763332072d1388d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] incubator-beam git commit: Move explicit references to _NativeWrite. archived-at: Mon, 10 Oct 2016 19:05:17 -0000 Move explicit references to _NativeWrite. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/807013a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/807013a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/807013a9 Branch: refs/heads/python-sdk Commit: 807013a963ecd9f1aaa8551508b2ef45be595380 Parents: e2dc685 Author: Robert Bradshaw Authored: Thu Oct 6 17:10:07 2016 -0700 Committer: Robert Bradshaw Committed: Mon Oct 10 10:30:00 2016 -0700 ---------------------------------------------------------------------- sdks/python/apache_beam/io/iobase.py | 9 ++++----- .../apache_beam/runners/inprocess/transform_evaluator.py | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/807013a9/sdks/python/apache_beam/io/iobase.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/io/iobase.py b/sdks/python/apache_beam/io/iobase.py index b83d7eb..f070b39 100644 --- a/sdks/python/apache_beam/io/iobase.py +++ b/sdks/python/apache_beam/io/iobase.py @@ -44,7 +44,6 @@ from apache_beam.transforms import ptransform from apache_beam.transforms import window from apache_beam.runners.dataflow.native_io.iobase import * -from apache_beam.runners.dataflow.native_io.iobase import _NativeWrite # Encapsulates information about a bundle of a source generated when method @@ -705,11 +704,11 @@ class Write(ptransform.PTransform): self.sink = sink def apply(self, pcoll): - from apache_beam.io import iobase - if isinstance(self.sink, iobase.NativeSink): + from apache_beam.runners.dataflow.native_io import iobase as native_iobase + if isinstance(self.sink, native_iobase.NativeSink): # A native sink - return pcoll | 'native_write' >> _NativeWrite(self.sink) - elif isinstance(self.sink, iobase.Sink): + return pcoll | 'native_write' >> native_iobase._NativeWrite(self.sink) + elif isinstance(self.sink, Sink): # A custom sink return pcoll | WriteImpl(self.sink) elif isinstance(self.sink, ptransform.PTransform): http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/807013a9/sdks/python/apache_beam/runners/inprocess/transform_evaluator.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/runners/inprocess/transform_evaluator.py b/sdks/python/apache_beam/runners/inprocess/transform_evaluator.py index 9aeda46..7d9166c 100644 --- a/sdks/python/apache_beam/runners/inprocess/transform_evaluator.py +++ b/sdks/python/apache_beam/runners/inprocess/transform_evaluator.py @@ -29,6 +29,7 @@ from apache_beam.runners.common import DoFnRunner from apache_beam.runners.common import DoFnState from apache_beam.runners.inprocess.inprocess_watermark_manager import InProcessWatermarkManager from apache_beam.runners.inprocess.inprocess_transform_result import InProcessTransformResult +from apache_beam.runners.dataflow.native_io.iobase import _NativeWrite # pylint: disable=protected-access from apache_beam.transforms import core from apache_beam.transforms import sideinputs from apache_beam.transforms.window import GlobalWindows @@ -54,7 +55,7 @@ class TransformEvaluatorRegistry(object): core.ParDo: _ParDoEvaluator, core.GroupByKeyOnly: _GroupByKeyOnlyEvaluator, sideinputs.CreatePCollectionView: _CreatePCollectionViewEvaluator, - io.iobase._NativeWrite: _NativeWriteEvaluator, # pylint: disable=protected-access + _NativeWrite: _NativeWriteEvaluator, } def for_application( @@ -98,7 +99,7 @@ class TransformEvaluatorRegistry(object): """ return isinstance(applied_ptransform.transform, (core.GroupByKeyOnly, sideinputs.CreatePCollectionView, - io.iobase._NativeWrite)) # pylint: disable=protected-access + _NativeWrite)) class _TransformEvaluator(object):