rubyrep 1.0.5 → 1.0.6

data/spec/noisy_connection_spec.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+include RR
+
+describe NoisyConnection do
+  before(:each) do
+    Initializer.configuration = proxied_config
+    @connection = ProxyConnection.new Initializer.configuration.left
+    @connection.send(:extend, NoisyConnection)
+    @connection.sweeper = TaskSweeper.new(1)
+  end
+
+  it "select_cursor should return correct results" do
+    @connection.sweeper.should_receive(:ping).exactly(4).times
+    fetcher = @connection.select_cursor(:table => 'scanner_records')
+    row = fetcher.next_row
+    row.should == {
+      'id' => '1',
+      'name' => 'Alice - exists in both databases'
+    }
+  end
+
+  it "insert_record should write nil values correctly" do
+    @connection.sweeper.should_receive(:ping).exactly(2).times
+    @connection.begin_db_transaction
+    begin
+      @connection.insert_record('extender_combined_key', 'first_id' => 8, 'second_id' => '9', 'name' => nil)
+      @connection.select_one(
+        "select first_id, second_id, name
+         from extender_combined_key where (first_id, second_id) = (8, 9)") \
+        .should == {'first_id' => '8', 'second_id' => '9', "name" => nil}
+    ensure
+      @connection.rollback_db_transaction
+    end
+  end
+
+  it "update_record should update the specified record" do
+    @connection.sweeper.should_receive(:ping).exactly(2).times
+    @connection.begin_db_transaction
+    begin
+      @connection.update_record('scanner_records', 'id' => 1, 'name' => 'update_test')
+      @connection.select_one("select * from scanner_records where id = 1") \
+        .should == {'id' => '1', 'name' => 'update_test'}
+    ensure
+      @connection.rollback_db_transaction
+    end
+  end
+
+  it "delete_record should delete the specified record" do
+    @connection.sweeper.should_receive(:ping).exactly(2).times
+    @connection.begin_db_transaction
+    begin
+      @connection.delete_record('extender_combined_key', 'first_id' => 1, 'second_id' => '1', 'name' => 'xy')
+      @connection.select_one(
+        "select first_id, second_id, name
+         from extender_combined_key where (first_id, second_id) = (1, 1)") \
+        .should be_nil
+    ensure
+      @connection.rollback_db_transaction
+    end
+  end
+
+  it "commit_db_transaction should update TaskSweeper" do
+    @connection.begin_db_transaction
+    initializer = ReplicationInitializer.new Session.new(standard_config)
+    begin
+      @connection.execute "insert into scanner_records(id,name) values(99, 'bla')"
+      @connection.sweeper.should_receive(:ping).exactly(2).times
+      @connection.commit_db_transaction
+      initializer.silence_ddl_notices(:left) do # avoid PostgreSQL warning that no transaction is open
+        @connection.rollback_db_transaction
+      end
+      @connection.select_one("select name from scanner_records where id = 99")['name'].
+        should == 'bla'
+    ensure
+      @connection.execute "delete from scanner_records where id = 99"
+    end
+  end
+
+end

data/spec/proxy_connection_spec.rb

@@ -22,17 +22,6 @@ describe ProxyConnection do
     @connection.connection.active?.should == false
   end
 
-  it "refresh should not do anything if the connection is still active" do
-    ConnectionExtenders.should_not_receive(:db_connect)
-    @connection.refresh
-  end
-
-  it "refresh should reestablish the connection if it is no more active" do
-    @connection.destroy
-    @connection.refresh
-    @connection.connection.should be_active
-  end
-  
   it "cursors should return the current cursor hash or an empty hash if nil" do
     @connection.cursors.should == {}
     @connection.cursors[:dummy_cursor] = :dummy_cursor

data/spec/replication_difference_spec.rb

@@ -7,21 +7,22 @@ describe ReplicationDifference do
     Initializer.configuration = standard_config
   end
 
-  it "initialize should store the session" do
+  it "initialize should store the loaders" do
     session = Session.new
-    diff = ReplicationDifference.new session
-    diff.session.should == session
+    loaders = LoggedChangeLoaders.new session
+    diff = ReplicationDifference.new loaders
+    diff.loaders.should == loaders
   end
 
   it "loaded? should return true if a difference was loaded" do
-    diff = ReplicationDifference.new Session.new
+    diff = ReplicationDifference.new LoggedChangeLoaders.new(Session.new)
     diff.should_not be_loaded
     diff.loaded = true
     diff.should be_loaded
   end
 
   it "load should leave the instance unloaded if no changes are available" do
-    diff = ReplicationDifference.new Session.new
+    diff = ReplicationDifference.new LoggedChangeLoaders.new(Session.new)
     diff.load
     diff.should_not be_loaded
   end
@@ -36,7 +37,7 @@ describe ReplicationDifference do
         'change_type' => 'I',
         'change_time' => Time.now
       }
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       diff.should be_loaded
@@ -57,7 +58,7 @@ describe ReplicationDifference do
         'change_type' => 'D',
         'change_time' => Time.now
       }
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       diff.should be_loaded
@@ -96,7 +97,7 @@ describe ReplicationDifference do
         'change_type' => 'D',
         'change_time' => 5.seconds.ago
       }
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       diff.should be_loaded
@@ -124,7 +125,7 @@ describe ReplicationDifference do
         'change_type' => 'I',
         'change_time' => Time.now
       }
-      diff = ReplicationDifference.new session
+      diff = ReplicationDifference.new LoggedChangeLoaders.new(session)
       diff.load
 
       diff.should be_loaded

data/spec/replication_helper_spec.rb

@@ -9,7 +9,7 @@ describe ReplicationHelper do
 
   it "initialize should initialize the correct committer" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     c = helper.instance_eval {@committer}
     c.should be_an_instance_of(Committers::DefaultCommitter)
@@ -17,26 +17,26 @@ describe ReplicationHelper do
   end
 
   it "session should return the session" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     helper.session.should == rep_run.session
   end
 
   it "replication_run should return the current ReplicationRun instance" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     helper.replication_run.should == rep_run
   end
 
   it "options should return the correct options" do
     session = Session.new
-    rep_run = ReplicationRun.new(session)
+    rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     helper.options.should == session.configuration.options
   end
 
   it "insert_record should insert the given record" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     c = helper.instance_eval {committer}
     c.should_receive(:insert_record).with(:right, 'scanner_records', :dummy_record)
@@ -44,7 +44,7 @@ describe ReplicationHelper do
   end
 
   it "update_record should update the given record" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     c = helper.instance_eval {committer}
     c.should_receive(:update_record).with(:right, 'scanner_records', :dummy_record, nil)
@@ -52,7 +52,7 @@ describe ReplicationHelper do
   end
 
   it "update_record should update the given record with the provided old key" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     c = helper.instance_eval {committer}
     c.should_receive(:update_record).with(:right, 'scanner_records', :dummy_record, :old_key)
@@ -60,7 +60,7 @@ describe ReplicationHelper do
   end
 
   it "delete_record should delete the given record" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     c = helper.instance_eval {committer}
     c.should_receive(:delete_record).with(:right, 'scanner_records', :dummy_record)
@@ -68,7 +68,7 @@ describe ReplicationHelper do
   end
 
   it "load_record should load the specified record (values converted to original data types)" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
     helper.load_record(:right, 'scanner_records', 'id' => '2').should == {
       'id' => 2, # Note: it's a number, not a string...
@@ -80,11 +80,14 @@ describe ReplicationHelper do
     session = Session.new
     session.left.begin_db_transaction
     begin
-      rep_run = ReplicationRun.new(session)
+      rep_run = ReplicationRun.new(session, TaskSweeper.new(1))
       helper = ReplicationHelper.new(rep_run)
-      left_change = LoggedChange.new session, :left
-      right_change = LoggedChange.new session, :right
-      diff = ReplicationDifference.new session
+
+      loaders = LoggedChangeLoaders.new(session)
+
+      left_change = LoggedChange.new loaders[:left]
+      right_change = LoggedChange.new loaders[:right]
+      diff = ReplicationDifference.new loaders
       diff.changes.replace :left => left_change, :right => right_change
       diff.type = :conflict
 
@@ -116,7 +119,7 @@ describe ReplicationHelper do
   end
 
   it "finalize should be delegated to the committer" do
-    rep_run = ReplicationRun.new(Session.new)
+    rep_run = ReplicationRun.new(Session.new, TaskSweeper.new(1))
     helper = ReplicationHelper.new(rep_run)
 
     c = helper.instance_eval {@committer}

data/spec/replication_initializer_spec.rb

@@ -363,6 +363,19 @@ describe ReplicationInitializer do
     initializer.ensure_infrastructure
   end
 
+  it "call_after_init_handler should call the according handler" do
+    config = deep_copy(standard_config)
+    received_session = nil
+    config.options[:after_infrastructure_setup] = lambda do |session|
+      received_session = session
+    end
+    session = Session.new config
+    initializer = ReplicationInitializer.new session
+    initializer.call_after_infrastructure_setup_handler
+
+    received_session.should == session
+  end
+
   it "exclude_ruby_rep_tables should exclude the correct system tables" do
     config = deep_copy(standard_config)
     initializer = ReplicationInitializer.new(Session.new(config))
@@ -416,6 +429,12 @@ describe ReplicationInitializer do
     config = deep_copy(standard_config)
     config.options[:committer] = :buffered_commit
     config.options[:use_ansi] = false
+
+    received_session = nil
+    config.options[:after_infrastructure_setup] = lambda do |session|
+      received_session = session
+    end
+
     config.include_tables 'rr_pending_changes' # added to verify that it is ignored
 
     session = Session.new(config)
@@ -426,6 +445,9 @@ describe ReplicationInitializer do
       initializer.should_receive(:ensure_infrastructure).any_number_of_times
       initializer.should_receive(:restore_unconfigured_tables).any_number_of_times
       initializer.prepare_replication
+
+      received_session.should == session
+      
       # verify sequences have been setup
       session.left.sequence_values('rr','scanner_left_records_only').values[0][:increment].should == 2
       session.right.sequence_values('rr','scanner_left_records_only').values[0][:increment].should == 2

data/spec/replication_run_spec.rb

@@ -9,12 +9,23 @@ describe ReplicationRun do
 
   it "initialize should store the provided session" do
     session = Session.new
-    run = ReplicationRun.new session
+    sweeper = TaskSweeper.new 1
+    run = ReplicationRun.new session, sweeper
     run.session.should == session
   end
 
+  it "install_sweeper should install a task sweeper into the database connections" do
+    session = Session.new
+    sweeper = TaskSweeper.new 1
+    run = ReplicationRun.new session, sweeper
+    run.install_sweeper
+
+    session.left.sweeper.should == sweeper
+    session.right.sweeper.should == sweeper
+  end
+
   it "helper should return the correctly initialized replication helper" do
-    run = ReplicationRun.new Session.new
+    run = ReplicationRun.new Session.new, TaskSweeper.new(1)
     run.helper.should be_an_instance_of(ReplicationHelper)
     run.helper.replication_run.should == run
     run.helper.should == run.helper # ensure the helper is created only once
@@ -22,7 +33,7 @@ describe ReplicationRun do
 
   it "replicator should return the configured replicator" do
     session = Session.new
-    run = ReplicationRun.new session
+    run = ReplicationRun.new session, TaskSweeper.new(1)
     run.replicator.
       should be_an_instance_of(Replicators.replicators[session.configuration.options[:replicator]])
     run.replicator.should == run.replicator # should only create the replicator once
@@ -47,7 +58,7 @@ describe ReplicationRun do
         'change_time' => Time.now
       }
 
-      run = ReplicationRun.new session
+      run = ReplicationRun.new session, TaskSweeper.new(1)
       run.run
 
       session.right.select_one("select * from extender_no_record").should == {
@@ -66,7 +77,7 @@ describe ReplicationRun do
 
   it "run should not create the replicator if there are no pending changes" do
     session = Session.new
-    run = ReplicationRun.new session
+    run = ReplicationRun.new session, TaskSweeper.new(1)
     run.should_not_receive(:replicator)
     run.run
   end
@@ -90,7 +101,7 @@ describe ReplicationRun do
         'change_time' => Time.now
       }
 
-      run = ReplicationRun.new session
+      run = ReplicationRun.new session, TaskSweeper.new(1)
       run.replicator.should_not_receive(:replicate)
       run.run
 
@@ -113,7 +124,7 @@ describe ReplicationRun do
         'change_type' => 'D',
         'change_time' => Time.now
       }
-      run = ReplicationRun.new session
+      run = ReplicationRun.new session, TaskSweeper.new(1)
       run.replicator.stub!(:replicate_difference).and_return {raise Exception, 'dummy message'}
       run.run
 
@@ -140,7 +151,7 @@ describe ReplicationRun do
         'change_time' => Time.now
       }
 
-      run = ReplicationRun.new session
+      run = ReplicationRun.new session, TaskSweeper.new(1)
       lambda {run.run}.should raise_error(ArgumentError)
     ensure
       session.left.rollback_db_transaction
@@ -163,7 +174,7 @@ describe ReplicationRun do
         'name' => 'bla'
       }
 
-      run = ReplicationRun.new session
+      run = ReplicationRun.new session, TaskSweeper.new(1)
       run.run
 
       session.right.select_one("select * from extender_no_record").should == {

data/spec/session_spec.rb

@@ -67,6 +67,7 @@ describe Session do   # here database connection caching is _not_ disabled
     dummy_connection = mock("dummy connection")
     dummy_connection.stub!(:tables).and_return([])
     dummy_connection.stub!(:manual_primary_keys=)
+    dummy_connection.stub!(:select_one).and_return({'x' => '2'})
     dummy_proxy.should_receive(:create_session).and_return(dummy_connection)
     DRbObject.should_receive(:new).with(nil,"druby://localhost:9876").and_return(dummy_proxy)
 
@@ -88,12 +89,33 @@ describe Session do   # here database connection caching is _not_ disabled
     session.right.manual_primary_keys.should == {'extender_without_key'=>['id']}
   end
 
-  it "refresh should reestablsih the database connections if no more active" do
+  it "refresh should reestablish the database connections if not active anymore" do
     session = Session.new
     session.right.destroy
     session.right.connection.should_not be_active
+    lambda {session.right.select_one("select 1+1 as x")}.should raise_error
     session.refresh
     session.right.connection.should be_active
+    session.right.select_one("select 1+1 as x")['x'].to_i.should == 2
+  end
+
+  it "refresh should raise error even if database connect fails silently" do
+    session = Session.new
+    session.right.destroy
+    session.right.connection.should_not be_active
+    session.should_receive(:connect_database)
+    lambda {session.refresh}.should raise_error(/no connection to.*right.*database/)
+  end
+
+  it "refresh should work with proxied database connections" do
+    ensure_proxy
+    session = Session.new(proxied_config)
+    session.right.destroy
+    session.right.connection.should_not be_active
+    lambda {session.right.select_one("select 1+1 as x")}.should raise_error
+    session.refresh
+    session.right.connection.should be_active
+    session.right.select_one("select 1+1 as x")['x'].to_i.should == 2
   end
 
   it "refresh should not do anyting if the connection is still active" do

data/spec/spec_helper.rb

@@ -94,6 +94,7 @@ def mock_active_record(number_of_calls)
   dummy_connection.stub!(:extend)
   dummy_connection.stub!(:tables).and_return([])
   dummy_connection.stub!(:initialize_search_path)
+  dummy_connection.stub!(:select_one).and_return({'x' => '2'})
     
   ConnectionExtenders::DummyActiveRecord.should_receive(:connection).send(number_of_calls) \
     .and_return {dummy_connection}

data/spec/task_sweeper_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+include RR
+
+describe TaskSweeper do
+  before(:each) do
+  end
+
+  it "should execute the given task" do
+    x = nil
+    TaskSweeper.timeout(1) {|sweeper| x = 1}
+    x.should == 1
+  end
+
+  it "should raise exceptions thrown by the task" do
+    lambda {
+      TaskSweeper.timeout(1) {raise "bla"}
+    }.should raise_error("bla")
+  end
+
+  it "should return if task stalls" do
+    start = Time.now
+    TaskSweeper.timeout(0.01) {sleep 10}.should be_terminated
+    (Time.now - start < 5).should be_true
+  end
+
+  it "should not return if task is active" do
+    start = Time.now
+    TaskSweeper.timeout(0.1) do |sweeper|
+      10.times do
+        sleep 0.05
+        sweeper.ping
+      end
+    end.should_not be_terminated
+    (Time.now - start > 0.4).should be_true
+
+  end
+
+  it "should notify a stalled task about it's termination" do
+    terminated = false
+    TaskSweeper.timeout(0.01) do |sweeper|
+      sleep 0.05
+      terminated = sweeper.terminated?
+    end.join
+    terminated.should be_true
+  end
+end