perfectqueue 0.7.20 → 0.7.21

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-07-19 version 0.7.21
+
+* Added max_running column for fair resource restriction
+
+
 == 2012-01-24 version 0.7.20
 
 * Fixed MonitorThread

data/lib/perfectqueue/backend/null.rb

@@ -23,7 +23,7 @@ class NullBackend < Backend
     true
   end
 
-  def submit(id, data, time=Time.now.to_i, resource=nil)
+  def submit(id, data, time=Time.now.to_i, resource=nil, max_running=nil)
     true
   end
 end

data/lib/perfectqueue/backend/rdb.rb

@@ -15,7 +15,7 @@ class RDBBackend < Backend
       # connection test
     }
     @sql = <<SQL
-SELECT id, timeout, data, created_at, resource
+SELECT id, timeout, data, created_at, resource, max_running-running AS runnable
 FROM `#{@table}`
 LEFT JOIN (
   SELECT resource AS res, COUNT(1) AS running
@@ -23,8 +23,9 @@ LEFT JOIN (
   WHERE timeout > ? AND created_at IS NOT NULL AND resource IS NOT NULL
   GROUP BY resource
 ) AS R ON resource = res
-WHERE timeout <= ? AND (running IS NULL OR running < #{MAX_RESOURCE})
-ORDER BY timeout ASC LIMIT #{MAX_SELECT_ROW}
+WHERE timeout <= ? AND (runnable IS NULL OR runnable > 0)
+ORDER BY runnable IS NOT NULL, runnable DESC, timeout ASC
+LIMIT #{MAX_SELECT_ROW}
 SQL
     # sqlite doesn't support SELECT ... FOR UPDATE but
     # sqlite doesn't need it because the db is not shared
@@ -41,6 +42,7 @@ SQL
     sql << "  data BLOB NOT NULL,"
     sql << "  created_at INT,"
     sql << "  resource VARCHAR(256),"
+    sql << "  max_running INT,"
     sql << "  PRIMARY KEY (id)"
     sql << ");"
     # TODO index
@@ -88,7 +90,6 @@ SQL
   end
 
   MAX_SELECT_ROW = 8
-  MAX_RESOURCE = (ENV['PQ_MAX_RESOURCE'] || 4).to_i
   #KEEPALIVE = 10
   MAX_RETRY = 10
 
@@ -140,10 +141,10 @@ SQL
     finish(id, delete_timeout, now)
   end
 
-  def submit(id, data, time=Time.now.to_i, resource=nil)
+  def submit(id, data, time=Time.now.to_i, resource=nil, max_running=nil)
     connect {
       begin
-        n = @db["INSERT INTO `#{@table}` (id, timeout, data, created_at, resource) VALUES (?, ?, ?, ?, ?);", id, time, data, time, resource].insert
+        n = @db["INSERT INTO `#{@table}` (id, timeout, data, created_at, resource, max_running) VALUES (?, ?, ?, ?, ?, ?);", id, time, data, time, resource, max_running].insert
         return true
       rescue Sequel::DatabaseError
         return nil

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.20'
+VERSION = '0.7.21'
 
 end

data/test/backend_test.rb

@@ -223,25 +223,28 @@ class BackendTest < Test::Unit::TestCase
 
     time = Time.now.to_i
 
-    5.times do |i|
-      ok = db1.submit(@key_prefix+'test'+i.to_s, 'data1', time-i, 'user1')
+    3.times do |i|
+      ok = db1.submit(@key_prefix+'test'+i.to_s, 'data1', time-(i+1), 'user1', 2)
       assert_equal true, ok
     end
-    ok = db1.submit(@key_prefix+'test5', 'data2', time, 'user2')
+    ok = db1.submit(@key_prefix+'test5', 'data2', time, 'user2', 2)
     assert_equal true, ok
 
     token_1 = nil
     task_1 = nil
-    4.times do
-      token_1, task_1 = db1.acquire(time+TIMEOUT, time)
-      assert_not_equal nil, task_1
-      assert_equal "user1", task_1.resource
-    end
+
+    token_1, task_1 = db1.acquire(time+TIMEOUT, time)
+    assert_not_equal nil, task_1
+    assert_equal "user1", task_1.resource
 
     token, task = db1.acquire(time+TIMEOUT, time)
     assert_not_equal nil, task
     assert_equal "user2", task.resource
 
+    token, task = db1.acquire(time+TIMEOUT, time)
+    assert_not_equal nil, task
+    assert_equal "user1", task.resource
+
     token, task = db1.acquire(time+TIMEOUT, time)
     assert_equal nil, task
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70266680954860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266680954860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70266680954320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70266680954320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: 
 email: frsyuki@gmail.com
 executables:
@@ -83,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Highly available distributed queue built on RDBMS or SimpleDB