pgtk 0.32.3 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d74c18619134011d6187d976ef4b2156e1d5e629399ce8accf9962458e011f
-  data.tar.gz: 76cfad9774a3c1872ea8204112b441bdf92f5b34fce1845356e7cf37496e21d8
+  metadata.gz: 72cdeed11d9faa8c9097c01256603b2ce77a507b936c983ab623b9e1d6e7d364
+  data.tar.gz: ab60b5670e87009e1eb47983bd8d729eb403d78a9c6a20c82ea14d70d4a7d18f
 SHA512:
-  metadata.gz: 1c4d9b98f94558363813c59d0a55a6a60a40ceefa7c25e9e831aa588175b90c8ee65f41e0c9b0bf89c52f0823ceffc80381ad741dad2d12e8a81c368880b36b0
-  data.tar.gz: 16995fbc6540edcd37982b69b0b3222d8bb5d9b4094ba5477500d3250795c672282ecc1611443bb1357f675cf5534d115d0742b13d9c42f30abc0b77c198e7cf
+  metadata.gz: 691ea0c8b5ca6002b72ab4b66487b3dbf489feaedbc8e80cc772fe69cfc1ad966fa836e13298b561cadb38c75290ed8a533a389751a7d6b0454da23b87afcb74
+  data.tar.gz: 8a04b05ad839b935ac3f8e5362bb957eb64e8e70e1b963c5713a7c7755f8184e6c1e8c806a4d03467bba80e3ce5af0cf9c1a1a50c4d73f11e79d46dc9569fc2f

data/lib/pgtk/stash.rb

@@ -61,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,
@@ -76,6 +76,7 @@ class Pgtk::Stash
     @pool = pool
     @stash = stash
     @stash[:table_mod] ||= {}
+    @stash[:table_inflight] ||= {}
     @loog = loog
     @entrance = entrance
     @refill = refill
@@ -221,22 +222,33 @@ 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)
@@ -380,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
@@ -396,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.3' unless defined?(VERSION)
+  VERSION = '0.32.4' unless defined?(VERSION)
 end

metadata

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