queue_classic_plus 4.0.0.alpha15 → 4.0.0.alpha17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 634ceaedff254e0c5382a484d574d6971101362a88b9d2185303d95298de06c8
-  data.tar.gz: '03509124366e931f02d928226da3b05ec3e625c5888eaba88f5669ee090566b6'
+  metadata.gz: 3b17bbec023aa5f8fa91527f15c91db3ca6a9975da20c304188b5100757bab9b
+  data.tar.gz: 57ce60a1dfd1912b7a6b57c6b8c312f78fc3f903dc674739099dc27bb138d8aa
 SHA512:
-  metadata.gz: 4c8b6ff9e377c59b579c7309ee1f75e3fb583b00450ef09548f46d5d6e921c2553cf64037b259a1267b2781276f2e06ccceb3c8e5d6bc76373dc9e64e7a61522
-  data.tar.gz: d3852486ebdf22d4c59d142a8f00257f2fa7b0847d09704001644e56cb5ab91845ba154807bc2699491f379b62c98656da7b70735c9b3d3ba13638efaddfefb6
+  metadata.gz: e45d48b488c7cc0bdea10fbea03397539a5533b1d98647aaf9f942150caaa121dc958bc57cc183782ffc7b74c98305a90ef14c9d07dfcb00b562372bf0c7048b
+  data.tar.gz: 23932d46b74e4f994b4e8a09d6b81e933f0798fa45608968e63f37b39476de0428c6315ebb925e18b043dabc4b10d0d8336e72d65407f61ba5e678c591d9918a

data/lib/queue_classic_plus/base.rb

@@ -6,10 +6,6 @@ module QueueClassicPlus
       QC::Queue.new(@queue)
     end
 
-    def self.queue_name_digest
-      @queue_name_digest ||= @queue.to_s.to_i(36)
-    end
-
     inheritable_attr :locked
     inheritable_attr :skip_transaction
     inheritable_attr :retries_on
@@ -56,42 +52,8 @@ module QueueClassicPlus
       QueueClassicPlus.logger
     end
 
-    def self.can_enqueue?(method, *args)
-      if locked?
-        max_lock_time = ENV.fetch("QUEUE_CLASSIC_MAX_LOCK_TIME", 10 * 60).to_i
-
-        q = "SELECT COUNT(1) AS count
-             FROM
-               (
-                 SELECT 1
-                 FROM queue_classic_jobs
-                 WHERE q_name = $1 AND method = $2 AND args::text = $3::text
-                   AND (locked_at IS NULL OR locked_at > current_timestamp - interval '#{max_lock_time} seconds')
-                 LIMIT 1
-               )
-             AS x"
-
-        result = QC.default_conn_adapter.execute(q, @queue, method, JSON.dump(serialized(args)))
-        result['count'].to_i == 0
-      else
-        true
-      end
-    end
-
     def self.enqueue(method, *args)
-       conn = QC.default_conn_adapter.connection
-       check_and_enqueue = proc do
-         conn.exec("SELECT pg_advisory_xact_lock(#{queue_name_digest})")
-         if can_enqueue?(method, *args)
-           queue.enqueue(method, *serialized(args))
-         end
-       end
-
-       if [PG::PQTRANS_ACTIVE, PG::PQTRANS_INTRANS].include?(conn.transaction_status)
-         check_and_enqueue.call
-       else
-         conn.transaction &check_and_enqueue
-       end
+      queue.enqueue(method, *serialized(args), lock: locked?)
     end
 
     def self.enqueue_perform(*args)

data/lib/queue_classic_plus/queue_classic/queue.rb

@@ -50,5 +50,25 @@ module QC
       end
     end
 
+    def enqueue(method, *args, lock: false)
+      QC.log_yield(:measure => 'queue.enqueue') do
+        insert_sql = <<-EOF
+          INSERT INTO #{QC.table_name} (q_name, method, args, lock)
+          VALUES ($1, $2, $3, $4)
+          ON CONFLICT (q_name, method, args) WHERE lock IS TRUE DO NOTHING
+          RETURNING id
+        EOF
+        begin
+          retries ||= 0
+          conn_adapter.execute(insert_sql, name, method, JSON.dump(args), lock)
+        rescue PG::Error => error
+          if (retries += 1) < 2
+            retry
+          else
+            raise
+          end
+        end
+      end
+    end
   end
 end

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha15'.freeze
+  VERSION = '4.0.0.alpha17'.freeze
 end

data/lib/queue_classic_plus.rb

@@ -15,14 +15,18 @@ module QueueClassicPlus
 
   def self.migrate(c = QC::default_conn_adapter.connection)
     conn = QC::ConnAdapter.new(connection: c)
-    conn.execute("ALTER TABLE queue_classic_jobs ADD COLUMN last_error TEXT")
-    conn.execute("ALTER TABLE queue_classic_jobs ADD COLUMN remaining_retries INTEGER")
+    conn.execute("ALTER TABLE queue_classic_jobs ADD COLUMN IF NOT EXISTS last_error TEXT")
+    conn.execute("ALTER TABLE queue_classic_jobs ADD COLUMN IF NOT EXISTS remaining_retries INTEGER")
+    conn.execute("ALTER TABLE queue_classic_jobs ADD COLUMN IF NOT EXISTS lock BOOLEAN NOT NULL DEFAULT FALSE")
+    conn.execute("CREATE UNIQUE INDEX IF NOT EXISTS index_queue_classic_jobs_enqueue_lock on queue_classic_jobs(q_name, method, args) WHERE lock IS TRUE")
   end
 
   def self.demigrate(c = QC::default_conn_adapter.connection)
     conn = QC::ConnAdapter.new(connection: c)
-    conn.execute("ALTER TABLE queue_classic_jobs DROP COLUMN last_error")
-    conn.execute("ALTER TABLE queue_classic_jobs DROP COLUMN remaining_retries")
+    conn.execute("ALTER TABLE queue_classic_jobs DROP COLUMN IF EXISTS last_error")
+    conn.execute("ALTER TABLE queue_classic_jobs DROP COLUMN IF EXISTS remaining_retries")
+    conn.execute("DROP INDEX IF EXISTS index_queue_classic_jobs_enqueue_lock")
+    conn.execute("ALTER TABLE queue_classic_jobs DROP COLUMN IF EXISTS lock")
   end
 
   def self.exception_handler

data/spec/base_spec.rb

@@ -3,6 +3,24 @@ require 'active_record'
 
 describe QueueClassicPlus::Base do
   context "A child of QueueClassicPlus::Base" do
+    subject do
+      Class.new(QueueClassicPlus::Base) do
+        @queue = :test
+      end
+    end
+
+    it "allows multiple enqueues" do
+      threads = []
+      10.times do
+        threads << Thread.new do
+          subject.do
+        end
+      end
+      threads.each(&:join)
+
+      expect(subject).to have_queue_size_of(10)
+    end
+
     context "that is locked" do
       subject do
         Class.new(QueueClassicPlus::Base) do
@@ -13,14 +31,27 @@ describe QueueClassicPlus::Base do
 
       it "does not allow multiple enqueues" do
         threads = []
-        50.times do
+        10.times do
           threads << Thread.new do
             subject.do
             expect(subject).to have_queue_size_of(1)
           end
         end
+        threads.each(&:join)
+      end
 
+      it "allows enqueueing same job with different arguments" do
+        threads = []
+        (1..3).each do |arg|
+          10.times do
+            threads << Thread.new do
+              subject.do(arg)
+            end
+          end
+        end
         threads.each(&:join)
+
+        expect(subject).to have_queue_size_of(3)
       end
 
       it "checks for an existing job using the same serializing as job enqueuing" do
@@ -34,14 +65,6 @@ describe QueueClassicPlus::Base do
         subject.do(date)
         expect(subject).to have_queue_size_of(1)
       end
-
-      it "does allow multiple enqueues if something got locked for too long" do
-        subject.do
-        one_day_ago = Time.now - 60*60*24
-        execute "UPDATE queue_classic_jobs SET locked_at = '#{one_day_ago}' WHERE q_name = 'test'"
-        subject.do
-        expect(subject).to have_queue_size_of(2)
-      end
     end
 
     context "when in a transaction" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha15
+  version: 4.0.0.alpha17
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic