sidekiq-batch 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d45a854229157eb70e9fb9b04390e6b4958fd535cb68d6dd2e0aab84c51e4b7
-  data.tar.gz: b8ec67ac9cce0cafde5b70883c0a77794f0d8506b694f74fb79765dc0ae5d7f2
+  metadata.gz: b70659750dde1e5afc337c6d8694055af5e103718a3719e3e12bffd66dbe191f
+  data.tar.gz: c47488bb9c1a9115e3bc9ee006190d3dd52534006b8bd74184810885e0dbbfcd
 SHA512:
-  metadata.gz: e703eb7d37c4234269835ee009d73cafd4bb9afb11d8c818860e18e7504244db08142830eeac20d32bff96079febcb13ae130fd7e0a21eadeea6115cb5384989
-  data.tar.gz: e616deb4ed0f7599b9c09d1d0fd943f25131c89966ae0575b073c507053ac9012357ed07ac34456ba0f60d1a91ab7d75c337ffe6fb4e8aca6b21fe2aea2b1ea4
+  metadata.gz: afb196a979725830e0576d4d9f1756c7d3afba5298c46d22b575a9cfbab39fcefe19434f27fd80808d5082a92e127784eb543408e7848e50f5f78e962c5e66a6
+  data.tar.gz: 9cfd132e6beb024c493b6c8acbf7ea375604ed193575abc9ac64b6ee1c10e37992796f80f6441661d24efb9b55963b50e12959b56bb30bf6abb5de6226977125

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+open_collective: sidekiq-batch

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '24 3 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/lib/sidekiq/batch/callback.rb

@@ -40,10 +40,10 @@ module Sidekiq
 
           _, _, success, _, complete, pending, children, failure = Sidekiq.redis do |r|
             r.multi do |pipeline|
-              pipeline.sadd("BID-#{parent_bid}-success", bid)
+              pipeline.sadd("BID-#{parent_bid}-success", [bid])
               pipeline.expire("BID-#{parent_bid}-success", Sidekiq::Batch::BID_EXPIRE_TTL)
               pipeline.scard("BID-#{parent_bid}-success")
-              pipeline.sadd("BID-#{parent_bid}-complete", bid)
+              pipeline.sadd("BID-#{parent_bid}-complete", [bid])
               pipeline.scard("BID-#{parent_bid}-complete")
               pipeline.hincrby("BID-#{parent_bid}", "pending", 0)
               pipeline.hincrby("BID-#{parent_bid}", "children", 0)
@@ -81,7 +81,7 @@ module Sidekiq
             Sidekiq.logger.debug {"Finalize parent complete bid: #{parent_bid}"}
             _, complete, pending, children, failure = Sidekiq.redis do |r|
               r.multi do |pipeline|
-                pipeline.sadd("BID-#{parent_bid}-complete", bid)
+                pipeline.sadd("BID-#{parent_bid}-complete", [bid])
                 pipeline.scard("BID-#{parent_bid}-complete")
                 pipeline.hincrby("BID-#{parent_bid}", "pending", 0)
                 pipeline.hincrby("BID-#{parent_bid}", "children", 0)

data/lib/sidekiq/batch/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Batch
-    VERSION = '0.1.7'.freeze
+    VERSION = '0.1.9'.freeze
   end
 end

data/lib/sidekiq/batch.rb

@@ -43,10 +43,10 @@ module Sidekiq
       callback_key = "#{@bidkey}-callbacks-#{event}"
       Sidekiq.redis do |r|
         r.multi do |pipeline|
-          pipeline.sadd(callback_key, JSON.unparse({
+          pipeline.sadd(callback_key, [JSON.unparse({
             callback: callback,
             opts: options
-          }))
+          })])
           pipeline.expire(callback_key, BID_EXPIRE_TTL)
         end
       end
@@ -96,7 +96,7 @@ module Sidekiq
             pipeline.hincrby(@bidkey, "total", @ready_to_queue.size)
             pipeline.expire(@bidkey, BID_EXPIRE_TTL)
 
-            pipeline.sadd(@bidkey + "-jids", @ready_to_queue)
+            pipeline.sadd(@bidkey + "-jids", [@ready_to_queue])
             pipeline.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
           end
         end
