ask-state-providers 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d2e01d6072da9c0296061aabcd038dd19e24b72d80de80b68a7ae3ed0ca8c3
-  data.tar.gz: 2e2f5887f6e4cc7cfdfd56c20318532cc12c1a709533a333aff715a3d2b29056
+  metadata.gz: 269e8a62defb31a02eb53fe42e5e13fb375b1a2037d3feb1a88048481f670ff5
+  data.tar.gz: 86ca88be92adcd9ee95651904cf3fd72079a1adc899a1870c87065de1657d1e8
 SHA512:
-  metadata.gz: 3552f0646a71c13685d16671d2dada5dec480c8dc40096e792c09220e9cd7da0013af0c600004c30935dba15dc53b66c37159c0e9b7011ce060d042d8524780a
-  data.tar.gz: 5236da7d851548d43c89dec20ab7f130a6a54f5b77b52ced711553607143dc98a4e03c476f23b60480e79ebea3ac1c0548a0d7340add3ffe3526e1595d68d073
+  metadata.gz: 0f8cd296decf02725687d44a96d3991b074fe975425885bf49ca064f68472370ed17d4596a336c8abaf6f8ff20366d0d7ff571a26dd7f46df1a0017c1d5053ac
+  data.tar.gz: 7c7425f0732e1f92b66b9458274ded4009e42ef673ac354e266290055af0792a0451d27e2c1b6b1ff9329c26ed2e0400283471dd4890962a7b7b8c1dfae75cd1

data/lib/ask/state/providers/postgres.rb

@@ -3,6 +3,8 @@
 require "json"
 require "time"
 require "securerandom"
+require "connection_pool"
+require "pg"
 
 module Ask
   module State
@@ -58,8 +60,6 @@ module Ask
         # @param pool_size [Integer] connection pool size (default 5)
         def initialize(url: ENV.fetch("DATABASE_URL", "postgres://localhost:5432/ask_state"),
                        pool_size: 5)
-          require "pg"
-
           @pool = ConnectionPool.new(size: pool_size) do
             ::PG.connect(url)
           end
@@ -81,9 +81,11 @@ module Ask
 
         def set(key, value, ttl: nil)
           @pool.with do |conn|
+            # Explicit casts: $3 is nil when no ttl, and PostgreSQL can't
+            # infer a type for a bare NULL parameter.
             conn.exec_params(<<~SQL, [key, JSON.generate(value), ttl ? Time.now.utc + ttl : nil])
               INSERT INTO state_store (key, value, expires_at)
-              VALUES ($1, $2, $3)
+              VALUES ($1::text, $2::text, $3::timestamptz)
               ON CONFLICT (key) DO UPDATE SET
                 value = EXCLUDED.value,
                 expires_at = EXCLUDED.expires_at
@@ -105,14 +107,21 @@ module Ask
             now = Time.now.utc
             expires = ttl ? now + ttl : nil
 
+            # Insert when the key is missing or its row is expired. An
+            # expired row still conflicts on the primary key, so the
+            # ON CONFLICT branch overwrites it — but only when it is
+            # actually expired, never a live value.
             result = conn.exec_params(<<~SQL, [key, JSON.generate(value), expires, now])
               INSERT INTO state_store (key, value, expires_at)
-              SELECT $1, $2, $3
+              SELECT $1::text, $2::text, $3::timestamptz
               WHERE NOT EXISTS (
                 SELECT 1 FROM state_store
                 WHERE key = $1 AND (expires_at IS NULL OR expires_at > $4)
               )
-              ON CONFLICT (key) DO NOTHING
+              ON CONFLICT (key) DO UPDATE SET
+                value = EXCLUDED.value,
+                expires_at = EXCLUDED.expires_at
+              WHERE state_store.expires_at IS NOT NULL AND state_store.expires_at <= $4
             SQL
             result.cmd_tuples > 0
           end
@@ -167,9 +176,9 @@ module Ask
             conn.exec_params("DELETE FROM locks WHERE key = $1 AND expires_at <= $2",
                            [key, now])
 
-            result = conn.exec_params(<<~SQL, [key, expires_at_time, token, now])
+            result = conn.exec_params(<<~SQL, [key, expires_at_time, token])
               INSERT INTO locks (key, expires_at, token)
-              SELECT $1, $2, $3
+              SELECT $1::text, $2::timestamptz, $3::text
               WHERE NOT EXISTS (
                 SELECT 1 FROM locks
                 WHERE key = $1
@@ -248,13 +257,16 @@ module Ask
 
             return unless max_length
 
-            conn.exec_params(<<~SQL, [key, key, max_length])
-              DELETE FROM lists WHERE id <= (
+            # Keep the newest max_length entries: the cutoff is the
+            # oldest id inside the newest max_length — delete strictly
+            # older rows (and only this list's).
+            conn.exec_params(<<~SQL, [key, max_length, key])
+              DELETE FROM lists WHERE list_key = $3 AND id < (
                 SELECT COALESCE(MIN(id), 0) FROM (
                   SELECT id FROM lists
                   WHERE list_key = $1
                   ORDER BY id DESC
-                  LIMIT $3
+                  LIMIT $2::bigint
                 ) sub
               )
             SQL

data/lib/ask/state/providers/version.rb

@@ -3,7 +3,7 @@
 module Ask
   module State
     module Providers
-      VERSION = "0.4.3"
+      VERSION = "0.4.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-state-providers
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Kaka Ruto
@@ -23,6 +23,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement