search-engine-for-typesense 30.1.8.6 → 30.1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c78ec682862c0d84b0e6a46d2e71fe0a34d195eb08f2c75885d6c9c5287333
-  data.tar.gz: b74ec0baf763752d4b110c970ed782fe24d7b9c6819359f88a8c79064180d876
+  metadata.gz: 77958fc8a7cb84effc7e3a4ca73b2f01e88eacc9ddead6e888c746e17b7e28d5
+  data.tar.gz: 74a046ef9f7cbdddeeed1c9fb7d9749d501b71300adc30bd0d2d771088aae189
 SHA512:
-  metadata.gz: e3b0de141dee645872757a533243779a50474183645f0f80ebe4e4434739baab3c838a9024c3c27f78db8a50b170001b88af2ac560ac92387496ac36b26482ab
-  data.tar.gz: 753e1c206dac9590dfd8833d9b1f6a12d54752159f0e638472eab40f03655cca8fc14db2caac177a664f9627f3f778e269c5551613abb01ae72eb549b3f7033c
+  metadata.gz: 9e6bc4e2159d41cd66f0f4f9568d503c3b40ebbbe59be2cb6709ce008589d2e2caa3028f54f3de180a1dc9ff5c37c37cab5ba049780b4583a4974018eaf7ca39
+  data.tar.gz: a478abb0104cf415d31bcd069d93eb89039acff25c081423117e965fed6d6cd2ffbc859a88601988036246e4b343633e454fda25e27999013c5363e4f824d0c9

data/lib/search_engine/postgres_outbox/repository.rb

@@ -22,6 +22,7 @@ module SearchEngine
         connection.transaction do
           rows = select_rows(claim_select_sql(limit.to_i))
           ids = rows.map { |row| row_value(row, :id) }
+          execute(supersede_older_pending_sql(rows)) unless rows.empty?
           execute(claim_update_sql(ids, worker_id)) unless ids.empty?
         end
 
@@ -103,12 +104,30 @@ module SearchEngine
 
       def claim_select_sql(limit)
         <<~SQL
-          SELECT *
-          FROM #{quoted_table}
-          WHERE status = 'pending'
-            AND (next_attempt_at IS NULL OR next_attempt_at <= CURRENT_TIMESTAMP)
-          ORDER BY id ASC
-          LIMIT #{limit}
+          WITH ranked_pending AS (
+            SELECT id,
+                   ROW_NUMBER() OVER (
+                     PARTITION BY collection, document_id
+                     ORDER BY id DESC
+                   ) AS row_number
+            FROM #{quoted_table}
+            WHERE status = 'pending'
+          ),
+          latest_due AS (
+            SELECT outbox.id
+            FROM #{quoted_table} outbox
+            INNER JOIN ranked_pending
+              ON ranked_pending.id = outbox.id
+            WHERE ranked_pending.row_number = 1
+              AND (outbox.next_attempt_at IS NULL OR outbox.next_attempt_at <= CURRENT_TIMESTAMP)
+            ORDER BY outbox.id ASC
+            LIMIT #{limit}
+          )
+          SELECT outbox.*
+          FROM #{quoted_table} outbox
+          INNER JOIN latest_due
+            ON latest_due.id = outbox.id
+          ORDER BY outbox.id ASC
           FOR UPDATE SKIP LOCKED
         SQL
       end
@@ -124,6 +143,24 @@ module SearchEngine
         SQL
       end
 
+      def supersede_older_pending_sql(rows)
+        <<~SQL
+          UPDATE #{quoted_table} older
+          SET status = 'superseded',
+              processed_at = CURRENT_TIMESTAMP,
+              locked_at = NULL,
+              locked_by = NULL,
+              updated_at = CURRENT_TIMESTAMP
+          FROM (
+            VALUES #{coalesce_values_sql(rows)}
+          ) AS latest(collection, document_id, id)
+          WHERE older.status = 'pending'
+            AND older.collection = latest.collection
+            AND older.document_id = latest.document_id
+            AND older.id < latest.id
+        SQL
+      end
+
       def update_status!(event_ids, status, extra:)
         ids = Array(event_ids).compact
         return if ids.empty?
@@ -154,6 +191,16 @@ module SearchEngine
         ids.map { |id| quote(id) }.join(', ')
       end
 
+      def coalesce_values_sql(rows)
+        rows.map do |row|
+          collection = row_value(row, :collection)
+          document_id = row_value(row, :document_id)
+          id = row_value(row, :id)
+
+          "(#{quote(collection)}, #{quote(document_id)}, #{quote(id)})"
+        end.join(', ')
+      end
+
       def quoted_table
         connection.quote_table_name(SearchEngine.config.postgres_outbox.table_name)
       end

data/lib/search_engine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search-engine-for-typesense
 version: !ruby/object:Gem::Version
-  version: 30.1.8.6
+  version: 30.1.8.7
 platform: ruby
 authors:
 - Nikita Shkoda