actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make scan helper deal with empty response, refs #142

Browse Source
This commit is contained in:
Yuri Khrustalev
2014-10-22 14:41:41 +04:00
parent 9d89259f06
commit 36967e5307
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/helpers/__init__.py
+6 -2
View File
@@ -173,7 +173,9 @@ def scan(client, query=None, scroll='5m', **kwargs):
# initial search to # initial search to
resp = client.search(body=query, search_type='scan', scroll=scroll, **kwargs) resp = client.search(body=query, search_type='scan', scroll=scroll, **kwargs)
scroll_id = resp['_scroll_id'] scroll_id = resp.get('_scroll_id')
if scroll_id is None:
return
while True: while True:
resp = client.scroll(scroll_id, scroll=scroll) resp = client.scroll(scroll_id, scroll=scroll)
@@ -181,7 +183,9 @@ def scan(client, query=None, scroll='5m', **kwargs):
break break
for hit in resp['hits']['hits']: for hit in resp['hits']['hits']:
yield hit yield hit
scroll_id = resp['_scroll_id'] scroll_id = resp.get('_scroll_id')
if scroll_id is None:
break
def reindex(client, source_index, target_index, target_client=None, chunk_size=500, scroll='5m'): def reindex(client, source_index, target_index, target_client=None, chunk_size=500, scroll='5m'):
""" """