Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'
[Rails5] Update ar5_batching initializer See merge request gitlab-org/gitlab-ce!17825
This commit is contained in:
commit
294a9e98cf
|
@ -1,41 +1,39 @@
|
||||||
# Port ActiveRecord::Relation#in_batches from ActiveRecord 5.
|
# Remove this file when upgraded to rails 5.0.
|
||||||
# https://github.com/rails/rails/blob/ac027338e4a165273607dccee49a3d38bc836794/activerecord/lib/active_record/relation/batches.rb#L184
|
unless Gitlab.rails5?
|
||||||
# TODO: this can be removed once we're using AR5.
|
module ActiveRecord
|
||||||
raise "Vendored ActiveRecord 5 code! Delete #{__FILE__}!" if ActiveRecord::VERSION::MAJOR >= 5
|
module Batches
|
||||||
|
# Differences from upstream: enumerator support was removed, and custom
|
||||||
|
# order/limit clauses are ignored without a warning.
|
||||||
|
def in_batches(of: 1000, start: nil, finish: nil, load: false)
|
||||||
|
raise "Must provide a block" unless block_given?
|
||||||
|
|
||||||
module ActiveRecord
|
relation = self.reorder(batch_order).limit(of)
|
||||||
module Batches
|
relation = relation.where(arel_table[primary_key].gteq(start)) if start
|
||||||
# Differences from upstream: enumerator support was removed, and custom
|
relation = relation.where(arel_table[primary_key].lteq(finish)) if finish
|
||||||
# order/limit clauses are ignored without a warning.
|
batch_relation = relation
|
||||||
def in_batches(of: 1000, start: nil, finish: nil, load: false)
|
|
||||||
raise "Must provide a block" unless block_given?
|
|
||||||
|
|
||||||
relation = self.reorder(batch_order).limit(of)
|
loop do
|
||||||
relation = relation.where(arel_table[primary_key].gteq(start)) if start
|
if load
|
||||||
relation = relation.where(arel_table[primary_key].lteq(finish)) if finish
|
records = batch_relation.records
|
||||||
batch_relation = relation
|
ids = records.map(&:id)
|
||||||
|
yielded_relation = self.where(primary_key => ids)
|
||||||
|
yielded_relation.load_records(records)
|
||||||
|
else
|
||||||
|
ids = batch_relation.pluck(primary_key)
|
||||||
|
yielded_relation = self.where(primary_key => ids)
|
||||||
|
end
|
||||||
|
|
||||||
loop do
|
break if ids.empty?
|
||||||
if load
|
|
||||||
records = batch_relation.records
|
primary_key_offset = ids.last
|
||||||
ids = records.map(&:id)
|
raise ArgumentError.new("Primary key not included in the custom select clause") unless primary_key_offset
|
||||||
yielded_relation = self.where(primary_key => ids)
|
|
||||||
yielded_relation.load_records(records)
|
yield yielded_relation
|
||||||
else
|
|
||||||
ids = batch_relation.pluck(primary_key)
|
break if ids.length < of
|
||||||
yielded_relation = self.where(primary_key => ids)
|
|
||||||
|
batch_relation = relation.where(arel_table[primary_key].gt(primary_key_offset))
|
||||||
end
|
end
|
||||||
|
|
||||||
break if ids.empty?
|
|
||||||
|
|
||||||
primary_key_offset = ids.last
|
|
||||||
raise ArgumentError.new("Primary key not included in the custom select clause") unless primary_key_offset
|
|
||||||
|
|
||||||
yield yielded_relation
|
|
||||||
|
|
||||||
break if ids.length < of
|
|
||||||
|
|
||||||
batch_relation = relation.where(arel_table[primary_key].gt(primary_key_offset))
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue