perfectqueue 0.7.9 → 0.7.10

data/ChangeLog

@@ -1,5 +1,5 @@
 
-== 2011-12-17 version 0.7.8, 0.7.9
+== 2011-12-17 version 0.7.8, 0.7.9, 0.7.10
 
 * Supports resource limit
 

data/lib/perfectqueue/backend/rdb.rb

@@ -55,7 +55,7 @@ class RDBBackend < Backend
       begin
         while true
           rows = 0
-          @db.fetch("SELECT id, timeout, data, created_at, resource FROM `#{@table}` AS T WHERE timeout <= ? AND (resource IS NULL OR (SELECT count(1) FROM `#{@table}` WHERE timeout > ? AND resource = T.resource) < #{MAX_RESOURCE}) ORDER BY timeout ASC LIMIT #{MAX_SELECT_ROW};", now, now) {|row|
+          @db.fetch("SELECT id, timeout, data, created_at, resource FROM `#{@table}` AS T WHERE timeout <= ? AND (resource IS NULL OR (SELECT count(1) FROM `#{@table}` WHERE timeout > ? AND created_at IS NOT NULL AND resource = T.resource) < #{MAX_RESOURCE}) ORDER BY timeout ASC LIMIT #{MAX_SELECT_ROW};", now, now) {|row|
 
             unless row[:created_at]
               # finished/canceled task
@@ -82,7 +82,7 @@ class RDBBackend < Backend
 
   def finish(id, delete_timeout=3600, now=Time.now.to_i)
     connect {
-      n = @db["UPDATE `#{@table}` SET timeout=?, created_at=NULL WHERE id=? AND created_at IS NOT NULL;", now+delete_timeout, id].update
+      n = @db["UPDATE `#{@table}` SET timeout=?, created_at=NULL, resource=NULL WHERE id=? AND created_at IS NOT NULL;", now+delete_timeout, id].update
       return n > 0
     }
   end

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.9'
+VERSION = '0.7.10'
 
 end

data/test/backend_test.rb

@@ -216,7 +216,7 @@ class BackendTest < Test::Unit::TestCase
     assert_equal 'data1', task.data
   end
 
-  it 'resource' do
+  it 'resource limit' do
     clean_backend
 
     db1 = open_backend
@@ -230,10 +230,12 @@ class BackendTest < Test::Unit::TestCase
     ok = db1.submit(@key_prefix+'test5', 'data2', time, 'user2')
     assert_equal true, ok
 
+    token_1 = nil
+    task_1 = nil
     4.times do
-      token, task = db1.acquire(time+TIMEOUT, time)
-      assert_not_equal nil, task
-      assert_equal "user1", task.resource
+      token_1, task_1 = db1.acquire(time+TIMEOUT, time)
+      assert_not_equal nil, task_1
+      assert_equal "user1", task_1.resource
     end
 
     token, task = db1.acquire(time+TIMEOUT, time)
@@ -242,6 +244,13 @@ class BackendTest < Test::Unit::TestCase
 
     token, task = db1.acquire(time+TIMEOUT, time)
     assert_equal nil, task
+
+    ok = db1.finish(token_1)
+    assert_equal true, ok
+
+    token, task = db1.acquire(time+TIMEOUT, time)
+    assert_not_equal nil, task
+    assert_equal "user1", task.resource
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70264336756840 !ruby/object:Gem::Requirement
+  requirement: &70217971584580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264336756840
+  version_requirements: *70217971584580
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70264336756360 !ruby/object:Gem::Requirement
+  requirement: &70217971580680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264336756360
+  version_requirements: *70217971580680
 description: 
 email: frsyuki@gmail.com
 executables: