perfectqueue 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7274d143afaecb7d6ee09cac6d4e287813dcf1bc
-  data.tar.gz: 25c4271e2bbcb2734c92234a73c59121e383834c
+SHA256:
+  metadata.gz: 7b8b427559de5e5d2d190fd34f8e5405c1285ceb8f4aaddb2f4fc8c255936774
+  data.tar.gz: 9931930b7abaaf9899d717badb51dd624ddf579e21c1cdd8f38efbe9fbe9adca
 SHA512:
-  metadata.gz: cc0acb6de0b1771606a5a8047f48d6c6e904722af0416291951cb87cfca8a65bd16b501099a1540e0f55ab7f9a41c650321b6cc87add520ead66b69acf61def2
-  data.tar.gz: 1b85520494ad5059f0dc5dc187eeab5810a51bd707e6931b21e1663c0425b0fcf05921ebb424f7aa1102e744a3f1e317cda7d0fe55d3fd36e947f895ba0420e3
+  metadata.gz: 82c3b26e8343f994e1464d185a7a1daa52cf183a299ffbf6a095cf0463d7760dce5dba31a5029905a3a364e3e3d4a1e0ee0141e6175d93c82638fcc933d0caf1
+  data.tar.gz: e3901f63fcb95ac368fece8f8f277cc0e95cbc960f2b5d7ab24312a4afa618ad5b032fcb4decc23c330623d7821d3d4aa72f733a8d3250a68666534ea634ad0c

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 
 script: "bundle exec rake spec"

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2019-07-10 version 0.10.0
+
+* Relax sequel version constraint (#62)
+  * Using sequel 4+ raises `Sequel::DatabaseConnectionError` on
+  `Backend::RDBBackend.new` instead of its `#connect`.
+
 == 2016-10-07 version 0.9.2
 
 * Use v08's strategy if resource limit is used (#55)

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -33,6 +33,9 @@ module PerfectQueue
       DELETE_OFFSET = 10_0000_0000
       EVENT_HORIZON = 13_0000_0000 # 2011-03-13 07:06:40 UTC
 
+      LOCK_RETRY_INITIAL_INTERVAL = 0.5
+      LOCK_RETRY_MAX_INTERVAL = 30
+
       class Token < Struct.new(:key)
       end
 
@@ -57,11 +60,14 @@ module PerfectQueue
           end
           @table_lock = lambda {
             locked = nil
+            interval = LOCK_RETRY_INITIAL_INTERVAL
             loop do
               @db.fetch("SELECT GET_LOCK('#{@table}', #{LOCK_WAIT_TIMEOUT}) locked") do |row|
                 locked = true if row[:locked] == 1
               end
               break if locked
+              sleep interval
+              interval = [interval * 2, LOCK_RETRY_MAX_INTERVAL].min
             end
           }
           @table_unlock = lambda {
@@ -90,7 +96,7 @@ module PerfectQueue
 
       KEEPALIVE = 10
       MAX_RETRY = 10
-      LOCK_WAIT_TIMEOUT = 60
+      LOCK_WAIT_TIMEOUT = 10
       DEFAULT_DELETE_INTERVAL = 20
 
       def init_database(options)

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/perfectqueue.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.required_ruby_version = '>= 2.1'
-  gem.add_dependency "sequel", "~> 3.48.0"
+  gem.add_dependency "sequel", ">= 3.48.0"
   gem.add_development_dependency "rake", "~> 0.9.2"
   gem.add_development_dependency "rspec", "~> 3.3.0"
   gem.add_development_dependency "simplecov", "~> 0.10.0"
-  gem.add_development_dependency "mysql2", "~> 0.3.20"
+  gem.add_development_dependency "mysql2", ">= 0.3.20"
 end

data/spec/rdb_backend_spec.rb

@@ -71,16 +71,8 @@ describe Backend::RDBBackend do
     end
     context 'cannot connect' do
       let (:uri){ 'mysql2://root:@nonexistent/perfectqueue_test' }
-      let (:db) do
-        Backend::RDBBackend.new(uri, table)
-      end
       it 'raises Sequel::DatabaseConnectionError' do
-        allow(STDERR).to receive(:puts)
-        slept = 0
-        expect(db).to receive(:sleep).exactly(9).times{|n| slept += n }
-        expect(db.db).to receive(:connect).exactly(10).times.and_call_original
-        expect{ db.__send__(:connect){ db.db.run('SELECT 1;') } }.to raise_error(Sequel::DatabaseConnectionError)
-        expect(slept).to be < 30
+        expect { Backend::RDBBackend.new(uri, table) }.to raise_error(Sequel::DatabaseConnectionError)
       end
     end
   end

data/spec/rdb_compat_backend_spec.rb

@@ -342,12 +342,7 @@ describe Backend::RDBCompatBackend do
         let (:config){ {url: 'mysql2://root:@nonexistent/perfectqueue_test', table: table} }
         it 'raises Sequel::DatabaseConnectionError' do
           allow(STDERR).to receive(:puts)
-          d = Backend::RDBCompatBackend.new(client, config)
-          slept = 0
-          expect(d).to receive(:sleep).exactly(9).times{|n| slept += n }
-          expect(d.db).to receive(:connect).exactly(10).times.and_call_original
-          expect{ d.__send__(:connect){ d.db.run('SELECT 1;') } }.to raise_error(Sequel::DatabaseConnectionError)
-          expect(slept).to eq(18)
+          expect { Backend::RDBCompatBackend.new(client, config) }.to raise_error(Sequel::DatabaseConnectionError)
         end
       end
     end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ if ENV["CI"]
 end
 
 require 'fileutils'
+require 'tempfile'
 
 module QueueTest
   def self.included(mod)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.48.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.48.0
 - !ruby/object:Gem::Dependency
@@ -70,14 +70,14 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
 description: Highly available distributed cron built on RDBMS
@@ -98,7 +98,6 @@ files:
 - Rakefile
 - bin/perfectqueue
 - bin/stress
-- circle.yml
 - lib/perfectqueue.rb
 - lib/perfectqueue/application.rb
 - lib/perfectqueue/application/base.rb
@@ -177,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Highly available distributed cron built on RDBMS

data/circle.yml

@@ -1,7 +0,0 @@
-machine:
-  ruby:
-    version: 2.2.2
-
-database:
-  pre:
-    - mysql -e 'create database perfectqueue_test;'