redis_batch 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d205bf5fdc9bfb375f6666e1017413f9bb2ecbdb8d696912cb9b658f3910ffed
-  data.tar.gz: 8b7521a379d318634fa2a6c8e5cf42398af416414b2fec89e1a0f9bd40e18087
+  metadata.gz: 21c8d0fc6fa834d58afff202ad63597688d3ec0943cba4f06d82e0033201b820
+  data.tar.gz: fe2a7c88467d02c85e205d726b53c6aff4f191d0c08aa7d88831c0414bdbcd6a
 SHA512:
-  metadata.gz: 357499ea517316f46c7b80dc43d14269656141f345afb8db1cc56a8dab790bcf6fbef8b95121b7480dbdd6fb6162c572182830550ba9637c191d13a99e5ec82d
-  data.tar.gz: 685246ee83f7a97946efebf7193477cd6aee5c75ace9b92e5f5bb75cf134a4d36968e11519bd3458b8da4b65c622701193e3b622c25615fd19bfb17c747646a4
+  metadata.gz: db65fe573cc1e50e53e870f620944dedb9d941309019ba06e068b2b49d8c9c6ff7b04b3352f560afeb2d487626fddd27cc26455c678685a021d29ee68d99198a
+  data.tar.gz: 1bbcf4b38252e74cd8e59ff705ee21c79ad9833f80933ca6b05f366da44a99225c0198e368bc691ee9022f85a56df2c847a61f5845a3a2a52cc60ca04a602f33

data/lib/redis_batch/lua.rb

@@ -0,0 +1,42 @@
+module RedisBatch
+  class Lua
+    def self.function_load(redis)
+      redis.call("FUNCTION", "LOAD", "REPLACE", redis_batch_lua)
+    end
+
+    def self.redis_batch_lua
+      <<~LUA
+        #!lua name=redis_batch
+
+        local function lmove(keys, args)
+          local count = tonumber(args[1])
+          local source = keys[1]
+          local target = keys[2]
+          local llen = redis.call("LLEN", source)
+          if llen < count then
+            count = llen
+          end
+          local values = {}
+          for i=1,count do
+            values[i] = redis.call("LMOVE", source, target, 'LEFT', 'RIGHT')
+          end 
+          return values
+        end
+
+        redis.register_function('rb_lmove', lmove)
+
+        local function lrestore(keys, args)
+          local source = keys[1]
+          local target = keys[2]
+          local llen = redis.call("LLEN", source)
+          for i=1,llen do
+            redis.call("LMOVE", source, target, 'RIGHT', 'LEFT')
+          end
+          return llen
+        end
+
+        redis.register_function('rb_lrestore', lrestore)
+      LUA
+    end
+  end
+end

data/lib/redis_batch/queue.rb

@@ -3,6 +3,7 @@ module RedisBatch
     def initialize(namespace = self.class.name)
       @namespace = namespace
       @client = Client.instance
+      @client.with  { |redis| RedisBatch::Lua.function_load(redis) }
     end
 
     def add(*items)
@@ -19,9 +20,8 @@ module RedisBatch
 
     def abort_all
       return unless processing?
-      keys = @client.with { |redis| redis.keys("#{@namespace}_takeout_*") }
-      client.with do |redis|
-        keys.each do |key|
+      @client.with do |redis|
+        redis.keys("#{@namespace}_takeout_*").each do |key|
           abort_processing(key, redis)
         end
       end
@@ -29,9 +29,7 @@ module RedisBatch
 
     def take(count: 1, client: @client)
       values = client.with do |redis|
-        redis.multi do |transaction|
-          count.times.map { transaction.lmove(queue_key, take_key, :left, :right) }
-        end
+        redis.call("FCALL", "rb_lmove", 2, queue_key, take_key, count)
       end
       yield values
       client.with { |redis| redis.del(take_key) }
@@ -43,10 +41,7 @@ module RedisBatch
     private
 
     def abort_processing(key, redis)
-      recover_count = redis.llen(key)
-      redis.multi do |transaction|
-        recover_count.times { transaction.lmove(take_key, queue_key, :right, :left) }
-      end
+      redis.call("FCALL", "rb_lrestore", 2, key, queue_key)
     end
 
     def queue_key

data/lib/redis_batch.rb

@@ -1,7 +1,8 @@
 require 'redis'
-require './lib/redis_batch/configurable'
-require './lib/redis_batch/client'
-require './lib/redis_batch/queue'
+require 'redis_batch/configurable'
+require 'redis_batch/lua'
+require 'redis_batch/client'
+require 'redis_batch/queue'
 
 module RedisBatch
   Error = Class.new(StandardError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_batch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Christian Avemark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -34,6 +34,7 @@ files:
 - lib/redis_batch.rb
 - lib/redis_batch/client.rb
 - lib/redis_batch/configurable.rb
+- lib/redis_batch/lua.rb
 - lib/redis_batch/queue.rb
 homepage: https://github.com/avemark/redis_batch_rb
 licenses: