Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed use of SortedDict for query.alias_refcount

This will have a smallish impact on performance. Refs #19276.
  • Loading branch information...
commit ce1af8d7023f02e4521cce3bcdbc9fd13d76c5f8 1 parent fa18b0a
@akaariai akaariai authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 django/db/models/sql/query.py
View
10 django/db/models/sql/query.py
@@ -103,7 +103,7 @@ class Query(object):
def __init__(self, model, where=WhereNode):
self.model = model
- self.alias_refcount = SortedDict()
+ self.alias_refcount = {}
# alias_map is the most important data structure regarding joins.
# It's used for recording which joins exist in the query and what
# type they are. The key is the alias of the joined table (possibly
@@ -860,7 +860,7 @@ def count_active_tables(self):
count. Note that after execution, the reference counts are zeroed, so
tables added in compiler will not be seen by this method.
"""
- return len([1 for count in six.itervalues(self.alias_refcount) if count])
+ return len([1 for count in self.alias_refcount.values() if count])
def join(self, connection, reuse=REUSE_ALL, promote=False,
outer_if_first=False, nullable=False):
@@ -1532,9 +1532,9 @@ def split_exclude(self, filter_expr, prefix, can_reuse):
# comparison to NULL (e.g. in
# Tag.objects.exclude(parent__parent__name='t1'), a tag with no parent
# would otherwise be overlooked).
- active_positions = [pos for (pos, count) in
- enumerate(six.itervalues(query.alias_refcount)) if count]
- if active_positions[-1] > 1:
+ active_positions = len([count for count
+ in query.alias_refcount.items() if count])
+ if active_positions > 1:
self.add_filter(('%s__isnull' % prefix, False), negate=True,
trim=True, can_reuse=can_reuse)
Please sign in to comment.
Something went wrong with that request. Please try again.