Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up country search #3292

Merged
merged 3 commits into from
Jan 7, 2024
Merged

Speed up country search #3292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4305160
prioritize country searches when penaly is equal
lonvia Jan 7, 2024
7337898
dump params in log view
lonvia Jan 7, 2024
b2afe3c
when a country is in the results, restrict further searches to places
lonvia Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion nominatim/api/search/db_searches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ async def _get_tiger(conn: SearchConnection, place_ids: List[int],
class AbstractSearch(abc.ABC):
""" Encapuslation of a single lookup in the database.
"""
SEARCH_PRIO: int = 2

def __init__(self, penalty: float) -> None:
self.penalty = penalty
Expand Down Expand Up @@ -448,6 +449,8 @@ def _base_query() -> SaSelect:
class CountrySearch(AbstractSearch):
""" Search for a country name or country code.
"""
SEARCH_PRIO = 0

def __init__(self, sdata: SearchData) -> None:
super().__init__(sdata.penalty)
self.countries = sdata.countries
Expand Down Expand Up @@ -481,7 +484,14 @@ async def lookup(self, conn: SearchConnection,
result.bbox = Bbox.from_wkb(row.bbox)
results.append(result)

return results or await self.lookup_in_country_table(conn, details)
if not results:
results = await self.lookup_in_country_table(conn, details)

if results:
details.min_rank = min(5, details.max_rank)
details.max_rank = min(25, details.max_rank)

return results


async def lookup_in_country_table(self, conn: SearchConnection,
Expand Down Expand Up @@ -604,6 +614,8 @@ async def lookup(self, conn: SearchConnection,
class PlaceSearch(AbstractSearch):
""" Generic search for an address or named place.
"""
SEARCH_PRIO = 1

def __init__(self, extra_penalty: float, sdata: SearchData, expected_count: int) -> None:
super().__init__(sdata.penalty + extra_penalty)
self.countries = sdata.countries
Expand Down
3 changes: 2 additions & 1 deletion nominatim/api/search/geocoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async def build_searches(self,
log().table_dump('Searches for assignment',
_dump_searches(searches, query, num_searches))
num_searches = len(searches)
searches.sort(key=lambda s: s.penalty)
searches.sort(key=lambda s: (s.penalty, s.SEARCH_PRIO))

return query, searches

Expand All @@ -85,6 +85,7 @@ async def execute_searches(self, query: QueryStruct,
if search.penalty > prev_penalty and (search.penalty > min_ranking or i > 20):
break
log().table_dump(f"{i + 1}. Search", _dump_searches([search], query))
log().var_dump('Params', self.params)
lookup_results = await search.lookup(self.conn, self.params)
for result in lookup_results:
rhash = (result.source_table, result.place_id,
Expand Down