pgtk 0.32.2 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48e3fb20daadf888fd4bbf448b1cd3463ec8205030cb33f05041cac725050fb
-  data.tar.gz: deba6c857216fc73285e4a68535a6aff8ead236849c470977e6904178497dc27
+  metadata.gz: 72cdeed11d9faa8c9097c01256603b2ce77a507b936c983ab623b9e1d6e7d364
+  data.tar.gz: ab60b5670e87009e1eb47983bd8d729eb403d78a9c6a20c82ea14d70d4a7d18f
 SHA512:
-  metadata.gz: dcf47d0d6145eba4cea340dbdc69bba939c84afad4da5a7aa9af2026cfc36d4b7a0dc29528e1a5cf5ed73ed45afaaaf1b1b64b6c52e36346c7a879cf8f13e77c
-  data.tar.gz: ea608bf12ae7334187830312d04d6954dc7f6071d49b9e6796a4a2b5b6fbbe219a836445ba208873f95d16bb31c7c9d866cf0fb20c1af92fa7ffbbd9d8b128ad
+  metadata.gz: 691ea0c8b5ca6002b72ab4b66487b3dbf489feaedbc8e80cc772fe69cfc1ad966fa836e13298b561cadb38c75290ed8a533a389751a7d6b0454da23b87afcb74
+  data.tar.gz: 8a04b05ad839b935ac3f8e5362bb957eb64e8e70e1b963c5713a7c7755f8184e6c1e8c806a4d03467bba80e3ce5af0cf9c1a1a50c4d73f11e79d46dc9569fc2f

data/Gemfile.lock

@@ -35,7 +35,7 @@ GEM
       tago (~> 0.1)
     ellipsized (0.3.0)
     joined (0.4.0)
-    json (2.19.4)
+    json (2.19.5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -52,21 +52,21 @@ GEM
       minitest (>= 5.0, < 7)
       ruby-progressbar
     minitest-stub-const (0.6)
-    nokogiri (1.19.2-aarch64-linux-gnu)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-aarch64-linux-musl)
+    nokogiri (1.19.3-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-gnu)
+    nokogiri (1.19.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-musl)
+    nokogiri (1.19.3-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-musl)
+    nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
     os (1.1.4)
     parallel (2.0.1)
@@ -94,7 +94,7 @@ GEM
       tago (~> 0.0)
     regexp_parser (2.12.0)
     rexml (3.4.4)
-    rubocop (1.86.1)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/pgtk/stash.rb

@@ -32,12 +32,16 @@ class Pgtk::Stash
   MODS = %w[INSERT DELETE UPDATE LOCK VACUUM TRANSACTION COMMIT ROLLBACK REINDEX TRUNCATE CREATE ALTER DROP SET].freeze
   MODS_RE = Regexp.new("(^|\\s)(#{MODS.join('|')})(\\s|$)")
 
+  IDENT = '[a-z_][a-z0-9_]*'
+
   ALTS = ['UPDATE', 'INSERT INTO', 'DELETE FROM', 'TRUNCATE', 'ALTER TABLE', 'DROP TABLE'].freeze
-  ALTS_RE = Regexp.new("(?<=^|\\s)(?:#{ALTS.join('|')})\\s([a-z]+)(?=[^a-z]|$)")
+  ALTS_RE = Regexp.new("(?<=^|\\s)(?:#{ALTS.join('|')})\\s(#{IDENT})(?=[^a-z0-9_]|$)")
+
+  READS_RE = Regexp.new("(?<=^|\\s)(?:FROM|JOIN)\\s(#{IDENT})(?=\\s|;|$)")
 
   SEPARATOR = ' --%*@#~($-- '
 
-  private_constant :MODS, :ALTS, :MODS_RE, :ALTS_RE, :SEPARATOR
+  private_constant :MODS, :ALTS, :IDENT, :MODS_RE, :ALTS_RE, :READS_RE, :SEPARATOR
 
   # Initialize a new Stash with query caching.
   #
