mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00
Code Issues Releases Wiki Activity

Split functionality out for easier extensibility

Browse Source 
Co-authored-by: Cameron Lamb <cameron.lamb@digital.trade.gov.uk>
Co-authored-by: Sam Dudley <samuel.dudley@digital.trade.gov.uk>
This commit is contained in:
marcelkornblum 2023-10-09 09:37:16 +01:00 committed by Matt Westcott
parent 4da28a4ba8
commit 83c1dad398
2 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
wagtail/search/backends/elasticsearch5.py
View File

@ -315,25 +315,22 @@ class Elasticsearch5SearchQueryCompiler(BaseSearchQueryCompiler):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.mapping = self.mapping_class(self.queryset.model)
self.remapped_fields = self._remap_fields(self.fields)
# Convert field names into index column names
if self.fields:
fields = []
searchable_fields = {
f.field_name: f
for f in self.queryset.model.get_searchable_search_fields()
}
for field_name in self.fields:
if field_name in searchable_fields:
field_name = self.mapping.get_field_column_name(
searchable_fields[field_name]
)
def _remap_fields(self, fields):
"""Convert field names into index column names"""
if fields is None:
return None
fields.append(field_name)
self.remapped_fields = fields
else:
self.remapped_fields = None
remapped_fields = []
searchable_fields = {f.field_name: f for f in self.get_searchable_fields()}
for field_name in fields:
if field_name in searchable_fields:
field_name = self.mapping.get_field_column_name(
searchable_fields[field_name]
)
remapped_fields.append(field_name)
return remapped_fields
def _process_lookup(self, field, lookup, value):
column_name = self.mapping.get_field_column_name(field)
@ -406,6 +403,19 @@ class Elasticsearch5SearchQueryCompiler(BaseSearchQueryCompiler):
}
}
def _join_and_compile_queries(self, query, fields, boost=1.0):
if len(fields) == 1:
return self._compile_query(query, fields[0], boost)
else:
# Compile a query for each field then combine with disjunction
# max (or operator which takes the max score out of each of the
# field queries)
field_queries = []
for field in fields:
field_queries.append(self._compile_query(query, field, boost))
return {"dis_max": {"queries": field_queries}}
def _connect_filters(self, filters, connector, negated):
if filters:
if len(filters) == 1:
@ -545,17 +555,7 @@ class Elasticsearch5SearchQueryCompiler(BaseSearchQueryCompiler):
return self._compile_fuzzy_query(self.query, fields)
else:
if len(fields) == 1:
return self._compile_query(self.query, fields[0])
else:
# Compile a query for each field then combine with disjunction
# max (or operator which takes the max score out of each of the
# field queries)
field_queries = []
for field in fields:
field_queries.append(self._compile_query(self.query, field))
return {"dis_max": {"queries": field_queries}}
return self._join_and_compile_queries(self.query, fields)
def get_content_type_filter(self):
# Query content_type using a "match" query. See comment in
@ -596,6 +596,9 @@ class Elasticsearch5SearchQueryCompiler(BaseSearchQueryCompiler):
else:
return inner_query
def get_searchable_fields(self):
return self.queryset.model.get_searchable_search_fields()
def get_sort(self):
# Ordering by relevance is the default in Elasticsearch
if self.order_by_relevance:

12
wagtail/search/backends/elasticsearch6.py
View File

@ -169,17 +169,7 @@ class Elasticsearch6SearchQueryCompiler(Elasticsearch5SearchQueryCompiler):
}
else:
if len(fields) == 1:
return self._compile_query(self.query, fields[0])
else:
# Compile a query for each field then combine with disjunction
# max (or operator which takes the max score out of each of the
# field queries)
field_queries = []
for field in fields:
field_queries.append(self._compile_query(self.query, field))
return {"dis_max": {"queries": field_queries}}
return self._join_and_compile_queries(self.query, fields)
class Elasticsearch6SearchResults(Elasticsearch5SearchResults):