diff options
Diffstat (limited to 'app/models/event_collection.rb')
| -rw-r--r-- | app/models/event_collection.rb | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/app/models/event_collection.rb b/app/models/event_collection.rb index 4258027aa56..72e1d28a297 100644 --- a/app/models/event_collection.rb +++ b/app/models/event_collection.rb @@ -62,21 +62,12 @@ class EventCollection end def in_operator_optimized_relation(parent_column, parents, parent_model) - query_builder_params = if Feature.enabled?(:optimized_project_and_group_activity_queries) - array_data = { - scope_ids: parents.pluck(:id), - scope_model: parent_model, - mapping_column: parent_column - } - filter.in_operator_query_builder_params(array_data) - else - { - scope: filtered_events, - array_scope: parents.select(:id), - array_mapping_scope: -> (parent_id_expression) { Event.where(Event.arel_table[parent_column].eq(parent_id_expression)).reorder(id: :desc) }, - finder_query: -> (id_expression) { Event.where(Event.arel_table[:id].eq(id_expression)) } - } - end + array_data = { + scope_ids: parents.pluck(:id), + scope_model: parent_model, + mapping_column: parent_column + } + query_builder_params = filter.in_operator_query_builder_params(array_data) Gitlab::Pagination::Keyset::InOperatorOptimization::QueryBuilder .new(**query_builder_params) @@ -84,10 +75,6 @@ class EventCollection .limit(@limit + @offset) end - def filtered_events - filter.apply_filter(base_relation) - end - def paginate_events(events) events.limit(@limit).offset(@offset) end |