@@ -57,7 +61,7 @@ class Pgtk::Stash
   # @param [Concurrent::ReentrantReadWriteLock] entrance Read-write lock for thread-safe access
   def initialize(
     pool,
-    stash: { queries: {}, tables: {}, table_mod: {} },
+    stash: { queries: {}, tables: {}, table_mod: {}, table_inflight: {} },
     loog: Loog::NULL,
     entrance: Concurrent::ReentrantReadWriteLock.new,
     refill: 16,
@@ -72,6 +76,7 @@ class Pgtk::Stash
     @pool = pool
     @stash = stash
     @stash[:table_mod] ||= {}
+    @stash[:table_inflight] ||= {}
     @loog = loog
     @entrance = entrance
     @refill = refill
@@ -217,29 +222,40 @@ class Pgtk::Stash
   def modify(pure, params, result)
     tables = pure.scan(ALTS_RE).flatten
     tables.uniq!
-    ret = @pool.exec(pure, params, result)
-    now = Time.now
     affected = (tables + tables.flat_map { |t| @cascades&.fetch(t, []) || [] }).uniq
     @entrance.with_write_lock do
-      affected.each do |t|
-        old = @stash[:table_mod][t]
-        stamp = old && old > now ? old : now
-        @stash[:table_mod][t] = stamp
-        @stash[:tables][t]&.each do |q|
-          @stash[:queries][q]&.each_key do |key|
-            @stash[:queries][q][key][:stale] = stamp
+      affected.each { |t| @stash[:table_inflight][t] = (@stash[:table_inflight][t] || 0) + 1 }
+    end
+    begin
+      ret = @pool.exec(pure, params, result)
+      now = Time.now
+      @entrance.with_write_lock do
+        affected.each do |t|
+          @stash[:table_inflight][t] -= 1
+          old = @stash[:table_mod][t]
+          stamp = old && old > now ? old : now
+          @stash[:table_mod][t] = stamp
+          @stash[:tables][t]&.each do |q|
+            @stash[:queries][q]&.each_key do |key|
+              @stash[:queries][q][key][:stale] = stamp
+            end
           end
         end
       end
+      ret
+    rescue StandardError
+      @entrance.with_write_lock do
+        affected.each { |t| @stash[:table_inflight][t] -= 1 }
+      end
+      raise
     end
-    ret
   end
 
   def select(pure, params, result)
     key = params.join(SEPARATOR)
     ret = @stash.dig(:queries, pure, key, :ret)
     if ret.nil? || @stash.dig(:queries, pure, key, :stale)
-      tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|;|$)/).flatten
+      tables = pure.scan(READS_RE).flatten
       tables.uniq!
       marks = tables.to_h { |t| [t, @stash[:table_mod][t]] }
       ret = @pool.exec(pure, params, result)
@@ -376,8 +392,12 @@ class Pgtk::Stash
   end
 
   def replenish(query)
+    tables = query.scan(READS_RE).flatten
+    tables.uniq!
+    pinned = nil
     snapshot =
       @entrance.with_read_lock do
+        pinned = tables.to_h { |t| [t, @stash[:table_mod][t]] }
         @stash[:queries][query]&.filter_map do |k, h|
           next unless h[:stale]
           next if h[:stale] > Time.now - @delay
@@ -392,10 +412,11 @@ class Pgtk::Stash
         @entrance.with_write_lock do
           h = @stash[:queries][query]&.dig(k)
           next unless h
-          if h[:stale] == mark
-            h[:ret] = ret
-            h.delete(:stale)
-          end
+          next unless h[:stale] == mark
+          next if pinned.any? { |t, m| @stash[:table_mod][t] != m }
+          next if tables.any? { |t| (@stash[:table_inflight][t] || 0).positive? }
+          h[:ret] = ret
+          h.delete(:stale)
         end
       end
     end

data/lib/pgtk/version.rb

@@ -10,5 +10,5 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 module Pgtk
-  VERSION = '0.32.2' unless defined?(VERSION)
+  VERSION = '0.32.4' unless defined?(VERSION)
 end

data/resources/pom.xml

@@ -11,7 +11,7 @@
   <packaging>pom</packaging>
   <properties>
     <postgresql.version>42.7.11</postgresql.version>
-    <liquibase.version>5.0.2</liquibase.version>
+    <liquibase.version>5.0.3</liquibase.version>
   </properties>
   <dependencies>
     <dependency>

metadata

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