pgtk 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc255f274b10a4bc7fe0a0e4d6c2a68a918957e571a147062325baf77d91db1
-  data.tar.gz: 971da231e5ff704bf28d28f3655f170ab986327da714cd3f27bade9ff784c6bd
+  metadata.gz: 57546e93aaf2c029a795f61302d943e4f64e7d1e03b77d339636bdfb73d271d5
+  data.tar.gz: 467c0493e69e8402b83ea6b537ac69760d5e712ac088b856307d2418449878f9
 SHA512:
-  metadata.gz: d65bd86d962357d89353daa86da5cd10f255cd1840198217963fe854cc83805c44c5fbff48e4c109871a29d17f8d6c93932a2a186b4067d6be28348cc631e174
-  data.tar.gz: ed61c3ae252043956524564e4a4a6b087d9df684b83c509d3f92291d721e2840cdd21fbc0535bbd027bb6b436c3164518b710a8f7ecae68ff4b6a12980e83864
+  metadata.gz: 83b61249a1888eed186c7faa7814c9a07f28fa9268d8d7fad1dfc0b9d7f4b304d4c835116fce6e32b6e651d7a2fc12731417c52922daae8ad9759419b32d2344
+  data.tar.gz: 5107f90f035a11e3ab17c8718f759c6869ea24d3c195dafb1845d546587244ad1e6f82dca7da5b505055cefdafa97f7b0e6390f17374e2458f773e54f7f9dd75

data/README.md

@@ -115,8 +115,8 @@ From inside your app you may find this class useful:
 
 ```ruby
 require 'pgtk/pool'
-pgsql = Pgtk::Pool.new(Pgtk::Wire::Yaml.new('config.yml'))
-pgsql.start!(5) # Start it with five simultaneous connections
+pgsql = Pgtk::Pool.new(Pgtk::Wire::Yaml.new('config.yml'), max: 5)
+pgsql.start! # Start it with five simultaneous connections
 ```
 
 You can also let it pick the connection parameters from the environment

data/lib/pgtk/impatient.rb

@@ -19,8 +19,8 @@ require_relative '../pgtk'
 # Basic usage:
 #
 #   # Create and configure a regular pool
-#   pool = Pgtk::Pool.new(wire)
-#   pool.start!(4)
+#   pool = Pgtk::Pool.new(wire, max: 4)
+#   pool.start!
 #
 #   # Wrap the pool in an impatient decorator with a 2-second timeout
 #   impatient = Pgtk::Impatient.new(pool, 2)
@@ -69,8 +69,8 @@ class Pgtk::Impatient
   end
 
   # Start a new connection pool with the given arguments.
-  def start!(*)
-    @pool.start!(*)
+  def start!
+    @pool.start!
   end
 
   # Get the version of PostgreSQL server.

data/lib/pgtk/pool.rb

@@ -29,8 +29,8 @@ require_relative 'wire'
 #   )
 #
 #   # Create and start a connection pool with 4 connections
-#   pool = Pgtk::Pool.new(wire)
-#   pool.start!(4)
+#   pool = Pgtk::Pool.new(wire, max: 4)
+#   pool.start!
 #
 #   # Execute a simple query
 #   pool.exec('SELECT * FROM users')
@@ -51,11 +51,14 @@ class Pgtk::Pool
   # Constructor.
   #
   # @param [Pgtk::Wire] wire The wire
+  # @param [Integer] max Total amount of PostgreSQL connections in the pool
   # @param [Object] log The log
-  def initialize(wire, log: Loog::NULL)
+  def initialize(wire, max: 8, log: Loog::NULL)
     @wire = wire
+    @max = max
     @log = log
-    @pool = IterableQueue.new
+    @pool = IterableQueue.new(max)
+    @started = false
   end
 
   # Get the version of PostgreSQL server.
@@ -120,13 +123,13 @@ class Pgtk::Pool
   # keep in mind that not all servers will allow you to have many connections
   # open at the same time. For example, Heroku free PostgreSQL database
   # allows only one connection open.
-  #
-  # @param [Integer] max Total amount of PostgreSQL connections in the pool
-  def start!(max = 8)
-    max.times do
+  def start!
+    return if @started
+    @max.times do
       @pool << @wire.connection
     end
