Commit 8f6d6efa authored by Adam Hegyi's avatar Adam Hegyi

Merge branch 'keyset_pagination_iterator_docs' into 'master'

Add docs for keyset pagination iterator

See merge request gitlab-org/gitlab!64997
parents 4e20c48e ce700692
...@@ -4,8 +4,12 @@ module Gitlab ...@@ -4,8 +4,12 @@ module Gitlab
module Pagination module Pagination
module Keyset module Keyset
class Iterator class Iterator
def initialize(scope:, use_union_optimization: false) UnsupportedScopeOrder = Class.new(StandardError)
@scope = scope
def initialize(scope:, use_union_optimization: true)
@scope, success = Gitlab::Pagination::Keyset::SimpleOrderBuilder.build(scope)
raise(UnsupportedScopeOrder, 'The order on the scope does not support keyset pagination') unless success
@order = Gitlab::Pagination::Keyset::Order.extract_keyset_order_object(scope) @order = Gitlab::Pagination::Keyset::Order.extract_keyset_order_object(scope)
@use_union_optimization = use_union_optimization @use_union_optimization = use_union_optimization
end end
......
...@@ -27,27 +27,31 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -27,27 +27,31 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
), ),
Gitlab::Pagination::Keyset::ColumnOrderDefinition.new( Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
attribute_name: 'id', attribute_name: 'id',
order_expression: klass.arel_table[:id].send(direction), order_expression: klass.arel_table[:id].send(direction)
add_to_projections: true
) )
]) ])
end end
let(:scope) { project.issues.reorder(custom_reorder) } let(:scope) { project.issues.reorder(custom_reorder) }
subject { described_class.new(scope: scope) } shared_examples 'iterator examples' do
describe '.each_batch' do describe '.each_batch' do
it 'yields an ActiveRecord::Relation when a block is given' do it 'yields an ActiveRecord::Relation when a block is given' do
subject.each_batch(of: 1) do |relation| iterator.each_batch(of: 1) do |relation|
expect(relation).to be_a_kind_of(ActiveRecord::Relation) expect(relation).to be_a_kind_of(ActiveRecord::Relation)
end end
end end
it 'raises error when ordering configuration cannot be automatically determined' do
expect do
described_class.new(scope: MergeRequestDiffCommit.order(:merge_request_diff_id, :relative_order))
end.to raise_error /The order on the scope does not support keyset pagination/
end
it 'accepts a custom batch size' do it 'accepts a custom batch size' do
count = 0 count = 0
subject.each_batch(of: 2) { |relation| count += relation.count(:all) } iterator.each_batch(of: 2) { |relation| count += relation.count(:all) }
expect(count).to eq(9) expect(count).to eq(9)
end end
...@@ -55,11 +59,11 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -55,11 +59,11 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'allows updating of the yielded relations' do it 'allows updating of the yielded relations' do
time = Time.current time = Time.current
subject.each_batch(of: 2) do |relation| iterator.each_batch(of: 2) do |relation|
relation.update_all(updated_at: time) Issue.connection.execute("UPDATE issues SET updated_at = '#{time.to_s(:inspect)}' WHERE id IN (#{relation.reselect(:id).to_sql})")
end end
expect(Issue.where(updated_at: time).count).to eq(9) expect(Issue.pluck(:updated_at)).to all(be_within(5.seconds).of(time))
end end
context 'with ordering direction' do context 'with ordering direction' do
...@@ -67,7 +71,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -67,7 +71,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'orders ascending by default, including secondary order column' do it 'orders ascending by default, including secondary order column' do
positions = [] positions = []
subject.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) } iterator.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) }
expect(positions).to eq(project.issues.order_relative_position_asc.order(id: :asc).pluck(:relative_position, :id)) expect(positions).to eq(project.issues.order_relative_position_asc.order(id: :asc).pluck(:relative_position, :id))
end end
...@@ -79,7 +83,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -79,7 +83,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'orders in reverse of ascending' do it 'orders in reverse of ascending' do
positions = [] positions = []
subject.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) } iterator.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) }
expect(positions).to eq(project.issues.order_relative_position_desc.order(id: :desc).pluck(:relative_position, :id)) expect(positions).to eq(project.issues.order_relative_position_desc.order(id: :desc).pluck(:relative_position, :id))
end end
...@@ -91,7 +95,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -91,7 +95,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'orders ascending with nulls first' do it 'orders ascending with nulls first' do
positions = [] positions = []
subject.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) } iterator.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) }
expect(positions).to eq(project.issues.reorder(::Gitlab::Database.nulls_first_order('relative_position', 'ASC')).order(id: :asc).pluck(:relative_position, :id)) expect(positions).to eq(project.issues.reorder(::Gitlab::Database.nulls_first_order('relative_position', 'ASC')).order(id: :asc).pluck(:relative_position, :id))
end end
...@@ -104,7 +108,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -104,7 +108,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'orders descending' do it 'orders descending' do
positions = [] positions = []
subject.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) } iterator.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:relative_position, :id)) }
expect(positions).to eq(project.issues.reorder(::Gitlab::Database.nulls_last_order('relative_position', 'DESC')).order(id: :desc).pluck(:relative_position, :id)) expect(positions).to eq(project.issues.reorder(::Gitlab::Database.nulls_last_order('relative_position', 'DESC')).order(id: :desc).pluck(:relative_position, :id))
end end
...@@ -117,11 +121,24 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do ...@@ -117,11 +121,24 @@ RSpec.describe Gitlab::Pagination::Keyset::Iterator do
it 'orders descending' do it 'orders descending' do
positions = [] positions = []
subject.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:id)) } iterator.each_batch(of: 2) { |rel| positions.concat(rel.pluck(:id)) }
expect(positions).to eq(project.issues.reorder(id: :desc).pluck(:id)) expect(positions).to eq(project.issues.reorder(id: :desc).pluck(:id))
end end
end end
end end
end end
end
context 'when use_union_optimization is used' do
subject(:iterator) { described_class.new(scope: scope, use_union_optimization: true) }
include_examples 'iterator examples'
end
context 'when use_union_optimization is not used' do
subject(:iterator) { described_class.new(scope: scope, use_union_optimization: false) }
include_examples 'iterator examples'
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment