Skip to content

#514: rip out Connection cruft #550

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 8 commits into from
Jan 15, 2015
Merged

#514: rip out Connection cruft #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de03993
Skip empty lists.
tseaver Jan 15, 2015
3527809
#514: rip out 'Connection.save_entity' and 'Connection.delete_entities'.
tseaver Jan 14, 2015
e68ce53
Add 'Batch.current' static method.
tseaver Jan 14, 2015
82a97e5
Rip out 'Connection.mutation'.
tseaver Jan 14, 2015
dd7a598
No longer store the transaction on the connection.
tseaver Jan 14, 2015
301498d
Add 'Transaction.current' staticmethod.
tseaver Jan 15, 2015
a4a65a2
Add explicit 'transaction_id' parm to 'Connection.{lookup,run_query}'.
tseaver Jan 15, 2015
f10620e
De-lint continuations.
tseaver Jan 15, 2015
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
9 changes: 6 additions & 3 deletions gcloud/datastore/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"""

from gcloud.datastore import _implicit_environ
from gcloud.datastore.batch import _BATCHES
from gcloud.datastore.batch import Batch
from gcloud.datastore.transaction import Transaction
from gcloud.datastore import helpers


Expand Down Expand Up @@ -113,10 +113,13 @@ def get(keys, missing=None, deferred=None, connection=None):
connection = _require_connection(connection)
dataset_id = _get_dataset_id_from_keys(keys)

transaction = Transaction.current()

entity_pbs = connection.lookup(
dataset_id=dataset_id,
key_pbs=[k.to_protobuf() for k in keys],
missing=missing, deferred=deferred,
transaction_id=transaction and transaction.id,
)

if missing is not None:
Expand Down Expand Up @@ -150,7 +153,7 @@ def put(entities, connection=None):

connection = connection or _implicit_environ.CONNECTION

current = _BATCHES.top
current = Batch.current()
in_batch = current is not None
if not in_batch:
keys = [entity.key for entity in entities]
Expand All @@ -177,7 +180,7 @@ def delete(keys, connection=None):
connection = connection or _implicit_environ.CONNECTION

# We allow partial keys to attempt a delete, the backend will fail.
current = _BATCHES.top
current = Batch.current()
in_batch = current is not None
if not in_batch:
dataset_id = _get_dataset_id_from_keys(keys)
Expand Down
12 changes: 11 additions & 1 deletion gcloud/datastore/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ def __init__(self, dataset_id=None, connection=None):
self._mutation = datastore_pb.Mutation()
self._auto_id_entities = []

@staticmethod
def current():

This comment was marked as spam.

Sign in to view

"""Return the topmost batch / transaction, or None."""
return _BATCHES.top

@property
def dataset_id(self):
"""Getter for dataset ID in which the batch will run.
Expand Down Expand Up @@ -308,6 +313,11 @@ def _assign_entity_to_mutation(mutation_pb, entity, auto_id_entities):
insert.key.CopyFrom(key_pb)

for name, value in entity.items():

value_is_list = isinstance(value, list)
if value_is_list and len(value) == 0:
continue

prop = insert.property.add()
# Set the name of the property.
prop.name = name
Expand All @@ -316,7 +326,7 @@ def _assign_entity_to_mutation(mutation_pb, entity, auto_id_entities):
helpers._set_protobuf_value(prop.value, value)

if name in entity.exclude_from_indexes:
if not isinstance(value, list):
if not value_is_list:
prop.value.indexed = False

for sub_value in prop.value.list_value:
Expand Down
Loading