pgtk 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57546e93aaf2c029a795f61302d943e4f64e7d1e03b77d339636bdfb73d271d5
-  data.tar.gz: 467c0493e69e8402b83ea6b537ac69760d5e712ac088b856307d2418449878f9
+  metadata.gz: b16d736e3b32a69aabf5a87fff3d4611f0af14c6c87e72fb7dc3e84d2ee027ee
+  data.tar.gz: 1c989c0af1b8ce28e325b0b9e146295e3cd24f02bb2cec0fee7ed2ac714ed2d6
 SHA512:
-  metadata.gz: 83b61249a1888eed186c7faa7814c9a07f28fa9268d8d7fad1dfc0b9d7f4b304d4c835116fce6e32b6e651d7a2fc12731417c52922daae8ad9759419b32d2344
-  data.tar.gz: 5107f90f035a11e3ab17c8718f759c6869ea24d3c195dafb1845d546587244ad1e6f82dca7da5b505055cefdafa97f7b0e6390f17374e2458f773e54f7f9dd75
+  metadata.gz: a6dcaac89f9ea200f9030505df810fb4a0a2136387e98833960f830be10d19aa9f1b55f7c3f8e6fd447c8df30235233aafd8f7730bde99c8751cb910416e660f
+  data.tar.gz: 34e7b0682c858ce58397abf4c8694cdb849453f70d0d0fe1c220d96eb800a425602ae693a149b53b7b2a1fc1b8afafee3f9c72a494b1214393d21d2d1dbafebd

data/Gemfile.lock

@@ -26,7 +26,7 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     joined (0.4.0)
-    json (2.15.2)
+    json (2.16.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -52,7 +52,7 @@ GEM
     pg (1.6.2-x64-mingw-ucrt)
     pg (1.6.2-x86_64-linux)
     prism (1.6.0)
-    qbash (0.4.5)
+    qbash (0.4.7)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -76,7 +76,7 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-minitest (0.38.2)
@@ -101,7 +101,7 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     slop (4.10.1)
-    tago (0.3.0)
+    tago (0.4.0)
     threads (0.4.1)
       backtrace (~> 0)
       concurrent-ruby (~> 1.0)

data/lib/pgtk/pool.rb

@@ -7,6 +7,7 @@ require 'pg'
 require 'loog'
 require 'tago'
 require_relative '../pgtk'
+require_relative 'version'
 require_relative 'wire'
 
 # Pool provides a connection pool for PostgreSQL database connections.
@@ -74,6 +75,7 @@ class Pgtk::Pool
   def dump
     [
       'Pgtk::Pool',
+      "  Pgtk version: #{Pgtk::VERSION}",
       "  PgSQL version: #{version}",
       "  #{@pool.size} connections:",
       @pool.map do |c|

data/lib/pgtk/stash.rb

@@ -6,6 +6,7 @@
 require 'concurrent-ruby'
 require 'joined'
 require 'loog'
+require 'tago'
 require_relative '../pgtk'
 
 # Database query cache implementation.
@@ -39,6 +40,8 @@ class Pgtk::Stash
   # @option [Hash] queries Internal cache data (default: {})
   # @option [Hash] tables Internal cache data (default: {})
   # @param [Integer] refill_interval Interval in seconds for recalculate stale queries
+  # @param [Integer] cap How many queries to keep in cache (if more, oldest ones are deleted)
+  # @param [Integer] cap_interval Interval in seconds for cap the cache (remove old queries)
   # @param [Integer] max_queue_length Number of refilling tasks in the queue
   # @param [Integer] threads Number of threads in tpool
   # @param [Loog] loog Logger for debugging (default: null logger)
@@ -48,6 +51,8 @@ class Pgtk::Stash
     refill_interval: 16,
     max_queue_length: 128,
     threads: 4,
+    cap: 10_000,
+    cap_interval: 60,
     loog: Loog::NULL,
     entrance: Concurrent::ReentrantReadWriteLock.new,
     launched: Concurrent::AtomicBoolean.new(false)
@@ -59,6 +64,8 @@ class Pgtk::Stash
     @refill_interval = refill_interval
     @max_queue_length = max_queue_length
     @threads = threads
+    @cap = cap
+    @cap_interval = cap_interval
     @loog = loog
     @tpool = Concurrent::FixedThreadPool.new(@threads)
   end
@@ -78,13 +85,14 @@ class Pgtk::Stash
   # Convert internal state into text.
   def dump
     qq =
-      @stash[:queries].map do |k, v|
-        [
-          k.dup, # the query
-          v.values.count, # how many keys?
-          v.values.sum { |vv| vv[:popularity] }, # total popularity of all keys
-          v.values.count { |vv| vv[:stale] } # how many stale keys?
-        ]
+      @stash[:queries].map do |q, kk|
+        {
+          q: q.dup, # the query
+          c: kk.values.count, # how many keys?
+          p: kk.values.sum { |vv| vv[:popularity] }, # total popularity of all keys
+          s: kk.values.count { |vv| vv[:stale] }, # how many stale keys?
+          u: kk.values.map { |vv| vv[:used] }.max || Time.now # when was it used
+        }
       end
     [
       @pool.dump,
@@ -93,10 +101,14 @@ class Pgtk::Stash
       "  #{'not ' if @launched.false?}launched",
       "  #{@tpool.queue_length} task(s) in the thread pool",
       "  #{@stash[:tables].count} table(s) in cache",
-      "  #{qq.sum { |a| a[3] }} stale quer(ies) in cache:",
-      qq.select { |a| a[3].positive? }.sort_by { -_1[2] }.take(16).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" },
-      "  #{qq.count { |a| a[3].zero? }} other quer(ies) in cache:",
-      qq.select { |a| a[3].zero? }.sort_by { -_1[2] }.take(8).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" }
+      "  #{qq.sum { |a| a[:s] }} stale quer(ies) 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.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
     ].join("\n")
   end
 
@@ -176,11 +188,17 @@ class Pgtk::Stash
 
   def launch!
     raise 'Cannot launch multiple times on same cache data' unless @launched.make_true
-    retire = 60 * 60
-    Concurrent::TimerTask.execute(execution_interval: retire, 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 }
+    Concurrent::TimerTask.execute(execution_interval: @cap_interval, executor: @tpool) do
+      loop do
+        s = @stash[:queries].values.sum { |kk| kk.values.size }
+        break if s <= @cap
+        @entrance.with_write_lock do
+          @stash[:queries].each_key do |q|
+            m = @stash[:queries][q].values.map { |h| h[:used] }.min
+            next unless m
+            @stash[:queries][q].delete_if { |_, h| h[:used] == m }
+            @stash[:queries].delete_if { |_, kk| kk.empty? }
+          end
         end
       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.23.0'
+  VERSION = '0.24.0'
 end

metadata

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