perfectqueue 0.8.23 → 0.8.24

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2013-01-03 version 0.8.24
+
+* rdb_compat: removed retry_count field
+* Added AcquiredTask#update_data!
+
+
 == 2013-01-03 version 0.8.23
 
 * rdb_compat: added retry_count field

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -45,7 +45,7 @@ module PerfectQueue
 
         if config[:disable_resource_limit]
           @sql = <<SQL
-SELECT id, timeout, data, created_at, retry_count, resource
+SELECT id, timeout, data, created_at, resource
 FROM `#{@table}`
 WHERE timeout <= ? AND timeout <= ? AND created_at IS NOT NULL
 ORDER BY timeout ASC
@@ -53,7 +53,7 @@ LIMIT ?
 SQL
         else
           @sql = <<SQL
-SELECT id, timeout, data, created_at, retry_count, resource, max_running, max_running/running AS weight
+SELECT id, timeout, data, created_at, resource, max_running, max_running/running AS weight
 FROM `#{@table}`
 LEFT JOIN (
   SELECT resource AS res, COUNT(1) AS running
@@ -100,7 +100,6 @@ SQL
               timeout INT NOT NULL,
               data BLOB NOT NULL,
               created_at INT,
-              retry_count INT NOT NULL DEFAULT 0,
               resource VARCHAR(256),
               max_running INT,
               PRIMARY KEY (id)
@@ -115,7 +114,7 @@ SQL
         now = (options[:now] || Time.now).to_i
 
         connect {
-          row = @db.fetch("SELECT timeout, data, created_at, retry_count, resource, max_running FROM `#{@table}` WHERE id=? LIMIT 1", key).first
+          row = @db.fetch("SELECT timeout, data, created_at, resource, max_running FROM `#{@table}` WHERE id=? LIMIT 1", key).first
           unless row
             raise NotFoundError, "task key=#{key} does no exist"
           end
@@ -134,8 +133,8 @@ SQL
         now = (options[:now] || Time.now).to_i
 
         connect {
-          #@db.fetch("SELECT id, timeout, data, created_at, retry_count, resource FROM `#{@table}` WHERE !(created_at IS NULL AND timeout <= ?) ORDER BY timeout ASC;", now) {|row|
-          @db.fetch("SELECT id, timeout, data, created_at, retry_count, resource, max_running FROM `#{@table}` ORDER BY timeout ASC", now) {|row|
+          #@db.fetch("SELECT id, timeout, data, created_at, resource FROM `#{@table}` WHERE !(created_at IS NULL AND timeout <= ?) ORDER BY timeout ASC;", now) {|row|
+          @db.fetch("SELECT id, timeout, data, created_at, resource, max_running FROM `#{@table}` ORDER BY timeout ASC", now) {|row|
             attributes = create_attributes(now, row)
             task = TaskWithMetadata.new(@client, row[:id], attributes)
             yield task
@@ -201,7 +200,7 @@ SQL
               return nil
             end
 
-            sql = "UPDATE `#{@table}` SET timeout=?, retry_count=(retry_count+1) WHERE id IN ("
+            sql = "UPDATE `#{@table}` SET timeout=? WHERE id IN ("
             params = [sql, next_timeout]
             tasks.each {|t| params << t.key }
             sql << (1..tasks.size).map { '?' }.join(',')
@@ -256,9 +255,19 @@ SQL
         now = (options[:now] || Time.now).to_i
         next_timeout = now + alive_time
         key = task_token.key
+        data = options[:data]
+
+        sql = "UPDATE `#{@table}` SET timeout=?"
+        params = [sql, next_timeout]
+        if data
+          sql << ", data=?"
+          params << data.to_json
+        end
+        sql << " WHERE id=? AND created_at IS NOT NULL"
+        params << key
 
         connect {
-          n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND created_at IS NOT NULL", next_timeout, key].update
+          n = @db[*params].update
           if n <= 0
             row = @db.fetch("SELECT id, timeout, created_at FROM `#{@table}` WHERE id=? LIMIT 1", key).first
             if row == nil
@@ -347,7 +356,6 @@ SQL
           :type => type,
           :user => row[:resource],
           :timeout => row[:timeout],
-          :retry_count => row[:retry_count],
           :max_running => row[:max_running],
           :message => nil,  # not supported
           :node => nil,  # not supported

data/lib/perfectqueue/task.rb

@@ -90,6 +90,13 @@ module PerfectQueue
       @client.retry(@task_token, options)
     end
 
+    def update_data!(hash)
+      data = @attributes[:data] || {}
+      merged = data.merge(hash)
+      heartbeat!(:data => merged)
+      @attributes[:data] = merged
+    end
+
     #def to_json
     #  [@key, @task_token, @attributes].to_json
     #end

data/lib/perfectqueue/task_metadata.rb

@@ -40,10 +40,6 @@ module PerfectQueue
       @attributes[:user]
     end
 
-    def retry_count
-      @attributes[:retry_count]
-    end
-
     def created_at
       if t = @attributes[:created_at]
         return Time.at(t)

data/lib/perfectqueue/task_monitor.rb

@@ -60,16 +60,6 @@ module PerfectQueue
       @mutex.synchronize {
         @task = task
         @last_task_heartbeat = Time.now.to_i
-        @heartbeat_message = nil
-      }
-    end
-
-    # callback
-    def set_heartbeat_message(task, message)
-      @mutex.synchronize {
-        if task == @task
-          @heartbeat_message = message
-        end
       }
     end
 
@@ -106,6 +96,17 @@ module PerfectQueue
       }
     end
 
+    # callback
+    def external_task_heartbeat(task, &block)
+      @mutex.synchronize {
+        if task == @task
+          ret = block.call if block
+          @last_task_heartbeat = Time.now.to_i
+        end
+        ret
+      }
+    end
+
     def run
       @mutex.synchronize {
         now = Time.now.to_i
@@ -144,8 +145,7 @@ module PerfectQueue
 
     private
     def task_heartbeat
-      @task.heartbeat! :message => @heartbeat_message
-      @heartbeat_message = nil
+      @task.heartbeat!
     rescue
       # finished, cancel_requested, preempted, etc.
       kill_task($!)
@@ -157,14 +157,6 @@ module PerfectQueue
     attr_accessor :task_monitor
     attr_accessor :runner
 
-    def heartbeat_message=(message)
-      @heartbeat_message = message
-      @task_monitor.set_heartbeat_message(self, message)
-      message
-    end
-
-    attr_reader :heartbeat_message
-
     def finish!(*args, &block)
       @log.info "finished task=#{self.key}" if @log
       @task_monitor.task_finished(self) {
@@ -192,6 +184,13 @@ module PerfectQueue
         super(*args, &block)
       }
     end
+
+    def update_data!(hash)
+      @log.info "update data #{hash.inspect} task=#{self.key}" if @log
+      @task_monitor.external_task_heartbeat(self) {
+        super(hash)
+      }
+    end
   end
 
 end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.23"
+  VERSION = "0.8.24"
 end

data/spec/queue_spec.rb

@@ -39,21 +39,18 @@ describe Queue do
     task01.finished?.should == false
     task01.type == 'type1'
     task01.key.should == 'task01'
-    task01.retry_count.should == 0
     task01.data["a"].should == 1
 
     task02 = a.shift
     task02.finished?.should == false
     task02.type == 'type1'
     task02.key.should == 'task02'
-    task01.retry_count.should == 0
     task02.data["a"].should == 2
 
     task03 = a.shift
     task03.finished?.should == false
     task03.type == 'type1'
     task03.key.should == 'task03'
-    task01.retry_count.should == 0
     task03.data["a"].should == 3
 
     a.empty?.should == true
@@ -84,7 +81,6 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10)
     task01.key.should == 'task01'
-    task01.retry_count.should == 0
 
     task02 = queue.poll(:now=>now+10)
     task02.should == nil
@@ -93,7 +89,6 @@ describe Queue do
 
     task03 = queue.poll(:now=>now+11)
     task03.key.should == 'task01'
-    task03.retry_count.should == 1
   end
 
   it 'timeout' do
@@ -102,14 +97,12 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
-    task01.retry_count.should == 0
 
     task02 = queue.poll(:now=>now+15)
     task02.should == nil
 
     task03 = queue.poll(:now=>now+20)
     task03.key.should == 'task01'
-    task03.retry_count.should == 1
   end
 
   it 'heartbeat' do
@@ -118,7 +111,6 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
-    task01.retry_count.should == 0
 
     task01.heartbeat!(:alive_time=>15, :now=>now+10)
 
@@ -127,7 +119,6 @@ describe Queue do
 
     task03 = queue.poll(:now=>now+30)
     task03.key.should == 'task01'
-    task03.retry_count.should == 1
   end
 
   it 'retry' do
@@ -136,7 +127,6 @@ describe Queue do
 
     task01 = queue.poll(:now=>now+10, :alive_time=>10)
     task01.key.should == 'task01'
-    task01.retry_count.should == 0
 
     task01.retry!(:retry_wait=>15, :now=>now+10)
 
@@ -145,7 +135,6 @@ describe Queue do
 
     task03 = queue.poll(:now=>now+30)
     task03.key.should == 'task01'
-    task03.retry_count.should == 1
   end
 
   it 'froce_finish' do
@@ -254,5 +243,26 @@ describe Queue do
     tasks = queue.poll_multi(:now=>now+10, :alive_time=>10, :max_acquire=>2)
     tasks.should == nil
   end
+
+  it 'data' do
+    now = Time.now.to_i
+    queue.submit('task01', 'type1', {"a"=>1}, :now=>now)
+
+    task01 = queue.poll(:now=>now+10)
+    task01.key.should == 'task01'
+    task01.data.should == {"a"=>1}
+
+    task01.update_data!({"b"=>2})
+    task01.data.should == {"a"=>1, "b"=>2}
+
+    task01.update_data!({"a"=>3,"c"=>4})
+    task01.data.should == {"a"=>3, "b"=>2, "c"=>4}
+
+    task01.release!
+
+    task01 = queue.poll(:now=>now+10)
+    task01.key.should == 'task01'
+    task01.data.should == {"a"=>3, "b"=>2, "c"=>4}
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.23
+  version: 0.8.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel