switchman 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbf29688ae3158c8e0a6e02d5dd27355d33fcc9
-  data.tar.gz: 104a872cbf73ba12f5a9bdc74d25db7d25d68c59
+  metadata.gz: a9f1b18d5c70d7c7c0db5295eecc955e89eb7ffc
+  data.tar.gz: 9c87565145d1c2d28319c5dd0fcfba2be42d63e6
 SHA512:
-  metadata.gz: 453bb244bc91a04501f5952f629a964ebcb338629a6ba4e3530954a71325bb268acbc514619e1ca06d68c6d56d333e24575dc6eb053c8c86a22506462882c0ca
-  data.tar.gz: 9f39e116166e29ce9bfaf22aff35d84821f8d8ccbd2ff93032cb8dfbabd77c695e4a4a1aaf4608ca5171b31b17a66325357f16a85b9b6aeb83bb1aa9c8f84941
+  metadata.gz: e5c427e9b504ba9f24407e635e59d4b53fe898666095390b18049ce17831aa72387bbf04fa4996face96ee1a958f861441a5064f7acc9c79c96f40fd38631d87
+  data.tar.gz: 23e544a6a514824bdca90f51a12de4832b350a1b63adba3569ec73bd51da8c5267b8b71e53685197330e37973c284314a7895764ee47e91e29892d1d46246afd

data/lib/switchman/active_record/association.rb

@@ -115,10 +115,9 @@ module Switchman
               # for multishard associations, it's the owner object itself
               # (all associated shards)
 
-              # this is the default behavior of partition_by_shard, so just set it to nil
+              # this is the default behavior of partition_by_shard, so just let it be nil
               # to avoid the proc call
               # partition_proc = ->(owner) { owner }
-              partitition_proc = nil
             end
 
             records = Shard.partition_by_shard(owners, partition_proc) do |partitioned_owners|

data/lib/switchman/active_record/base.rb

@@ -128,7 +128,7 @@ module Switchman
       end
 
       def hash
-        self.class.sharded_primary_key? ? global_id.hash : super
+        self.class.sharded_primary_key? ? Shard.global_id_for(id).hash : super
       end
 
       def to_param

data/lib/switchman/active_record/core.rb

@@ -0,0 +1,18 @@
+require "switchman/shard_aware_statement_cache"
+
+module Switchman
+  module ActiveRecord
+    module Core
+      def initialize_find_by_cache
+        if ::Rails.version < '5'
+          self.find_by_statement_cache = ShardAwareStatementCache.new(shard_category)
+        else
+          # note that this will not work beyond ActiveRecord 5.0.0.beta3 since
+          #  as of beta4 this has been replaced with a hash containing two separate caches:
+          #  one for prepared statements, and one for unprepared ones
+          @find_by_statement_cache = ShardAwareStatementCache.new(shard_category)
+        end
+      end
+    end
+  end
+end

data/lib/switchman/active_record/statement_cache.rb

@@ -15,7 +15,7 @@ module Switchman
         current_shard = Shard.current(klass.shard_category)
         target_shard ||= current_shard
 
-        bind_values = bind_map.bind(params, current_shard, target_shard || current_shard)
+        bind_values = bind_map.bind(params, current_shard, target_shard)
 
         sql = query_builder.sql_for(bind_values, connection)
         target_shard.activate(klass.shard_category) do
@@ -69,4 +69,4 @@ module Switchman
       end
     end
   end
-end
+end

data/lib/switchman/engine.rb

@@ -93,9 +93,11 @@ module Switchman
 
         if ::Rails.version > '4.2'
           require "switchman/active_record/statement_cache"
+          require "switchman/active_record/core"
           ::ActiveRecord::StatementCache.prepend(ActiveRecord::StatementCache)
           ::ActiveRecord::StatementCache::BindMap.prepend(ActiveRecord::StatementCache::BindMap)
           ::ActiveRecord::StatementCache::Substitute.send(:attr_accessor, :primary, :sharded)
+          singleton_class.prepend ActiveRecord::Core
 
           ::ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecord::CollectionAssociation)
         end

data/lib/switchman/shard_aware_statement_cache.rb

@@ -0,0 +1,21 @@
+module Switchman
+  class ShardAwareStatementCache
+
+    attr_accessor :__cache, :shard_category
+    private :__cache, :shard_category
+
+    def initialize(shard_category)
+      self.extend Mutex_m
+      self.__cache = {}
+      self.shard_category = shard_category
+    end
+
+    def [](key)
+      __cache[[key, Shard.current(shard_category).id]]
+    end
+
+    def []=(key, value)
+      __cache[[key, Shard.current(shard_category).id]] = value
+    end
+  end
+end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,9 +19,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +29,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,9 +39,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,9 +49,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: shackles
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - lib/switchman/active_record/calculations.rb
 - lib/switchman/active_record/connection_handler.rb
 - lib/switchman/active_record/connection_pool.rb
+- lib/switchman/active_record/core.rb
 - lib/switchman/active_record/finder_methods.rb
 - lib/switchman/active_record/log_subscriber.rb
 - lib/switchman/active_record/model_schema.rb
@@ -200,6 +201,7 @@ files:
 - lib/switchman/schema_cache.rb
 - lib/switchman/shackles.rb
 - lib/switchman/shackles/relation.rb
+- lib/switchman/shard_aware_statement_cache.rb
 - lib/switchman/sharded_instrumenter.rb
 - lib/switchman/test_helper.rb
 - lib/switchman/version.rb
@@ -224,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic