pgtk 0.31.5 → 0.31.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9986e9d0fb260d182d823661b28c2782b7cbc066348431c59f18a2541e53018f
-  data.tar.gz: 50c04ad428b737284568c3cc134c7b5f0cff4d8cdf9b1a02430213a31e819701
+  metadata.gz: 117996e543551102eebf83be228996818dbfdbfc324f7f45b5d346a57d39fc1a
+  data.tar.gz: 22bd0738c88e60ed29ad3310a87755709dc4512d6b92932c88442253c29847f3
 SHA512:
-  metadata.gz: 0f6bf39b221fcedfc9ffd9843ef1d6ca43834d695c9a980139f60dd4915c9582f3174c5047710ecad954f62e9fad42b0fac540b9efcf5946885b7cde7da6b747
-  data.tar.gz: 64bd40eaa16ad9ee3684adc204d442b3ec8a19fe699c0cfc8323b19c098fcbf61ed3bf225d961bbb02cf1f16ee69b976035aaa5dd3661873ab4c3fbf00defd57
+  metadata.gz: 0ae1185f452400e2f2f984e5266bdb9c6b8dc7d92b798eb714d18903949f230d8707911b562431984f4fa52178dc52198bfeac5b24d2aaeff918ee0b36804541
+  data.tar.gz: 4b8fc6853d556967173556f0067a6c611b4a93be0440c31659b0892f7d944606fbc19f15e27b1361b06cacea99e268bb81008893dfcc910e56103c10d0b9c42c

data/lib/pgtk/pool.rb

@@ -209,6 +209,7 @@ class Pgtk::Pool
       @timeout = timeout
       @items = []
       @taken = []
+      @free = []
       @mutex = Mutex.new
       @condition = ConditionVariable.new
     end
@@ -218,6 +219,7 @@ class Pgtk::Pool
         if @items.size < @size
           @items << item
           @taken << false
+          @free << (@items.size - 1)
         else
           index = @items.index(item)
           if index.nil?
@@ -226,6 +228,7 @@ class Pgtk::Pool
             @items[index] = item
           end
           @taken[index] = false
+          @free << index
         end
         @condition.signal
       end
@@ -234,12 +237,12 @@ class Pgtk::Pool
     def pop
       @mutex.synchronize do
         deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
-        while @taken.all? || @items.empty?
+        while @free.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)
+        index = @free.shift
         @taken[index] = true
         @items[index]
       end
@@ -274,6 +277,7 @@ class Pgtk::Pool
       start = Time.now
       sql = query.is_a?(Array) ? query.join(' ') : query
       @conn.instance_variable_set(:@pgtk_last_query, sql)
+      @conn.instance_variable_set(:@pgtk_started_at, start)
       begin
         out =
           if args.empty?
@@ -351,6 +355,7 @@ class Pgtk::Pool
     transactions = { PG::Constants::PQTRANS_IDLE => 'IDLE', PG::Constants::PQTRANS_ACTIVE => 'ACTIVE',
                      PG::Constants::PQTRANS_INTRANS => 'INTRANS', PG::Constants::PQTRANS_INERROR => 'INERROR',
                      PG::Constants::PQTRANS_UNKNOWN => 'UNKNOWN' }
+    conn.instance_variable_set(:@pgtk_pid, conn.backend_pid)
     parts = [
       '    ',
       "##{conn.backend_pid}",
@@ -358,27 +363,35 @@ class Pgtk::Pool
       statuses.fetch(conn.status, "status=#{conn.status}"),
       transactions.fetch(conn.transaction_status, "transaction_status=#{conn.transaction_status}")
     ]
+    if conn.transaction_status != PG::Constants::PQTRANS_IDLE
+      started = conn.instance_variable_get(:@pgtk_started_at)
+      parts << started.ago if started
+    end
     if conn.transaction_status == PG::Constants::PQTRANS_ACTIVE
       running = conn.instance_variable_get(:@pgtk_last_query)
       parts << "running: #{running.gsub(/\s+/, ' ').strip.ellipsized(60)}" if running
     end
     parts.join(' ')
   rescue PG::ConnectionBad => e
-    parts = [e.message.strip]
+    pid = conn.instance_variable_get(:@pgtk_pid)
+    parts = ['    ']
+    parts << (pid ? "##{pid}" : '#?')
+    parts << e.message.gsub(/\s+/, ' ').strip
     closed = conn.instance_variable_get(:@pgtk_closed_at)
     parts << "#{closed.ago} ago" if closed
     reason = conn.instance_variable_get(:@pgtk_closed_reason)
-    parts << "because: #{reason}" if reason
+    parts << "because: #{reason.gsub(/\s+/, ' ').strip}" if reason
     last = conn.instance_variable_get(:@pgtk_last_query)
     parts << "last query: #{last.gsub(/\s+/, ' ').strip.ellipsized(60)}" if last
-    parts.join(', ')
+    "#{parts.shift} #{parts.shift} #{parts.join(', ')}"
   end
 
   def renew(conn, reason)
     begin
       unless conn.finished?
+        conn.instance_variable_set(:@pgtk_pid, conn.backend_pid)
         conn.instance_variable_set(:@pgtk_closed_at, Time.now)
-        conn.instance_variable_set(:@pgtk_closed_reason, reason)
+        conn.instance_variable_set(:@pgtk_closed_reason, reason.gsub(/\s+/, ' ').strip)
         conn.close
       end
     rescue StandardError => e

data/lib/pgtk/retry.rb

@@ -85,11 +85,14 @@ class Pgtk::Retry
     ].join("\n")
   end
 
-  # 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.
+  # Execute a SQL query with automatic retry on transient failures.
+  # SELECT queries are retried on any error, since reads are idempotent.
+  # Non-SELECT queries are retried only on PG::ConnectionBad, since by
+  # definition the query never reached the server, so retrying cannot
+  # duplicate a write. Other errors on writes propagate immediately,
+  # because 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
@@ -98,6 +101,10 @@ class Pgtk::Retry
     attempt = 0
     begin
       @pool.exec(sql, *)
+    rescue PG::ConnectionBad => e
+      attempt += 1
+      raise(Exhausted, "Retry gave up after #{@attempts} attempts: #{e.message}") if attempt >= @attempts
+      retry
     rescue StandardError, Pgtk::Impatient::TooSlow => e
       raise(e) unless query.strip.upcase.start_with?('SELECT')
       attempt += 1

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

metadata

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