db-charmer 1.6.11 → 1.6.12

data/CHANGES

@@ -1,3 +1,12 @@
+1.6.12 (2010-05-09):
+
+Starting with this version we use Rails.cache (memcache or whatever you use in your project)
+to cache sharding blocks information.
+
+Bugfixes: Thanks to Allen Madsen (github user blatyo) we've fixed a few minor issues in
+database connections handling.
+
+----------------------------------------------------------------------------------------
 1.6.11 (2010-04-16):
 
 Bugfix: Change the way we allocate sharding blocks in block map sharding method to

data/VERSION

@@ -1 +1 @@
-1.6.11
+1.6.12

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.11"
+  s.version = "1.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-05-09}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer/connection_proxy.rb

@@ -10,6 +10,10 @@ module DbCharmer
       @db_name
     end
 
+    def db_charmer_connection_proxy
+      self
+    end
+
     def method_missing(meth, *args, &block)
       @abstract_connection_class.retrieve_connection.send(meth, *args, &block)
     end

data/lib/db_charmer/connection_switch.rb

@@ -10,8 +10,8 @@ module DbCharmer
 
         if conn.kind_of?(Hash)
           conn = conn.symbolize_keys
-          raise ArgumentError, "Missing required :name parameter" unless conn[:name]
-          return DbCharmer::ConnectionFactory.connect_to_db(conn[:name], conn)
+          raise ArgumentError, "Missing required :connection_name parameter" unless conn[:connection_name]
+          return DbCharmer::ConnectionFactory.connect_to_db(conn[:connection_name], conn)
         end
 
         if conn.respond_to?(:db_charmer_connection_proxy)

data/lib/db_charmer/db_magic.rb

@@ -6,7 +6,7 @@ module DbCharmer
         hijack_connection!
 
         # Should requested connections exist in the config?
-        should_exist = opt[:should_exist] || DbCharmer.connections_should_exist?
+        should_exist = opt.has_key?(:should_exist) ? opt[:should_exist] : DbCharmer.connections_should_exist?
 
         # Main connection management
         setup_connection_magic(opt[:connection], should_exist)

data/lib/db_charmer/multi_db_migrations.rb

@@ -30,7 +30,7 @@ module DbCharmer
     end
 
     def on_db(db_name)
-      name = db_name.is_a?(Hash) ? db_name[:name] : db_name.inspect
+      name = db_name.is_a?(Hash) ? db_name[:connection_name] : db_name.inspect
       announce "Switching connection to #{name}"
       # Switch connection
       old_proxy = ActiveRecord::Base.db_charmer_connection_proxy

data/lib/db_charmer/sharding/method/db_block_map.rb

@@ -31,7 +31,9 @@ module DbCharmer
 
           # Local caches
           @shard_info_cache = {}
-          @blocks_cache = {}
+
+          @blocks_cache = Rails.cache
+          @blocks_cache_prefix = config[:blocks_cache_prefix] || "#{@name}_block:"
         end
 
         def shard_for_key(key)
@@ -69,13 +71,29 @@ module DbCharmer
           # Cleanup the cache if asked to
           key_range = [ block_start_for_key(key), block_end_for_key(key) ]
           block_cache_key = "%d-%d" % key_range
-          @blocks_cache[block_cache_key] = nil unless cache
+
+          if cache
+            cached_block = get_cached_block(block_cache_key)
+            return cached_block if cached_block
+          end
 
           # Fetch cached value or load from db
-          @blocks_cache[block_cache_key] ||= begin
+          block = begin
             sql = "SELECT * FROM #{map_table} WHERE start_id = #{key_range.first} AND end_id = #{key_range.last} LIMIT 1"
             connection.select_one(sql, 'Find a shard block')
           end
+          
+          set_cached_block(block_cache_key, block)
+
+          return block
+        end
+
+        def get_cached_block(block_cache_key)
+          @blocks_cache.read("#{@blocks_cache_prefix}#{block_cache_key}")
+        end
+
+        def set_cached_block(block_cache_key, block)
+          @blocks_cache.write("#{@blocks_cache_prefix}#{block_cache_key}", block)
         end
 
         # Load shard info
@@ -144,7 +162,7 @@ module DbCharmer
           # FIXME: Find a better way, maybe move config method to our ar extenstions
           connection.instance_variable_get(:@config).clone.merge(
             # Name for the connection factory
-            :name => shard_name,
+            :connection_name => shard_name,
             # Connection params
             :host => shard.db_host,
             :port => shard.db_port,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 11
-  version: 1.6.11
+  - 12
+  version: 1.6.12
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
+date: 2010-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency