pgtk 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ef00bc464354f5067a8346303914924549a69127dd7d089511b432ceb61cb5
-  data.tar.gz: f0714a56d3d31bdc90f6a8b24bd871b4ac2256dabe32be94191afb92e2034f74
+  metadata.gz: 383ebf58dcd3f2deefe3f56384a1144f0de2aadd81b01f814cc2aa1610b4e1f1
+  data.tar.gz: 3421b3a30ec731028021b7206ed9d35d271d325d311a9c50feca0c7cd909d256
 SHA512:
-  metadata.gz: 186a1581c002df615bef9ddecf615140ee0cfe4abd328f7ea841b891d09ffbb3f08ae058eb534abcb4c7002fd2b903d082e4b1d5a577b4f9d615a3b8ee8bd35d
-  data.tar.gz: efa556d86eea1b11834d8c19f3620abcc17d3567d3db0d9452d20c4cdd56ad59db13b38ecded753f86ca14f2d36fc95e7e2f67d43386246071ff3d65675bede0
+  metadata.gz: 9d6be631578aa3ad6d31f563365b8c5094bb26f959ea5bf601d8e474bb018af35557190744719ea9392385b22ab5a036355fb84bc141ba6715678caaf6e09a8c
+  data.tar.gz: 6fa8e5aedf00a6da89de5dc770695aaa488c1364752909d0c783c658ac6d85708a5004aaf41126a1286c033c1f2f40d223cfcd4a1698f7f80c16774987462d55

data/lib/pgtk/stash.rb

@@ -212,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|
@@ -303,13 +303,16 @@ class Pgtk::Stash
     return unless @refill_interval
     Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: @tpool) do
       qq =
-        @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] }
-        .map { |a| a[0] }
+        @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|
-        @stash[:queries][q].each_key do |k|
+        @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.1'
+  VERSION = '0.28.2'
 end

metadata

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