master_slave_adapter 1.0.0.beta1 → 1.0.0.beta2

data/spec/mysql_master_slave_adapter_spec.rb

@@ -1,21 +1,9 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
-
-class Mysql
-  class Error
-    CR_CONNECTION_ERROR   = 1
-    CR_CONN_HOST_ERROR    = 2
-    CR_SERVER_GONE_ERROR  = 4
-    CR_SERVER_LOST        = 8
-  end
-end
-
+require 'logger'
 require 'active_record/connection_adapters/mysql_master_slave_adapter'
 
-ActiveRecord::Base.logger =
-  Logger.new($stdout).tap { |l| l.level = Logger::DEBUG }
-
 module ActiveRecord
   class Base
     cattr_accessor :master_mock, :slave_mock
@@ -26,7 +14,7 @@ module ActiveRecord
 end
 
 describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
-  let(:default_database_setup) do
+  let(:database_setup) do
     {
       :adapter => 'master_slave',
       :username => 'root',
@@ -37,13 +25,11 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
     }
   end
 
-  let(:database_setup) { default_database_setup }
-
   let(:mocked_methods) do
     {
-      :reconnect! => true,
+      :reconnect!  => true,
       :disconnect! => true,
-      :active? => true,
+      :active?     => true,
     }
   end
 
@@ -68,8 +54,8 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
     ActiveRecord::Base.connection
   end
 
-  SelectMethods = [ :select_all, :select_one, :select_rows, :select_value, :select_values ]
-  Clock = ActiveRecord::ConnectionAdapters::MasterSlaveAdapter::Clock
+  SelectMethods = [ :select_all, :select_one, :select_rows, :select_value, :select_values ] unless defined?(SelectMethods)
+  Clock = ActiveRecord::ConnectionAdapters::MasterSlaveAdapter::Clock unless defined?(Clock)
 
   before do
     ActiveRecord::Base.establish_connection(database_setup)
@@ -88,20 +74,31 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
       Clock.new('', pos)
     end
 
-    def slave_should_report_clock(pos)
+    def supports_prepared_statements?
+      ActiveRecord::ConnectionAdapters::MysqlAdapter.instance_methods.map(&:to_sym).include?(:exec_without_stmt)
+    end
+
+    def select_method
+      supports_prepared_statements? ? :exec_without_stmt : :select_one
+    end
+
+    def should_report_clock(pos, connection, log_file, log_pos, sql)
       pos = Array(pos)
-      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').
+      values = pos.map { |p| { log_file => '', log_pos => p } }
+      values.map! { |result| [ result ] } if supports_prepared_statements?
+
+      connection.
+        should_receive(select_method).exactly(pos.length).times.
+        with(sql).
         and_return(*values)
     end
 
+    def slave_should_report_clock(pos)
+      should_report_clock(pos, slave_connection, 'Relay_Master_Log_File', 'Exec_Master_Log_Pos', 'SHOW SLAVE STATUS')
+    end
+
     def master_should_report_clock(pos)
-      pos = Array(pos)
-      values = pos.map { |p| { 'File' => '', 'Position' => p } }
-      master_connection.
-        should_receive('select_one').exactly(pos.length).with('SHOW MASTER STATUS').
-        and_return(*values)
+      should_report_clock(pos, master_connection, 'File', 'Position', 'SHOW MASTER STATUS')
     end
 
     SelectMethods.each do |method|
@@ -152,12 +149,12 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
         slave_should_report_clock(0)
         master_should_report_clock(2)
         slave_connection.should_receive(method).with('testing').and_return(true)
-        master_connection.should_receive('update').with('testing').and_return(true)
+        master_connection.should_receive(:update).with('testing').and_return(true)
         master_connection.should_receive(method).with('testing').and_return(true)
         old_clock = zero
         new_clock = ActiveRecord::Base.with_consistency(old_clock) do
           adapter_connection.send(method, 'testing')   # slave
-          adapter_connection.send('update', 'testing') # master
+          adapter_connection.send(:update, 'testing') # master
           adapter_connection.send(method, 'testing')   # master
         end
         new_clock.should be_a(Clock)
@@ -170,14 +167,14 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
       master_should_report_clock([0, 1, 1])
 
       slave_connection.
-        should_receive('select_all').exactly(1).times.with('testing').
+        should_receive(:select_all).exactly(1).times.with('testing').
         and_return(true)
 
       master_connection.
-        should_receive('update').exactly(3).times.with('testing').
+        should_receive(:update).exactly(3).times.with('testing').
         and_return(true)
       master_connection.
-        should_receive('select_all').exactly(5).times.with('testing').
+        should_receive(:select_all).exactly(5).times.with('testing').
         and_return(true)
       %w(begin_db_transaction
          commit_db_transaction
@@ -204,19 +201,19 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
 
       old_clock = zero
       new_clock = ActiveRecord::Base.with_consistency(old_clock) do
-        adapter_connection.send('select_all', 'testing') # slave  s=0 m=0
-        adapter_connection.send('update', 'testing')     # master s=0 m=1
-        adapter_connection.send('select_all', 'testing') # master s=0 m=1
+        adapter_connection.send(:select_all, 'testing') # slave  s=0 m=0
+        adapter_connection.send(:update, 'testing')     # master s=0 m=1
+        adapter_connection.send(:select_all, 'testing') # master s=0 m=1
 
         ActiveRecord::Base.transaction do
-          adapter_connection.send('select_all', 'testing') # master s=0 m=1
-          adapter_connection.send('update', 'testing')     # master s=0 m=1
-          adapter_connection.send('select_all', 'testing') # master s=0 m=1
+          adapter_connection.send(:select_all, 'testing') # master s=0 m=1
+          adapter_connection.send(:update, 'testing')     # master s=0 m=1
+          adapter_connection.send(:select_all, 'testing') # master s=0 m=1
         end
 
-        adapter_connection.send('select_all', 'testing') # master s=0 m=2
-        adapter_connection.send('update', 'testing')     # master s=0 m=3
-        adapter_connection.send('select_all', 'testing') # master s=0 m=3
+        adapter_connection.send(:select_all, 'testing') # master s=0 m=2
+        adapter_connection.send(:update, 'testing')     # master s=0 m=3
+        adapter_connection.send(:select_all, 'testing') # master s=0 m=3
       end
 
       new_clock.should > old_clock
@@ -224,18 +221,18 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
 
     context "with nested with_consistency" do
       it "should return the same clock if not writing and no lag" do
-        slave_should_report_clock(0) # note: tests memoizing slave clock
+        slave_should_report_clock(0)
         slave_connection.
-          should_receive('select_one').exactly(3).times.with('testing').
+          should_receive(:select_one).exactly(3).times.with('testing').
           and_return(true)
 
         old_clock = zero
         new_clock = ActiveRecord::Base.with_consistency(old_clock) do
-          adapter_connection.send('select_one', 'testing')
+          adapter_connection.send(:select_one, 'testing')
           ActiveRecord::Base.with_consistency(old_clock) do
-            adapter_connection.send('select_one', 'testing')
+            adapter_connection.send(:select_one, 'testing')
           end
-          adapter_connection.send('select_one', 'testing')
+          adapter_connection.send(:select_one, 'testing')
         end
         new_clock.should equal(old_clock)
       end
@@ -245,20 +242,20 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
           should_receive('slave_consistent?').exactly(2).times.
           and_return(true, false)
         slave_connection.
-          should_receive('select_all').exactly(2).times.with('testing').
+          should_receive(:select_all).exactly(2).times.with('testing').
           and_return(true)
         master_connection.
-          should_receive('select_all').exactly(1).times.with('testing').
+          should_receive(:select_all).exactly(1).times.with('testing').
           and_return(true)
 
         start_clock = zero
         inner_clock = zero
         outer_clock = ActiveRecord::Base.with_consistency(start_clock) do
-          adapter_connection.send('select_all', 'testing') # slave
+          adapter_connection.send(:select_all, 'testing') # slave
           inner_clock = ActiveRecord::Base.with_consistency(master_position(1)) do
-            adapter_connection.send('select_all', 'testing') # master
+            adapter_connection.send(:select_all, 'testing') # master
           end
-          adapter_connection.send('select_all', 'testing') # slave
+          adapter_connection.send(:select_all, 'testing') # slave
         end
 
         start_clock.should equal(outer_clock)
@@ -268,53 +265,100 @@ describe ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter do
 
     it "should do the right thing when nested inside with_master" do
       slave_should_report_clock(0)
-      slave_connection.should_receive('select_all').exactly(1).times.with('testing').and_return(true)
-      master_connection.should_receive('select_all').exactly(2).times.with('testing').and_return(true)
+      slave_connection.should_receive(:select_all).exactly(1).times.with('testing').and_return(true)
+      master_connection.should_receive(:select_all).exactly(2).times.with('testing').and_return(true)
       ActiveRecord::Base.with_master do
-        adapter_connection.send('select_all', 'testing') # master
+        adapter_connection.send(:select_all, 'testing') # master
         ActiveRecord::Base.with_consistency(zero) do
-          adapter_connection.send('select_all', 'testing') # slave
+          adapter_connection.send(:select_all, 'testing') # slave
         end
-        adapter_connection.send('select_all', 'testing') # master
+        adapter_connection.send(:select_all, 'testing') # master
       end
     end
 
     it "should do the right thing when nested inside with_slave" do
       slave_should_report_clock(0)
-      slave_connection.should_receive('select_all').exactly(3).times.with('testing').and_return(true)
+      slave_connection.should_receive(:select_all).exactly(3).times.with('testing').and_return(true)
       ActiveRecord::Base.with_slave do
-        adapter_connection.send('select_all', 'testing') # slave
+        adapter_connection.send(:select_all, 'testing') # slave
         ActiveRecord::Base.with_consistency(zero) do
-          adapter_connection.send('select_all', 'testing') # slave
+          adapter_connection.send(:select_all, 'testing') # slave
         end
-        adapter_connection.send('select_all', 'testing') # slave
+        adapter_connection.send(:select_all, 'testing') # slave
       end
     end
 
     it "should do the right thing when wrapping with_master" do
       slave_should_report_clock(0)
-      slave_connection.should_receive('select_all').exactly(2).times.with('testing').and_return(true)
-      master_connection.should_receive('select_all').exactly(1).times.with('testing').and_return(true)
+      slave_connection.should_receive(:select_all).exactly(2).times.with('testing').and_return(true)
+      master_connection.should_receive(:select_all).exactly(1).times.with('testing').and_return(true)
       ActiveRecord::Base.with_consistency(zero) do
-        adapter_connection.send('select_all', 'testing') # slave
+        adapter_connection.send(:select_all, 'testing') # slave
         ActiveRecord::Base.with_master do
-          adapter_connection.send('select_all', 'testing') # master
+          adapter_connection.send(:select_all, 'testing') # master
         end
-        adapter_connection.send('select_all', 'testing') # slave
+        adapter_connection.send(:select_all, 'testing') # slave
       end
     end
 
     it "should do the right thing when wrapping with_slave" do
       slave_should_report_clock(0)
-      slave_connection.should_receive('select_all').exactly(1).times.with('testing').and_return(true)
-      master_connection.should_receive('select_all').exactly(2).times.with('testing').and_return(true)
+      slave_connection.should_receive(:select_all).exactly(1).times.with('testing').and_return(true)
+      master_connection.should_receive(:select_all).exactly(2).times.with('testing').and_return(true)
       ActiveRecord::Base.with_consistency(master_position(1)) do
-        adapter_connection.send('select_all', 'testing') # master
+        adapter_connection.send(:select_all, 'testing') # master
         ActiveRecord::Base.with_slave do
-          adapter_connection.send('select_all', 'testing') # slave
+          adapter_connection.send(:select_all, 'testing') # slave
         end
-        adapter_connection.send('select_all', 'testing') # master
+        adapter_connection.send(:select_all, 'testing') # master
+      end
+    end
+
+    it "should accept clock as string" do
+      slave_should_report_clock(0)
+      slave_connection.should_receive(:select_all).with('testing')
+
+      ActiveRecord::Base.with_consistency("@0") do
+        adapter_connection.send(:select_all, 'testing')
       end
     end
   end # /with_consistency
+
+  describe "connection error detection" do
+    {
+      Mysql::Error::CR_CONNECTION_ERROR   => "query: not connected",
+      Mysql::Error::CR_CONN_HOST_ERROR    => "Can't connect to MySQL server on 'localhost' (3306)",
+      Mysql::Error::CR_SERVER_GONE_ERROR  => "MySQL server has gone away",
+      Mysql::Error::CR_SERVER_LOST        => "Lost connection to MySQL server during query",
+    }.each do |errno, description|
+      it "raises MasterUnavailable for '#{description}' during query execution" do
+        master_connection.stub_chain(:raw_connection, :errno).and_return(errno)
+        master_connection.should_receive(:insert).and_raise(ActiveRecord::StatementInvalid.new("Mysql::Error: #{description}: INSERT 42"))
+
+        expect do
+          adapter_connection.insert("INSERT 42")
+        end.to raise_error(ActiveRecord::MasterUnavailable)
+      end
+
+      it "doesn't raise anything for '#{description}' during connection" do
+        error = Mysql::Error.new(description)
+        error.stub(:errno).and_return(errno)
+        ActiveRecord::Base.should_receive(:master_mock).and_raise(error)
+
+        expect do
+          ActiveRecord::Base.connection_handler.clear_all_connections!
+          ActiveRecord::Base.connection
+        end.to_not raise_error
+      end
+    end
+
+    it "raises StatementInvalid for other errors" do
+      master_connection.stub_chain(:raw_connection, :errno).and_return(Mysql::Error::ER_QUERY_INTERRUPTED)
+      master_connection.should_receive(:insert).and_raise(ActiveRecord::StatementInvalid.new("Mysql::Error: Query execution was interrupted: INSERT 42"))
+
+      expect do
+        adapter_connection.insert("INSERT 42")
+      end.to raise_error(ActiveRecord::StatementInvalid)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_slave_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -15,24 +15,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.3.9
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.9
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -50,21 +56,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.9
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: '0'
 description: (MySQL) Replication Aware Master/Slave Database Adapter for ActiveRecord
 email: kim@soundcloud.com tcurdt@soundcloud.com ts@soundcloud
 executables: []
@@ -72,22 +78,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - Rakefile
 - Readme.md
-- TODO.txt
 - lib/active_record/connection_adapters/master_slave_adapter.rb
 - lib/active_record/connection_adapters/master_slave_adapter/circuit_breaker.rb
 - lib/active_record/connection_adapters/master_slave_adapter/clock.rb
+- lib/active_record/connection_adapters/master_slave_adapter/shared_mysql_adapter_behavior.rb
 - lib/active_record/connection_adapters/master_slave_adapter/version.rb
+- lib/active_record/connection_adapters/mysql2_master_slave_adapter.rb
 - lib/active_record/connection_adapters/mysql_master_slave_adapter.rb
 - lib/master_slave_adapter.rb
 - master_slave_adapter.gemspec
+- spec/all.sh
 - spec/circuit_breaker_spec.rb
+- spec/gemfiles/activerecord2.3
+- spec/gemfiles/activerecord3.0
+- spec/gemfiles/activerecord3.2
+- spec/integration/helpers/mysql_helper.rb
+- spec/integration/helpers/shared_mysql_examples.rb
+- spec/integration/mysql2_master_slave_adapter_spec.rb
+- spec/integration/mysql_master_slave_adapter_spec.rb
 - spec/master_slave_adapter_spec.rb
+- spec/mysql2_master_slave_adapter_spec.rb
 - spec/mysql_master_slave_adapter_spec.rb
 homepage: http://github.com/soundcloud/master_slave_adapter
 licenses: []
@@ -109,11 +125,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Replication Aware Master/Slave Database Adapter for ActiveRecord
 test_files:
+- spec/all.sh
 - spec/circuit_breaker_spec.rb
+- spec/gemfiles/activerecord2.3
+- spec/gemfiles/activerecord3.0
+- spec/gemfiles/activerecord3.2
+- spec/integration/helpers/mysql_helper.rb
+- spec/integration/helpers/shared_mysql_examples.rb
+- spec/integration/mysql2_master_slave_adapter_spec.rb
+- spec/integration/mysql_master_slave_adapter_spec.rb
 - spec/master_slave_adapter_spec.rb
+- spec/mysql2_master_slave_adapter_spec.rb
 - spec/mysql_master_slave_adapter_spec.rb

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gemspec

data/TODO.txt

@@ -1,18 +0,0 @@
-Read only mode
---------------
-
-- Write tests
-  - Clock.parse
-  - connection_error (integration test)
-  - integration tests
-  - with_consistency accepts string clock
-  - raise MasterUnavailable in all cases
-  - connection stack usage
-
-- Check
-  - thread safety
-  - AR reconnect behavior / connection check
-  - replication in other databases
-
-- restructure MasterSlaveAdapter with proper namespaces
-- make clock private