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

nicer merge_index_specs (thanks @gukoff!)

Browse Source
This commit is contained in:
Stefan Wojcik 2016-12-08 21:49:25 -05:00
parent 44b86e29c6
commit 76219901db
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mongoengine/base/document.py
View File

@ -730,22 +730,30 @@ class BaseDocument(object):
unique_indices = cls._unique_with_indexes() unique_indices = cls._unique_with_indexes()
index_specs = [cls._build_index_spec(spec) for spec in meta_indexes] index_specs = [cls._build_index_spec(spec) for spec in meta_indexes]
# Merge geo indexes and unique_with indexes into the meta index specs
def merge_index_specs(index_specs, indices): def merge_index_specs(index_specs, indices):
"""Helper method for merging index specs."""
if not indices: if not indices:
return index_specs return index_specs
spec_fields = [idx['fields'] for idx in index_specs] # Create a map of index fields to index spec. We're converting
# the fields from a list to a tuple so that it's hashable.
spec_fields = dict(
(tuple(index['fields']), index) for index in index_specs
)
# Merge unique_indexes with existing specs # For each new index, if there's an existing index with the same
for idx in indices: # fields list, update the existing spec with all data from the
if idx['fields'] in spec_fields: # new spec.
index_specs[spec_fields.index(idx['fields'])].update(idx) for new_index in indices:
candidate = spec_fields.get(tuple(new_index['fields']))
if candidate is None:
index_specs.append(new_index)
else: else:
index_specs.append(idx) candidate.update(new_index)
return index_specs return index_specs
# Merge geo indexes and unique_with indexes into the meta index specs.
index_specs = merge_index_specs(index_specs, geo_indices) index_specs = merge_index_specs(index_specs, geo_indices)
index_specs = merge_index_specs(index_specs, unique_indices) index_specs = merge_index_specs(index_specs, unique_indices)
return index_specs return index_specs
@ -866,16 +874,18 @@ class BaseDocument(object):
unique_fields += unique_with unique_fields += unique_with
# Add the new index to the list # Add the new index to the list
fields = [("%s%s" % (namespace, f), pymongo.ASCENDING) fields = [
for f in unique_fields] ("%s%s" % (namespace, f), pymongo.ASCENDING)
for f in unique_fields
]
index = {'fields': fields, 'unique': True, 'sparse': sparse} index = {'fields': fields, 'unique': True, 'sparse': sparse}
unique_indexes.append(index) unique_indexes.append(index)
if field.__class__.__name__ == "ListField": if field.__class__.__name__ == 'ListField':
field = field.field field = field.field
# Grab any embedded document field unique indexes # Grab any embedded document field unique indexes
if (field.__class__.__name__ == "EmbeddedDocumentField" and if (field.__class__.__name__ == 'EmbeddedDocumentField' and
field.document_type != cls): field.document_type != cls):
field_namespace = "%s." % field_name field_namespace = "%s." % field_name
doc_cls = field.document_type doc_cls = field.document_type
@ -889,8 +899,9 @@ class BaseDocument(object):
geo_indices = [] geo_indices = []
inspected.append(cls) inspected.append(cls)
geo_field_type_names = ["EmbeddedDocumentField", "GeoPointField", geo_field_type_names = ('EmbeddedDocumentField', 'GeoPointField',
"PointField", "LineStringField", "PolygonField"] 'PointField', 'LineStringField',
'PolygonField')
geo_field_types = tuple([_import_class(field) geo_field_types = tuple([_import_class(field)
for field in geo_field_type_names]) for field in geo_field_type_names])