mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #28817 -- Made QuerySet.iterator() use server-side cursors after values() and values_list().

Browse source
This commit is contained in:
Dražen Odobašić 2017-11-19 10:13:10 -05:00 • committed by Tim Graham
parent 6cb6382639
commit d97f026a7a
4 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
django/db/models/query.py
View file

@ -105,7 +105,7 @@ class ValuesIterable(BaseIterable):
names = extra_names + field_names + annotation_names
indexes = range(len(names))
for row in compiler.results_iter():
for row in compiler.results_iter(chunked_fetch=self.chunked_fetch, chunk_size=self.chunk_size):
yield {names[i]: row[i] for i in indexes}
@ -133,8 +133,11 @@ class ValuesListIterable(BaseIterable):
# Reorder according to fields.
index_map = {name: idx for idx, name in enumerate(names)}
rowfactory = operator.itemgetter(*[index_map[f] for f in fields])
return map(rowfactory, compiler.results_iter())
return compiler.results_iter(tuple_expected=True)
return map(
rowfactory,
compiler.results_iter(chunked_fetch=self.chunked_fetch, chunk_size=self.chunk_size)
)
return compiler.results_iter(tuple_expected=True, chunked_fetch=self.chunked_fetch, chunk_size=self.chunk_size)
class NamedValuesListIterable(ValuesListIterable):
@ -174,7 +177,7 @@ class FlatValuesListIterable(BaseIterable):
def __iter__(self):
queryset = self.queryset
compiler = queryset.query.get_compiler(queryset.db)
return chain.from_iterable(compiler.results_iter())
return chain.from_iterable(compiler.results_iter(chunked_fetch=self.chunked_fetch, chunk_size=self.chunk_size))
class QuerySet: