Skip to content

fix: avoid subqueries when calling /messages without parameters #877

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
Open

fix: avoid subqueries when calling /messages without parameters #877

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
6 changes: 5 additions & 1 deletion src/aleph/db/accessors/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ def count_matching_messages(
session: DbSession,
start_date: float = 0.0,
end_date: float = 0.0,
start_block: int = 0,
end_block: int = 0,
sort_by: SortBy = SortBy.TIME,
sort_order: SortOrder = SortOrder.DESCENDING,
page: int = 1,
Expand All @@ -220,11 +222,13 @@ def count_matching_messages(
# Note that we deliberately ignore the pagination parameters so that users can pass
# the same parameters as get_matching_messages and get the total number of messages,
# not just the number on a page.
if kwargs or start_date or end_date:
if kwargs or start_date or end_date or start_block or end_block:
select_stmt = make_matching_messages_query(
**kwargs,
start_date=start_date,
end_date=end_date,
start_block=start_block,
end_block=end_block,
include_confirmations=False,
page=1,
pagination=0,
Expand Down
Loading