You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2017/06/08 01:35:18 UTC

[29/50] beam git commit: Fix imports in sdk_worker.

Fix imports in sdk_worker.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/efe8e1f4
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/efe8e1f4
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/efe8e1f4

Branch: refs/heads/DSL_SQL
Commit: efe8e1f41d78e06bef7ab5c9d72a7c65f553c5a3
Parents: be26dd3
Author: Robert Bradshaw <ro...@gmail.com>
Authored: Tue Jun 6 15:14:12 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Jun 6 16:12:39 2017 -0700

----------------------------------------------------------------------
 sdks/python/apache_beam/runners/worker/sdk_worker.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/efe8e1f4/sdks/python/apache_beam/runners/worker/sdk_worker.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/worker/sdk_worker.py b/sdks/python/apache_beam/runners/worker/sdk_worker.py
index 596bb90..33c50ad 100644
--- a/sdks/python/apache_beam/runners/worker/sdk_worker.py
+++ b/sdks/python/apache_beam/runners/worker/sdk_worker.py
@@ -35,7 +35,8 @@ from google.protobuf import wrappers_pb2
 from apache_beam.coders import coder_impl
 from apache_beam.coders import WindowedValueCoder
 from apache_beam.internal import pickler
-from apache_beam.runners.dataflow.native_io import iobase
+from apache_beam.io import iobase
+from apache_beam.runners.dataflow.native_io import iobase as native_iobase
 from apache_beam.utils import counters
 from apache_beam.runners.api import beam_fn_api_pb2
 from apache_beam.runners.worker import operation_specs
@@ -126,7 +127,8 @@ class DataInputOperation(RunnerIOOperation):
 # custom sources without forcing intermediate materialization.  This seems very
 # related to the desire to inject key and window preserving [Splittable]DoFns
 # into the view computation.
-class SideInputSource(iobase.NativeSource, iobase.NativeSourceReader):
+class SideInputSource(native_iobase.NativeSource,
+                      native_iobase.NativeSourceReader):
   """A 'source' for reading side inputs via state API calls.
   """