@@ -149,7 +149,7 @@ module Sidekiq
       def process_failed_job(bid, jid)
         _, pending, failed, children, complete, parent_bid = Sidekiq.redis do |r|
           r.multi do |pipeline|
-            pipeline.sadd("BID-#{bid}-failed", jid)
+            pipeline.sadd("BID-#{bid}-failed", [jid])
 
             pipeline.hincrby("BID-#{bid}", "pending", 0)
             pipeline.scard("BID-#{bid}-failed")
@@ -166,7 +166,7 @@ module Sidekiq
           Sidekiq.redis do |r|
             r.multi do |pipeline|
               pipeline.hincrby("BID-#{parent_bid}", "pending", 1)
-              pipeline.sadd("BID-#{parent_bid}-failed", jid)
+              pipeline.sadd("BID-#{parent_bid}-failed", [jid])
               pipeline.expire("BID-#{parent_bid}-failed", BID_EXPIRE_TTL)
             end
           end
@@ -188,8 +188,8 @@ module Sidekiq
             pipeline.hget("BID-#{bid}", "total")
             pipeline.hget("BID-#{bid}", "parent_bid")
 
-            pipeline.srem("BID-#{bid}-failed", jid)
-            pipeline.srem("BID-#{bid}-jids", jid)
+            pipeline.srem("BID-#{bid}-failed", [jid])
+            pipeline.srem("BID-#{bid}-jids", [jid])
             pipeline.expire("BID-#{bid}", BID_EXPIRE_TTL)
           end
         end
@@ -203,12 +203,13 @@ module Sidekiq
       end
 
       def enqueue_callbacks(event, bid)
+        event_name = event.to_s
         batch_key = "BID-#{bid}"
-        callback_key = "#{batch_key}-callbacks-#{event}"
+        callback_key = "#{batch_key}-callbacks-#{event_name}"
         already_processed, _, callbacks, queue, parent_bid, callback_batch = Sidekiq.redis do |r|
           r.multi do |pipeline|
-            pipeline.hget(batch_key, event)
-            pipeline.hset(batch_key, event, true)
+            pipeline.hget(batch_key, event_name)
+            pipeline.hset(batch_key, event_name, true)
             pipeline.smembers(callback_key)
             pipeline.hget(batch_key, "callback_queue")
             pipeline.hget(batch_key, "parent_bid")
@@ -222,10 +223,10 @@ module Sidekiq
         parent_bid = !parent_bid || parent_bid.empty? ? nil : parent_bid    # Basically parent_bid.blank?
         callback_args = callbacks.reduce([]) do |memo, jcb|
           cb = Sidekiq.load_json(jcb)
-          memo << [cb['callback'], event, cb['opts'], bid, parent_bid]
+          memo << [cb['callback'], event_name, cb['opts'], bid, parent_bid]
         end
 
-        opts = {"bid" => bid, "event" => event}
+        opts = {"bid" => bid, "event" => event_name}
 
         # Run callback batch finalize synchronously
         if callback_batch
@@ -233,7 +234,7 @@ module Sidekiq
           # Pass in stored event as callback finalize is processed on complete event
           cb_opts = callback_args.first&.at(2) || opts
 
-          Sidekiq.logger.debug {"Run callback batch bid: #{bid} event: #{event} args: #{callback_args.inspect}"}
+          Sidekiq.logger.debug {"Run callback batch bid: #{bid} event: #{event_name} args: #{callback_args.inspect}"}
           # Finalize now
           finalizer = Sidekiq::Batch::Callback::Finalize.new
           status = Status.new bid
@@ -242,7 +243,7 @@ module Sidekiq
           return
         end
 
-        Sidekiq.logger.debug {"Enqueue callback bid: #{bid} event: #{event} args: #{callback_args.inspect}"}
+        Sidekiq.logger.debug {"Enqueue callback bid: #{bid} event: #{event_name} args: #{callback_args.inspect}"}
 
         if callback_args.empty?
           # Finalize now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-batch
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Marcin Naglik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -87,8 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"