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

Jump to bottom

fix(search): compute common aggregations one by one #990

Merged
merged 1 commit into from Jan 18, 2022
Merged

fix(search): compute common aggregations one by one #990

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 28 additions & 26 deletions src/rubrix/server/tasks/commons/dao/dao.py
View file
Open in desktop
Expand Up @@ -220,43 +220,45 @@ def search_records(
"""
search = search or RecordSearch()
records_index = dataset_records_index(dataset.id)

compute_aggregations = record_from == 0
aggregation_requests = (
{**(search.aggregations or {})} if record_from == 0 else None
{**(search.aggregations or {})} if compute_aggregations else {}
)

if aggregation_requests is not None and search.include_default_aggregations:
aggregation_requests.update(
{
**aggregations.predicted_as(),
**aggregations.predicted_by(),
**aggregations.annotated_as(),
**aggregations.annotated_by(),
**aggregations.status(),
**aggregations.predicted(),
**aggregations.words_cloud(),
**aggregations.score(),
**aggregations.custom_fields(
self._es.get_field_mapping(
index=records_index, field_name="metadata.*"
)
),
}
)

if record_from > 0:
aggregation_requests = None

es_query = {
"_source": {"excludes": exclude_fields or []},
"size": size,
"from": record_from,
"query": search.query or {"match_all": {}},
"sort": search.sort or [{"_id": {"order": "asc"}}],
"aggs": aggregation_requests or {},
"aggs": aggregation_requests,
}
results = self._es.search(index=records_index, query=es_query, size=size)

if compute_aggregations and search.include_default_aggregations:
current_aggrs = results.get("aggregations", {})
for aggr in [
aggregations.predicted_as(),
aggregations.predicted_by(),
aggregations.annotated_as(),
aggregations.annotated_by(),
aggregations.status(),
aggregations.predicted(),
aggregations.words_cloud(),
aggregations.score(),
aggregations.custom_fields(
self._es.get_field_mapping(
index=records_index, field_name="metadata.*"
)
),
]:
if aggr:
aggr_results = self._es.search(
index=records_index,
query={"query": es_query["query"], "aggs": aggr},
)
current_aggrs.update(aggr_results["aggregations"])
results["aggregations"] = current_aggrs

hits = results["hits"]
total = hits["total"]
docs = hits["hits"]
Expand Down