From 6d26cf98c7420b9a46ee4453f5fd2b63ea851899 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Tue, 18 Jul 2017 12:34:25 -0700 Subject: [PATCH 1/2] Remove references to google.cloud.operation from spanner --- spanner/google/cloud/spanner/database.py | 9 +-------- spanner/google/cloud/spanner/instance.py | 11 ++--------- spanner/tests/unit/test_database.py | 4 ---- spanner/tests/unit/test_instance.py | 4 ---- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py index 12af9ca20edb..e2513ee18433 100644 --- a/spanner/google/cloud/spanner/database.py +++ b/spanner/google/cloud/spanner/database.py @@ -27,7 +27,6 @@ # pylint: disable=ungrouped-imports from google.cloud.exceptions import Conflict from google.cloud.exceptions import NotFound -from google.cloud.operation import register_type from google.cloud.spanner import __version__ from google.cloud.spanner._helpers import _options_with_prefix from google.cloud.spanner.batch import Batch @@ -44,10 +43,6 @@ r'databases/(?P[a-z][a-z0-9_\-]*[a-z0-9])$' ) -register_type(admin_v1_pb2.Database) -register_type(admin_v1_pb2.CreateDatabaseMetadata) -register_type(admin_v1_pb2.UpdateDatabaseDdlMetadata) - class Database(object): """Representation of a Cloud Spanner Database. @@ -205,7 +200,6 @@ def create(self): )) raise - future.caller_metadata = {'request_type': 'CreateDatabase'} return future def exists(self): @@ -252,7 +246,7 @@ def update_ddl(self, ddl_statements): See https://cloud.google.com/spanner/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.UpdateDatabase - :rtype: :class:`google.cloud.operation.Operation` + :rtype: :class:`google.cloud.future.operation.Operation` :returns: an operation instance """ client = self._instance._client @@ -267,7 +261,6 @@ def update_ddl(self, ddl_statements): raise NotFound(self.name) raise - future.caller_metadata = {'request_type': 'UpdateDatabaseDdl'} return future def drop(self): diff --git a/spanner/google/cloud/spanner/instance.py b/spanner/google/cloud/spanner/instance.py index 711b8c489853..e67a0c31be6c 100644 --- a/spanner/google/cloud/spanner/instance.py +++ b/spanner/google/cloud/spanner/instance.py @@ -28,7 +28,6 @@ from google.cloud.exceptions import Conflict from google.cloud.exceptions import NotFound from google.cloud.iterator import GAXIterator -from google.cloud.operation import register_type from google.cloud.spanner._helpers import _options_with_prefix from google.cloud.spanner.database import Database from google.cloud.spanner.pool import BurstyPool @@ -41,10 +40,6 @@ DEFAULT_NODE_COUNT = 1 -register_type(admin_v1_pb2.Instance) -register_type(admin_v1_pb2.CreateInstanceMetadata) -register_type(admin_v1_pb2.UpdateInstanceMetadata) - class Instance(object): """Representation of a Cloud Spanner Instance. @@ -204,7 +199,7 @@ def create(self): before calling :meth:`create`. - :rtype: :class:`google.cloud.operation.Operation` + :rtype: :class:`google.cloud.future.operation.Operation` :returns: an operation instance """ api = self._client.instance_admin_api @@ -228,7 +223,6 @@ def create(self): raise Conflict(self.name) raise - future.caller_metadata = {'request_type': 'CreateInstance'} return future def exists(self): @@ -285,7 +279,7 @@ def update(self): before calling :meth:`update`. - :rtype: :class:`google.cloud.operation.Operation` + :rtype: :class:`google.cloud.future.operation.Operation` :returns: an operation instance """ api = self._client.instance_admin_api @@ -309,7 +303,6 @@ def update(self): raise NotFound(self.name) raise - future.caller_metadata = {'request_type': 'UpdateInstance'} return future def delete(self): diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py index 5369a6f2c0d1..ede8e290292c 100644 --- a/spanner/tests/unit/test_database.py +++ b/spanner/tests/unit/test_database.py @@ -312,8 +312,6 @@ def test_create_success(self): future = database.create() self.assertIs(future, op_future) - self.assertEqual(future.caller_metadata, - {'request_type': 'CreateDatabase'}) (parent, create_statement, extra_statements, options) = api._created_database @@ -493,8 +491,6 @@ def test_update_ddl(self): future = database.update_ddl(DDL_STATEMENTS) self.assertIs(future, op_future) - self.assertEqual(future.caller_metadata, - {'request_type': 'UpdateDatabaseDdl'}) name, statements, op_id, options = api._updated_database_ddl self.assertEqual(name, self.DATABASE_NAME) diff --git a/spanner/tests/unit/test_instance.py b/spanner/tests/unit/test_instance.py index b556a0396f01..69f3529c1608 100644 --- a/spanner/tests/unit/test_instance.py +++ b/spanner/tests/unit/test_instance.py @@ -241,8 +241,6 @@ def test_create_success(self): future = instance.create() self.assertIs(future, op_future) - self.assertEqual(future.caller_metadata, - {'request_type': 'CreateInstance'}) (parent, instance_id, instance, options) = api._created_instance self.assertEqual(parent, self.PARENT) @@ -424,8 +422,6 @@ def test_update_success(self): future = instance.update() self.assertIs(future, op_future) - self.assertEqual(future.caller_metadata, - {'request_type': 'UpdateInstance'}) instance, field_mask, options = api._updated_instance self.assertEqual(field_mask.paths, From 8635d88b7f3dbb1898811f306df7a0fde56f2697 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Thu, 20 Jul 2017 09:46:08 -0700 Subject: [PATCH 2/2] Remove unused import --- spanner/google/cloud/spanner/database.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/spanner/google/cloud/spanner/database.py b/spanner/google/cloud/spanner/database.py index e2513ee18433..a449f304bf79 100644 --- a/spanner/google/cloud/spanner/database.py +++ b/spanner/google/cloud/spanner/database.py @@ -18,8 +18,6 @@ from google.gax.errors import GaxError from google.gax.grpc import exc_to_code -from google.cloud.proto.spanner.admin.database.v1 import ( - spanner_database_admin_pb2 as admin_v1_pb2) from google.cloud.gapic.spanner.v1.spanner_client import SpannerClient from grpc import StatusCode import six