job-iteration 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a4821d55797f7597b3c916d6fbca2195c054bd3aab0ffcc40c9ce21ae0b1ec4
-  data.tar.gz: e71ce0fb7ec744b502f018ccfc7ea5e819bfe06f9fb2ca5a32c70cc1b875abc7
+  metadata.gz: 7868f8da1aee096abee4d4a1848c2242d0a7ac9bb1b456ad8385cfe6421a902e
+  data.tar.gz: fd82a4cdfcbff16220363e1c53aa064b0cd5e599e17290aa968fdb01d8fe4002
 SHA512:
-  metadata.gz: 943795fabf60cff76fa7b8678f1f5d5a83bd98340194e142092dc891ff1abe991c0410572cebd09155c6c220ff96aa5530fb27e1b4fe119c6bbbf22fe12670ef
-  data.tar.gz: 11ea6f0165aa31350c6486236a33d66c94316a08f52905aeaab049388b433c229ccf52e69ae3e43eb8bca9a5c56dc4aae46803aae4add9d2a052d5d49af14d8d
+  metadata.gz: 42a601bb25a38571c97d108a8847317892a5289e2d3f8d818b68c99a49fc6d142dffcdd9191350261a89db65bf24aa3b0691057238f2416e2a0140bf16c47485
+  data.tar.gz: 364868992c7fe4602f31d453891f4597d73d0b7b76482510d7ae9d3d3de7baf951465c5df7fcf9923592abb05b3584a9206f104bd610ab52dbbf3625c03be3f6

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    services:
+      redis:
+        image: redis
+        ports:
+        - 6379:6379
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0]
+        gemfile: [rails_5_2, rails_6_0, rails_edge]
+        exclude:
+          - ruby: 2.5
+            gemfile: rails_edge
+          - ruby: 2.6
+            gemfile: rails_edge
+          - ruby: 3.0
+            gemfile: rails_5_2
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Start MySQL and create DB
+      run: |
+        sudo systemctl start mysql.service
+        mysql -uroot -h localhost -proot -e "CREATE DATABASE job_iteration_test;"
+    - name: Rubocop
+      run: bundle exec rubocop
+    - name: Ruby tests
+      run: bundle exec rake test
+      env:
+        REDIS_HOST: localhost
+        REDIS_PORT: ${{ job.services.redis.ports[6379] }}
+    - name: Documentation correctly written
+      run: bundle exec yardoc --no-output --no-save --no-stats --fail-on-warning

data/.rubocop.yml

@@ -1,5 +1,5 @@
-inherit_from:
-  - http://shopify.github.io/ruby-style-guide/rubocop.yml
+inherit_gem:
+  rubocop-shopify: rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.4.4

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 #### Bug fix
 
