Skip to content

Search: improve queries #12569

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −5
Open

Search: improve queries #12569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions readthedocs/search/faceted_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,15 @@ def _get_text_queries(self, *, query, fields):
is_advanced_query = self.use_advanced_query or self._is_advanced_query(query)
for operator in self.operators:
if is_advanced_query:
# See all valid options at:
# https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-simple-query-string-query.
query_string = SimpleQueryString(
query=query,
fields=fields,
default_operator=operator,
# Restrict fuzziness to avoid timeouts with complex queries.
fuzzy_prefix_length=1,
fuzzy_max_expansions=15,
)
else:
query_string = self._get_fuzzy_query(
Expand Down Expand Up @@ -283,13 +288,13 @@ def _get_projects_query(self):

if isinstance(self.projects, dict):
versions_query = [
Bool(filter=[Term(project=project), Term(version=version)])
Bool(must=[Term(project=project), Term(version=version)])
for project, version in self.projects.items()
]
return Bool(should=versions_query)

if isinstance(self.projects, list):
return Bool(filter=Terms(project=self.projects))
return Terms(project=self.projects)

raise ValueError("projects must be a list or a dict!")

Expand All @@ -312,13 +317,14 @@ def query(self, search, query):
query=query,
path="sections",
fields=self._section_fields,
limit=3,
)
queries.append(sections_nested_query)
bool_query = Bool(should=queries)

projects_query = self._get_projects_query()
if projects_query:
bool_query = Bool(must=[bool_query, projects_query])
bool_query = Bool(must=[bool_query], filter=projects_query)

final_query = FunctionScore(
query=bool_query,
Expand All @@ -327,7 +333,7 @@ def query(self, search, query):
search = search.query(final_query)
return search

def _get_nested_query(self, *, query, path, fields):
def _get_nested_query(self, *, query, path, fields, limit=3):
"""Generate a nested query with passed parameters."""
queries = self._get_queries(
query=query,
Expand All @@ -348,7 +354,7 @@ def _get_nested_query(self, *, query, path, fields):

return Nested(
path=path,
inner_hits={"highlight": highlight},
inner_hits={"highlight": highlight, "size": limit},
query=bool_query,
)

Expand Down