canvas_sync 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c79e88e0f642fadba95afa7f6b6960a511144ad41d6c6333febc010e7fe2e3e
-  data.tar.gz: 26ab8638f656d00f93cbd0393d46b5e0a711ab7dfa94d60bf98bcb5fb42a1a7b
+  metadata.gz: cc62b25843e2b3e57b83e1ca41b4a0e546666ce6e824a8a799f534ee90fb28c5
+  data.tar.gz: 1fb1747c3882282894b0aa4e6fef9d7240977a453da6415e3a31460c55833306
 SHA512:
-  metadata.gz: d06042a0cb184a7f1efdfaf3b3e755967d97d13c8ed4a9d436eaedb5f7ebe0de0007ab58e8b6f1ad1fc520d4be1e6c139d81b292c7edb79dd8c6d3b6b491c879
-  data.tar.gz: cf3240e17d1df90858e1216c7e1ad8db3d92835d9ad10a17a3fc0f85a309058462e13a121ef156dee75b08adc05731f68a486de7c22c3b3b78cfab65395dca0f
+  metadata.gz: 3ac70536bc476c02ee262487ff7074493e99c05d585cec78a32cddb5569feb9e5ca6407a7104cf7538ed9030e4cb2401be823171de5f5e261de5bd2aeafbc11f
+  data.tar.gz: 31178103ff1168d6a54b622c612260857c4f5841dff32c637a95877a1df3f7c4467221e05c19e7688f1ebf3284d79cc8cf5113208f89ac4299983dcaa2ccf51d

data/lib/canvas_sync/job_batches/batch.rb

@@ -478,20 +478,22 @@ module CanvasSync::JobBatches
 
       # Internal method to cleanup a Redis Hash and related keys
       def cleanup_redis_index_for(key, suffixes = [""])
-        if r.hget(k, "created_at").present?
-          r.multi do |r|
-            suffixes.each do |suffix|
-              r.expire(key + suffix, BID_EXPIRE_TTL)
+        redis do |r|
+          if r.hget(k, "created_at").present?
+            r.multi do |r|
+              suffixes.each do |suffix|
+                r.expire(key + suffix, BID_EXPIRE_TTL)
+              end
             end
-          end
-          false
-        else
-          r.multi do |r|
-            suffixes.each do |suffix|
-              r.unlink(key + suffix)
+            false
+          else
+            r.multi do |r|
+              suffixes.each do |suffix|
+                r.unlink(key + suffix)
+              end
             end
+            true
           end
-          true
         end
       end
 
@@ -499,14 +501,16 @@ module CanvasSync::JobBatches
       def cleanup_redis_index!
         suffixes = ["", "-callbacks-complete", "-callbacks-success", "-failed", "-dead", "-batches-success", "-batches-complete", "-batches-failed", "-bids", "-jids", "-pending_callbacks"]
 
-        cleanup_index = ->(index) {
-          r.zrangebyscore(index, "0", BID_EXPIRE_TTL.seconds.ago.to_i).each do |bid|
-            r.zrem(index, bid) if cleanup_redis_index_for("BID-#{bid}", suffixes)
-          end
-        }
+        redis do |r|
+          cleanup_index = ->(index) {
+            r.zrangebyscore(index, "0", BID_EXPIRE_TTL.seconds.ago.to_i).each do |bid|
+              r.zrem(index, bid) if cleanup_redis_index_for("BID-#{bid}", suffixes)
+            end
+          }
 
-        cleanup_index.call("BID-ROOT-bids")
-        cleanup_index.call("batches")
+          cleanup_index.("BID-ROOT-bids")
+          cleanup_index.("batches")
+        end
       end
 
       def redis(&blk)

data/lib/canvas_sync/job_uniqueness/lock_context.rb

@@ -122,14 +122,27 @@ module CanvasSync::JobUniqueness
 
         args = @context_data[:args] || []
         kwargs = @context_data[:kwargs] || {}
+        hash = config[:hash]
         if config[:hash].is_a?(Proc)
-          base_key << config[:hash].call(*args, **kwargs)
+          hash = config[:hash].call(*args, **kwargs)
         elsif config[:hash].nil?
-          base_key << OpenSSL::Digest::MD5.hexdigest(JSON.dump([ args, kwargs.sort]))
-        else
-          base_key << config[:hash]
+          hash = [*args, kwargs]
         end
 
+        hash = ":#{hash}" if hash.is_a?(Symbol)
+
+        if hash && !hash.is_a?(String)
+          hash = Array(hash)
+
+          # Normalize the hash to ensure that the order of any Hash keys don't matter
+          hash = normalize_hash_chunk(hash)
+
+          normalized = ActiveJob::Arguments.serialize(hash)
+          hash = OpenSSL::Digest::MD5.hexdigest(JSON.dump(normalized))
+        end
+
+        base_key << hash if hash
+
         base_key.join(":")
       end
     end
@@ -173,5 +186,14 @@ module CanvasSync::JobUniqueness
 
     private
 
+    def normalize_hash_chunk(chunk)
+      if chunk.is_a?(Hash)
+        chunk.map { |k, v| [k, normalize_hash_chunk(v)] }.sort.to_h
+      elsif chunk.is_a?(Array)
+        chunk.map { |c| normalize_hash_chunk(c) }
+      else
+        chunk
+      end
+    end
   end
 end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.22.2".freeze
+  VERSION = "0.22.3".freeze
 end

data/spec/job_uniqueness/lock_context_spec.rb

@@ -24,6 +24,17 @@ RSpec.describe CanvasSync::JobUniqueness::LockContext do
       TestWorker.unique_job_options[:scope] = scope
     end
 
+    it 'returns matching keys for equal hashes' do
+      context_data[:args] = [{ foo: 'bar', bar: 'foo' }]
+      key1 = lock_context.base_key
+      lock_context.instance_variable_set(:@base_key, nil)
+
+      context_data[:args] = [{ bar: 'foo', foo: 'bar' }]
+      key2 = lock_context.base_key
+
+      expect(key1).to eq key2
+    end
+
     context 'when scope is a Proc' do
       let(:scope) { ->(queue:) { "blob" } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails