specwrk-store-redis_adapter 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b53937122c80fdbbb0dc3fc53316b7626e712b582082b50eac68d4bdf75d37f
-  data.tar.gz: 3d1ea9b242ad223c8e9f4186ef1b88bad5ee50d97bab382de4712ffdc36d355f
+  metadata.gz: 626a515c92546cb68ff4378393f6bdf02af48e022c0cb481990eab35cdcdedbd
+  data.tar.gz: e4c2a3d80b9585ab9ae554a6cc470b37f66223f374a09876c5e35bddd0c4aa44
 SHA512:
-  metadata.gz: 370012160a8f0a0de2b52c820fb6eb02dd51afaad589980dd297396d348aa16c035cf728ebfa5cd0aa8071401ce254ccd05e0bce1de5ea85d098ee42469b01b9
-  data.tar.gz: 36cff8ca197aab39a0a74e00f9d136497fd210f2a098ef0d885c29b21fdd5bb3d857adc6586ffdce9726c2eec8a792ad757bd9a6afa2508a63b2f534d5e15438
+  metadata.gz: 35cdba9ff17f1c868b0968b17d4ccd1c90842d4a06b0c8cae7dd4ea9c9b2726b3480c056ef505ca9fdf3d961d54721015d4d2a667f6f6e3a91c2d5f61bca3ea8
+  data.tar.gz: d52567dfc1112d99a91809ef3edb754269ef0cccc4d7988293c3a74e1a333ef33578bac596d5074625ec59a0a405bfffd5c992a4954fe4a2151c751716d29d69

data/docker-compose.yml

@@ -1,6 +1,6 @@
 version: '3'
 services:
   redis:
-    image: redis:4.0
+    image: redis:6.0
     ports:
       - "0.0.0.0:6379:6379"

data/lib/specwrk/store/redis_adapter.rb

@@ -1,36 +1,40 @@
 # frozen_string_literal: true
 
 require "json"
+require "securerandom"
 
 require "specwrk/store/base_adapter"
 require "redis-client"
-require "redlock"
 
 module Specwrk
   class Store
     class RedisAdapter < Specwrk::Store::BaseAdapter
-      VERSION = "0.1.0"
-
-      REDIS_KEY_DELIMITER = "||||"
-
       @connection_pools = {}
       @mutex = Mutex.new
 
       class << self
         def with_lock(uri, key)
           connection_pool_for(uri).with do |connection|
-            client = Redlock::Client.new(
-              [connection],
-              retry_count: lock_retry_count,
-              retry_delay: lock_retry_delay,
-              retry_jitter: lock_retry_jitter
-            )
+            Thread.current[:connection] = connection
 
-            until (lock = client.lock("specwrk-lock-#{key}", lock_ttl))
-              sleep(rand(0.001..0.09))
+            id = SecureRandom.uuid
+            queue = "specwrk-lock-#{key}"
+            connection.pipelined do |pipeline|
+              pipeline.call("RPUSH", queue, id)
+              pipeline.call("EXPIRE", queue, 10) # only set if no expireat already
             end
 
-            yield.tap { client.unlock(lock) }
+            # wait for our id to be first in line or the queue to expire
+            Thread.pass until [id, nil].include? connection.call("LINDEX", queue, 0)
+
+            yield
+          ensure
+            connection.pipelined do |pipeline|
+              pipeline.call("LPOP", queue)
+              pipeline.call("EXPIRE", queue, 10) # keeps the queue fresh when things are moving
+            end
+
+            Thread.current[:connection] = nil
           end
         end
 
@@ -39,7 +43,7 @@ module Specwrk
 
           @mutex.synchronize do
             @connection_pools[uri] ||= RedisClient.config(url: uri).new_pool(
-              size: ENV.fetch("SPECWRK_THREAD_COUNT", "4").to_i
+              size: ENV.fetch("SPECWRK_THREAD_COUNT", ENV.fetch("SPECWRK_COUNT", "4")).to_i
             )
           end
         end
@@ -47,56 +51,38 @@ module Specwrk
         def reset_connections!
           @connection_pools.clear
         end
-
-        private
-
-        # In ms
-        def lock_ttl
-          ENV.fetch("SPECWRK_REDIS_ADAPTER_LOCK_TTL", "5000").to_i
-        end
-
-        # See https://www.rubydoc.info/gems/redlock/Redlock/Client#initialize-instance_method
-        def lock_retry_count
-          ENV.fetch("SPECWRK_REDIS_ADAPTER_LOCK_RETRY_COUNT", "3").to_i
-        end
-
-        def lock_retry_delay
-          ENV.fetch("SPECWRK_REDIS_ADAPTER_LOCK_RETRY_DELAY", "100").to_i
-        end
-
-        def lock_retry_jitter
-          ENV.fetch("SPECWRK_REDIS_ADAPTER_LOCK_RETRY_JITTER", "10").to_i
-        end
       end
 
       def [](key)
         with_connection do |redis|
-          value = redis.call("GET", encode_key(key))
+          value = redis.call("HGET", scope, key)
           JSON.parse(value, symbolize_names: true) if value
         end
       end
 
       def []=(key, value)
         with_connection do |redis|
-          redis.call("SET", encode_key(key), JSON.generate(value))
+          redis.call("HSET", scope, key, JSON.generate(value))
         end
       end
 
       def keys
-        [].tap do |collected|
-          scan_for("#{scope}#{REDIS_KEY_DELIMITER}*") { |k| collected << decode_key(k) }
+        with_connection do |redis|
+          redis.call("HKEYS", scope)
         end
       end
 
       def clear
-        delete(*keys)
+        with_connection do |redis|
+          redis.call("DEL", scope)
+        end
       end
 
       def delete(*keys)
         return if keys.length.zero?
 
         with_connection do |redis|
-          redis.call("DEL", *keys.map { |key| encode_key key })
+          redis.call("HDEL", scope, *keys)
         end
       end
 
@@ -108,7 +94,7 @@ module Specwrk
         return {} if read_keys.length.zero?
 
         values = with_connection do |redis|
-          redis.call("MGET", *read_keys.map { |key| encode_key(key) })
+          redis.call("HMGET", scope, *read_keys)
         end
 
         result = {}
@@ -125,37 +111,24 @@ module Specwrk
         return if hash.nil? || hash.length.zero?
 
         with_connection do |redis|
-          redis.call("MSET", *hash.flat_map { |key, value| [encode_key(key), JSON.generate(value)] })
+          redis.call("HMSET", scope, *hash.flat_map { |key, value| [key, JSON.generate(value)] })
         end
       end
 
       def empty?
-        keys.length.zero?
+        with_connection do |redis|
+          redis.call("HLEN", scope).zero?
+        end
       end
 
       private
 
       def with_connection
-        self.class.connection_pool_for(uri).with do |connection|
-          yield connection
-        end
-      end
-
-      def encode_key(key)
-        [scope, REDIS_KEY_DELIMITER, key].join
-      end
-
-      def decode_key(key)
-        key.split(REDIS_KEY_DELIMITER).last
-      end
-
-      def scan_for(match)
-        with_connection do |redis|
-          cursor = "0"
-          loop do
-            cursor, batch = redis.call("SCAN", cursor, "MATCH", match, "COUNT", 5_000)
-            batch.each { |k| yield k }
-            break if cursor == "0"
+        if Thread.current[:connection]
+          yield Thread.current[:connection]
+        else
+          self.class.connection_pool_for(uri).with do |connection|
+            yield connection
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specwrk-store-redis_adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Westendorf
@@ -37,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redlock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement