pgtk 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757b15a689138f24c6ede8c373da30e0dce065bced0be49ecc1cde717fa44498
-  data.tar.gz: b3d1f97cb77914eda80071362d7adbaf850e2b2db810b6cc3f6fdce6d1b51f69
+  metadata.gz: 383ebf58dcd3f2deefe3f56384a1144f0de2aadd81b01f814cc2aa1610b4e1f1
+  data.tar.gz: 3421b3a30ec731028021b7206ed9d35d271d325d311a9c50feca0c7cd909d256
 SHA512:
-  metadata.gz: c2d377b1dc85c5d499665f6c57118b9c7373e8026e80eb0a21ef1a1ef5b2decffa80cdd2225f1a89cfe43e120d32f96cd64e047c841611883fc3f5dee7683284
-  data.tar.gz: 24f984d5f13d767514fd47b75920d3da94a0f6abfb4be0daf408d90846161a09c34b1607e4565a33ca3f3d5d61973496171d44f17eebab4aed50d558dd26628b
+  metadata.gz: 9d6be631578aa3ad6d31f563365b8c5094bb26f959ea5bf601d8e474bb018af35557190744719ea9392385b22ab5a036355fb84bc141ba6715678caaf6e09a8c
+  data.tar.gz: 6fa8e5aedf00a6da89de5dc770695aaa488c1364752909d0c783c658ac6d85708a5004aaf41126a1286c033c1f2f40d223cfcd4a1698f7f80c16774987462d55

data/lib/pgtk/stash.rb

@@ -116,67 +116,69 @@ class Pgtk::Stash
   #
   # @return [String] Multi-line text representation of the current cache state
   def dump
-    qq =
-      @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,
-      '',
+    @entrance.with_read_lock do
+      qq =
+        @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
       [
-        'Pgtk::Stash (',
+        @pool.dump,
+        '',
         [
-          "threads=#{@threads}",
-          "max_queue_length=#{@max_queue_length}",
-          if @refill_interval
-            [
-              "refill_interval=#{@refill_interval}s",
-              "refill_delay=#{@refill_delay}s"
-            ]
-          else
-            'no refilling'
-          end,
-          if @cap_interval
-            [
-              "cap_interval=#{@cap_interval}s",
-              "cap=#{@cap}"
-            ]
-          else
-            'no capping'
-          end,
-          if @retire_interval
-            [
-              "retire_interval=#{@retire_interval}s",
-              "retire=#{@retire}"
-            ]
-          else
-            'no retirement'
-          end
-        ].flatten.join(', '),
-        '):'
-      ].join,
-      if @tpool
-        "  #{@tpool.queue_length} tasks in the thread pool"
-      else
-        '  Not launched yet'
-      end,
-      "  #{stash_size} queries cached (#{stash_size > @cap ? 'above' : 'below'} the cap)",
-      "  #{@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 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
-    ].join("\n")
+          'Pgtk::Stash (',
+          [
+            "threads=#{@threads}",
+            "max_queue_length=#{@max_queue_length}",
+            if @refill_interval
+              [
+                "refill_interval=#{@refill_interval}s",
+                "refill_delay=#{@refill_delay}s"
+              ]
+            else
+              'no refilling'
+            end,
+            if @cap_interval
+              [
+                "cap_interval=#{@cap_interval}s",
+                "cap=#{@cap}"
+              ]
+            else
+              'no capping'
+            end,
+            if @retire_interval
+              [
+                "retire_interval=#{@retire_interval}s",
+                "retire=#{@retire}"
+              ]
+            else
+              'no retirement'
+            end
+          ].flatten.join(', '),
+          '):'
+        ].join,
+        if @tpool
+          "  #{@tpool.queue_length} tasks in the thread pool"
+        else
+          '  Not launched yet'
+        end,
+        "  #{stash_size} queries cached (#{stash_size > @cap ? 'above' : 'below'} the cap)",
+        "  #{@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 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
+      ].join("\n")
+    end
   end
 
   # Execute a SQL query with optional caching.
@@ -210,7 +212,7 @@ class Pgtk::Stash
       if ret.nil? || @stash.dig(:queries, pure, key, :stale)
         ret = @pool.exec(pure, params, result)
         unless pure.include?(' NOW() ')
-          tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|$)/).map(&:first).uniq
+          tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|;|$)/).map(&:first).uniq
           raise "No tables at #{pure.inspect}" if tables.empty?
           @entrance.with_write_lock do
             tables.each do |t|
@@ -258,7 +260,9 @@ class Pgtk::Stash
   #
   # @return [Integer] Total count of cached query results
   def stash_size
-    @stash[:queries].values.sum { |kk| kk.values.size }
+    @entrance.with_write_lock do
+      @stash[:queries].values.sum { |kk| kk.values.size }
+    end
   end
 
   # Launch background tasks for cache management.
@@ -298,13 +302,17 @@ class Pgtk::Stash
     end
     return unless @refill_interval
     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] }] }
-        .select { _1[2] }
-        .sort_by { -_1[1] }
-        .each do |a|
-        q = a[0]
-        @stash[:queries][q].each_key do |k|
+      qq =
+        @entrance.with_write_lock do
+          @stash[:queries]
+            .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
+        end
+      qq =
+        qq.select { _1[2] }
+          .sort_by { -_1[1] }
+          .map { _1[0] }
+      qq.each do |q|
+        @entrance.with_write_lock { @stash[:queries][q].keys }.each 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

data/lib/pgtk/version.rb

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

metadata

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