ar-octopus 0.0.20 → 0.0.21

data/Rakefile

@@ -29,7 +29,7 @@ begin
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.20"
+    gem.version = "0.0.21"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
-  s.date = %q{2010-07-07}
+  s.date = %q{2010-07-08}
   s.description = %q{This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.}
   s.email = %q{tchandy@gmail.com}
   s.extra_rdoc_files = [

data/lib/octopus/migration.rb

@@ -4,23 +4,16 @@ module Octopus::Migration
       alias_method_chain :migrate, :octopus
     end
   end
-  
+
   def using(*args, &block)
     Octopus.config()
 
     args.each do |shard|
-      if !ActiveRecord::Base.using(shard).connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
-        ActiveRecord::Base.using(shard).connection.initialize_schema_migrations_table 
-      end
-    end
-
-    if args.size == 1
-      self.connection().block = true
-      self.connection().current_shard = args.first
-    else
-      self.connection().current_shard = args        
+      self.connection().check_schema_migrations(shard)
     end
 
+    self.connection().block = true
+    self.connection().current_shard = args        
 
     yield if block_given?
 
@@ -29,36 +22,36 @@ module Octopus::Migration
 
   def using_group(*args)
     Octopus.config()
-
+    
     args.each do |group_shard|
       shards = self.connection().instance_variable_get(:@groups)[group_shard] || []
 
       shards.each do |shard|
-        if !ActiveRecord::Base.using(shard).connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
-          ActiveRecord::Base.using(shard).connection.initialize_schema_migrations_table 
-        end
+        self.connection().check_schema_migrations(shard)
       end
     end
 
-    if args.size == 1
-      self.connection().block = true
-      self.connection().current_group = args.first
-    else
-      self.connection().current_group = args
-    end
+    self.connection().block = true
+    self.connection().current_group = args
 
     return self
   end
-  
+
   def migrate_with_octopus(direction)
-    ret = migrate_without_octopus(direction)
-    # This Cleans the proxy
-    # TODO - REFACTOR!
-    ActiveRecord::Base.connection.instance_variable_set(:@current_shard, :master)
-    ActiveRecord::Base.connection.instance_variable_set(:@current_group, nil)
-    ActiveRecord::Base.connection().block = false
+    conn = ActiveRecord::Base.connection
+    groups = conn.instance_variable_get(:@groups)
+    
+    if conn.current_group.is_a?(Array)
+      conn.current_group.each { |group| conn.send_queries_to_multiple_shards(groups[group]) { migrate_without_octopus(direction) } } 
+    elsif conn.current_group.is_a?(Symbol)       
+      conn.send_queries_to_multiple_shards(groups[conn.current_group]) { migrate_without_octopus(direction) }     
+    elsif conn.current_shard.is_a?(Array)
+      conn.send_queries_to_multiple_shards(conn.current_shard) { migrate_without_octopus(direction) }     
+    else
+      migrate_without_octopus(direction)
+    end
 
-    return ret
+    conn.clean_proxy()
   end
 end
 

data/lib/octopus/proxy.rb

@@ -70,24 +70,36 @@ class Octopus::Proxy
   def shard_name
     current_shard.is_a?(Array) ? current_shard.first : current_shard
   end
+  
+  def run_queries_on_shard(shard, &block)
+    older_shard = self.current_shard
+    self.block = true
+    self.current_shard = shard
 
-  def add_transaction_record(record)
-    if !select_connection().instance_variable_get(:@_current_transaction_records).nil?
-      select_connection().add_transaction_record(record)
+    begin
+      yield
+    ensure
+      self.block = false
+      self.current_shard = older_shard
     end
   end
-
-  def transaction(options = {}, &block)
-    if should_send_queries_to_multiple_shards?
-      self.send_transaction_to_multiple_shards(current_shard, options, &block)
-    elsif should_send_queries_to_multiple_groups?
-      self.send_transaction_to_multiple_groups(options, &block)
-      @current_group = nil      
-    elsif should_send_queries_to_a_group_of_shards?
-      self.send_transaction_to_multiple_shards(@groups[current_group], options, &block)
-      @current_group = nil      
-    else
-      select_connection.transaction(options, &block) 
+  
+  def send_queries_to_multiple_shards(shards, &block)
+    shards.each do |shard|
+      self.run_queries_on_shard(shard, &block)
+    end
+  end
+  
+  def clean_proxy()
+    @using_enabled = nil
+    @current_shard = :master
+    @current_group = nil
+    @block = false
+  end
+  
+  def check_schema_migrations(shard)
+    if !ActiveRecord::Base.using(shard).connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
+      ActiveRecord::Base.using(shard).connection.initialize_schema_migrations_table 
     end
   end
 
@@ -95,35 +107,15 @@ class Octopus::Proxy
     if should_clean_connection?(method)
       conn = select_connection()
       self.last_current_shard = self.current_shard
-      self.current_shard = :master
-      @using_enabled = nil
+      clean_proxy()
       conn.send(method, *args, &block)
     elsif should_send_queries_to_replicated_databases?(method)
       send_queries_to_selected_slave(method, *args, &block)      
-    elsif should_send_queries_to_multiple_groups?
-      send_queries_to_multiple_groups(method, *args, &block)
-    elsif should_send_queries_to_multiple_shards?
-      send_queries_to_shards(current_shard, method, *args, &block)
-    elsif should_send_queries_to_a_group_of_shards?
-      send_queries_to_shards(@groups[current_group], method, *args, &block)
     else
       select_connection().send(method, *args, &block)
     end
   end
 
-  def run_queries_on_shard(shard, &block)
-    older_shard = self.current_shard
-    self.block = true
-    self.current_shard = shard
-
-    begin
-      yield
-    ensure
-      self.block = false
-      self.current_shard = older_shard
-    end
-  end
-
   protected
   def connection_pool_for(adapter, config)
     ActiveRecord::ConnectionAdapters::ConnectionPool.new(ActiveRecord::Base::ConnectionSpecification.new(adapter, config))
@@ -143,19 +135,7 @@ class Octopus::Proxy
   end
 
   def should_clean_connection?(method)
-    method.to_s =~ /insert|select|execute/ && !should_send_queries_to_multiple_shards? && !self.current_group && !@replicated && !self.block
-  end
-
-  def should_send_queries_to_multiple_shards?
-    current_shard.is_a?(Array)
-  end
-
-  def should_send_queries_to_multiple_groups?
-    current_group.is_a?(Array)
-  end
-
-  def should_send_queries_to_a_group_of_shards?
-    !current_group.nil?
+    method.to_s =~ /insert|select|execute/ && !self.current_group && !@replicated && !self.block
   end
 
   def should_send_queries_to_replicated_databases?(method)
@@ -166,26 +146,6 @@ class Octopus::Proxy
     !config[Octopus.env()].nil?
   end
 
-  def send_queries_to_multiple_groups(method, *args, &block)
-    method_return = nil
-
-    current_group.each do |group_symbol|
-      method_return = self.send_queries_to_shards(@groups[group_symbol], method, *args, &block)
-    end
-
-    return method_return
-  end
-
-  def send_queries_to_shards(shard_array, method, *args, &block)
-    method_return = nil
-
-    shard_array.each do |shard_symbol|
-      method_return = @shards[shard_symbol].connection().send(method, *args, &block) 
-    end
-
-    return method_return
-  end
-
   def send_queries_to_selected_slave(method, *args, &block)        
     old_shard = self.current_shard
 
@@ -203,16 +163,4 @@ class Octopus::Proxy
     @using_enabled = nil
     return sql    
   end
-
-  def send_transaction_to_multiple_shards(shard_array, options, &block)
-    shard_array.each do |shard_symbol|
-      @shards[shard_symbol].connection().transaction(options, &block)
-    end
-  end
-
-  def send_transaction_to_multiple_groups(options, &block)
-    current_group.each do |group_symbol|
-      self.send_transaction_to_multiple_shards(@groups[group_symbol], options, &block)
-    end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -03:00
+date: 2010-07-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency