pgtk 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc06629facf30f84cc049cd8404c347129c286edfd82c15d75382930d44456aa
-  data.tar.gz: 27a43238939e20b6b8aa5356924fd2a18e10d78c10190dda446cea2c57edf004
+  metadata.gz: b21dae64f611c7570502547af5c940397cbc247e45f7426f5e349c6308f7fa57
+  data.tar.gz: ec130297606a929b7774b350ae74ac0a7e4b66222eeaeaaa5ba7a4e363cd11ae
 SHA512:
-  metadata.gz: 17d9b5d89759f159db6f0dea44a679bda49d05005b4f2215d2d174f8e92a09dbcb1ce5388e01fcf1ce7a0c6105dd2c4968f428f9c9a640946e4e14dcffeffd54
-  data.tar.gz: 14a6aff5628756724cd356e83345a1f111be05a006eab4aa034b1c397253dac72f293b68b218eb06d9d17a0a549ca0477081e34b658de8ff1c05cecbe577d0b6
+  metadata.gz: 20a6203a23f64e00f9e9bfe9daf44463530820959f70d512d560e3dc0b73e8d9b2b2d453361d37c23a484208630d06654d139518f3188aec0eab18cb4c1817a5
+  data.tar.gz: a985cd2ab24bfc68927b46f1852ac1b06f10ad642aac41d23f8294ef66065020796f702f58df8e5c1ae03da8fc1a716a9fcc1c5349a58ee1d983e67b56398374

data/lib/pgtk/stash.rb

@@ -44,16 +44,20 @@ class Pgtk::Stash
   # @param [Object] pool The underlying connection pool that executes actual database queries
   # @param [Hash] stash Internal cache structure containing queries and tables hashes for sharing state
   #   across transactions
-  # @param [Integer] refill_interval Interval in seconds between background tasks that recalculate stale
+  # @param [Float] refill_interval Interval in seconds between background tasks that recalculate stale
   #   cached queries
+  # @param [Float] refill_delay A pause in seconds we take before making a refill
   # @param [Integer] max_queue_length Maximum number of refilling tasks allowed in the thread pool queue
   #   before new tasks are skipped
   # @param [Integer] threads Number of worker threads in the background thread pool for cache refilling
   #   operations
   # @param [Integer] cap Maximum number of cached query results to retain; oldest queries are evicted when
   #   this limit is exceeded
-  # @param [Integer] cap_interval Interval in seconds between background tasks that enforce the cache size
+  # @param [Float] cap_interval Interval in seconds between background tasks that enforce the cache size
   #   cap by removing old queries
+  # @param [Integer] retire Maximum age in seconds to keep a query in cache after its latest usage
+  # @param [Float] retire_interval Interval in seconds between background tasks that remove
+  #   retired queries
   # @param [Loog] loog Logger instance for debugging and monitoring cache operations (default: null logger)
   # @param [Concurrent::ReentrantReadWriteLock] entrance Read-write lock for thread-safe cache access
   #   shared across instances
@@ -63,10 +67,13 @@ class Pgtk::Stash
     pool,
     stash: { queries: {}, tables: {} },
     refill_interval: 16,
+    refill_delay: 0,
     max_queue_length: 128,
     threads: 4,
     cap: 10_000,
     cap_interval: 60,
+    retire: 15 * 60,
+    retire_interval: 60,
     loog: Loog::NULL,
     entrance: Concurrent::ReentrantReadWriteLock.new,
     launched: Concurrent::AtomicBoolean.new(false)
@@ -76,10 +83,13 @@ class Pgtk::Stash
     @launched = launched
     @entrance = entrance
     @refill_interval = refill_interval
+    @refill_delay = refill_delay
     @max_queue_length = max_queue_length
     @threads = threads
     @cap = cap
     @cap_interval = cap_interval
+    @retire = retire
+    @retire_interval = retire_interval
     @loog = loog
     @tpool = Concurrent::FixedThreadPool.new(@threads)
   end
@@ -122,18 +132,28 @@ class Pgtk::Stash
     [
       @pool.dump,
       '',
-      # rubocop:disable Layout/LineLength
-      "Pgtk::Stash (refill_interval=#{@refill_interval}s, max_queue_length=#{@max_queue_length}, threads=#{@threads}, cap=#{@cap}, cap_interval=#{@cap_interval}s):",
-      # rubocop:enable Layout/LineLength
+      [
+        'Pgtk::Stash (',
+        [
+          "refill_interval=#{@refill_interval}s",
+          "max_queue_length=#{@max_queue_length}",
+          "threads=#{@threads}",
+          "cap=#{@cap}",
+          "cap_interval=#{@cap_interval}s",
+          "retire=#{@retire}",
+          "retire_interval=#{@retire_interval}s"
+        ].join(', '),
+        '):'
+      ].join,
       "  #{'not ' if @launched.false?}launched",
-      "  #{stash_size} queries stashed (#{stash_size > @cap ? 'above' : 'below'} the cap)",
-      "  #{@tpool.queue_length} task(s) in the thread pool",
-      "  #{@stash[:tables].count} table(s) in cache",
-      "  #{qq.sum { |a| a[:s] }} stale quer(ies) in cache:",
+      "  #{stash_size} queries cached (#{stash_size > @cap ? 'above' : 'below'} the cap)",
+      "  #{@tpool.queue_length} tasks in the thread pool",
+      "  #{@stash[:tables].count} tables in cache",
+      "  #{qq.sum { |a| a[:s] }} stale queries in cache:",
       qq.select { |a| a[:s].positive? }.sort_by { -_1[:p] }.take(8).map do |a|
         "    #{a[:c]}/#{a[:p]}p/#{a[:s]}s/#{a[:u].ago}: #{a[:q]}"
       end,
-      "  #{qq.count { |a| a[:s].zero? }} other quer(ies) in cache:",
+      "  #{qq.count { |a| a[:s].zero? }} other queries in cache:",
       qq.select { |a| a[:s].zero? }.sort_by { -_1[:p] }.take(16).map do |a|
         "    #{a[:c]}/#{a[:p]}p/#{a[:s]}s/#{a[:u].ago}: #{a[:q]}"
       end
@@ -160,7 +180,7 @@ class Pgtk::Stash
         tables.each do |t|
           @stash[:tables][t]&.each do |q|
             @stash[:queries][q]&.each_key do |key|
-              @stash[:queries][q][key][:stale] = true
+              @stash[:queries][q][key][:stale] = Time.now
             end
           end
         end
@@ -249,6 +269,14 @@ class Pgtk::Stash
         end
       end
     end
+    Concurrent::TimerTask.execute(execution_interval: @retire_interval, executor: @tpool) do
+      @entrance.with_write_lock do
+        @stash[:queries].each_key do |q|
+          @stash[:queries][q].delete_if { |_, h| h[:used] < Time.now - @retire }
+          @stash[:queries].delete_if { |_, kk| kk.empty? }
+        end
+      end
+    end
     Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: @tpool) do
       @stash[:queries]
         .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
@@ -258,13 +286,14 @@ class Pgtk::Stash
         q = a[0]
         @stash[:queries][q].each_key do |k|
           next unless @stash[:queries][q][k][:stale]
+          next if @stash[:queries][q][k][:stale] > Time.now - @refill_delay
           next if @tpool.queue_length >= @max_queue_length
           @tpool.post do
             h = @stash[:queries][q][k]
             ret = @pool.exec(q, h[:params], h[:result])
             @entrance.with_write_lock do
               h = @stash[:queries][q][k]
-              h[:stale] = false
+              h.delete(:stale)
               h[:ret] = ret
             end
           end

data/lib/pgtk/version.rb

@@ -11,5 +11,5 @@ require_relative '../pgtk'
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.24.3'
+  VERSION = '0.25.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0
 platform: ruby
 authors:
 - Yegor Bugayenko