switchman 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a864ee73e89a300af961ba7041f8f82ae193d9e5
-  data.tar.gz: 3b15e10e5bcb9dccd99e3b88b257f1f95c551a9b
+  metadata.gz: a6e7bdc0136ef65434df5ec4cd150a80ea3ff48a
+  data.tar.gz: 3ac58daa39eb55bc3b1ea743d6995072acf91ab2
 SHA512:
-  metadata.gz: aa6ea9736d0316467d7f9493eecb127ed352a2421df4789b8ceb129f5a6eb9ed893ae3863dc72b15268bf7241c55d97dea00b26f78e9dafc0059e18999575a78
-  data.tar.gz: 0ee49239c7054e8e510c350aa0c9fe529c92e18fd50ee8ee8ceb468e9d2971f99ce788ce4071543d2b2f85bb73dcad94ef1f36b171cc6f09ad420ba8ec50e03e
+  metadata.gz: 792fbbdedbdc2028003b2eda51934e9c8821d0fd479c7e5da119c453d3696f232a752bcef868c291f3cc4b31a7acf560cadfda50c4bd48df4aa64826eb27b1f3
+  data.tar.gz: 1310d057a27d42f01a7dbad5b70d6ac3be09b42aa06f3abd71f3c933260a387b3542e97a2ca5754b0bd89ee65f0689f7314f8717e5a8929c676dad24879c5ef3

data/lib/switchman/active_record/connection_pool.rb

@@ -3,10 +3,12 @@ require 'switchman/errors'
 module Switchman
   module ActiveRecord
     module ConnectionPool
-      attr_writer :shard
-
       def shard
-        @shard || Shard.default
+        Thread.current["#{object_id}_shard".to_sym] || Shard.default
+      end
+
+      def shard=(value)
+        Thread.current["#{object_id}_shard".to_sym] = value
       end
 
       def default_schema
@@ -18,10 +20,14 @@ module Switchman
       end
 
       def checkout_new_connection
-        # TODO: this might be a threading issue
-        spec.config[:shard_name] = self.shard.name
+        conn = synchronize do
+          # ideally I would just keep a thread-local spec that I could modify
+          # without locking anything, but if spec returns not-the-object passed
+          # to initialize this pool, things break
+          spec.config[:shard_name] = self.shard.name
 
-        conn = super
+          super
+        end
         conn.shard = self.shard
         conn
       end

data/lib/switchman/active_record/query_methods.rb

@@ -71,7 +71,7 @@ module Switchman
         when ::ActiveRecord::Relation
           Shard.default
         when nil
-          Shard.current(klass.respond_to?(:shard_category) ? klass.shard_category : :default)
+          Shard.current(klass.shard_category)
         else
           raise ArgumentError, "invalid shard value #{shard_value}"
         end
@@ -85,7 +85,7 @@ module Switchman
         when ::ActiveRecord::Base
           shard_value.respond_to?(:associated_shards) ? shard_value.associated_shards : [shard_value.shard]
         when nil
-          [Shard.current(klass.respond_to?(:shard_category) ? klass.shard_category : default)]
+          [Shard.current(klass.shard_category)]
         else
           shard_value
         end

data/lib/switchman/active_record/reflection.rb

@@ -13,6 +13,20 @@ module Switchman
             owner.send(active_record_primary_key) # use sharded id values in association binds
           end
         end
+
+        # cache association scopes by shard.
+        if ::Rails.version >= '4.2'
+          def association_scope_cache(conn, owner)
+            key = conn.prepared_statements
+            if polymorphic?
+              key = [key, owner._read_attribute(@foreign_type)]
+            end
+            key = [key, owner.shard.id].flatten
+            @association_scope_cache[key] ||= @scope_lock.synchronize {
+              @association_scope_cache[key] ||= yield
+            }
+          end
+        end
       end
     end
   end

data/lib/switchman/active_record/relation.rb

@@ -7,13 +7,13 @@ module Switchman
 
       def initialize(*args)
         super
-        self.shard_value = Shard.current(klass.respond_to?(:shard_category) ? klass.shard_category : :default) unless shard_value
+        self.shard_value = Shard.current(klass ? klass.shard_category : :default) unless shard_value
         self.shard_source_value = :implicit unless shard_source_value
       end
 
       def clone
         result = super
-        result.shard_value = Shard.current(klass.respond_to?(:shard_category) ? klass.shard_category : :default) unless shard_value
+        result.shard_value = Shard.current(klass ? klass.shard_category : :default) unless shard_value
         result
       end
 

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic