switchman 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5205c32993056a0fa71d272a95c5306d17762b31971c6242b0fd40e3b587a591
-  data.tar.gz: fd445dbeb2e0654e591a461637fa3720a7b335d1307e6ecf289ce88caac17d2d
+  metadata.gz: c544d2ed8498a6aecf33823f39b304393a65f213f6a68bf04f4d36610ebe3ac2
+  data.tar.gz: be685b315997b103dd13376f5223196f1b66a5be490502aac6bc401408899abc
 SHA512:
-  metadata.gz: a7db2fab2fb62cae74a845bff7373584c75057e2e9464ffacc130d053e78b6949e6c971aa29372b0f31ef6d25aba389b1c420fc601e18ae7cd8f1ac89b6b85e5
-  data.tar.gz: aa2fcb0523b80507b35f5e2b9cdf14f3793b8354ba26bf8dddd000d6da7d6a4abfc50eb7ef45b4013516282111aabe3dd31b264764378fc9abbc1cb1f5bee9e9
+  metadata.gz: fbdd769d90c831e1bbe6dd39def12775537989346daae7dbbab3103a330b89151e9d1c3b9fe216ab9ade75e3c01ee1b1c91062cc622707c3c2697f7dc3239ea8
+  data.tar.gz: 27d32eefa842a76debb1a1fc7875407b4df1398a45a71419c7cc13045fd8705ff5e4af724478a9cb854d517433ae8d16420baa13fc8e7459ab1953e626c0c80a

data/lib/switchman/active_record/migration.rb

@@ -31,7 +31,7 @@ module Switchman
 
     module Migrator
       def generate_migrator_advisory_lock_id
-        shard_name_hash = Zlib.crc32(Shard.current.name)
+        shard_name_hash = Zlib.crc32("#{Shard.current.id}:#{Shard.current.name}")
         ::ActiveRecord::Migrator::MIGRATOR_SALT * shard_name_hash
       end
     end

data/lib/switchman/active_record/query_methods.rb

@@ -78,6 +78,10 @@ module Switchman
         end
       end
 
+      def or(other)
+        super(other.shard(self.primary_shard))
+      end
+
       private
 
       if ::Rails.version >= '5.2'
@@ -242,92 +246,135 @@ module Switchman
                                binds: nil,
                                dup_binds_on_mutation: false)
         result = predicates.map do |predicate|
-          next predicate unless predicate.is_a?(::Arel::Nodes::Binary)
-          next predicate unless predicate.left.is_a?(::Arel::Attributes::Attribute)
-          relation, column = relation_and_column(predicate.left)
-          next predicate unless (type = transposable_attribute_type(relation, column))
+          transposed, binds = transpose_single_predicate(predicate, source_shard, target_shard, remove_nonlocal_primary_keys,
+                                     binds: binds, dup_binds_on_mutation: dup_binds_on_mutation)
+          transposed
+        end
+        result = [result, binds]
+        result
+      end
 
-          remove = true if type == :primary &&
-              remove_nonlocal_primary_keys &&
-              predicate.left.relation.model == klass &&
-              predicate.is_a?(::Arel::Nodes::Equality)
+      def transpose_single_predicate(predicate,
+                                     source_shard,
+                                     target_shard,
+                                     remove_nonlocal_primary_keys = false,
+                                     binds: nil,
+                                     dup_binds_on_mutation: false)
+        if predicate.is_a?(::Arel::Nodes::Grouping)
+          return predicate, binds unless predicate.expr.is_a?(::Arel::Nodes::Or)
+          # Dang, we have an OR.  OK, that means we have other epxressions below this
+          # level, perhaps many, that may need transposition.
+          # the left side and right side must each be treated as predicate lists and
+          # transformed in kind, if neither of them changes we can just return the grouping as is.
+          # hold on, it's about to get recursive...
+          #
+          # TODO: "binds" is getting passed up and down
+          # this stack purely because of the necessary handling for rails <5.2
+          #  Dropping support for 5.2 means we can remove the "binds" argument from
+          # all of this and yank the conditional below where we monkey with their instance state.
+          or_expr = predicate.expr
+          left_node = or_expr.left
+          right_node = or_expr.right
+          left_predicates = left_node.children
+          right_predicates = right_node.children
+          new_left_predicates, binds = transpose_predicates(left_predicates, source_shard,
+                                                               target_shard, remove_nonlocal_primary_keys,
+                                                               binds: binds, dup_binds_on_mutation: dup_binds_on_mutation)
+          new_right_predicates, binds = transpose_predicates(right_predicates, source_shard,
+                                                               target_shard, remove_nonlocal_primary_keys,
+                                                               binds: binds, dup_binds_on_mutation: dup_binds_on_mutation)
+          if new_left_predicates != left_predicates
+            left_node.instance_variable_set(:@children, new_left_predicates)
+          end
+          if new_right_predicates != right_predicates
+            right_node.instance_variable_set(:@children, new_right_predicates)
+          end
+          return predicate, binds
+        end
+        return predicate, binds unless predicate.is_a?(::Arel::Nodes::Binary)
+        return predicate, binds unless predicate.left.is_a?(::Arel::Attributes::Attribute)
+        relation, column = relation_and_column(predicate.left)
+        return predicate, binds unless (type = transposable_attribute_type(relation, column))
 
-          current_source_shard =
-              if source_shard
-                source_shard
-              elsif type == :primary
-                Shard.current(klass.shard_category)
-              elsif type == :foreign
-                source_shard_for_foreign_key(relation, column)
-              end
+        remove = true if type == :primary &&
+            remove_nonlocal_primary_keys &&
+            predicate.left.relation.model == klass &&
+            predicate.is_a?(::Arel::Nodes::Equality)
 
