pgtk 0.31.4 → 0.31.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a43722aa806c7c496234f00c186abac8cf07dfeb48e9baa97353fca08a1e0a
-  data.tar.gz: 63e903b575092c0bb62bf25b5aa96004723f4c4312bf3e16c4b5fc2af0b2b0c7
+  metadata.gz: 117996e543551102eebf83be228996818dbfdbfc324f7f45b5d346a57d39fc1a
+  data.tar.gz: 22bd0738c88e60ed29ad3310a87755709dc4512d6b92932c88442253c29847f3
 SHA512:
-  metadata.gz: d03c3c8458643fc95801a51b6d2fd4a61808ff934f2ac4341ea02b779d8ef688f44283f079b69a8d8bd02dc1d2733c07af4549dfcf8b41e3acceb5402083223e
-  data.tar.gz: 842c436ab8180751b612b55a5a0f113b3db10a101c1db9dd3adf1150ac2b5961c3baa5654a7d8c4cc44ccb788c77e495c0523a235ef0e2275f6c4b12729a8fa6
+  metadata.gz: 0ae1185f452400e2f2f984e5266bdb9c6b8dc7d92b798eb714d18903949f230d8707911b562431984f4fa52178dc52198bfeac5b24d2aaeff918ee0b36804541
+  data.tar.gz: 4b8fc6853d556967173556f0067a6c611b4a93be0440c31659b0892f7d944606fbc19f15e27b1361b06cacea99e268bb81008893dfcc910e56103c10d0b9c42c

data/lib/pgtk/pool.rb

@@ -4,6 +4,7 @@ require 'loog'
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'ellipsized'
 require 'pg'
 require 'tago'
 require_relative '../pgtk'
@@ -84,46 +85,7 @@ class Pgtk::Pool
       "  Pgtk version: #{Pgtk::VERSION}",
       "  PgSQL version: #{version}",
       "  #{@pool.size} connections:",
-      @pool.map do |c|
-        [
-          '    ',
-          "##{c.backend_pid}",
-          case c.pipeline_status
-          when PG::Constants::PQ_PIPELINE_ON
-            'ON'
-          when PG::Constants::PQ_PIPELINE_OFF
-            'OFF'
-          when PG::Constants::PQ_PIPELINE_ABORTED
-            'ABORTED'
-          else
-            "pipeline_status=#{c.pipeline_status}"
-          end,
-          case c.status
-          when PG::Constants::CONNECTION_OK
-            'OK'
-          when PG::Constants::CONNECTION_BAD
-            'BAD'
-          else
-            "status=#{c.status}"
-          end,
-          case c.transaction_status
-          when PG::Constants::PQTRANS_IDLE
-            'IDLE'
-          when PG::Constants::PQTRANS_ACTIVE
-            'ACTIVE'
-          when PG::Constants::PQTRANS_INTRANS
-            'INTRANS'
-          when PG::Constants::PQTRANS_INERROR
-            'INERROR'
-          when PG::Constants::PQTRANS_UNKNOWN
-            'UNKNOWN'
-          else
-            "transaction_status=#{c.transaction_status}"
-          end
-        ].join(' ')
-      rescue PG::ConnectionBad => e
-        e.message
-      end
+      @pool.map { |conn| info(conn) }
     ].flatten.join("\n")
   end
 
@@ -247,6 +209,7 @@ class Pgtk::Pool
       @timeout = timeout
       @items = []
       @taken = []
+      @free = []
       @mutex = Mutex.new
       @condition = ConditionVariable.new
     end
@@ -256,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?
@@ -264,6 +228,7 @@ class Pgtk::Pool
             @items[index] = item
           end
           @taken[index] = false
+          @free << index
         end
         @condition.signal
       end
@@ -272,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
@@ -311,6 +276,8 @@ class Pgtk::Pool
     def exec(query, args = [], result = 0)
       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?
@@ -348,32 +315,85 @@ class Pgtk::Pool
 
   def connect
     conn = @pool.pop
-    conn = renew(conn) if dead?(conn)
     begin
-      yield(conn)
-    rescue StandardError => e
+      reason = cause(conn)
+      if reason
+        begin
+          conn = renew(conn, reason)
+        rescue StandardError => e
+          @log.warn("Failed to renew dead connection (#{reason}): #{e.message}")
+        end
+      end
       begin
-        conn = renew(conn)
-      rescue StandardError => re
-        @log.warn("Failed to renew connection after #{e.message}: #{re.message}")
+        yield(conn)
+      rescue StandardError => e
+        begin
+          conn = renew(conn, "query failed: #{e.message.strip}")
+        rescue StandardError => re
+          @log.warn("Failed to renew connection after #{e.message}: #{re.message}")
+        end
+        raise(e)
       end
-      raise(e)
     ensure
       @pool.push(conn)
     end
   end
 
-  def dead?(conn)
-    conn.finished? ||
-      conn.status == PG::Constants::CONNECTION_BAD ||
-      conn.transaction_status != PG::Constants::PQTRANS_IDLE
-  rescue StandardError
-    true
+  def cause(conn)
+    return 'finished' if conn.finished?
+    return 'status BAD' if conn.status == PG::Constants::CONNECTION_BAD
+    return "transaction status #{conn.transaction_status}" if conn.transaction_status != PG::Constants::PQTRANS_IDLE
+    nil
+  rescue StandardError => e
+    "inspection failed: #{e.message.strip}"
+  end
+
+  def info(conn)
+    pipelines = { PG::Constants::PQ_PIPELINE_ON => 'ON', PG::Constants::PQ_PIPELINE_OFF => 'OFF',
+                  PG::Constants::PQ_PIPELINE_ABORTED => 'ABORTED' }
+    statuses = { PG::Constants::CONNECTION_OK => 'OK', PG::Constants::CONNECTION_BAD => 'BAD' }
+    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}",
+      pipelines.fetch(conn.pipeline_status, "pipeline_status=#{conn.pipeline_status}"),
+      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
+    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.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.shift} #{parts.shift} #{parts.join(', ')}"
   end
 
-  def renew(conn)
+  def renew(conn, reason)
     begin
-      conn.close unless conn.finished?
+      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.gsub(/\s+/, ' ').strip)
+        conn.close
+      end
     rescue StandardError => e
       @log.warn("Failed to close connection: #{e.message}")
     end

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.4' 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.4
+  version: 0.31.6
 platform: ruby
 authors:
 - Yegor Bugayenko