que-scheduler 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c236715a6d4450fe4a293f9bf036b0c4055bd3dab37f8ca271b5104fc0feaf2
-  data.tar.gz: 85972f01e64ca1a3f9570bfa1789d8980dc8355d2a8a486cda0c6954f94ceb90
+  metadata.gz: 3bd2f9250706164b35b25db80c41136311383cbe5d2d0d93a3a0f14c222d2cdc
+  data.tar.gz: 5ef3839cbdb4a13b7864675a4e641e89b19f1355da058fa2974b1092a8286f16
 SHA512:
-  metadata.gz: c1e3ee3cf06dbee42c3369a1fe384872dd766a39ef39a5fd0928b5d854af189828c3cc1e457a1aa1987dc4031aabfed2d9e592e8c1e00d6665bb8093cc4df0e4
-  data.tar.gz: 967d7a3ad3ef09fb93802e6b7d4068a5466768d1f9bf4e901856d6464475d1bd56c8273ad118987e7e08d06ec8edc0e1f32be2d27b4fb34bd3b097b8d479b456
+  metadata.gz: 64d917abf9404977b0d95648545f363ed44c1d1088b0f5a302825c028795318818f4799fb1ee23acc52b5aa84de81202a63b56499c78329d12132a00091cc6bb
+  data.tar.gz: e99bd69d7201245c8ee930a5076c3ba1efcec98a808eec045b2144845a3c346b7f3e727335faab2ea77d22bd32a54975e14d3e33d353a3aec1d9bc7317ceb91e

data/README.md

@@ -28,7 +28,7 @@ files, but with additional features.
     ```ruby
     class CreateQueSchedulerSchema < ActiveRecord::Migration
       def change
-        Que::Scheduler::Migrations.migrate!(version: 2)
+        Que::Scheduler::Migrations.migrate!(version: 3)
       end
     end
     ```

data/lib/que/scheduler/audit.rb

@@ -4,19 +4,34 @@ module Que
   module Scheduler
     module Audit
       TABLE_NAME = 'que_scheduler_audit'
+      ENQUEUED_TABLE_NAME = 'que_scheduler_audit_enqueued'
       INSERT_AUDIT = %{
-        INSERT INTO #{TABLE_NAME} (scheduler_job_id, jobs_enqueued, executed_at, next_run_at)
-        VALUES ($1::integer, $2::jsonb, $3::timestamptz, $4::timestamptz)
+        INSERT INTO #{TABLE_NAME} (scheduler_job_id, executed_at)
+        VALUES ($1::integer, $2::timestamptz)
+        RETURNING *
+      }
+      INSERT_AUDIT_ENQUEUED = %{
+        INSERT INTO #{ENQUEUED_TABLE_NAME} (scheduler_job_id, job_class, queue, priority, args)
+        VALUES ($1::integer, $2::varchar, $3::varchar, $4::integer, $5::jsonb)
         RETURNING *
       }
 
       class << self
-        def append(job_id, executed_at, result, next_run_at)
-          json = result.missed_jobs.map { |j| j.to_h.merge(job_class: j.job_class.to_s) }.to_json
-          inserted = ::Que.execute(
-            INSERT_AUDIT, [job_id, json, executed_at, next_run_at]
-          )
-          raise "Cannot save audit row #{job_id} #{executed_at}" if inserted.empty?
+        def append(job_id, executed_at, result)
+          ::Que.execute(INSERT_AUDIT, [job_id, executed_at])
+          result.missed_jobs.each do |j|
+            inserted = ::Que.execute(
+              INSERT_AUDIT_ENQUEUED,
+              [
+                job_id,
+                j.job_class,
+                j.queue,
+                j.priority,
+                j.args
+              ]
+            )
+            raise "Cannot save audit row #{job_id} #{executed_at} #{j}" if inserted.empty?
+          end
         end
       end
     end

data/lib/que/scheduler/defined_job.rb

@@ -87,18 +87,17 @@ module Que
       end
 
       def generate_to_enqueue_list(missed_times)
-        [].tap do |jobs_for_class|
-          unless missed_times.empty?
-            options = to_h.slice(:args, :queue, :priority, :job_class).compact
+        return [] if missed_times.empty?
 
-            if schedule_type == DefinedJob::SCHEDULE_TYPE_EVERY_EVENT
-              missed_times.each do |time_missed|
-                jobs_for_class << ToEnqueue.new(options.merge(args: [time_missed] + (args || [])))
-              end
-            else
-              jobs_for_class << ToEnqueue.new(options)
-            end
+        options = to_h.slice(:args, :queue, :priority, :job_class).compact
+        args_array = args.is_a?(Array) ? args : Array(args)
+
+        if schedule_type == DefinedJob::SCHEDULE_TYPE_EVERY_EVENT
+          missed_times.map do |time_missed|
+            ToEnqueue.new(options.merge(args: [time_missed] + args_array))
           end
+        else
+          [ToEnqueue.new(options.merge(args: args_array))]
         end
       end
     end

data/lib/que/scheduler/migrations/3/down.sql

@@ -0,0 +1,8 @@
+DROP TABLE que_scheduler_audit_enqueued;
+ALTER TABLE que_scheduler_audit DROP CONSTRAINT que_scheduler_audit_pkey;
+
+ALTER TABLE que_scheduler_audit
+ADD COLUMN next_run_at      timestamptz,
+ADD COLUMN jobs_enqueued    jsonb;
+
+CREATE INDEX index_que_scheduler_audit_on_jobs_enqueued ON que_scheduler_audit USING btree (jobs_enqueued);

data/lib/que/scheduler/migrations/3/up.sql

@@ -0,0 +1,19 @@
+ALTER TABLE que_scheduler_audit ADD PRIMARY KEY (scheduler_job_id);
+
+CREATE TABLE que_scheduler_audit_enqueued (
+  scheduler_job_id integer      NOT NULL REFERENCES que_scheduler_audit (scheduler_job_id),
+  job_class        varchar(255) NOT NULL,
+  queue            varchar(255),
+  priority         integer,
+  args             jsonb        NOT NULL
+);
+
+CREATE INDEX que_scheduler_audit_enqueued_job_class ON que_scheduler_audit_enqueued USING btree (job_class);
+CREATE INDEX que_scheduler_audit_enqueued_args ON que_scheduler_audit_enqueued USING btree (args);
+
+WITH rows AS (SELECT scheduler_job_id, json_array_elements(jobs_enqueued::json) AS enqueued FROM que_scheduler_audit)
+INSERT INTO que_scheduler_audit_enqueued(scheduler_job_id, args, job_class)
+SELECT scheduler_job_id, (enqueued->>'args')::json AS args, enqueued->>'job_class' AS job_class FROM rows;
+
+ALTER TABLE que_scheduler_audit DROP COLUMN next_run_at;
+ALTER TABLE que_scheduler_audit DROP COLUMN jobs_enqueued;

data/lib/que/scheduler/migrations.rb

@@ -25,7 +25,7 @@ module Que
 
         def db_version
           return 0 if Que::Scheduler::Db.count_schedulers.zero?
-          return 1 unless ActiveRecord::Base.connection.table_exists?(AUDIT_TABLE_NAME)
+          return 1 unless audit_table_exists?
           Que.execute(TABLE_COMMENT).first[:description].to_i
         end
 
@@ -43,8 +43,14 @@ module Que
 
         def execute_step(number, direction)
           Que.execute(IO.read("#{__dir__}/migrations/#{number}/#{direction}.sql"))
-          return unless number >= (direction == :up ? 2 : 3)
-          Que.execute "COMMENT ON TABLE que_scheduler_audit IS '#{number}'"
+          return unless audit_table_exists?
+          Que.execute(
+            "COMMENT ON TABLE que_scheduler_audit IS '#{direction == :up ? number : number - 1}'"
+          )
+        end
+
+        def audit_table_exists?
+          ActiveRecord::Base.connection.table_exists?(AUDIT_TABLE_NAME)
         end
       end
     end

data/lib/que/scheduler/scheduler_job.rb

@@ -59,7 +59,7 @@ module Que
           job_dictionary: result.job_dictionary,
           run_at: next_run_at
         )
-        Audit.append(attrs[:job_id], scheduler_job_args.as_time, result, next_run_at)
+        Audit.append(attrs[:job_id], scheduler_job_args.as_time, result)
       end
     end
   end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '2.0.2'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,6 +295,8 @@ files:
 - lib/que/scheduler/migrations/1/up.sql
 - lib/que/scheduler/migrations/2/down.sql
 - lib/que/scheduler/migrations/2/up.sql
+- lib/que/scheduler/migrations/3/down.sql
+- lib/que/scheduler/migrations/3/up.sql
 - lib/que/scheduler/scheduler_job.rb
 - lib/que/scheduler/scheduler_job_args.rb
 - lib/que/scheduler/version.rb