Skip to content

Don't check 'exclude_from_indexes' for empty lists. #4915

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
tseaver merged 2 commits into from
Feb 22, 2018
Merged

Don't check 'exclude_from_indexes' for empty lists. #4915

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
f885008
Add unit test which actually exercises #3152.
tseaver Feb 22, 2018
3585264
Don't check 'exclude_from_indexes' for empty lists.
tseaver Feb 22, 2018
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
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def entity_from_protobuf(pb):
# Check if ``value_pb`` was excluded from index. Lists need to be
# special-cased and we require all ``exclude_from_indexes`` values
# in a list agree.
if is_list:
if is_list and len(value) > 0:
exclude_values = set(value_pb.exclude_from_indexes
for value_pb in value_pb.array_value.values)
if len(exclude_values) != 1:
Expand Down
22 changes: 22 additions & 0 deletions datastore/tests/unit/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,28 @@ def test_nested_entity_no_key(self):
self.assertEqual(len(inside_entity), 1)
self.assertEqual(inside_entity[INSIDE_NAME], INSIDE_VALUE)

def test_index_mismatch_ignores_empty_list(self):
from google.cloud.datastore_v1.proto import entity_pb2

_PROJECT = 'PROJECT'
_KIND = 'KIND'
_ID = 1234

array_val_pb = entity_pb2.Value(
array_value=entity_pb2.ArrayValue(values=[]))

entity_pb = entity_pb2.Entity(
properties={
'baz': array_val_pb,
},
)
entity_pb.key.partition_id.project_id = _PROJECT
entity_pb.key.path.add(kind=_KIND, id=_ID)

entity = self._call_fut(entity_pb)
entity_dict = dict(entity)
self.assertEqual(entity_dict['baz'], [])


class Test_entity_to_protobuf(unittest.TestCase):

Expand Down