switchman 4.3.2 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930ab408c80afadb2064fa5476f4c0cd68130f13a7dd4303bf356194d0e4bed4
-  data.tar.gz: 1dca68c3804bf3ea9756e2d3a9054ca830ae79bbc8977d713a9d76f3eafef8cc
+  metadata.gz: 4c949cae7b5eb8457d2bd174b8546640c3692cdd13ded98eb907611400f6c822
+  data.tar.gz: 056763fe8e03d98d4d3bef4cf101bdfe51b2b66b2a9fa2bf796a40bbd6789949
 SHA512:
-  metadata.gz: 7c0a3ab18976beb94b4e9a46efb7f24e503c66363d6354946c7156e1221ffacafdc364c7bcc61205092801508ab6a329caf00c2c95592426a467b5cab86692e7
-  data.tar.gz: 94e9b98dfd1453eb967d02fe4a07c0cdbf4c4fdb04258da291994c9e04e3ac55c0bd4e1d214de9a0c6cfa4c10fe1b8d1476cc6509f27369f45abff1f997aadaf
+  metadata.gz: 526f97df24eaeea23324fcf6aaabe322256064a34d9071be36919881b8b3d787539e673455c4d1fdc4292dd64b5dfa09b910860975fc79e940698069bbe6bc1e
+  data.tar.gz: 609b4ee92ddea6bd07b0d79aa2a8c14fdfdcc3b8b7ce559941d919b881ba2921dbd9cfed662188050a16960b923d9bffbad910b42f4af1d7e34d09c292c747db

data/lib/switchman/database_server.rb

@@ -306,9 +306,14 @@ module Switchman
 
     def primary_shard_id
       unless instance_variable_defined?(:@primary_shard_id)
-        # if sharding isn't fully set up yet, we may not be able to query the shards table
-        @primary_shard_id = Shard.default.id if Shard.default.database_server == self
-        @primary_shard_id ||= shards.where(name: nil).first&.id
+        @primary_shard_id = Shard.default.activate do
+          Switchman.cache.fetch(["db_server_primary_shard_id", id]) do
+            # if sharding isn't fully set up yet, we may not be able to query the shards table
+            break Shard.default.id if Shard.default.database_server == self
+
+            shards.where(name: nil).first&.id
+          end
+        end
       end
       @primary_shard_id
     end

data/lib/switchman/shard.rb

@@ -149,9 +149,18 @@ module Switchman
         cached_shards[id]
       end
 
-      def preload_cache
-        cached_shards.reverse_merge!(active_shards.values.index_by(&:id))
-        cached_shards.reverse_merge!(all.index_by(&:id))
+      def preload_cache(shard_ids: nil)
+        if shard_ids
+          missing = shard_ids - cached_shards.keys
+          return if missing.empty?
+
+          found = where(id: missing).index_by(&:id)
+          missing.each { |id| found[id] = nil unless found.key?(id) } # cache nonexistence of shards
+          cached_shards.reverse_merge!(found)
+        else
+          cached_shards.reverse_merge!(active_shards.values.index_by(&:id))
+          cached_shards.reverse_merge!(all.index_by(&:id))
+        end
       end
 
       def clear_cache
@@ -672,6 +681,9 @@ module Switchman
       Shard.default.activate do
         Switchman.cache.delete(["shard", id].join("/"))
         Switchman.cache.delete("default_shard") if default?
+        if database_server && (self[:name].nil? || name_before_last_save.nil?)
+          Switchman.cache.delete(["db_server_primary_shard_id", database_server.id])
+        end
       end
       self.class.clear_cache
     end

data/lib/switchman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.4
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-19 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord