Skip to content

Enable gRPC for datastore API. #2099

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
dhermes merged 2 commits into from
Aug 18, 2016
Merged

Enable gRPC for datastore API. #2099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2025874
Enable gRPC for datastore API.
dhermes Aug 12, 2016
cd9bc26
Updating datastore script to add imported message types.
dhermes Aug 17, 2016
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
18 changes: 10 additions & 8 deletions gcloud/datastore/_generated/datastore_grpc_pb2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import grpc
from grpc.beta import implementations as beta_implementations
from grpc.beta import interfaces as beta_interfaces
from grpc.framework.common import cardinality
from grpc.framework.interfaces.face import utilities as face_utilities

# BEGIN: Manually added imports
# BEGIN: Imports from datastore_pb2
from gcloud.datastore._generated.datastore_pb2 import AllocateIdsRequest
from gcloud.datastore._generated.datastore_pb2 import AllocateIdsResponse
from gcloud.datastore._generated.datastore_pb2 import BeginTransactionRequest
Expand All @@ -13,11 +7,19 @@
from gcloud.datastore._generated.datastore_pb2 import CommitResponse
from gcloud.datastore._generated.datastore_pb2 import LookupRequest
from gcloud.datastore._generated.datastore_pb2 import LookupResponse
from gcloud.datastore._generated.datastore_pb2 import Mutation
from gcloud.datastore._generated.datastore_pb2 import MutationResult
from gcloud.datastore._generated.datastore_pb2 import ReadOptions
from gcloud.datastore._generated.datastore_pb2 import RollbackRequest
from gcloud.datastore._generated.datastore_pb2 import RollbackResponse
from gcloud.datastore._generated.datastore_pb2 import RunQueryRequest
from gcloud.datastore._generated.datastore_pb2 import RunQueryResponse
# END: Manually added imports
# END: Imports from datastore_pb2
import grpc
from grpc.beta import implementations as beta_implementations
from grpc.beta import interfaces as beta_interfaces
from grpc.framework.common import cardinality
from grpc.framework.interfaces.face import utilities as face_utilities

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


class DatastoreStub(object):
Expand Down
24 changes: 24 additions & 0 deletions scripts/make_datastore_grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'gcloud', 'datastore',
'_generated', 'datastore_grpc_pb2.py')
GRPCIO_VIRTUALENV = os.environ.get('GRPCIO_VIRTUALENV', 'protoc')
MESSAGE_SNIPPET = ' = _reflection.GeneratedProtocolMessageType('
IMPORT_TEMPLATE = 'from gcloud.datastore._generated.datastore_pb2 import %s\n'


def get_pb2_contents_with_grpc():
Expand Down Expand Up @@ -110,10 +112,32 @@ def get_pb2_grpc_only():
return grpc_only_lines


def get_pb2_message_types():
"""Get message types defined in datastore pb2 file.

:rtype: list
:returns: A list of names that are defined as message types.
"""
non_grpc_contents = get_pb2_contents_without_grpc()
result = []
for line in non_grpc_contents:
if MESSAGE_SNIPPET in line:
name, _ = line.split(MESSAGE_SNIPPET)
result.append(name)

return sorted(result)


def main():
"""Write gRPC-only lines to custom module."""
grpc_only_lines = get_pb2_grpc_only()
with open(GRPC_ONLY_FILE, 'wb') as file_obj:
# First add imports for public objects in the original.
file_obj.write('# BEGIN: Imports from datastore_pb2\n')
for name in get_pb2_message_types():
import_line = IMPORT_TEMPLATE % (name,)
file_obj.write(import_line)
file_obj.write('# END: Imports from datastore_pb2\n')
file_obj.write(''.join(grpc_only_lines))


Expand Down