pgtk 0.30.10 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eef46168e2daa0ddc6721aac48a99dc20f8aa80f078cfc76a31fa4ec70759af6
-  data.tar.gz: 13dc7a6f18fcb34385c3580700e8e192b3bb38daab86f64b85fa64ac3f3dcce0
+  metadata.gz: a15b5d36eab5407bca78c591056966cee9b90167e5bfa0cc98fa36984801622a
+  data.tar.gz: bd201e64d30a88836337d86b4b3d202b708109de1676ce5d83593df8f4e4ace4
 SHA512:
-  metadata.gz: 18489070b6f37d64338982c7ade356881ffe7a6fc01f6cc1b837f2433ed2779a4838388ec60468ec80c3a21342b7f9c19b52bb87792c7bf0dc7011fb7163d9cd
-  data.tar.gz: bc115bdd5e53ff555e1e1d383d90f9ecc80d33b282cd57e89b03540a14f35792e718b5f74c64a637c761da7762791edcc9534f49612ebe5984836817c1e1c314
+  metadata.gz: 8b58b179b7c85ff2183d7c909da288f9a4be5c67bbe8040350c8706098bac8ccbfe05010d638f28db67cf70b1434744abc6667008f1fcc32bdc6aaa3a4cb1fd8
+  data.tar.gz: 0da90a8d6b61c07125bab269833149217f625caadbfbb8e12363ac84f84efa36e321fb6ec18f5b12c0b1bb9dfdab42ad74086cb6300b9fb0b122e2a52e9384cf

data/Gemfile.lock

@@ -42,7 +42,7 @@ GEM
     loog (0.8.0)
       ellipsized
       logger (~> 1.0)
-    minitest (6.0.4)
+    minitest (6.0.5)
       drb (~> 2.0)
       prism (~> 1.5)
     minitest-mock (5.27.0)
@@ -108,7 +108,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-elegant (0.0.18)
+    rubocop-elegant (0.0.20)
       lint_roller (~> 1.1)
       rubocop (~> 1.75)
     rubocop-minitest (0.39.1)

data/lib/pgtk/impatient.rb

@@ -119,13 +119,19 @@ class Pgtk::Impatient
     end
   end
 
-  # Run a transaction with a timeout for each query.
+  # Run a transaction with a timeout for each query and for idle time inside
+  # the transaction. If the transaction stays in the +INTRANS+ state (idle
+  # inside transaction) for longer than the configured timeout, PostgreSQL
+  # terminates the session, which frees locks and releases the connection
+  # slot back to the pool.
   #
   # @yield [Pgtk::Impatient] Yields an impatient transaction
   # @return [Object] Result of the block
   def transaction
     @pool.transaction do |t|
-      t.exec("SET LOCAL statement_timeout = #{Integer((@timeout * 1000).to_s, 10)}")
+      ms = Integer((@timeout * 1000).to_s, 10)
+      t.exec("SET LOCAL statement_timeout = #{ms}")
+      t.exec("SET LOCAL idle_in_transaction_session_timeout = #{ms}")
       yield(Pgtk::Impatient.new(t, @timeout))
     end
   end

data/lib/pgtk/pool.rb

@@ -49,16 +49,22 @@ require_relative 'wire'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Pool
+  # Raised when no connection becomes available from the pool within
+  # the configured timeout. Indicates that all connections are currently
+  # taken by other threads and none was returned in time.
+  class Busy < StandardError; end
+
   # Constructor.
   #
   # @param [Pgtk::Wire] wire The wire
   # @param [Integer] max Total amount of PostgreSQL connections in the pool
+  # @param [Numeric] timeout Max seconds to wait for a free connection
   # @param [Object] log The log
-  def initialize(wire, max: 8, log: Loog::NULL)
+  def initialize(wire, max: 8, timeout: 1, log: Loog::NULL)
     @wire = wire
     @max = max
     @log = log
-    @pool = IterableQueue.new(max)
+    @pool = IterableQueue.new(max, timeout)
     @started = false
   end
 
@@ -231,8 +237,9 @@ class Pgtk::Pool
   # the internal array but is marked as "taken". When returned, it's placed
   # back in its original slot and marked as available.
   class IterableQueue
-    def initialize(size)
+    def initialize(size, timeout)
       @size = size
+      @timeout = timeout
       @items = []
       @taken = []
       @mutex = Mutex.new
@@ -259,7 +266,12 @@ class Pgtk::Pool
 
     def pop
       @mutex.synchronize do
-        @condition.wait(@mutex) while @taken.all? || @items.empty?
+        deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
+        while @taken.all? || @items.empty?
+          remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          raise(Busy, "No free connection appeared in the pool after #{@timeout}s of waiting") if remaining <= 0
+          @condition.wait(@mutex, remaining)
+        end
         index = @taken.index(false)
         @taken[index] = true
         @items[index]

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.30.10' unless defined?(VERSION)
+  VERSION = '0.31.1' unless defined?(VERSION)
 end

metadata

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