-    @log.debug("PostgreSQL pool started with #{max} connections")
+    @started = true
+    @log.debug("PostgreSQL pool started with #{@max} connections")
   end
 
   # Make a query and return the result as an array of hashes. For example,
@@ -219,24 +222,43 @@ class Pgtk::Pool
   #
   # This class is used internally by Pool to store database connections
   # and provide the ability to iterate over them for inspection purposes.
+  #
+  # The queue is bounded by size. When an item is taken out, it remains in
+  # 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
+    def initialize(size)
+      @size = size
       @items = []
+      @taken = []
       @mutex = Mutex.new
       @condition = ConditionVariable.new
     end
 
     def <<(item)
       @mutex.synchronize do
-        @items << item
+        if @items.size < @size
+          @items << item
+          @taken << false
+        else
+          index = @items.index(item)
+          if index.nil?
+            index = @taken.index(true)
+            raise 'No taken slot found' if index.nil?
+            @items[index] = item
+          end
+          @taken[index] = false
+        end
         @condition.signal
       end
     end
 
     def pop
       @mutex.synchronize do
-        @condition.wait(@mutex) while @items.empty?
-        @items.shift
+        @condition.wait(@mutex) while @taken.all? || @items.empty?
+        index = @taken.index(false)
+        @taken[index] = true
+        @items[index]
       end
     end
 

data/lib/pgtk/retry.rb

@@ -16,8 +16,8 @@ require_relative '../pgtk'
 # Basic usage:
 #
 #   # Create and configure a regular pool
-#   pool = Pgtk::Pool.new(wire)
-#   pool.start!(4)
+#   pool = Pgtk::Pool.new(wire, max: 4)
+#   pool.start!
 #
 #   # Wrap the pool in a retry decorator with 3 attempts
 #   retry_pool = Pgtk::Retry.new(pool, attempts: 3)
@@ -58,8 +58,8 @@ class Pgtk::Retry
   end
 
   # Start a new connection pool with the given arguments.
-  def start!(*)
-    @pool.start!(*)
+  def start!
+    @pool.start!
   end
 
   # Get the version of PostgreSQL server.

data/lib/pgtk/spy.rb

@@ -19,8 +19,8 @@ require_relative 'wire'
 # Basic usage:
 #
 #   # Create and configure a regular pool
-#   pool = Pgtk::Pool.new(wire)
-#   pool.start!(4)
+#   pool = Pgtk::Pool.new(wire, max: 4)
+#   pool.start!
 #
 #   # Wrap the pool in a spy that tracks all executed queries
 #   queries = []
@@ -57,8 +57,8 @@ class Pgtk::Spy
   end
 
   # Start a new connection pool with the given arguments.
-  def start!(*)
-    @pool.start!(*)
+  def start!
+    @pool.start!
   end
 
   # Get the version of PostgreSQL server.

data/lib/pgtk/stash.rb

@@ -64,9 +64,9 @@ class Pgtk::Stash
   end
 
   # Start a new connection pool with the given arguments.
-  def start!(*)
+  def start!
     launch!
-    @pool.start!(*)
+    @pool.start!
   end
 
   # Get the PostgreSQL server version.
@@ -136,7 +136,7 @@ class Pgtk::Stash
               @stash[:tables][t].append(pure).uniq!
             end
             @stash[:queries][pure] ||= {}
-            @stash[:queries][pure][key] = { ret:, params:, result: }
+            @stash[:queries][pure][key] = { ret:, params:, result:, used: Time.now }
           end
         end
       end
@@ -144,6 +144,7 @@ class Pgtk::Stash
         @entrance.with_write_lock do
           @stash[:queries][pure][key][:popularity] ||= 0
           @stash[:queries][pure][key][:popularity] += 1
+          @stash[:queries][pure][key][:used] = Time.now
         end
       end
     end
@@ -175,12 +176,11 @@ class Pgtk::Stash
 
   def launch!
     raise 'Cannot launch multiple times on same cache data' unless @launched.make_true
-    Concurrent::TimerTask.execute(execution_interval: 60 * 60, executor: @tpool) do
+    retire = 60 * 60
+    Concurrent::TimerTask.execute(execution_interval: retire, 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
+          @stash[:queries][q].delete_if { |_, h| h[:used] < Time.now - retire }
         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.1'
+  VERSION = '0.23.0'
 end

metadata

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