mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Clear the scroll when we are done with it

Browse Source
This commit is contained in:
Karl Hobley 2017-04-13 11:27:30 +01:00
parent d794a52ff8
commit dea74450ca
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wagtail/wagtailsearch/backends/elasticsearch.py
View File

@ -468,7 +468,7 @@ class ElasticsearchSearchResults(BaseSearchResults):
while True: while True:
if len(page['hits']['hits']) == 0: if len(page['hits']['hits']) == 0:
return break
# Get pks from results # Get pks from results
pks = [hit['fields']['pk'][0] for hit in page['hits']['hits']] pks = [hit['fields']['pk'][0] for hit in page['hits']['hits']]
@ -494,13 +494,20 @@ class ElasticsearchSearchResults(BaseSearchResults):
limit -= 1 limit -= 1
if limit == 0: if limit == 0:
return break
if limit is not None and limit == 0:
break
# Fetch next page of results # Fetch next page of results
if '_scroll_id' not in page: if '_scroll_id' not in page:
return break
page = self.backend.es.scroll(scroll_id=page['_scroll_id'], scroll='2m') page = self.backend.es.scroll(scroll_id=page['_scroll_id'], scroll='2m')
# Clear the scroll
if '_scroll_id' in page:
self.backend.es.clear_scroll(scroll_id=page['_scroll_id'])
else: else:
params.update({ params.update({
'size': limit or PAGE_SIZE, 'size': limit or PAGE_SIZE,