Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

always call search_ahead

Browse source
This commit is contained in:
Victor Shyba 2021-05-17 14:54:39 -03:00
parent 099f3b6a62
commit 6e8b8a5920
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lbry/wallet/server/db/elasticsearch/search.py
View file

@ -252,13 +252,7 @@ class SearchIndex:
if not kwargs['channel_id'] or not isinstance(kwargs['channel_id'], str): if not kwargs['channel_id'] or not isinstance(kwargs['channel_id'], str):
return [], 0, 0 return [], 0, 0
try: try:
if 'limit_claims_per_channel' in kwargs: return await self.search_ahead(**kwargs)
return await self.search_ahead(**kwargs), 0, 0
else:
result = (await self.search_client.search(
expand_query(**kwargs), index=self.index,
track_total_hits=False if kwargs.get('no_totals') else 10_000
))['hits']
except NotFoundError: except NotFoundError:
return [], 0, 0 return [], 0, 0
return expand_result(result['hits']), 0, result.get('total', {}).get('value', 0) return expand_result(result['hits']), 0, result.get('total', {}).get('value', 0)
@ -280,7 +274,8 @@ class SearchIndex:
query = expand_query(**kwargs) query = expand_query(**kwargs)
reordered_hits = await self.__search_ahead(query, page_size, per_channel_per_page) reordered_hits = await self.__search_ahead(query, page_size, per_channel_per_page)
cache_item.result = reordered_hits cache_item.result = reordered_hits
return list(await self.get_many(*(claim_id for claim_id, _ in reordered_hits[offset:(offset + page_size)]))) result = list(await self.get_many(*(claim_id for claim_id, _ in reordered_hits[offset:(offset + page_size)])))
return result, 0, len(reordered_hits)
async def __search_ahead(self, query: dict, page_size: int, per_channel_per_page: int): async def __search_ahead(self, query: dict, page_size: int, per_channel_per_page: int):
search_hits = deque((await self.search_client.search( search_hits = deque((await self.search_client.search(