search-engine-for-typesense 30.1.8.5 → 30.1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a738bfc2dcfe706d2c67c70b4f4923859ca808a50364b4b97ec93f1ecfdc66
-  data.tar.gz: dcb84555d2106d27c5bff18e31b0d9f20af7b2584ec2740ebe32cf4f07e842d2
+  metadata.gz: b1c78ec682862c0d84b0e6a46d2e71fe0a34d195eb08f2c75885d6c9c5287333
+  data.tar.gz: b74ec0baf763752d4b110c970ed782fe24d7b9c6819359f88a8c79064180d876
 SHA512:
-  metadata.gz: db614f2ad79a4ed16424721b06b990a6b523f98bbc0e3e054fbf7f7ad1939c9282e948c70db257b40623865337b94f88c6614845a8088b048904c2baf105762d
-  data.tar.gz: 98d27347d7e98ee4f0380884331464e280d003af96fc5cd87c5278efca443ce88d8047f2652055e111621bbb10808f93f6fb8d9fec3000f8f475d3a73128b3b7
+  metadata.gz: e3b0de141dee645872757a533243779a50474183645f0f80ebe4e4434739baab3c838a9024c3c27f78db8a50b170001b88af2ac560ac92387496ac36b26482ab
+  data.tar.gz: 753e1c206dac9590dfd8833d9b1f6a12d54752159f0e638472eab40f03655cca8fc14db2caac177a664f9627f3f778e269c5551613abb01ae72eb549b3f7033c

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

@@ -14,10 +14,20 @@ module SearchEngine
       def perform(limit: nil)
         return nil unless SearchEngine.config.postgres_outbox.enabled
 
+        effective_limit = limit || SearchEngine.config.postgres_outbox.batch_size
         drainer = SearchEngine::PostgresOutbox::Drainer.new
-        return drainer.drain_once if limit.nil?
+        summary = drainer.drain_once(limit: effective_limit)
+        enqueue_continuation(limit: limit) if summary[:claimed].to_i >= effective_limit.to_i
 
-        drainer.drain_once(limit: limit)
+        summary
+      end
+
+      private
+
+      def enqueue_continuation(limit:)
+        return self.class.perform_later if limit.nil?
+
+        self.class.perform_later(limit: limit)
       end
     end
   end

data/lib/search_engine/postgres_outbox/listener.rb

@@ -37,6 +37,7 @@ module SearchEngine
         @mutex = Mutex.new
         @stop_requested = false
         @thread = nil
+        @last_enqueue_at = nil
       end
 
       # Start the listener thread.
@@ -120,7 +121,7 @@ module SearchEngine
             next if notified || stop_requested?
 
             instrument('search_engine.postgres_outbox.listener_fallback') {}
-            enqueue_drain
+            enqueue_drain(force: true)
           end
         ensure
           connection.execute("UNLISTEN #{quoted_channel}")
@@ -187,10 +188,33 @@ module SearchEngine
         end
       end
 
-      def enqueue_drain
+      def enqueue_drain(force: false)
+        return if enqueue_throttled?(force: force)
+
         drain_job.perform_later
       end
 
+      def enqueue_throttled?(force:)
+        @mutex.synchronize do
+          now = monotonic_time
+          if force
+            @last_enqueue_at = now
+            next false
+          end
+
+          if @last_enqueue_at && (now - @last_enqueue_at) < poll_interval_s
+            true
+          else
+            @last_enqueue_at = now
+            false
+          end
+        end
+      end
+
+      def monotonic_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
       def drain_job
         @drain_job ||= SearchEngine::PostgresOutbox::DrainJob
       end

data/lib/search_engine/version.rb

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

metadata

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