test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #14697 - speeded up model instance creation by moving work outside of loops 

Thanks to akaariai for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2010-11-23 13:54:58 +00:00
parent 8aa2485a58
commit ff7c243b4c
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django/db/models/query.py
View File

@ -266,11 +266,14 @@ class QuerySet(object):
init_list.append(field.attname) init_list.append(field.attname)
model_cls = deferred_class_factory(self.model, skip) model_cls = deferred_class_factory(self.model, skip)
compiler = self.query.get_compiler(using=self.db) # Cache db and model outside the loop
db = self.db
model = self.model
compiler = self.query.get_compiler(using=db)
for row in compiler.results_iter(): for row in compiler.results_iter():
if fill_cache: if fill_cache:
obj, _ = get_cached_row(self.model, row, obj, _ = get_cached_row(model, row,
index_start, using=self.db, max_depth=max_depth, index_start, using=db, max_depth=max_depth,
requested=requested, offset=len(aggregate_select), requested=requested, offset=len(aggregate_select),
only_load=only_load) only_load=only_load)
else: else:
@ -280,19 +283,21 @@ class QuerySet(object):
obj = model_cls(**dict(zip(init_list, row_data))) obj = model_cls(**dict(zip(init_list, row_data)))
else: else:
# Omit aggregates in object creation. # Omit aggregates in object creation.
obj = self.model(*row[index_start:aggregate_start]) obj = model(*row[index_start:aggregate_start])
# Store the source database of the object # Store the source database of the object
obj._state.db = self.db obj._state.db = db
# This object came from the database; it's not being added. # This object came from the database; it's not being added.
obj._state.adding = False obj._state.adding = False
for i, k in enumerate(extra_select): if extra_select:
setattr(obj, k, row[i]) for i, k in enumerate(extra_select):
setattr(obj, k, row[i])
# Add the aggregates to the model # Add the aggregates to the model
for i, aggregate in enumerate(aggregate_select): if aggregate_select:
setattr(obj, aggregate, row[i+aggregate_start]) for i, aggregate in enumerate(aggregate_select):
setattr(obj, aggregate, row[i+aggregate_start])
yield obj yield obj

3
django/db/models/sql/compiler.py
View File

@ -672,6 +672,7 @@ class SQLCompiler(object):
""" """
resolve_columns = hasattr(self, 'resolve_columns') resolve_columns = hasattr(self, 'resolve_columns')
fields = None fields = None
has_aggregate_select = bool(self.query.aggregate_select)
for rows in self.execute_sql(MULTI): for rows in self.execute_sql(MULTI):
for row in rows: for row in rows:
if resolve_columns: if resolve_columns:
@ -692,7 +693,7 @@ class SQLCompiler(object):
f.column in only_load[db_table]] f.column in only_load[db_table]]
row = self.resolve_columns(row, fields) row = self.resolve_columns(row, fields)
if self.query.aggregate_select: if has_aggregate_select:
aggregate_start = len(self.query.extra_select.keys()) + len(self.query.select) aggregate_start = len(self.query.extra_select.keys()) + len(self.query.select)
aggregate_end = aggregate_start + len(self.query.aggregate_select) aggregate_end = aggregate_start + len(self.query.aggregate_select)
row = tuple(row[:aggregate_start]) + tuple([ row = tuple(row[:aggregate_start]) + tuple([