pgtk 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902941bbf98d37acfad72c9615282264148e6ad6ce1183f2fcd085d3a0cf288e
-  data.tar.gz: 00a5488c8dd99f98df1ebce8cef20207514964a1628df8489bd320d0c199ca77
+  metadata.gz: 0dc255f274b10a4bc7fe0a0e4d6c2a68a918957e571a147062325baf77d91db1
+  data.tar.gz: 971da231e5ff704bf28d28f3655f170ab986327da714cd3f27bade9ff784c6bd
 SHA512:
-  metadata.gz: 47d6993b709ebce71a8cd1525f94230b8c554a8c2edd871ca67627ce6e6724d46ea3530827fa3cb653ae54b56cf4299cb4291197d3f870e602942ffc0b7b6134
-  data.tar.gz: cbe8bf7eebf1c038d71079845355d805bc647be88e62523db89180ce9f39e4299a779f104ee648a1f4399f18f90a0e4f3aab371f277df964dec843299b5b733d
+  metadata.gz: d65bd86d962357d89353daa86da5cd10f255cd1840198217963fe854cc83805c44c5fbff48e4c109871a29d17f8d6c93932a2a186b4067d6be28348cc631e174
+  data.tar.gz: ed61c3ae252043956524564e4a4a6b087d9df684b83c509d3f92291d721e2840cdd21fbc0535bbd027bb6b436c3164518b710a8f7ecae68ff4b6a12980e83864

data/Gemfile

@@ -16,6 +16,7 @@ gem 'rubocop-performance', '~>1.25', require: false
 gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>3.0'
+gem 'threads', '~>0.4'
 gem 'timeout', '~>0.4'
 gem 'xcop', '~>0.8', require: false
 gem 'yard', '~>0.9', require: false

data/Gemfile.lock

@@ -102,6 +102,9 @@ GEM
     simplecov_json_formatter (0.1.4)
     slop (4.10.1)
     tago (0.3.0)
+    threads (0.4.1)
+      backtrace (~> 0)
+      concurrent-ruby (~> 1.0)
     timeout (0.4.4)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
@@ -132,6 +135,7 @@ DEPENDENCIES
   rubocop-rake (~> 0.7)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 3.0)
+  threads (~> 0.4)
   timeout (~> 0.4)
   xcop (~> 0.8)
   yard (~> 0.9)

data/lib/pgtk/pool.rb

@@ -74,7 +74,42 @@ class Pgtk::Pool
       "  PgSQL version: #{version}",
       "  #{@pool.size} connections:",
       @pool.map do |c|
-        "    ##{c.backend_pid} #{c.pipeline_status} #{c.status} #{c.transaction_status}"
+        [
+          '    ',
+          "##{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(' ')
       end
     ].flatten.join("\n")
   end

data/lib/pgtk/stash.rb

@@ -60,6 +60,7 @@ class Pgtk::Stash
     @max_queue_length = max_queue_length
     @threads = threads
     @loog = loog
+    @tpool = Concurrent::FixedThreadPool.new(@threads)
   end
 
   # Start a new connection pool with the given arguments.
@@ -90,9 +91,12 @@ class Pgtk::Stash
       '',
       "Pgtk::Stash (refill_interval=#{@refill_interval}s, max_queue_length=#{@max_queue_length}, threads=#{@threads}):",
       "  #{'not ' if @launched.false?}launched",
-      "  #{@stash[:tables].count} tables in cache",
-      "  #{@stash[:queries].count} queries in cache:",
-      qq.sort_by { -_1[2] }.take(64).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" }
+      "  #{@tpool.queue_length} task(s) in the thread pool",
+      "  #{@stash[:tables].count} table(s) in cache",
+      "  #{qq.sum { |a| a[3] }} stale quer(ies) in cache:",
+      qq.select { |a| a[3].positive? }.sort_by { -_1[2] }.take(16).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" },
+      "  #{qq.count { |a| a[3].zero? }} other quer(ies) in cache:",
+      qq.select { |a| a[3].zero? }.sort_by { -_1[2] }.take(8).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" }
     ].join("\n")
   end
 
@@ -171,34 +175,32 @@ class Pgtk::Stash
 
   def launch!
     raise 'Cannot launch multiple times on same cache data' unless @launched.make_true
-    Concurrent::FixedThreadPool.new(@threads).then do |tpool|
-      Concurrent::TimerTask.execute(execution_interval: 60 * 60, executor: tpool) do
-        @entrance.with_write_lock do
-          @stash[:queries].each_key do |q|
-            @stash[:queries][q].each_key do |k|
-              @stash[:queries][q][k][:popularity] = 0
-            end
+    Concurrent::TimerTask.execute(execution_interval: 60 * 60, executor: @tpool) do
+      @entrance.with_write_lock do
+        @stash[:queries].each_key do |q|
+          @stash[:queries][q].each_key do |k|
+            @stash[:queries][q][k][:popularity] = 0
           end
         end
       end
-      Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: tpool) do
-        @stash[:queries]
-          .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
-          .select { _1[2] }
-          .sort_by { -_1[1] }
-          .each do |a|
-          q = a[0]
-          @stash[:queries][q].each_key do |k|
-            next unless @stash[:queries][q][k][:stale]
-            next if tpool.queue_length >= @max_queue_length
-            tpool.post do
+    end
+    Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: @tpool) do
+      @stash[:queries]
+        .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
+        .select { _1[2] }
+        .sort_by { -_1[1] }
+        .each do |a|
+        q = a[0]
+        @stash[:queries][q].each_key do |k|
+          next unless @stash[:queries][q][k][:stale]
+          next if @tpool.queue_length >= @max_queue_length
+          @tpool.post do
+            h = @stash[:queries][q][k]
+            ret = @pool.exec(q, h[:params], h[:result])
+            @entrance.with_write_lock do
               h = @stash[:queries][q][k]
-              ret = @pool.exec(q, h[:params], h[:result])
-              @entrance.with_write_lock do
-                h = @stash[:queries][q][k]
-                h[:stale] = false
-                h[:ret] = ret
-              end
+              h[:stale] = false
+              h[:ret] = ret
             end
           end
         end

data/lib/pgtk/version.rb

@@ -11,5 +11,5 @@ require_relative '../pgtk'
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.22.0'
+  VERSION = '0.22.1'
 end

metadata

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