master_slave_adapter_tcurdt 0.0.2 → 0.0.3

data/lib/master_slave_adapter/active_record_extensions.rb

@@ -15,9 +15,11 @@ ActiveRecord::Base.class_eval do
     # ActiveRecord::Base.with_master do
     #   User.count( :conditions => { :login => 'testuser' } )
     # end
-    def with_master
-      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.with_master do
-        yield
+    def with_master(&block)
+      if connection.respond_to? :with_master
+        connection.with_master(&block)
+      else
+        raise "no with_master"
       end
     end
 
@@ -26,9 +28,11 @@ ActiveRecord::Base.class_eval do
     # ActiveRecord::Base.with_slave do
     #   User.count( :conditions => { :login => 'testuser' } )
     # end
-    def with_slave
-      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.with_slave do
-        yield
+    def with_slave(&block)
+      if connection.respond_to? :with_slave
+        connection.with_slave(&block)
+      else
+        raise "no with_slave"
       end
     end
 
@@ -39,11 +43,25 @@ ActiveRecord::Base.class_eval do
     # consistency = ActiveRecord::Base.with_consistency(consistency) do
     #   User.count( :conditions => { :login => 'testuser' } )
     # end
-    def with_consistency(consistency)
-      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.with_consistency(consistency) do
-        yield
+    def with_consistency(clock, &block)
+      if connection.respond_to? :with_consistency
+        connection.with_consistency(clock, &block)
+      else
+        raise "no with_consistency"
+      end
+    end
+
+    def transaction_with_master(*args, &block)
+      if connection.respond_to? :transaction
+        connection.transaction do
+          transaction_without_master(*args, &block)
+        end
+      else
+        transaction_without_master(*args, &block)
       end
     end
+    alias_method_chain :transaction, :master
+
 
     def master_slave_connection( config )
       config = config.symbolize_keys
@@ -66,7 +84,7 @@ ActiveRecord::Base.class_eval do
 
       end
 
-      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.new( config )
+      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.new(config)
     end
 
     def columns_with_master
@@ -74,9 +92,7 @@ ActiveRecord::Base.class_eval do
         columns_without_master
       end
     end
-
     alias_method_chain :columns, :master
 
   end
-
 end

data/lib/master_slave_adapter/adapter.rb

@@ -1,13 +1,12 @@
 module ActiveRecord
-
   module ConnectionAdapters
-
     class MasterSlaveAdapter
 
       class Clock
         include Comparable
         attr_reader :file, :position
         def initialize(file, position)
+          raise ArgumentError, "file and postion may not be nil" if file.nil? || position.nil?
           @file, @position = file, position.to_i
         end
         def <=>(other)
@@ -19,7 +18,7 @@ module ActiveRecord
         def self.zero
           @zero ||= Clock.new('', 0)
         end
-     end
+      end
 
       SELECT_METHODS = [ :select_all, :select_one, :select_rows, :select_value, :select_values ]
 
@@ -70,12 +69,6 @@ module ActiveRecord
         end
       end
 
-      def commit_db_transaction()
-        on_write do
-          self.master_connection.commit_db_transaction()
-        end
-      end
-  
       def reconnect!
         @active = true
         self.connections.each { |c| c.reconnect! }
@@ -102,6 +95,22 @@ module ActiveRecord
         connect_to_slave
       end
 
+      def current_connection=(stack)
+        Thread.current[:master_slave_connection] = stack
+      end
+
+      def current_connection
+        Thread.current[:master_slave_connection] || []
+      end
+
+      def current_clock=(stack)
+        Thread.current[:master_slave_clock] = stack
+      end
+
+      def current_clock
+        Thread.current[:master_slave_clock] || []
+      end
+
       def connections
         [ @master_connection, @slave_connection ].compact
       end
@@ -117,39 +126,42 @@ module ActiveRecord
         end
       end
 
-      class << self
-
-        def with_master
-          Thread.current[:master_slave_select_connection] = [ :master ] + (Thread.current[:master_slave_select_connection]||[])
-          result = yield
-          Thread.current[:master_slave_select_connection] = Thread.current[:master_slave_select_connection].drop(1)
-          result
-        end
-
-        def with_slave
-          Thread.current[:master_slave_select_connection] = [ :slave ] + (Thread.current[:master_slave_select_connection]||[])
-          result = yield
-          Thread.current[:master_slave_select_connection] = Thread.current[:master_slave_select_connection].drop(1)
-          result
-        end
-
+      def with_master
+        self.current_connection = [ :master ] + self.current_connection
+        result = yield
+        self.current_connection = self.current_connection.drop(1)
+        result
+      end
 
-        def with_consistency(clock)
-          raise ArgumentError, "consistency cannot be nil" if !clock
+      def with_slave
+        self.current_connection = [ :slave ] + self.current_connection
+        result = yield
+        self.current_connection = self.current_connection.drop(1)
+        result
+      end
 
-          Thread.current[:master_slave_select_connection] = [ nil ] + (Thread.current[:master_slave_select_connection]||[])
-          Thread.current[:master_slave_clock] = [ clock || Clock::zero ] + (Thread.current[:master_slave_clock]||[])
+      def with_consistency(clock)
+        raise ArgumentError, "consistency cannot be nil" if clock.nil?
+        self.current_connection = [ nil ] + self.current_connection
+        self.current_clock = [ clock ] + self.current_clock
+        yield
+        result = current_clock[0]
+        self.current_clock = self.current_clock.drop(1)
+        self.current_connection = self.current_connection.drop(1)
+        result
+      end
 
-          yield
-          result = Thread.current[:master_slave_clock][0]
+      def transaction(*args)
+        puts "<transaction"
+        yield
+        puts "</transaction"
+        update_clock
+      end
 
-          Thread.current[:master_slave_clock] = Thread.current[:master_slave_clock].drop(1)
-          Thread.current[:master_slave_select_connection] = Thread.current[:master_slave_select_connection].drop(1)
-          result
-        end
+      class << self
 
         def reset!
-          Thread.current[:master_slave_select_connection] = nil
+          Thread.current[:master_slave_connection] = nil
           Thread.current[:master_slave_clock] = nil
         end
 
@@ -162,8 +174,8 @@ module ActiveRecord
         end
 
         def using_master?
-          if Thread.current[:master_slave_select_connection]
-            Thread.current[:master_slave_select_connection][0] == :master
+          if Thread.current[:master_slave_connection]
+            Thread.current[:master_slave_connection][0] == :master
           else
             # there is no wrapper so selects go to slave by default
             false
@@ -175,11 +187,12 @@ module ActiveRecord
       private
 
       def update_clock
+        puts " update clock"
         # update the clock, if there was problem keep using the old one
-        Thread.current[:master_slave_clock][0] = master_clock || Thread.current[:master_slave_clock][0]
+        self.current_clock[0] = master_clock || self.current_clock[0]
         # it's a write so from now on we use the master connection
         # as replication is not likely to be that fast
-        Thread.current[:master_slave_select_connection][0] = :master
+        self.current_connection[0] = :master
       end
 
       def on_write
@@ -213,13 +226,14 @@ module ActiveRecord
       end
 
       def select_connection
-        connection_stack = Thread.current[:master_slave_select_connection] ||= []
-        clock_stack = Thread.current[:master_slave_clock] ||= []
+        connection_stack = self.current_connection
+        clock_stack = self.current_clock
 
         # pick the right connection
         if MasterSlaveAdapter.master_forced? || @master_connection.open_transactions > 0
           connection_stack[0] = :master
         end
+
         connection_stack[0] ||= connection_for_clock(clock_stack[0])
 
         # return the current connection
@@ -231,13 +245,17 @@ module ActiveRecord
       end
 
       def master_clock
-        if status = connect_to_master.select_one("SHOW MASTER STATUS")
+        puts " master clock"
+        connection = connect_to_master
+        if status = connection.uncached { connection.select_one("SHOW MASTER STATUS") }
           Clock.new(status['File'], status['Position'])
         end
       end
 
       def slave_clock
-        if status = connect_to_slave.select_one("SHOW SLAVE STATUS")
+        puts " slave clock"
+        connection = connect_to_slave
+        if status = connection.uncached { connection.select_one("SHOW SLAVE STATUS") }
           Clock.new(status['Relay_Master_Log_File'], status['Exec_Master_Log_Pos'])
         end
       end
@@ -251,7 +269,5 @@ module ActiveRecord
       end
 
     end
-
   end
-
 end

data/lib/master_slave_adapter/version.rb

@@ -1,3 +1,3 @@
 module MasterSlaveAdapter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/specs/specs.rb

@@ -42,6 +42,13 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
     @master_connection = ActiveRecord::Base._master
     @slave_connection = ActiveRecord::Base._slave
 
+    @master_connection.stub!(:uncached) do |block|
+      block.call
+    end
+    @slave_connection.stub!(:uncached) do |block|
+      block.call
+    end 
+
   end
 
   after do
@@ -50,7 +57,6 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
 
   describe 'with common configuration' do
 
-
     before do
 
       @database_setup = {
@@ -241,7 +247,7 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
       if pos.instance_of? Fixnum
         pos = [ pos ]
       end
-      values = pos.map { |p| { 'Master_Log_File' => '', 'Exec_Master_Log_Pos' => p } }
+      values = pos.map { |p| { 'Relay_Master_Log_File' => '', 'Exec_Master_Log_Pos' => p } }
       @slave_connection.should_receive('select_one').exactly(pos.length).with('SHOW SLAVE STATUS').and_return(*values)
     end
 
@@ -307,9 +313,9 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
         @master_connection.should_receive(method).with('testing').and_return(true)
         old_clock = zero
         new_clock = ActiveRecord::Base.with_consistency(old_clock) do
-          ActiveRecord::Base.connection.send(method, 'testing')
-          ActiveRecord::Base.connection.send('update', 'testing')
-          ActiveRecord::Base.connection.send(method, 'testing')
+          ActiveRecord::Base.connection.send(method, 'testing')   # slave
+          ActiveRecord::Base.connection.send('update', 'testing') # master
+          ActiveRecord::Base.connection.send(method, 'testing')   # master
         end
         new_clock.should be_a(zero.class)
         new_clock.should > old_clock
@@ -317,6 +323,42 @@ describe ActiveRecord::ConnectionAdapters::MasterSlaveAdapter do
 
     end
 
+    it "should update the clock after a transaction" do
+      ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.reset!
+      slave_should_report_clock(0)
+      master_should_report_clock([0, 1, 1, 1, 1])
+      @slave_connection.should_receive('select_all').exactly(1).times.with('testing').and_return(true)
+      @master_connection.should_receive('update').exactly(3).times.with('testing').and_return(true)
+      # @master_connection.should_receive('transaction').and_return(true)
+      @master_connection.should_receive('select_all').exactly(5).times.with('testing').and_return(true)
+
+      old_clock = zero
+      new_clock = ActiveRecord::Base.with_consistency(old_clock) do
+        puts "slave: select"
+        ActiveRecord::Base.connection.send('select_all', 'testing') # slave  s=0 m=0
+        puts "master: update"
+        ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=1
+        puts "master: select"
+        ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
+
+        ActiveRecord::Base.transaction do
+          puts "master: select"
+          ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
+          puts "master: update"
+          ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=1
+          puts "master: select"
+          ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=1
+        end
+
+        puts "master: select"
+        ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=2
+        puts "master: update"
+        ActiveRecord::Base.connection.send('update', 'testing')     # master s=0 m=3
+        puts "master: select"
+        ActiveRecord::Base.connection.send('select_all', 'testing') # master s=0 m=3
+      end
+    end
+
     it "should do the right thing when nested inside with_consistency" do
       ActiveRecord::ConnectionAdapters::MasterSlaveAdapter.reset!
       slave_should_report_clock([ 0, 0 ])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mauricio Linhares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency