Skip to content

Remove references to google.cloud.operation from spanner #3625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theacodes merged 2 commits into from
Jul 20, 2017
Merged

Remove references to google.cloud.operation from spanner #3625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d26cf9
Remove references to google.cloud.operation from spanner
Jul 18, 2017
8635d88
Remove unused import
Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions spanner/google/cloud/spanner/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@

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

# 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
Expand All @@ -44,10 +41,6 @@
r'databases/(?P<database_id>[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.
Expand Down Expand Up @@ -205,7 +198,6 @@ def create(self):
))
raise

future.caller_metadata = {'request_type': 'CreateDatabase'}
return future

def exists(self):
Expand Down Expand Up @@ -252,7 +244,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
Expand All @@ -267,7 +259,6 @@ def update_ddl(self, ddl_statements):
raise NotFound(self.name)
raise

future.caller_metadata = {'request_type': 'UpdateDatabaseDdl'}
return future

def drop(self):
Expand Down
11 changes: 2 additions & 9 deletions spanner/google/cloud/spanner/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -228,7 +223,6 @@ def create(self):
raise Conflict(self.name)
raise

future.caller_metadata = {'request_type': 'CreateInstance'}
return future

def exists(self):
Expand Down Expand Up @@ -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
Expand All @@ -309,7 +303,6 @@ def update(self):
raise NotFound(self.name)
raise

future.caller_metadata = {'request_type': 'UpdateInstance'}
return future

def delete(self):
Expand Down
4 changes: 0 additions & 4 deletions spanner/tests/unit/test_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions spanner/tests/unit/test_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down