perfectqueue 0.8.38 → 0.8.39

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yzg4Njg1ZTRkYTgzMmRhZTJiZjhjODAyYzhiMmJjMmY3MTVkODIxMA==
+  data.tar.gz: !binary |-
+    MmRiYzNmYjVjZmQ3MTljNTE2MDIwNGRmN2FjMmU0OTUyYzAzMTgzZg==
+SHA512:
+  metadata.gz: !binary |-
+    MDk4ODEzNWI1NGU1ZTUxMjgyYTQwYzRkY2UxNzZmYzlkMDc0MTlkMDc3ZTM4
+    MDM0MGJiMmJmN2Y3MmY4NDg5MjNhZDc0ZTQ3ZDY0YmZlMTA2MTI2ZDc0YTM3
+    YTUzMzM4N2Y4YzllOTU2NjVkNDBiYjAxMzlkMGUxNDRlMjI2ODk=
+  data.tar.gz: !binary |-
+    YzZiZDViYjg2MjY3NjdjOTVjOTY4YTMwZTYyOWE0ZDI0YWYxM2M2MThjYTU3
+    NGI5NGIwOWY5ZDQyZGVlNzczNGQ0YzhhZWY3NjA3NTExYzFlNTI1NzY3OWE5
+    M2I1ZTBkOTI3NGUwNmE5MGJmMTM4MzJhYjI4M2NjNWFhNjgzNjM=

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -221,50 +221,43 @@ SQL
 
         tasks = []
 
-        connect {
-          if @cleanup_interval_count <= 0
+        if @cleanup_interval_count <= 0
+          connect_locked {
             @db["DELETE FROM `#{@table}` WHERE timeout <= ? AND created_at IS NULL", now].delete
             @cleanup_interval_count = @cleanup_interval
-          end
-
-          @db.transaction do
-            if @table_lock
-              @db[@table_lock].update
-            end
-
-            tasks = []
-            @db.fetch(@sql, now, now, max_acquire) {|row|
-              attributes = create_attributes(nil, row)
-              task_token = Token.new(row[:id])
-              task = AcquiredTask.new(@client, row[:id], attributes, task_token)
-              tasks.push task
+          }
+        end
 
-              if @prefetch_break_types.include?(attributes[:type])
-                break
-              end
-            }
+        connect_locked {
+          tasks = []
+          @db.fetch(@sql, now, now, max_acquire) {|row|
+            attributes = create_attributes(nil, row)
+            task_token = Token.new(row[:id])
+            task = AcquiredTask.new(@client, row[:id], attributes, task_token)
+            tasks.push task
 
-            if tasks.empty?
-              return nil
+            if @prefetch_break_types.include?(attributes[:type])
+              break
             end
+          }
 
-            sql = "UPDATE `#{@table}` SET timeout=? WHERE id IN ("
-            params = [sql, next_timeout]
-            tasks.each {|t| params << t.key }
-            sql << (1..tasks.size).map { '?' }.join(',')
-            sql << ") AND created_at IS NOT NULL"
-
-            n = @db[*params].update
-            if n != tasks.size
-              # TODO table lock doesn't work. error?
-            end
+          if tasks.empty?
+            return nil
+          end
 
-            @cleanup_interval_count -= 1
+          sql = "UPDATE `#{@table}` SET timeout=? WHERE id IN ("
+          params = [sql, next_timeout]
+          tasks.each {|t| params << t.key }
+          sql << (1..tasks.size).map { '?' }.join(',')
+          sql << ") AND created_at IS NOT NULL"
 
-            if @use_connection_pooling && @table_unlock
-              @db[@table_unlock].update
-            end
+          n = @db[*params].update
+          if n != tasks.size
+            # TODO table lock doesn't work. error?
           end
+
+          @cleanup_interval_count -= 1
+
           return tasks
         }
       end
@@ -341,6 +334,28 @@ SQL
       end
 
       protected
+      def connect_locked(&block)
+        connect {
+          locked = false
+
+          begin
+            @db.transaction do
+              if @table_lock
+                @db[@table_lock].update
+                locked = true
+              end
+
+              return block.call
+            end
+
+          ensure
+            if @use_connection_pooling && locked
+              @db[@table_unlock].update
+            end
+          end
+        }
+      end
+
       def connect(&block)
         now = Time.now.to_i
         @mutex.synchronize do

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.38"
+  VERSION = "0.8.39"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.38
-  prerelease: 
+  version: 0.8.39
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -145,33 +134,26 @@ files:
 homepage: https://github.com/treasure-data/perfectqueue
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3420430891342513756
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3420430891342513756
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Highly available distributed cron built on RDBMS
 test_files:
 - spec/queue_spec.rb