+## v1.1.10 (March 30, 2021)
+
+- [69](https://github.com/Shopify/job-iteration/pull/69) Fix memory leak in ActiveRecordCursor
+
 ## v1.1.9 (January 6, 2021)
 
 - [61](https://github.com/Shopify/job-iteration/pull/61) Call `super` in `method_added`

data/Gemfile

@@ -8,21 +8,21 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 # for integration testing
-gem 'sidekiq'
-gem 'resque'
+gem "sidekiq"
+gem "resque"
 
-gem 'mysql2', '~> 0.5'
-gem 'globalid'
-gem 'i18n'
-gem 'redis'
-gem 'database_cleaner'
+gem "mysql2", "~> 0.5"
+gem "globalid"
+gem "i18n"
+gem "redis"
+gem "database_cleaner"
 
-gem 'pry'
-gem 'mocha'
+gem "pry"
+gem "mocha"
 
-gem 'rubocop', '~> 0.77.0'
-gem 'yard'
-gem 'rake'
+gem "rubocop-shopify", require: false
+gem "yard"
+gem "rake"
 
 # for unit testing optional sorbet support
-gem 'sorbet-runtime'
+gem "sorbet-runtime"

data/gemfiles/rails_5_2.gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-eval_gemfile '../Gemfile'
+eval_gemfile "../Gemfile"
 
-gem 'activejob', '~> 5.2.0'
-gem 'activerecord', '~> 5.2.0'
+gem "activejob", "~> 5.2.0"
+gem "activerecord", "~> 5.2.0"

data/gemfiles/rails_6_0.gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-eval_gemfile '../Gemfile'
+eval_gemfile "../Gemfile"
 
-gem 'activejob', '~> 6.0.0'
-gem 'activerecord', '~> 6.0.0'
+gem "activejob", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"

data/gemfiles/rails_edge.gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-eval_gemfile '../Gemfile'
+eval_gemfile "../Gemfile"
 
-gem 'activejob', github: 'rails/rails'
-gem 'activerecord', github: 'rails/rails'
+gem "activejob", github: "rails/rails", branch: "main"
+gem "activerecord", github: "rails/rails", branch: "main"

data/job-iteration.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = %w(Shopify)
   spec.email         = ["ops-accounts+shipit@shopify.com"]
 
-  spec.summary       = 'Makes your background jobs interruptible and resumable.'
+  spec.summary       = "Makes your background jobs interruptible and resumable."
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/shopify/job-iteration"
   spec.license       = "MIT"

data/lib/job-iteration.rb

@@ -54,11 +54,11 @@ module JobIteration
   def load_integration(integration)
     unless INTEGRATIONS.include?(integration)
       raise IntegrationLoadError,
-        "#{integration} integration is not supported. Available integrations: #{INTEGRATIONS.join(', ')}"
+        "#{integration} integration is not supported. Available integrations: #{INTEGRATIONS.join(", ")}"
     end
 
     require_relative "./job-iteration/integrations/#{integration}"
   end
 end
 
-JobIteration.load_integrations unless ENV['ITERATION_DISABLE_AUTOCONFIGURE']
+JobIteration.load_integrations unless ENV["ITERATION_DISABLE_AUTOCONFIGURE"]

data/lib/job-iteration/active_record_cursor.rb

@@ -23,7 +23,7 @@ module JobIteration
       @columns = Array.wrap(columns)
       self.position = Array.wrap(position)
       raise ArgumentError, "Must specify at least one column" if columns.empty?
-      if relation.joins_values.present? && !@columns.all? { |column| column.to_s.include?('.') }
+      if relation.joins_values.present? && !@columns.all? { |column| column.to_s.include?(".") }
         raise ArgumentError, "You need to specify fully-qualified columns if you join a table"
       end
 
@@ -31,7 +31,7 @@ module JobIteration
         raise ConditionNotSupportedError
       end
 
-      @base_relation = relation.reorder(@columns.join(','))
+      @base_relation = relation.reorder(@columns.join(","))
       @reached_end = false
     end
 
@@ -50,7 +50,7 @@ module JobIteration
 
     def update_from_record(record)
       self.position = @columns.map do |column|
-        method = column.to_s.split('.').last
+        method = column.to_s.split(".").last
         record.send(method.to_sym)
       end
     end
@@ -64,7 +64,9 @@ module JobIteration
         relation = relation.where(*conditions)
       end
 
-      records = relation.to_a
+      records = relation.uncached do
+        relation.to_a
+      end
 
       update_from_record(records.last) unless records.empty?
       @reached_end = records.size < batch_size

data/lib/job-iteration/active_record_enumerator.rb

@@ -40,7 +40,7 @@ module JobIteration
 
     def cursor_value(record)
       positions = @columns.map do |column|
-        attribute_name = column.to_s.split('.').last
+        attribute_name = column.to_s.split(".").last
         column_value(record, attribute_name)
       end
       return positions.first if positions.size == 1

data/lib/job-iteration/integrations/resque.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'resque'
+require "resque"
 
 module JobIteration
   module Integrations

data/lib/job-iteration/integrations/sidekiq.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq'
+require "sidekiq"
 
 module JobIteration
   module Integrations # @private

data/lib/job-iteration/iteration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/all'
+require "active_support/all"
 
 module JobIteration
   module Iteration
@@ -54,17 +54,17 @@ module JobIteration
 
     def serialize # @private
       super.merge(
-        'cursor_position' => cursor_position,
-        'times_interrupted' => times_interrupted,
-        'total_time' => total_time,
+        "cursor_position" => cursor_position,
+        "times_interrupted" => times_interrupted,
+        "total_time" => total_time,
       )
     end
 
     def deserialize(job_data) # @private
       super
-      self.cursor_position = job_data['cursor_position']
-      self.times_interrupted = job_data['times_interrupted'] || 0
-      self.total_time = job_data['total_time'] || 0
+      self.cursor_position = job_data["cursor_position"]
+      self.times_interrupted = job_data["times_interrupted"] || 0
+      self.total_time = job_data["total_time"] || 0
     end
 
     def perform(*params) # @private

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "1.1.9"
+  VERSION = "1.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md

data/.travis.yml

@@ -1,19 +0,0 @@
-services:
-  - mysql
-  - redis-server
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - mysql -e 'CREATE DATABASE job_iteration_test;'
-script:
-  - bundle exec rake test
-  - bundle exec rubocop
-  - bundle exec yardoc --no-output --no-save --no-stats --fail-on-warning
-
-gemfile:
-  - 'gemfiles/rails_5_2.gemfile'
-  - 'gemfiles/rails_6_0.gemfile'
-  - 'gemfiles/rails_edge.gemfile'