mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
Remove dependency on pluck_each gem (#16012)
This commit is contained in:
parent
619fad6cf8
commit
ad61265268
1
Gemfile
1
Gemfile
|
@ -157,4 +157,3 @@ gem 'concurrent-ruby', require: false
|
||||||
gem 'connection_pool', require: false
|
gem 'connection_pool', require: false
|
||||||
|
|
||||||
gem 'xorcist', '~> 1.1'
|
gem 'xorcist', '~> 1.1'
|
||||||
gem 'pluck_each', git: 'https://github.com/nsommer/pluck_each', ref: '73be0947c52fc54bf6d7085378db008358aac5eb'
|
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -9,15 +9,6 @@ GIT
|
||||||
sidekiq (>= 3.5)
|
sidekiq (>= 3.5)
|
||||||
statsd-ruby (~> 1.4, >= 1.4.0)
|
statsd-ruby (~> 1.4, >= 1.4.0)
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: https://github.com/nsommer/pluck_each
|
|
||||||
revision: 73be0947c52fc54bf6d7085378db008358aac5eb
|
|
||||||
ref: 73be0947c52fc54bf6d7085378db008358aac5eb
|
|
||||||
specs:
|
|
||||||
pluck_each (0.1.3)
|
|
||||||
activerecord (>= 6.1.0)
|
|
||||||
activesupport (>= 6.1.0)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -771,7 +762,6 @@ DEPENDENCIES
|
||||||
pg (~> 1.2)
|
pg (~> 1.2)
|
||||||
pghero (~> 2.8)
|
pghero (~> 2.8)
|
||||||
pkg-config (~> 1.4)
|
pkg-config (~> 1.4)
|
||||||
pluck_each!
|
|
||||||
posix-spawn
|
posix-spawn
|
||||||
premailer-rails
|
premailer-rails
|
||||||
private_address_check (~> 0.5)
|
private_address_check (~> 0.5)
|
||||||
|
|
|
@ -29,6 +29,7 @@ require_relative '../lib/webpacker/helper_extensions'
|
||||||
require_relative '../lib/action_dispatch/cookie_jar_extensions'
|
require_relative '../lib/action_dispatch/cookie_jar_extensions'
|
||||||
require_relative '../lib/rails/engine_extensions'
|
require_relative '../lib/rails/engine_extensions'
|
||||||
require_relative '../lib/active_record/database_tasks_extensions'
|
require_relative '../lib/active_record/database_tasks_extensions'
|
||||||
|
require_relative '../lib/active_record/batches'
|
||||||
|
|
||||||
Dotenv::Railtie.load
|
Dotenv::Railtie.load
|
||||||
|
|
||||||
|
|
44
lib/active_record/batches.rb
Normal file
44
lib/active_record/batches.rb
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module ActiveRecord
|
||||||
|
module Batches
|
||||||
|
def pluck_each(*column_names)
|
||||||
|
relation = self
|
||||||
|
|
||||||
|
options = column_names.extract_options!
|
||||||
|
|
||||||
|
flatten = column_names.size == 1
|
||||||
|
batch_limit = options[:batch_limit] || 1_000
|
||||||
|
order = options[:order] || :asc
|
||||||
|
|
||||||
|
column_names.unshift(primary_key)
|
||||||
|
|
||||||
|
relation = relation.reorder(batch_order(order)).limit(batch_limit)
|
||||||
|
relation.skip_query_cache!
|
||||||
|
|
||||||
|
batch_relation = relation
|
||||||
|
|
||||||
|
loop do
|
||||||
|
batch = batch_relation.pluck(*column_names)
|
||||||
|
|
||||||
|
break if batch.empty?
|
||||||
|
|
||||||
|
primary_key_offset = batch.last[0]
|
||||||
|
|
||||||
|
batch.each do |record|
|
||||||
|
if flatten
|
||||||
|
yield record[1]
|
||||||
|
else
|
||||||
|
yield record[1..-1]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
break if batch.size < batch_limit
|
||||||
|
|
||||||
|
batch_relation = relation.where(
|
||||||
|
predicate_builder[primary_key, primary_key_offset, order == :desc ? :lt : :gt]
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue