perfectqueue 0.7.22 → 0.7.23

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-03 version 0.7.23
+
+* Use free slot ratio instead of free slot amount to decide task priorities
+
+
 == 2012-07-19 version 0.7.22
 
 * Fixed RDBBackend SQL

data/lib/perfectqueue/backend/rdb.rb

@@ -15,7 +15,7 @@ class RDBBackend < Backend
       # connection test
     }
     @sql = <<SQL
-SELECT id, timeout, data, created_at, resource, max_running-running AS runnable
+SELECT id, timeout, data, created_at, resource, max_running/running AS weight
 FROM `#{@table}`
 LEFT JOIN (
   SELECT resource AS res, COUNT(1) AS running
@@ -24,7 +24,7 @@ LEFT JOIN (
   GROUP BY resource
 ) AS R ON resource = res
 WHERE timeout <= ? AND (max_running-running IS NULL OR max_running-running > 0)
-ORDER BY runnable IS NOT NULL, runnable DESC, timeout ASC
+ORDER BY weight IS NOT NULL, weight DESC, timeout ASC
 LIMIT #{MAX_SELECT_ROW}
 SQL
     # sqlite doesn't support SELECT ... FOR UPDATE but

data/lib/perfectqueue/backend/rdb_compat/active_record_mixin.rb

@@ -0,0 +1,70 @@
+#
+# PerfectQueue
+#
+# Copyright (C) 2012 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module PerfectQueue
+  module Backend
+    class RDBCompatBackend
+
+      # This module is mostly copied from rdb_backend.rb
+      # and should be maintained with it.
+
+      module ActiveRecordMixin
+        def self.included(mod)
+          mod.extend(ClassMethods)
+        end
+
+        class ClassMethods
+          def submit!(key, type, data, options)
+            now = (options[:now] || Time.now).to_i
+            run_at = (options[:run_at] || now).to_i
+            user = options[:user]
+            max_running = options[:max_running]
+            data = data ? data.dup : {}
+            data['type'] = type
+
+            create!({
+              :id => key,
+              :timeout => run_at,
+              :data => data.to_json,
+              :created_at => now,
+              :resource => user,
+              :max_running => max_running,
+            })
+
+          rescue ActiveRecord::RecordNotUnique
+            raise IdempotentAlreadyExistsError, "task key=#{key} already exists"
+          end
+
+          def cancel_request!(key, options)
+            now = (options[:now] || Time.now).to_i
+
+            o = find_by_id(key)
+            if o == nil || o.created_at == nil
+              raise AlreadyFinishedError, "task key=#{key} does not exist or already finished."
+            end
+
+            o.created_at = -1
+            o.save!
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.22'
+VERSION = '0.7.23'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.22
+  version: 0.7.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -57,6 +57,7 @@ files:
 - lib/perfectqueue/backend.rb
 - lib/perfectqueue/backend/null.rb
 - lib/perfectqueue/backend/rdb.rb
+- lib/perfectqueue/backend/rdb_compat/active_record_mixin.rb
 - lib/perfectqueue/backend/simpledb.rb
 - lib/perfectqueue/command/perfectqueue.rb
 - lib/perfectqueue/engine.rb