pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for creating a geo2d index by prefixing the field name with a *

Browse Source
This commit is contained in:
Robert Kajic 2012-01-31 22:31:24 +01:00
parent 13f38b1c1d
commit d3962c4f7d
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mongoengine/queryset.py
View File

@ -399,12 +399,14 @@ class QuerySet(object):
index_list = [] index_list = []
use_types = doc_cls._meta.get('allow_inheritance', True) use_types = doc_cls._meta.get('allow_inheritance', True)
for key in spec['fields']: for key in spec['fields']:
# Get direction from + or - # Get ASCENDING direction from +, DESCENDING from -, and GEO2D from *
direction = pymongo.ASCENDING direction = pymongo.ASCENDING
if key.startswith("-"): if key.startswith("-"):
direction = pymongo.DESCENDING direction = pymongo.DESCENDING
if key.startswith(("+", "-")): elif key.startswith("*"):
key = key[1:] direction = pymongo.GEO2D
if key.startswith(("+", "-", "*")):
key = key[1:]
# Use real field name, do it manually because we need field # Use real field name, do it manually because we need field
# objects for the next part (list field checking) # objects for the next part (list field checking)
@ -421,7 +423,7 @@ class QuerySet(object):
# If _types is being used, prepend it to every specified index # If _types is being used, prepend it to every specified index
index_types = doc_cls._meta.get('index_types', True) index_types = doc_cls._meta.get('index_types', True)
allow_inheritance = doc_cls._meta.get('allow_inheritance') allow_inheritance = doc_cls._meta.get('allow_inheritance')
if spec.get('types', index_types) and allow_inheritance and use_types: if spec.get('types', index_types) and allow_inheritance and use_types and direction is not pymongo.GEO2D:
index_list.insert(0, ('_types', 1)) index_list.insert(0, ('_types', 1))
spec['fields'] = index_list spec['fields'] = index_list

20
tests/document.py
View File

@ -658,6 +658,26 @@ class DocumentTest(unittest.TestCase):
BlogPost.drop_collection() BlogPost.drop_collection()
def test_explicit_geo2d_index(self):
"""Ensure that geo2d indexes work when created via meta[indexes]
"""
class Place(Document):
location = DictField()
meta = {
'indexes': [
'*location.point',
],
}
Place.drop_collection()
info = Place.objects._collection.index_information()
# Indexes are lazy so use list() to perform query
list(Place.objects)
info = Place.objects._collection.index_information()
info = [value['key'] for key, value in info.iteritems()]
self.assertTrue([('location.point', '2d')] in info)
def test_dictionary_indexes(self): def test_dictionary_indexes(self):
"""Ensure that indexes are used when meta[indexes] contains dictionaries """Ensure that indexes are used when meta[indexes] contains dictionaries
instead of lists. instead of lists.