lowkiq 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f492057b98cba44b9c22db8f0344823a267f19646defbe6c31269b1fc525e416
-  data.tar.gz: 31450dc9d3a9b6dac7e16cbd14bc84db0c947276b3499047969ca75f2939b5b2
+  metadata.gz: c2b13ccb79c80bb58f09ba2ebe9fa23b7bfcee3e449c7982c51f2a4ad4290308
+  data.tar.gz: '02322860fde3de91215a635867a8bf4400147ad824bfeb67d5cc06c8208be3d7'
 SHA512:
-  metadata.gz: f02ada15af2434cbb991331a2b2b415f1f632e568b2cc1867431c4f9e515901a3a5498e054ba7a72b1fe0b576f4148922a2d7b1717bc45142ebeab14172bedd3
-  data.tar.gz: af480933334f8f36693f7695425d57a24154bd62d097a14ad12ae8bce0ca1a17169a5e85c25bb1229619d4bc48bb7d298257c20845ea0f4b8bcd77e5b36a3b0b
+  metadata.gz: 559466b6e35738653122d52524ae47d5b36edb7823a0e3a1ba815df50c4f0bd60cb4513b8576a667c088455fd13e0ac323dc46657f9aab4400598bef45998423
+  data.tar.gz: e2ebad80e86410a1ff13a417ec3d5489c17a9d8b4b189abfc5a4a98e7d924530c25c5c1f37b59bf26e5dec881f7fa231a7f1acf5fcb5f460ac7a9191468e2e3b

data/lib/lowkiq/queue/queue.rb

@@ -38,16 +38,13 @@ module Lowkiq
       def pop(shard, limit:)
         @pool.with do |redis|
           data = nil
-          tx = redis.watch @keys.ids_scored_by_perform_in_zset(shard) do
-            ids = redis.zrangebyscore @keys.ids_scored_by_perform_in_zset(shard),
-                                      0, @timestamp.call,
-                                      limit: [0, limit]
-
-            if ids.empty?
-              redis.unwatch
-              return []
-            end
+          ids = redis.zrangebyscore @keys.ids_scored_by_perform_in_zset(shard),
+                                    0, @timestamp.call,
+                                    limit: [0, limit]
+          return [] if ids.empty?
 
+          payloads_keys = ids.map { |id| @keys.payloads_zset id }
+          tx = redis.watch *payloads_keys do
             data = @fetch.fetch(redis, :pipelined, ids)
 
             redis.multi do

data/lib/lowkiq/version.rb

@@ -1,3 +1,3 @@
 module Lowkiq
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lowkiq
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Mikhail Kuzmin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis