db-charmer 1.6.10 → 1.6.11

data/CHANGES

@@ -1,3 +1,11 @@
+1.6.11 (2010-04-16):
+
+Bugfix: Change the way we allocate sharding blocks in block map sharding method to
+prevent race-conditions from happening on block to shard assignments.
+Breaking change: We require connections to exist by default in all connection factory
+methods. If you need old behavior, pass should_exist=false explicitly.
+
+----------------------------------------------------------------------------------------
 1.6.10 (2010-04-09):
 
 Multi-Db migrations changed. Now it is possible to call ActiveRecord::Migration.db_magic

data/VERSION

@@ -1 +1 @@
-1.6.10
+1.6.11

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.10"
+  s.version = "1.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-04-09}
+  s.date = %q{2010-04-16}
   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_factory.rb

@@ -13,7 +13,7 @@ module DbCharmer
     end
 
     # Establishes connection or return an existing one from cache
-    def self.connect(connection_name, should_exist = false)
+    def self.connect(connection_name, should_exist = true)
       connection_name = connection_name.to_s
       @@connection_classes[connection_name] ||= establish_connection(connection_name, should_exist)
     end
@@ -25,7 +25,7 @@ module DbCharmer
     end
 
     # Establish connection with a specified name
-    def self.establish_connection(connection_name, should_exist = false)
+    def self.establish_connection(connection_name, should_exist = true)
       abstract_class = generate_abstract_class(connection_name, should_exist)
       DbCharmer::ConnectionProxy.new(abstract_class, connection_name)
     end
@@ -37,7 +37,7 @@ module DbCharmer
     end
 
     # Generate an abstract AR class with specified connection established
-    def self.generate_abstract_class(connection_name, should_exist = false)
+    def self.generate_abstract_class(connection_name, should_exist = true)
       # Generate class
       klass = generate_empty_abstract_ar_class(abstract_connection_class_name(connection_name))
 

data/lib/db_charmer/db_magic.rb

@@ -57,12 +57,12 @@ module DbCharmer
         self.sharded_connection = DbCharmer::Sharding.sharded_connection(name)
       end
 
-      def setup_connection_magic(conn, should_exist = false)
+      def setup_connection_magic(conn, should_exist = true)
         switch_connection_to(conn, should_exist)
         self.db_charmer_default_connection = conn
       end
 
-      def setup_slaves_magic(slaves, should_exist = false)
+      def setup_slaves_magic(slaves, should_exist = true)
         self.db_charmer_slaves = slaves.collect do |slave|
           coerce_to_connection_proxy(slave, should_exist)
         end

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

@@ -23,7 +23,7 @@ module DbCharmer
 
         def initialize(config)
           @name = config[:name] or raise(ArgumentError, "Missing required :name parameter!")
-          @connection = DbCharmer::ConnectionFactory.connect(config[:connection])
+          @connection = DbCharmer::ConnectionFactory.connect(config[:connection], true)
           @block_size = (config[:block_size] || 10000).to_i
 
           @map_table = config[:map_table] or raise(ArgumentError, "Missing required :map_table parameter!")
@@ -37,8 +37,14 @@ module DbCharmer
         def shard_for_key(key)
           block = block_for_key(key)
 
-          # Auto-allocate new blocks
-          block ||= allocate_new_block_for_key(key)
+          begin
+            # Auto-allocate new blocks
+            block ||= allocate_new_block_for_key(key)
+          rescue ActiveRecord::StatementInvalid => e
+            raise unless e.message.include?('Duplicate entry')
+            block = block_for_key(key)
+          end
+
           raise ArgumentError, "Invalid key value, no shards found for this key and could not create a new block!" unless block
 
           # Bail if no shard found
@@ -94,13 +100,13 @@ module DbCharmer
 
           # Try to insert a new mapping (ignore duplicate key errors)
           sql = <<-SQL
-            INSERT IGNORE INTO #{map_table}
-                           SET start_id = #{start_id},
-                               end_id = #{end_id},
-                               shard_id = #{shard.id},
-                               block_size = #{block_size},
-                               created_at = NOW(),
-                               updated_at = NOW()
+            INSERT INTO #{map_table}
+                   SET start_id = #{start_id},
+                       end_id = #{end_id},
+                       shard_id = #{shard.id},
+                       block_size = #{block_size},
+                       created_at = NOW(),
+                       updated_at = NOW()
           SQL
           connection.execute(sql, "Allocate new block")
 

metadata

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