pgtk 0.30.9 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e73feebd4e15e2cd5ed8a862dd3f739e417cb2b24967efb084be032ceb4ea0a
-  data.tar.gz: 6e992abff2e960da1cf93b9bbac4c4f09a72482b65ce2e60e89e8597bb40bc20
+  metadata.gz: 5bce43b422e6baef8427e57d0635f613f2af93eea4a2f783b2fa62c85520b565
+  data.tar.gz: ea73771e5ea9c4f17919d257316d548280cf623e77f50266f6283e8f0ed71d8b
 SHA512:
-  metadata.gz: 9279442627e304c9489fba9ad8a2b3bef33fa4ec5602656cd2955f683087338f171593cc4d686a1b5b79d105bb4bb0000a99ea5176c0e64c61b709d97b400e64
-  data.tar.gz: f94ac7b9215ca461f2b9fc1692c2ba9ca5a1ad7ebc06363480812b01cc7b91a425d945f28f6f36ee52dd774f07ea016778469e3243afefba1c379f749f1a6645
+  metadata.gz: 908b1a4e77e794a5d91aae82169969bac770d3638771356f65b7f5ac7b2b490b14a99f5cc7caba4e63e99e09678d423f51944faf52f6c368040a6f4d55eb9b78
+  data.tar.gz: 5a15b9c10cb8f238b00888d761436633d8381e7b52c731af3c8fa67c5c4c48cd27274dc3975d9b3eaf612f189ffa871c026eca758991924b4d0aa3b3a4b9099a

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/retry.rb

@@ -49,11 +49,17 @@ require_relative 'impatient'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Retry
+  # Raised when all retry attempts have been exhausted. The original
+  # exception that caused the last failure is available via #cause,
+  # so its message and stack trace are preserved for debugging.
+  class Exhausted < StandardError; end
+
   # Constructor.
   #
   # @param [Pgtk::Pool] pool The pool to decorate
   # @param [Integer] attempts Number of attempts to make (default: 3)
   def initialize(pool, attempts: 3)
+    raise(ArgumentError, "Attempts must be at least 2, while #{attempts} provided") if attempts < 2
     @pool = pool
     @attempts = attempts
   end
@@ -79,10 +85,11 @@ class Pgtk::Retry
     ].join("\n")
   end
 
-  # Execute a SQL query with automatic retry for SELECT queries.
-  # Also retries PG::ConnectionBad and Pgtk::Impatient::TooSlow errors
-  # for all query types, since they indicate the query never completed
-  # against PostgreSQL and can be safely re-issued.
+  # Execute a SQL query with automatic retry for SELECT queries only.
+  # Non-SELECT queries fail on the first error, since a failure may occur
+  # after the server received the query but before the acknowledgement
+  # reached the client, and retrying a non-idempotent write could duplicate
+  # it.
   #
   # @param [String] sql The SQL query with params inside (possibly)
   # @return [Array] Result rows
@@ -91,14 +98,10 @@ class Pgtk::Retry
     attempt = 0
     begin
       @pool.exec(sql, *)
-    rescue PG::ConnectionBad, Pgtk::Impatient::TooSlow => e
-      attempt += 1
-      raise(e) if attempt >= @attempts
-      retry
-    rescue StandardError => e
+    rescue StandardError, Pgtk::Impatient::TooSlow => e
       raise(e) unless query.strip.upcase.start_with?('SELECT')
       attempt += 1
-      raise(e) if attempt >= @attempts
+      raise(Exhausted, "Retry gave up after #{@attempts} attempts: #{e.message}") if attempt >= @attempts
       retry
     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.30.9' unless defined?(VERSION)
+  VERSION = '0.31.0' unless defined?(VERSION)
 end

metadata

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