Skip to content

#260: break datastore cycles via factories #268

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

Closed
tseaver wants to merge 11 commits into from
Closed

#260: break datastore cycles via factories #268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1036f85
Drop 'Dataset.query' and 'Dataset.entity' convenience APIs.
tseaver Oct 20, 2014
1c432a9
Add a factory registry to datastore._helpers.
tseaver Oct 20, 2014
8d05122
Break import cycles via a factory registry.
tseaver Oct 20, 2014
3c1d516
Tidy local imports, remove remaining cycles.
tseaver Oct 20, 2014
cf29c90
Fix build: invoke correct factory when unmarshalling key from pb.
tseaver Oct 20, 2014
31f60d8
Reorder 'Query.__init__' paramters to match Entity.
tseaver Oct 20, 2014
3a62db9
Rename '_query_factory' helper -> '_get_factory' to avoid confustion.
tseaver Oct 20, 2014
daf889c
Avoid relative imports.
tseaver Oct 21, 2014
a2c8bcb
Encapsulate factory registry as a singleton object.
tseaver Oct 21, 2014
3cc965c
Rename alternate factories for clarity.
tseaver Oct 21, 2014
d539b17
Use 'invoke' rather than 'get' followed by call to invoke factories.
tseaver Oct 21, 2014
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
Prev Previous commit
Next Next commit
Rename '_query_factory' helper -> '_get_factory' to avoid confustion. 
Incorporates feedback from @dhermees.
  • Loading branch information
@tseaver
tseaver committed Oct 22, 2014
commit 3a62db9e4c8975d8747a5a6e469700069ad28186
4 changes: 2 additions & 2 deletions gcloud/datastore/_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def _register_factory(name, factory):
_FACTORIES[name] = factory


def _query_factory(name):
def _get_factory(name):
"""Look up a factory by name."""
factory = _FACTORIES.get(name)
if factory is None:
Expand All @@ -40,7 +40,7 @@ def _query_factory(name):

def _invoke_factory(name, *args, **kw):
"""Look up and call a factory by name."""
return _query_factory(name)(*args, **kw)
return _get_factory(name)(*args, **kw)


def _get_protobuf_attribute_and_value(val):
Expand Down
2 changes: 1 addition & 1 deletion gcloud/datastore/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def ancestor(self, ancestor):
ancestor = _helpers._invoke_factory('Key_path', *ancestor)

# If we don't have a Key value by now, something is wrong.
if not isinstance(ancestor, _helpers._query_factory('Key')):
if not isinstance(ancestor, _helpers._get_factory('Key')):
raise TypeError('Expected list or Key, got %s.' % type(ancestor))

# Get the composite filter and add a new property filter.
Expand Down
8 changes: 4 additions & 4 deletions gcloud/datastore/test__helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ class _Bar(object):
self.assertRaises(DuplicateFactory, self._callFUT, 'Foo', _Bar)


class Test__query_factory(_FactoryBase, unittest2.TestCase):
class Test__get_factory(_FactoryBase, unittest2.TestCase):

def setUp(self):
from gcloud.datastore._helpers import _FACTORIES

super(Test__query_factory, self).setUp()
super(Test__get_factory, self).setUp()
_FACTORIES['Widget'] = self._factory

def _callFUT(self, name, *args, **kw):
from gcloud.datastore._helpers import _query_factory
from gcloud.datastore._helpers import _get_factory

return _query_factory(name, *args, **kw)
return _get_factory(name, *args, **kw)

@staticmethod
def _factory(*args, **kw): # pragma: NO COVER
Expand Down