specwrk-store-redis_adapter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d04547dbffe8b9129a823f463c65ecf55a5e546d98df580f0b31cfa00be6e49
-  data.tar.gz: acdd63b88bd20fbd00630c672b8636576df932bb8a5e21556638628b4f4e7e6f
+  metadata.gz: 626a515c92546cb68ff4378393f6bdf02af48e022c0cb481990eab35cdcdedbd
+  data.tar.gz: e4c2a3d80b9585ab9ae554a6cc470b37f66223f374a09876c5e35bddd0c4aa44
 SHA512:
-  metadata.gz: 1a3a323c1d16651cbf4880e35deeae665db6df0aaf88d454a16417a6ea8f076dde4ee3a593a3fc4567e42421343ec313537dd4cc66baf35b6677a81642af8924
-  data.tar.gz: 7bc076bd89ae1993d58155efbec15b17130e2c689102d10e2b0ce670d61e752f46086b150aa2b6883bc019d1c886e2ac0b12edb5a210d8ecd26f39209bd94a7d
+  metadata.gz: 35cdba9ff17f1c868b0968b17d4ccd1c90842d4a06b0c8cae7dd4ea9c9b2726b3480c056ef505ca9fdf3d961d54721015d4d2a667f6f6e3a91c2d5f61bca3ea8
+  data.tar.gz: d52567dfc1112d99a91809ef3edb754269ef0cccc4d7988293c3a74e1a333ef33578bac596d5074625ec59a0a405bfffd5c992a4954fe4a2151c751716d29d69

data/lib/specwrk/store/redis_adapter.rb

@@ -9,14 +9,14 @@ require "redis-client"
 module Specwrk
   class Store
     class RedisAdapter < Specwrk::Store::BaseAdapter
-      REDIS_KEY_DELIMITER = "||||"
-
       @connection_pools = {}
       @mutex = Mutex.new
 
       class << self
         def with_lock(uri, key)
           connection_pool_for(uri).with do |connection|
+            Thread.current[:connection] = connection
+
             id = SecureRandom.uuid
             queue = "specwrk-lock-#{key}"
             connection.pipelined do |pipeline|
@@ -25,7 +25,7 @@ module Specwrk
             end
 
             # wait for our id to be first in line or the queue to expire
-            sleep(rand(0.001..0.012)) until [id, nil].include? connection.call("LINDEX", queue, 0)
+            Thread.pass until [id, nil].include? connection.call("LINDEX", queue, 0)
 
             yield
           ensure
@@ -33,6 +33,8 @@ module Specwrk
               pipeline.call("LPOP", queue)
               pipeline.call("EXPIRE", queue, 10) # keeps the queue fresh when things are moving
             end
+
+            Thread.current[:connection] = nil
           end
         end
 
@@ -41,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
@@ -53,32 +55,34 @@ module Specwrk
 
       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
 
@@ -90,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 = {}
@@ -107,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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Westendorf