|
8 | 8 | from typing import TYPE_CHECKING, Any, cast |
9 | 9 |
|
10 | 10 | from sqlalchemy import CursorResult, exists, func, or_, select, update |
11 | | -from sqlalchemy import func as sql_func |
12 | 11 | from sqlalchemy.exc import SQLAlchemyError |
13 | 12 | from sqlalchemy.orm import load_only |
14 | 13 | from typing_extensions import NotRequired, Self, override |
@@ -778,22 +777,20 @@ def _prepare_buffer_data( |
778 | 777 | @override |
779 | 778 | async def _apply_buffer_updates(self, session: AsyncSession, max_buffer_id: int) -> None: |
780 | 779 | aggregations: list[ColumnElement[Any]] = [ |
781 | | - sql_func.max(self._BUFFER_TABLE.accessed_at).label('max_accessed_at'), |
782 | | - sql_func.max(self._BUFFER_TABLE.modified_at).label('max_modified_at'), |
783 | | - sql_func.sum(self._BUFFER_TABLE.delta_handled_count).label('delta_handled_count'), |
784 | | - sql_func.sum(self._BUFFER_TABLE.delta_pending_count).label('delta_pending_count'), |
785 | | - sql_func.sum(self._BUFFER_TABLE.delta_total_count).label('delta_total_count'), |
| 780 | + func.max(self._BUFFER_TABLE.accessed_at).label('max_accessed_at'), |
| 781 | + func.max(self._BUFFER_TABLE.modified_at).label('max_modified_at'), |
| 782 | + func.sum(self._BUFFER_TABLE.delta_handled_count).label('delta_handled_count'), |
| 783 | + func.sum(self._BUFFER_TABLE.delta_pending_count).label('delta_pending_count'), |
| 784 | + func.sum(self._BUFFER_TABLE.delta_total_count).label('delta_total_count'), |
786 | 785 | ] |
787 | 786 |
|
788 | 787 | if not self._had_multiple_clients: |
789 | | - aggregations.append( |
790 | | - sql_func.count(sql_func.distinct(self._BUFFER_TABLE.client_id)).label('unique_clients_count') |
791 | | - ) |
| 788 | + aggregations.append(func.count(func.distinct(self._BUFFER_TABLE.client_id)).label('unique_clients_count')) |
792 | 789 |
|
793 | 790 | if self._storage_client.get_dialect_name() == 'postgresql': |
794 | | - aggregations.append(sql_func.bool_or(self._BUFFER_TABLE.need_recalc).label('need_recalc')) |
| 791 | + aggregations.append(func.bool_or(self._BUFFER_TABLE.need_recalc).label('need_recalc')) |
795 | 792 | else: |
796 | | - aggregations.append(sql_func.max(self._BUFFER_TABLE.need_recalc).label('need_recalc')) |
| 793 | + aggregations.append(func.max(self._BUFFER_TABLE.need_recalc).label('need_recalc')) |
797 | 794 |
|
798 | 795 | aggregation_stmt = select(*aggregations).where( |
799 | 796 | self._BUFFER_TABLE.storage_id == self._id, self._BUFFER_TABLE.id <= max_buffer_id |
|
0 commit comments