You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/06/23 22:13:41 UTC

[1/2] beam git commit: Fix python fn API data plane remote grpc port access

Repository: beam
Updated Branches:
  refs/heads/master af69e979a -> 9acce7150


Fix python fn API data plane remote grpc port access


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

Branch: refs/heads/master
Commit: 32095487e56b63b5c1aa690bb6e098375cb108d5
Parents: af69e97
Author: Vikas Kedigehalli <vi...@google.com>
Authored: Fri Jun 23 11:50:12 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Fri Jun 23 15:13:27 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/beam/blob/32095487/sdks/python/apache_beam/runners/worker/data_plane.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/runners/worker/data_plane.py b/sdks/python/apache_beam/runners/worker/data_plane.py
index bc981a8..26f65ee 100644
--- a/sdks/python/apache_beam/runners/worker/data_plane.py
+++ b/sdks/python/apache_beam/runners/worker/data_plane.py
@@ -246,8 +246,8 @@ class DataChannelFactory(object):
   __metaclass__ = abc.ABCMeta
 
   @abc.abstractmethod
-  def create_data_channel(self, function_spec):
-    """Returns a ``DataChannel`` from the given function_spec."""
+  def create_data_channel(self, remote_grpc_port):
+    """Returns a ``DataChannel`` from the given RemoteGrpcPort."""
     raise NotImplementedError(type(self))
 
   @abc.abstractmethod
@@ -265,9 +265,7 @@ class GrpcClientDataChannelFactory(DataChannelFactory):
   def __init__(self):
     self._data_channel_cache = {}
 
-  def create_data_channel(self, function_spec):
-    remote_grpc_port = beam_fn_api_pb2.RemoteGrpcPort()
-    function_spec.data.Unpack(remote_grpc_port)
+  def create_data_channel(self, remote_grpc_port):
     url = remote_grpc_port.api_service_descriptor.url
     if url not in self._data_channel_cache:
       logging.info('Creating channel for %s', url)
@@ -289,7 +287,7 @@ class InMemoryDataChannelFactory(DataChannelFactory):
   def __init__(self, in_memory_data_channel):
     self._in_memory_data_channel = in_memory_data_channel
 
-  def create_data_channel(self, unused_function_spec):
+  def create_data_channel(self, unused_remote_grpc_port):
     return self._in_memory_data_channel
 
   def close(self):


[2/2] beam git commit: This closes #3431

Posted by al...@apache.org.
This closes #3431


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

Branch: refs/heads/master
Commit: 9acce7150ee8fa6c9e50049155ad7b85b646f98e
Parents: af69e97 3209548
Author: Ahmet Altay <al...@google.com>
Authored: Fri Jun 23 15:13:30 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Fri Jun 23 15:13:30 2017 -0700

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