-          if ::Rails.version >= "5.2"
-            new_right_value =
-              case predicate.right
-              when Array
-                predicate.right.map {|val| transpose_predicate_value(val, current_source_shard, target_shard, type, remove) }
-              else
-                transpose_predicate_value(predicate.right, current_source_shard, target_shard, type, remove)
-              end
-          else
-            new_right_value = case predicate.right
+        current_source_shard =
+            if source_shard
+              source_shard
+            elsif type == :primary
+              Shard.current(klass.shard_category)
+            elsif type == :foreign
+              source_shard_for_foreign_key(relation, column)
+            end
+
+        if ::Rails.version >= "5.2"
+          new_right_value =
+            case predicate.right
             when Array
-              local_ids = []
-              predicate.right.each do |value|
-                local_id = Shard.relative_id_for(value, current_source_shard, target_shard)
-                next unless local_id
-                unless remove && local_id > Shard::IDS_PER_SHARD
-                  if value.is_a?(::Arel::Nodes::Casted)
-                    if local_id == value.val
-                      local_id = value
-                    elsif local_id != value
-                      local_id = value.class.new(local_id, value.attribute)
-                    end
+              predicate.right.map {|val| transpose_predicate_value(val, current_source_shard, target_shard, type, remove) }
+            else
+              transpose_predicate_value(predicate.right, current_source_shard, target_shard, type, remove)
+            end
+        else
+          new_right_value = case predicate.right
+          when Array
+            local_ids = []
+            predicate.right.each do |value|
+              local_id = Shard.relative_id_for(value, current_source_shard, target_shard)
+              next unless local_id
+              unless remove && local_id > Shard::IDS_PER_SHARD
+                if value.is_a?(::Arel::Nodes::Casted)
+                  if local_id == value.val
+                    local_id = value
+                  elsif local_id != value
+                    local_id = value.class.new(local_id, value.attribute)
                   end
-                  local_ids << local_id
                 end
+                local_ids << local_id
               end
-              local_ids
-            when ::Arel::Nodes::BindParam
-              # look for a bind param with a matching column name
-              if binds && bind = binds.detect{|b| b&.name.to_s == predicate.left.name.to_s}
-                # before we mutate, dup
-                if dup_binds_on_mutation
-                  binds = binds.map(&:dup)
-                  dup_binds_on_mutation = false
-                  bind = binds.find { |b| b&.name.to_s == predicate.left.name.to_s }
-                end
-                if bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
-                  bind.value.sharded = true # mark for transposition later
-                  bind.value.primary = true if type == :primary
-                else
-                  local_id = Shard.relative_id_for(bind.value, current_source_shard, target_shard)
-                  local_id = [] if remove && local_id > Shard::IDS_PER_SHARD
-                  bind.instance_variable_set(:@value, local_id)
-                  bind.instance_variable_set(:@value_for_database, nil)
-                end
+            end
+            local_ids
+          when ::Arel::Nodes::BindParam
+            # look for a bind param with a matching column name
+            if binds && bind = binds.detect{|b| b&.name.to_s == predicate.left.name.to_s}
+              # before we mutate, dup
+              if dup_binds_on_mutation
+                binds = binds.map(&:dup)
+                dup_binds_on_mutation = false
+                bind = binds.find { |b| b&.name.to_s == predicate.left.name.to_s }
+              end
+              if bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
+                bind.value.sharded = true # mark for transposition later
+                bind.value.primary = true if type == :primary
+              else
+                local_id = Shard.relative_id_for(bind.value, current_source_shard, target_shard)
+                local_id = [] if remove && local_id > Shard::IDS_PER_SHARD
+                bind.instance_variable_set(:@value, local_id)
+                bind.instance_variable_set(:@value_for_database, nil)
               end
-              predicate.right
-            else
-              local_id = Shard.relative_id_for(predicate.right, current_source_shard, target_shard) || predicate.right
-              local_id = [] if remove && local_id.is_a?(Integer) && local_id > Shard::IDS_PER_SHARD
-              local_id
             end
+            predicate.right
+          else
+            local_id = Shard.relative_id_for(predicate.right, current_source_shard, target_shard) || predicate.right
+            local_id = [] if remove && local_id.is_a?(Integer) && local_id > Shard::IDS_PER_SHARD
+            local_id
           end
-          if new_right_value == predicate.right
+        end
+        out_predicate = if new_right_value == predicate.right
+          predicate
+        elsif predicate.right.is_a?(::Arel::Nodes::Casted)
+          if new_right_value == predicate.right.val
             predicate
-          elsif predicate.right.is_a?(::Arel::Nodes::Casted)
-            if new_right_value == predicate.right.val
-              predicate
-            else
-              predicate.class.new(predicate.left, predicate.right.class.new(new_right_value, predicate.right.attribute))
-            end
           else
-            predicate.class.new(predicate.left, new_right_value)
+            predicate.class.new(predicate.left, predicate.right.class.new(new_right_value, predicate.right.attribute))
           end
+        else
+          predicate.class.new(predicate.left, new_right_value)
         end
-        result = [result, binds]
-        result
+        return out_predicate, binds
       end
 
       def transpose_predicate_value(value, current_shard, target_shard, attribute_type, remove_non_local_ids)

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "2.0.3"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Cody Cutrer
 - James Williams
 - Jacob Fugal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -257,7 +257,7 @@ homepage: http://www.instructure.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Rails sharding magic
 test_files: []