perfectqueue 0.8.20 → 0.8.21

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-09-11 version 0.8.21
+
+* rdb_compat backend uses IS NOT NULL condition instead of >= because RANGE
+partitioning of MySQL doesn't work with non-primary keys
+
+
 == 2012-09-08 version 0.8.20
 
 * Show log messages when a worker decides next status of a task (finished!,

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -47,7 +47,7 @@ module PerfectQueue
           @sql = <<SQL
 SELECT id, timeout, data, created_at, resource
 FROM `#{@table}`
-WHERE timeout <= ? AND timeout <= ? AND created_at >= 0
+WHERE timeout <= ? AND timeout <= ? AND created_at IS NOT NULL
 ORDER BY timeout ASC
 LIMIT ?
 SQL
@@ -58,10 +58,10 @@ FROM `#{@table}`
 LEFT JOIN (
   SELECT resource AS res, COUNT(1) AS running
   FROM `#{@table}` AS T
-  WHERE timeout > ? AND created_at >= 0 AND resource IS NOT NULL
+  WHERE timeout > ? AND created_at IS NOT NULL AND resource IS NOT NULL
   GROUP BY resource
 ) AS R ON resource = res
-WHERE timeout <= ? AND created_at >= 0 AND (max_running-running IS NULL OR max_running-running > 0)
+WHERE timeout <= ? AND created_at IS NOT NULL AND (max_running-running IS NULL OR max_running-running > 0)
 ORDER BY weight IS NOT NULL, weight DESC, timeout ASC
 LIMIT ?
 SQL
@@ -145,7 +145,7 @@ SQL
       # => Task
       def submit(key, type, data, options)
         now = (options[:now] || Time.now).to_i
-        now = 0 if now < 0
+        now = 1 if now < 1  # 0 means cancel requested
         run_at = (options[:run_at] || now).to_i
         user = options[:user]
         user = user.to_s if user
@@ -204,7 +204,7 @@ SQL
             params = [sql, next_timeout]
             tasks.each {|t| params << t.key }
             sql << (1..tasks.size).map { '?' }.join(',')
-            sql << ") AND created_at >= 0"
+            sql << ") AND created_at IS NOT NULL"
 
             n = @db[*params].update
             if n != tasks.size
@@ -223,7 +223,7 @@ SQL
 
         # created_at=0 means cancel_requested
         connect {
-          n = @db["UPDATE `#{@table}` SET created_at=0 WHERE id=? AND created_at >= 0", key].update
+          n = @db["UPDATE `#{@table}` SET created_at=0 WHERE id=? AND created_at IS NOT NULL", key].update
           if n <= 0
             raise AlreadyFinishedError, "task key=#{key} does not exist or already finished."
           end
@@ -242,7 +242,7 @@ SQL
         key = task_token.key
 
         connect {
-          n = @db["UPDATE `#{@table}` SET timeout=?, created_at=NULL, resource=NULL WHERE id=? AND created_at >= 0", delete_timeout, key].update
+          n = @db["UPDATE `#{@table}` SET timeout=?, created_at=NULL, resource=NULL WHERE id=? AND created_at IS NOT NULL", delete_timeout, key].update
           if n <= 0
             raise IdempotentAlreadyFinishedError, "task key=#{key} does not exist or already finished."
           end
@@ -257,12 +257,12 @@ SQL
         key = task_token.key
 
         connect {
-          n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND created_at >= 0", next_timeout, key].update
+          n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND created_at IS NOT NULL", next_timeout, key].update
           if n <= 0
             row = @db.fetch("SELECT id, timeout, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
             if row == nil
               raise PreemptedError, "task key=#{key} does not exist or preempted."
-            elsif row[:created_at] == 0
+            elsif row[:created_at] <= 0
               raise CancelRequestedError, "task key=#{key} is cancel requested."
             elsif row[:timeout] == next_timeout
               # ok
@@ -310,7 +310,7 @@ SQL
         if row[:created_at] === nil
           created_at = nil  # unknown creation time
           status = TaskStatus::FINISHED
-        elsif row[:created_at] == 0
+        elsif row[:created_at] <= 0
           status = TaskStatus::CANCEL_REQUESTED
         elsif now && row[:timeout] < now
           created_at = row[:created_at]

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.20"
+  VERSION = "0.8.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.20
+  version: 0.8.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel