search-engine-for-typesense 30.1.8.14 → 30.1.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b92138a4716df3c14da84a5f66b26f30bbdcb6afcb8d54f19d953c6652d1ed
-  data.tar.gz: 7f21c4f3ea8216ad390494f9ca813a3829b80b15b8948f3ea5523f566d101368
+  metadata.gz: fd4cd9a02cea20dbf913f71c55c1ae57b77d29245be9e1f02e93a22e791cadcf
+  data.tar.gz: 404f2b78d290227c1fdfcd0b82cfcd7d41f4ec353d5e551a20658cd9a78ff593
 SHA512:
-  metadata.gz: 0cec597cc88d5553ac833035e7e974ea3f6683d1efeaf1c2a2f2431f004c78a5ccfdee27e4eb22c513a0e95f8c2275e28b2b2158fb6d8d95b3846328f45633e4
-  data.tar.gz: 0a3d95f6df6dba0f0ea9bbdb93fe6224a3b5b2d7cefa0907504273a004c095750f1a9a9f7d67b3e60180dcbf019a01ab55bd137fc5cde563c76c28634a401e3b
+  metadata.gz: 166cb097643cfb4376a1232eaab0e4f371fd1b3c409a9103f2a3d812dd1ba74f9812e13986e542abcbd086fe4cdcf05db3bca799ddaac2e5ee94215db5d83098
+  data.tar.gz: 5a57d41c35a28022ca8384f8f7924b5d26e7210ac3a3681ccc8a9dcfaf7cba90ba5db6ea3914d09d2f9c19efa6fe43947778a086ecafc13fddc0a4ab1e751d5e

data/app/search_engine/search_engine/postgres_outbox/drain_job.rb

@@ -42,6 +42,7 @@ module SearchEngine
         slot = drain_slot.to_i
         effective_limit = limit || SearchEngine.config.postgres_outbox.batch_size
         repository = repository_for_slot
+        slot_requeued = false
         return stale_slot_summary(target.key, slot) unless repository.start_drain_slot!(
           target_key: target.key,
           slot: slot,
@@ -55,13 +56,16 @@ module SearchEngine
             slot: slot,
             worker_id: worker_id
           )
-          enqueue_target_continuation(limit: limit, target_key: target.key, drain_slot: slot) if requeued
+          if requeued
+            slot_requeued = true
+            enqueue_requeued_slot_continuation(repository, target.key, slot, limit: limit)
+          end
         else
           repository.release_drain_slot!(target_key: target.key, slot: slot, worker_id: worker_id)
         end
         summary
       rescue StandardError => error
-        if repository && target && slot
+        if repository && target && slot && !slot_requeued
           repository.release_drain_slot!(target_key: target.key, slot: slot, worker_id: worker_id, error: error)
         end
         raise
@@ -88,6 +92,13 @@ module SearchEngine
         summary
       end
 
+      def enqueue_requeued_slot_continuation(repository, target_key, slot, limit:)
+        enqueue_target_continuation(limit: limit, target_key: target_key, drain_slot: slot)
+      rescue StandardError => error
+        repository.release_requeued_drain_slot!(target_key: target_key, slot: slot, error: error)
+        raise
+      end
+
       def continue_draining?(summary, effective_limit)
         summary[:continue] || summary[:claimed].to_i >= effective_limit.to_i
       end

data/lib/search_engine/postgres_outbox/repository.rb

@@ -112,7 +112,7 @@ module SearchEngine
       # Create missing delivery rows for all configured delivery targets.
       # @return [void]
       def materialize_deliveries!(limit: SearchEngine.config.postgres_outbox.batch_size)
-        targets = delivery_targets
+        targets = materialization_delivery_targets
         return if targets.empty?
 
         rows = []
@@ -222,6 +222,27 @@ module SearchEngine
         SQL
       end
 
+      # Release a queued slot when a follow-up job could not be enqueued.
+      #
+      # @param target_key [String, Symbol]
+      # @param slot [Integer]
+      # @param error [Exception, String, nil]
+      # @return [void]
+      def release_requeued_drain_slot!(target_key:, slot:, error: nil)
+        execute(<<~SQL)
+          UPDATE #{quoted_drain_slot_table}
+          SET status = 'idle',
+              locked_at = NULL,
+              locked_by = NULL,
+              finished_at = CURRENT_TIMESTAMP,
+              last_error = #{quote(error.nil? ? nil : truncate_error(error))},
+              updated_at = CURRENT_TIMESTAMP
+          WHERE target_key = #{quote(target_key)}
+            AND slot = #{slot.to_i}
+            AND status = 'queued'
+        SQL
+      end
+
       private
 
       attr_reader :target_key
@@ -250,8 +271,10 @@ module SearchEngine
           WITH target(target_key, queue_name) AS (
             VALUES #{delivery_target_values_sql(targets)}
           ),
-          candidate_events AS (
-            SELECT outbox.*
+          candidate_events AS MATERIALIZED (
+            SELECT outbox.id,
+                   outbox.collection,
+                   outbox.document_id
             FROM #{quoted_table} outbox
             WHERE outbox.status IN ('pending', 'processing', 'failed')
               AND (outbox.next_attempt_at IS NULL OR outbox.next_attempt_at <= CURRENT_TIMESTAMP)
@@ -268,10 +291,24 @@ module SearchEngine
             ORDER BY outbox.id ASC
             LIMIT #{limit}
             FOR UPDATE SKIP LOCKED
+          ),
+          latest_candidate_ids AS (
+            SELECT id
+            FROM (
+              SELECT id,
+                     ROW_NUMBER() OVER (
+                       PARTITION BY collection, document_id
+                       ORDER BY id DESC
+                     ) AS row_number
+              FROM candidate_events
+            ) ranked_candidate_events
+            WHERE row_number = 1
           )
-          SELECT DISTINCT ON (collection, document_id) *
-          FROM candidate_events
-          ORDER BY collection, document_id, id DESC
+          SELECT outbox.*
+          FROM #{quoted_table} outbox
+          INNER JOIN latest_candidate_ids
+            ON latest_candidate_ids.id = outbox.id
+          ORDER BY outbox.id ASC
         SQL
       end
 
@@ -798,6 +835,13 @@ module SearchEngine
         Array(raw_targets).map { |target| DeliveryTarget.normalize(target) }
       end
 
+      def materialization_delivery_targets
+        targets = delivery_targets
+        return targets unless delivery_mode?
+
+        targets.select { |target| target.key == target_key }
+      end
+
       def max_attempts
         SearchEngine.config.postgres_outbox.max_attempts.to_i
       end

data/lib/search_engine/version.rb

@@ -3,5 +3,5 @@
 module SearchEngine
   # Current gem version.
   # @return [String]
-  VERSION = '30.1.8.14'
+  VERSION = '30.1.8.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search-engine-for-typesense
 version: !ruby/object:Gem::Version
-  version: 30.1.8.14
+  version: 30.1.8.16
 platform: ruby
 authors:
 - Nikita Shkoda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-05 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby