FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Only parsing protobuf entity key if field is set. by dhermes · Pull Request #617 · googleapis/google-cloud-python · GitHub

/ google-cloud-python Public

Only parsing protobuf entity key if field is set. #617

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 1 commit into from
Feb 12, 2015
Conversation 1 Commits 1 Checks 0 Files changed
Merged

Only parsing protobuf entity key if field is set. #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 4 additions & 1 deletion gcloud/datastore/helpers.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ def entity_from_protobuf(pb):
:rtype: :class:`gcloud.datastore.entity.Entity`
:returns: The entity derived from the protobuf.
"""
key = key_from_protobuf(pb.key)
key = None
if pb.HasField('key'):
key = key_from_protobuf(pb.key)

entity_props = {}
exclude_from_indexes = []

Expand Down
42 changes: 42 additions & 0 deletions gcloud/datastore/test_helpers.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,48 @@ def test_mismatched_value_indexed(self):
with self.assertRaises(ValueError):
self._callFUT(entity_pb)

def test_entity_no_key(self):
from gcloud.datastore import _datastore_v1_pb2 as datastore_pb

entity_pb = datastore_pb.Entity()
entity = self._callFUT(entity_pb)

self.assertEqual(entity.key, None)
self.assertEqual(dict(entity), {})

def test_nested_entity_no_key(self):
from gcloud.datastore import _datastore_v1_pb2 as datastore_pb

DATASET_ID = 's~FOO'
KIND = 'KIND'
INSIDE_NAME = 'IFOO'
OUTSIDE_NAME = 'OBAR'
INSIDE_VALUE = 1337

entity_inside = datastore_pb.Entity()
inside_prop = entity_inside.property.add()
inside_prop.name = INSIDE_NAME
inside_prop.value.integer_value = INSIDE_VALUE

entity_pb = datastore_pb.Entity()
entity_pb.key.partition_id.dataset_id = DATASET_ID
element = entity_pb.key.path_element.add()
element.kind = KIND

outside_prop = entity_pb.property.add()
outside_prop.name = OUTSIDE_NAME
outside_prop.value.entity_value.CopyFrom(entity_inside)

entity = self._callFUT(entity_pb)
self.assertEqual(entity.key.dataset_id, DATASET_ID)
self.assertEqual(entity.key.flat_path, (KIND,))
self.assertEqual(len(entity), 1)

inside_entity = entity[OUTSIDE_NAME]
self.assertEqual(inside_entity.key, None)
self.assertEqual(len(inside_entity), 1)
self.assertEqual(inside_entity[INSIDE_NAME], INSIDE_VALUE)


class Test_key_from_protobuf(unittest2.TestCase):

Expand Down
Back | FazBrowse Home | New Git URL