rpush 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01653298bef15cc73e0010be8bb353c3adcb0aecc442f3883858415189a9265
-  data.tar.gz: ff64bca96549d684dfd2c4c6c0184dd55d3c93750c377a857f99d7ddb51405ec
+  metadata.gz: deccc35a73da0b426daeb20fdbbe287be5e9df9e4b8c8fcd5ef2b69c6663da68
+  data.tar.gz: c7038ba47604bde8a322beff513ab999e1a2692e56bd83b983cb757301e7e590
 SHA512:
-  metadata.gz: b4ced1c3c0a14607758568a0e717b75651b4721dcb10b6f0466450e65e8a3665f6b696b90d586085e358c79c6da7cc11c336b74ddeb82561be56a5cb5bcc58eb
-  data.tar.gz: 69f82291e5c071e93703f25385397a2dbc968f2f22685721382df52f657a2f788597dea2d110778ee342b82d0e0dab043da96f66d3a9402fcedbaf50d0a8df28
+  metadata.gz: 2a405b20855ef2d3c77f33c842058f95da8c7436a911712e221d5d199af82708dc8b5757f11219d2e31787311f8ea8f25384f85821c806f5492998436770743e
+  data.tar.gz: 4fdfe15b520768b4cbcc24c09c8859fa220fccfe18aed3a00680ff317d70ef95a4503f240262a1bdaf4aa0c4ea10be20478a4d1080e11b9b466458a8a68374c0

data/CHANGELOG.md

@@ -1,16 +1,35 @@
- ## HEAD
+## HEAD
 
- ### Breaking Changes
+### Breaking Changes
+
+- None
 
- - None
+### Added
 
- ### Added
+- None
 
- - None
+### Fixed
+
+- None
+
+## 3.1.1 (2018-04-16)
+
+### Breaking Changes
 
- ### Fixed
+- None
+
+### Added
+
+- None
+
+### Fixed
+
+- Database deadlock [#200](https://github.com/rpush/rpush/issues/200) (by [@loadhigh](https://github.com/loadhigh) in [#428](https://github.com/rpush/rpush/issues/428))
+
+### Enhancements
 
- - None
+- Change the index on `rpush_notifications` to minimize number of locked records and pre-sort the records ([#428](https://github.com/rpush/rpush/issues/428) by [@loadhigh](https://github.com/loadhigh))
+- Minimize the locking duration by moving the row dump code outside of the transaction ([#428](https://github.com/rpush/rpush/issues/428) by [@loadhigh](https://github.com/loadhigh))
 
 ## 3.1.0 (2018-04-11)
 

data/lib/generators/rpush_migration_generator.rb

@@ -45,6 +45,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
     add_rpush_migration('rpush_3_0_0_updates')
     add_rpush_migration('rpush_3_0_1_updates')
     add_rpush_migration('rpush_3_1_0_add_pushy')
+    add_rpush_migration('rpush_3_1_1_updates')
   end
 
   protected

data/lib/generators/templates/rpush_3_1_1_updates.rb

@@ -0,0 +1,15 @@
+class Rpush311Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  def self.up
+    change_table :rpush_notifications do |t|
+      t.remove_index name: 'index_rpush_notifications_multi'
+      t.index [:delivered, :failed, :processing, :deliver_after, :created_at], name: 'index_rpush_notifications_multi', where: 'NOT delivered AND NOT failed'
+    end
+  end
+
+  def self.down
+    change_table :rpush_notifications do |t|
+      t.remove_index name: 'index_rpush_notifications_multi'
+      t.index [:delivered, :failed], name: 'index_rpush_notifications_multi', where: 'NOT delivered AND NOT failed'
+    end
+  end
+end

data/lib/rpush/daemon/store/active_record.rb

@@ -11,7 +11,6 @@ module Rpush
         DEFAULT_MARK_OPTIONS = { persist: true }
 
         def initialize
-          @using_oracle = adapter_name =~ /oracle/
           reopen_log unless Rpush.config.embedded
         end
 
@@ -29,13 +28,21 @@ module Rpush
 
         def deliverable_notifications(limit)
           with_database_reconnect_and_retry do
-            Rpush::Client::ActiveRecord::Notification.transaction do
+            notifications = Rpush::Client::ActiveRecord::Notification.transaction do
               relation = ready_for_delivery
               relation = relation.limit(limit)
-              notifications = claim(relation)
-              mark_processing(notifications)
-              notifications
+              ids = relation.lock(true).ids
+              unless ids.empty?
+                relation = Rpush::Client::ActiveRecord::Notification.where(id: ids)
+                # mark processing
+                relation.update_all(processing: true, updated_at: Time.now)
+                relation
+              else
+                []
+              end
             end
+
+            notifications.to_a
           end
         end
 
@@ -190,23 +197,7 @@ module Rpush
 
         def ready_for_delivery
           relation = Rpush::Client::ActiveRecord::Notification.where('processing = ? AND delivered = ? AND failed = ? AND (deliver_after IS NULL OR deliver_after < ?)', false, false, false, Time.now)
-          @using_oracle ? relation : relation.order('created_at ASC')
-        end
-
-        def mark_processing(notifications)
-          return if notifications.empty?
-
-          ids = []
-          notifications.each do |n|
-            n.processing = true
-            ids << n.id
-          end
-          Rpush::Client::ActiveRecord::Notification.where(id: ids).update_all(['processing = ?', true])
-        end
-
-        def claim(relation)
-          notifications = relation.lock(true).to_a
-          @using_oracle ? notifications.sort_by(&:created_at) : notifications
+          relation.order('deliver_after ASC, created_at ASC')
         end
 
         def adapter_name

data/lib/rpush/version.rb

@@ -2,7 +2,7 @@ module Rpush
   module VERSION
     MAJOR = 3
     MINOR = 1
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/spec/support/active_record_setup.rb

@@ -34,6 +34,7 @@ require 'generators/templates/rpush_2_7_0_updates'
 require 'generators/templates/rpush_3_0_0_updates'
 require 'generators/templates/rpush_3_0_1_updates'
 require 'generators/templates/rpush_3_1_0_add_pushy'
+require 'generators/templates/rpush_3_1_1_updates'
 
 migrations = [
   AddRpush,
@@ -43,7 +44,8 @@ migrations = [
   Rpush270Updates,
   Rpush300Updates,
   Rpush301Updates,
-  Rpush310AddPushy
+  Rpush310AddPushy,
+  Rpush311Updates
 ]
 
 unless ENV['TRAVIS']

data/spec/unit/daemon/store/active_record_spec.rb

@@ -63,7 +63,7 @@ describe Rpush::Daemon::Store::ActiveRecord do
       Rpush.config.batch_size = 5000
       relation = double.as_null_object
       expect(relation).to receive(:limit).with(5000)
-      allow(relation).to receive_messages(to_a: [])
+      allow(relation).to receive_messages(pluck: [])
       allow(store).to receive_messages(ready_for_delivery: relation)
       store.deliverable_notifications(Rpush.config.batch_size)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -371,6 +371,7 @@ files:
 - lib/generators/templates/rpush_3_0_0_updates.rb
 - lib/generators/templates/rpush_3_0_1_updates.rb
 - lib/generators/templates/rpush_3_1_0_add_pushy.rb
+- lib/generators/templates/rpush_3_1_1_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb