pgtk 0.21.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d8784e334eb788333eb79d26c99c47f129ea8de8e522732fa37fa333b99a35
-  data.tar.gz: ec5caad7117ec1f22784c718316b2897effb907f03cd1043e7305a057d9412ee
+  metadata.gz: 902941bbf98d37acfad72c9615282264148e6ad6ce1183f2fcd085d3a0cf288e
+  data.tar.gz: 00a5488c8dd99f98df1ebce8cef20207514964a1628df8489bd320d0c199ca77
 SHA512:
-  metadata.gz: 2266b9797e6f49cecdd4f5e4b198f4d06d9060544a6e2eb89ca99c8f0a05a93e6674b6237af30569e6d474c08e13b02ac706cf9a96daf07938021cd61d518e51
-  data.tar.gz: 1b723ca7237b8d1e5381481599fd0850e2685fa411a37551360d78548ca0b29ea38da50b849dbad37c8cac1d65422cdcb488b1edd45d9025ccf67336ea586048
+  metadata.gz: 47d6993b709ebce71a8cd1525f94230b8c554a8c2edd871ca67627ce6e6724d46ea3530827fa3cb653ae54b56cf4299cb4291197d3f870e602942ffc0b7b6134
+  data.tar.gz: cbe8bf7eebf1c038d71079845355d805bc647be88e62523db89180ce9f39e4299a779f104ee648a1f4399f18f90a0e4f3aab371f277df964dec843299b5b733d

data/Gemfile.lock

@@ -32,7 +32,7 @@ GEM
     logger (1.7.0)
     loog (0.6.1)
       logger (~> 1.0)
-    minitest (5.26.0)
+    minitest (5.26.1)
     minitest-reporters (1.7.1)
       ansi
       builder

data/lib/pgtk/stash.rb

@@ -38,30 +38,26 @@ class Pgtk::Stash
   # @param [Hash] stash Optional existing stash to use (default: new empty stash)
   # @option [Hash] queries Internal cache data (default: {})
   # @option [Hash] tables Internal cache data (default: {})
-  # @option [Concurrent::ReentrantReadWriteLock] entrance Lock for write internal state
-  # @option [Concurrent::AtomicBoolean] launched Latch for start timers once
   # @param [Integer] refill_interval Interval in seconds for recalculate stale queries
-  # @param [Integer] top Number of queries to recalculate
-  # @param [Integer] threads Number of threads in threadpool
+  # @param [Integer] max_queue_length Number of refilling tasks in the queue
+  # @param [Integer] threads Number of threads in tpool
   # @param [Loog] loog Logger for debugging (default: null logger)
   def initialize(
     pool,
-    stash = {
-      queries: {},
-      tables: {},
-      entrance: Concurrent::ReentrantReadWriteLock.new,
-      launched: Concurrent::AtomicBoolean.new(false)
-    },
-    refill_interval: 5,
-    top: 100,
-    threads: 5,
-    loog: Loog::NULL
+    stash: { queries: {}, tables: {} },
+    refill_interval: 16,
+    max_queue_length: 128,
+    threads: 4,
+    loog: Loog::NULL,
+    entrance: Concurrent::ReentrantReadWriteLock.new,
+    launched: Concurrent::AtomicBoolean.new(false)
   )
     @pool = pool
     @stash = stash
-    @entrance = stash[:entrance]
+    @launched = launched
+    @entrance = entrance
     @refill_interval = refill_interval
-    @top = top
+    @max_queue_length = max_queue_length
     @threads = threads
     @loog = loog
   end
@@ -92,11 +88,11 @@ class Pgtk::Stash
     [
       @pool.dump,
       '',
-      "Pgtk::Stash (refill_interval=#{@refill_interval}s, top=#{@top}q, threads=#{@threads}t):",
-      "  #{'not ' if @stash[:launched].false?}launched",
+      "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(20).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" }
+      qq.sort_by { -_1[2] }.take(64).map { |a| "    #{a[1]}/#{a[2]}p/#{a[3]}s: #{a[0]}" }
     ].join("\n")
   end
 
@@ -128,9 +124,9 @@ class Pgtk::Stash
       if ret.nil? || @stash.dig(:queries, pure, key, :stale)
         ret = @pool.exec(pure, params, result)
         unless pure.include?(' NOW() ')
+          tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|$)/).map(&:first).uniq
+          raise "No tables at #{pure.inspect}" if tables.empty?
           @entrance.with_write_lock do
-            tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|$)/).map(&:first).uniq
-            raise "No tables at #{pure.inspect}" if tables.empty?
             tables.each do |t|
               @stash[:tables][t] = [] if @stash[:tables][t].nil?
               @stash[:tables][t].append(pure).uniq!
@@ -159,11 +155,14 @@ class Pgtk::Stash
   def transaction
     @pool.transaction do |t|
       yield Pgtk::Stash.new(
-        t, @stash,
+        t,
+        stash: @stash,
         refill_interval: @refill_interval,
-        top: @top,
+        max_queue_length: @max_queue_length,
         threads: @threads,
-        loog: @loog
+        loog: @loog,
+        entrance: @entrance,
+        launched: @launched
       )
     end
   end
@@ -171,9 +170,9 @@ class Pgtk::Stash
   private
 
   def launch!
-    raise 'Cannot launch multiple times on same cache data' unless @stash[:launched].make_true
-    Concurrent::FixedThreadPool.new(@threads).then do |threadpool|
-      Concurrent::TimerTask.execute(execution_interval: 60 * 60, executor: threadpool) do
+    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|
@@ -182,21 +181,23 @@ class Pgtk::Stash
           end
         end
       end
-      Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: threadpool) do
+      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] }
-          .first(@top)
           .each do |a|
           q = a[0]
           @stash[:queries][q].each_key do |k|
             next unless @stash[:queries][q][k][:stale]
-            threadpool.post do
+            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]
                 h[:stale] = false
-                h[:ret] = @pool.exec(q, h[:params], h[:result])
+                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.21.3'
+  VERSION = '0.22.0'
 end

metadata

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