switchman 3.0.2 → 3.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,48 +18,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: guardrail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,21 +79,21 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -242,8 +242,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- app/models/switchman/shard.rb
-- app/models/switchman/unsharded_record.rb
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
@@ -253,7 +251,7 @@ files:
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
-- lib/switchman/active_record/association.rb
+- lib/switchman/active_record/associations.rb
 - lib/switchman/active_record/attribute_methods.rb
 - lib/switchman/active_record/base.rb
 - lib/switchman/active_record/calculations.rb
@@ -275,6 +273,7 @@ files:
 - lib/switchman/active_record/statement_cache.rb
 - lib/switchman/active_record/table_definition.rb
 - lib/switchman/active_record/tasks/database_tasks.rb
+- lib/switchman/active_record/test_fixtures.rb
 - lib/switchman/active_record/type_caster.rb
 - lib/switchman/active_support/cache.rb
 - lib/switchman/arel.rb
@@ -286,18 +285,21 @@ files:
 - lib/switchman/errors.rb
 - lib/switchman/guard_rail.rb
 - lib/switchman/guard_rail/relation.rb
-- lib/switchman/open4.rb
+- lib/switchman/parallel.rb
 - lib/switchman/r_spec_helper.rb
 - lib/switchman/rails.rb
+- lib/switchman/shard.rb
 - lib/switchman/sharded_instrumenter.rb
 - lib/switchman/standard_error.rb
 - lib/switchman/test_helper.rb
+- lib/switchman/unsharded_record.rb
 - lib/switchman/version.rb
 - lib/tasks/switchman.rake
 homepage: http://www.instructure.com/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -306,14 +308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Rails sharding magic

data/lib/switchman/active_record/association.rb

@@ -1,206 +0,0 @@
-# frozen_string_literal: true
-
-module Switchman
-  module ActiveRecord
-    module Association
-      def shard
-        reflection.shard(owner)
-      end
-
-      def build_record(*args)
-        shard.activate { super }
-      end
-
-      def load_target
-        shard.activate { super }
-      end
-
-      def scope
-        shard_value = @reflection.options[:multishard] ? @owner : shard
-        @owner.shard.activate { super.shard(shard_value, :association) }
-      end
-    end
-
-    module CollectionAssociation
-      def find_target
-        shards = reflection.options[:multishard] && owner.respond_to?(:associated_shards) ? owner.associated_shards : [shard]
-        # activate both the owner and the target's shard category, so that Reflection#join_id_for,
-        # when called for the owner, will be returned relative to shard the query will execute on
-        Shard.with_each_shard(shards, [klass.connection_classes, owner.class.connection_classes].uniq) do
-          super
-        end
-      end
-
-      def _create_record(*)
-        shard.activate { super }
-      end
-    end
-
-    module BelongsToAssociation
-      def replace_keys(record, force: false)
-        if record&.class&.sharded_column?(reflection.association_primary_key(record.class))
-          foreign_id = record[reflection.association_primary_key(record.class)]
-          owner[reflection.foreign_key] = Shard.relative_id_for(foreign_id, record.shard, owner.shard)
-        else
-          super
-        end
-      end
-
-      def shard
-        if @owner.class.sharded_column?(@reflection.foreign_key) &&
-           (foreign_id = @owner[@reflection.foreign_key])
-          Shard.shard_for(foreign_id, @owner.shard)
-        else
-          super
-        end
-      end
-    end
-
-    module ForeignAssociation
-      # significant change:
-      #   * transpose the key to the correct shard
-      def set_owner_attributes(record) # rubocop:disable Naming/AccessorMethodName
-        return if options[:through]
-
-        key = owner._read_attribute(reflection.join_foreign_key)
-        key = Shard.relative_id_for(key, owner.shard, shard)
-        record._write_attribute(reflection.join_primary_key, key)
-
-        record._write_attribute(reflection.type, owner.class.polymorphic_name) if reflection.type
-      end
-    end
-
-    module Extension
-      def self.build(_model, _reflection); end
-
-      def self.valid_options
-        [:multishard]
-      end
-    end
-
-    ::ActiveRecord::Associations::Builder::Association.extensions << Extension
-
-    module Preloader
-      module Association
-        # Copypasta from Activerecord but with added global_id_for goodness.
-        def records_for(ids)
-          scope.where(association_key_name => ids).load do |record|
-            global_key = if model.connection_classes == UnshardedRecord
-                           convert_key(record[association_key_name])
-                         else
-                           Shard.global_id_for(record[association_key_name], record.shard)
-                         end
-            owner = owners_by_key[convert_key(global_key)].first
-            association = owner.association(reflection.name)
-            association.set_inverse_instance(record)
-          end
-        end
-
-        # significant changes:
-        #  * partition_by_shard the records_for call
-        #  * re-globalize the fetched owner id before looking up in the map
-        def load_records
-          # owners can be duplicated when a relation has a collection association join
-          # #compare_by_identity makes such owners different hash keys
-          @records_by_owner = {}.compare_by_identity
-
-          if owner_keys.empty?
-            raw_records = []
-          else
-            # determine the shard to search for each owner
-            if reflection.macro == :belongs_to
-              # for belongs_to, it's the shard of the foreign_key
-              partition_proc = lambda do |owner|
-                if owner.class.sharded_column?(owner_key_name)
-                  Shard.shard_for(owner[owner_key_name], owner.shard)
-                else
-                  Shard.current
-                end
-              end
-            elsif !reflection.options[:multishard]
-              # for non-multishard associations, it's *just* the owner's shard
-              partition_proc = ->(owner) { owner.shard }
-            end
-
-            raw_records = Shard.partition_by_shard(owners, partition_proc) do |partitioned_owners|
-              relative_owner_keys = partitioned_owners.map do |owner|
-                key = owner[owner_key_name]
-                if key && owner.class.sharded_column?(owner_key_name)
-                  key = Shard.relative_id_for(key, owner.shard,
-                                              Shard.current(klass.connection_classes))
-                end
-                convert_key(key)
-              end
-              relative_owner_keys.compact!
-              relative_owner_keys.uniq!
-              records_for(relative_owner_keys)
-            end
-          end
-
-          @preloaded_records = raw_records.select do |record|
-            assignments = false
-
-            owner_key = record[association_key_name]
-            if owner_key && record.class.sharded_column?(association_key_name)
-              owner_key = Shard.global_id_for(owner_key,
-                                              record.shard)
-            end
-
-            owners_by_key[convert_key(owner_key)].each do |owner|
-              entries = (@records_by_owner[owner] ||= [])
-
-              if reflection.collection? || entries.empty?
-                entries << record
-                assignments = true
-              end
-            end
-
-            assignments
-          end
-        end
-
-        # significant change: globalize keys on sharded columns
-        def owners_by_key
-          @owners_by_key ||= owners.each_with_object({}) do |owner, result|
-            key = owner[owner_key_name]
-            key = Shard.global_id_for(key, owner.shard) if key && owner.class.sharded_column?(owner_key_name)
-            key = convert_key(key)
-            (result[key] ||= []) << owner if key
-          end
-        end
-
-        # significant change: don't cache scope (since it could be for different shards)
-        def scope
-          build_scope
-        end
-      end
-    end
-
-    module CollectionProxy
-      def initialize(*args)
-        super
-        self.shard_value = scope.shard_value
-        self.shard_source_value = :association
-      end
-
-      def shard(*args)
-        scope.shard(*args)
-      end
-    end
-
-    module AutosaveAssociation
-      def record_changed?(reflection, record, key)
-        record.new_record? ||
-          (record.has_attribute?(reflection.foreign_key) && record.send(reflection.foreign_key) != key) || # have to use send instead of [] because sharding
-          record.attribute_changed?(reflection.foreign_key)
-      end
-
-      def save_belongs_to_association(reflection)
-        # this seems counter-intuitive, but the autosave code will assign to attribute bypassing switchman,
-        # after reading the id attribute _without_ bypassing switchman. So we need Shard.current for the
-        # category of the associated record to match Shard.current for the category of self
-        shard.activate(connection_classes_for_reflection(reflection)) { super }
-      end
-    end
-  end
-end

data/lib/switchman/open4.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-require 'open4'
-
-# This fixes a bug with exception handling,
-# see https://github.com/ahoward/open4/pull/30
-module Open4
-  def self.do_popen(b = nil, exception_propagation_at = nil, closefds=false, &cmd)
-    pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
-
-    verbose = $VERBOSE
-    begin
-      $VERBOSE = nil
-
-      cid = fork {
-        if closefds
-          exlist = [0, 1, 2] | [pw,pr,pe,ps].map{|p| [p.first.fileno, p.last.fileno] }.flatten
-          ObjectSpace.each_object(IO){|io|
-            io.close if (not io.closed?) and (not exlist.include? io.fileno) rescue nil
-          }
-        end
-
-        pw.last.close
-        STDIN.reopen pw.first
-        pw.first.close
-
-        pr.first.close
-        STDOUT.reopen pr.last
-        pr.last.close
-
-        pe.first.close
-        STDERR.reopen pe.last
-        pe.last.close
-
-        STDOUT.sync = STDERR.sync = true
-
-        begin
-          cmd.call(ps)
-        rescue Exception => e
-          begin
-            Marshal.dump(e, ps.last)
-            ps.last.flush
-          rescue Errno::EPIPE
-            raise e
-          end
-        ensure
-          ps.last.close unless ps.last.closed?
-        end
-
-        exit!
-      }
-    ensure
-      $VERBOSE = verbose
-    end
-
-    [ pw.first, pr.last, pe.last, ps.last ].each { |fd| fd.close }
-
-    Open4.propagate_exception cid, ps.first if exception_propagation_at == :init
-
-    pw.last.sync = true
-
-    pi = [ pw.last, pr.first, pe.first ]
-
-    begin
-      return [cid, *pi] unless b
-
-      begin
-        b.call(cid, *pi)
-      ensure
-        pi.each { |fd| fd.close unless fd.closed? }
-      end
-
-      Open4.propagate_exception cid, ps.first if exception_propagation_at == :block
-
-      Process.waitpid2(cid).last
-    ensure
-      ps.first.close unless ps.first.closed?
-    end
-  end
-end