switchman 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ede324b26c105f71f0d071eee8afa73297430ae
-  data.tar.gz: 6dc4b1fd3878baa64ab87827cdab9da20c7693fd
+SHA256:
+  metadata.gz: 4aa0193a7496422746f84c2f7f9e97641ba11790a668dc34456719fbc61bec73
+  data.tar.gz: d932aa66cddb7c71934cb016d330dd23b77b9580ab7ca3f6fe3db4494e72085f
 SHA512:
-  metadata.gz: 8655c6d6342901d739e858f5914aafc2a5b3a875c30a58802128df70630abcb2f09de364a52e43064ad5388368845d8d28c944617a7fd36eaaae7db45cf2e2ae
-  data.tar.gz: 5631ec070476582189e1ebb53c1822d50c2c72a5ee0dab301d604a18166f166e143e1b13edfee3fc95df015bf5a2e315e4ebc067d77dd6e8e741ffbd1936290a
+  metadata.gz: 47ae6fae556db8c38e80989c5676bae68cd358bdbd664be065dbbba07230ca7ef58e30964bc776e18f98db3b889b68233a600700443573588aba4df4dd72a5b7
+  data.tar.gz: 6d49615fed9167e04e4a5db8a704e1810df401d69555e25d7477eaaa56e60051b918fe81dff0b870479999fbfcbfe996c5a5090803d2607c38cb8522b39ab2ef

data/app/models/switchman/shard_internal.rb

@@ -56,7 +56,7 @@ module Switchman
 
           # Now find the actual record, if it exists; rescue the fake default if the table doesn't exist
           @default = begin
-            Shard.where(default: true).first || default
+            find_cached("default_shard") { Shard.where(default: true).take } || default
           rescue
             default
           end
@@ -111,30 +111,7 @@ module Switchman
 
         unless cached_shards.has_key?(id)
           cached_shards[id] = Shard.default.activate do
-            # can't simply cache the AR object since Shard has a custom serializer
-            # that calls this method
-            attributes = Switchman.cache.fetch(['shard', id].join('/')) do
-              shard = find_by_id(id)
-              if shard
-                shard.attributes
-              else
-                :nil
-              end
-            end
-            if attributes == :nil
-              nil
-            else
-              shard = Shard.new
-              attributes.each do |attr, value|
-                shard.send(:"#{attr}=", value)
-              end
-              shard.clear_changes_information
-              shard.instance_variable_set(:@new_record, false)
-              # connection info doesn't exist in database.yml;
-              # pretend the shard doesn't exist either
-              shard = nil unless shard.database_server
-              shard
-            end
+            find_cached(['shard', id]) { find_by(id: id) }
           end
         end
         cached_shards[id]
@@ -540,6 +517,24 @@ module Switchman
         cached_shards.delete(shard.id)
       end
 
+      def find_cached(key)
+        # can't simply cache the AR object since Shard has a custom serializer
+        # that calls this method
+        attributes = Switchman.cache.fetch(key) { yield&.attributes }
+        return nil unless attributes
+
+        shard = Shard.new
+        attributes.each do |attr, value|
+          shard.send(:"#{attr}=", value)
+        end
+        shard.clear_changes_information
+        shard.instance_variable_set(:@new_record, false)
+        # connection info doesn't exist in database.yml;
+        # pretend the shard doesn't exist either
+        shard = nil unless shard.database_server
+        shard
+      end
+
       def active_shards
         Thread.current[:active_shards] ||= {}.compare_by_identity
       end
@@ -673,6 +668,7 @@ module Switchman
     def clear_cache
       Shard.default.activate do
         Switchman.cache.delete(['shard', id].join('/'))
+        Switchman.cache.delete("default_shard") if default?
       end
     end
 

data/db/migrate/20180828183945_add_default_shard_index.rb

@@ -0,0 +1,13 @@
+class AddDefaultShardIndex < ActiveRecord::Migration[4.2]
+  def change
+    Switchman::Shard.where(default: nil).update_all(default: false)
+    change_column_default :switchman_shards, :default, false
+    change_column_null :switchman_shards, :default, false
+    options = if connection.adapter_name == 'PostgreSQL'
+                { unique: true, where: "\"default\"" }
+              else
+                {}
+              end
+    add_index :switchman_shards, :default, options
+  end
+end

data/db/migrate/20180828192111_add_timestamps_to_shards.rb

@@ -0,0 +1,9 @@
+class AddTimestampsToShards < ActiveRecord::Migration[4.2]
+  def change
+    add_timestamps :switchman_shards, null: true
+    now = Time.now.utc
+    Switchman::Shard.update_all(updated_at: now, created_at: now)
+    change_column_null :switchman_shards, :updated_at, false
+    change_column_null :switchman_shards, :created_at, false
+  end
+end

data/lib/switchman/active_record/connection_handler.rb

@@ -3,13 +3,14 @@ require 'switchman/connection_pool_proxy'
 module Switchman
   module ActiveRecord
     module ConnectionHandler
-      def self.make_sharing_automagic(config)
+      def self.make_sharing_automagic(config, shard = Shard.current)
         key = config[:adapter] == 'postgresql' ? :schema_search_path : :database
 
         # only load the shard name from the db if we have to
-        if config[key] || !config[:shard_name]
+        if !config[:shard_name]
           # we may not be able to connect to this shard yet, cause it might be an empty database server
-          shard_name = Shard.current.name rescue nil
+          shard = shard.call if shard.is_a?(Proc)
+          shard_name = shard.name rescue nil
           return unless shard_name
 
           config[:shard_name] ||= shard_name
@@ -84,12 +85,15 @@ module Switchman
           if Shard.default.is_a?(Shard)
             DatabaseServer.all.each do |server|
               next if server == Shard.default.database_server
-              shard = server.shards.where(:name => nil).first
-              shard ||= Shard.new(:database_server => server)
-              shard.activate do
-                ConnectionHandler.make_sharing_automagic(server.config)
-                ConnectionHandler.make_sharing_automagic(proxy.current_pool.spec.config)
+
+              shard = nil
+              shard_proc = -> do
+                shard ||= server.shards.where(:name => nil).first
+                shard ||= Shard.new(:database_server => server)
+                shard
               end
+              ConnectionHandler.make_sharing_automagic(server.config, shard_proc)
+              ConnectionHandler.make_sharing_automagic(proxy.current_pool.spec.config, shard_proc)
             end
           end
           # we may have established some connections above trying to infer the shard's name.

data/lib/switchman/r_spec_helper.rb

@@ -36,6 +36,7 @@ module Switchman
 
         puts "Setting up sharding for all specs..."
         Shard.delete_all
+        Switchman.cache.delete("default_shard")
 
         @@shard1, @@shard2 = TestHelper.recreate_persistent_test_shards
         @@default_shard = Shard.default
@@ -71,6 +72,7 @@ module Switchman
         # we'll re-persist in the group's `before :all`; we don't want them to exist
         # in the db before then
         Shard.delete_all
+        Switchman.cache.delete("default_shard")
         Shard.default(true)
         puts "Done!"
 
@@ -99,6 +101,7 @@ module Switchman
         dup = @@default_shard.dup
         dup.id = @@default_shard.id
         dup.save!
+        Switchman.cache.delete("default_shard")
         Shard.default(true)
         dup = @@shard1.dup
         dup.id = @@shard1.id
@@ -147,6 +150,7 @@ module Switchman
 
       klass.after(:all) do
         Shard.delete_all
+        Switchman.cache.delete("default_shard")
         Shard.default(true)
       end
     end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.12.3"
+  VERSION = "1.12.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -191,7 +191,8 @@ files:
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
-- db/shard_1708.sqlite3
+- db/migrate/20180828183945_add_default_shard_index.rb
+- db/migrate/20180828192111_add_timestamps_to_shards.rb
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic