r4644@asus: jeremy | 2006-06-16 14:57:03 -0700

 locking
 r4645@asus:  jeremy | 2006-06-17 12:41:30 -0700
 missing reply fixture
 r4646@asus:  jeremy | 2006-06-19 13:05:23 -0700
 Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections.
 r4647@asus:  jeremy | 2006-06-19 13:07:23 -0700
 PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency.
 r4648@asus:  jeremy | 2006-06-19 13:08:40 -0700
 Pass the default allow_concurrency when instantiating new connections.
 r4649@asus:  jeremy | 2006-06-19 13:11:12 -0700
 Break out concurrent transaction tests and run them for PostgreSQLAdapter only (need to fork or system('some_test_script') for the other adapters)
 r4650@asus:  jeremy | 2006-06-19 13:42:48 -0700
 Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE".
 r4661@asus:  jeremy | 2006-06-19 15:36:51 -0700
 excise the junk mutex


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4460 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 85 insertions, 6 deletions

diff --git a/activerecord/test/locking_test.rb b/activerecord/test/locking_test.rb
index 105f19f2bc..bacc7b8ae0 100644
--- a/activerecord/test/locking_test.rb
+++ b/activerecord/test/locking_test.rb
@@ -2,16 +2,16 @@ require 'abstract_unit'
 require 'fixtures/person'
 require 'fixtures/legacy_thing'
 
-class LockingTest < Test::Unit::TestCase
+class OptimisticLockingTest < Test::Unit::TestCase
   fixtures :people, :legacy_things
 
   def test_lock_existing
     p1 = Person.find(1)
     p2 = Person.find(1)
-    
+
     p1.first_name = "Michael"
     p1.save
-    
+
     assert_raises(ActiveRecord::StaleObjectError) {
       p2.first_name = "should fail"
       p2.save
@@ -24,13 +24,13 @@ class LockingTest < Test::Unit::TestCase
     assert_equal p1.id, p2.id
     p1.first_name = "Anika"
     p1.save
-    
+
     assert_raises(ActiveRecord::StaleObjectError) {
       p2.first_name = "should fail"
       p2.save
     }
   end
-  
+
   def test_lock_column_name_existing
     t1 = LegacyThing.find(1)
     t2 = LegacyThing.find(1)
@@ -41,6 +41,85 @@ class LockingTest < Test::Unit::TestCase
       t2.tps_report_number = 300
       t2.save
     }
-  end 
+  end
+end
+
+
+# TODO: test against the generated SQL since testing locking behavior itself
+# is so cumbersome. Will deadlock Ruby threads if the underlying db.execute
+# blocks, so separate script called by Kernel#system is needed.
+# (See exec vs. async_exec in the PostgreSQL adapter.)
+class PessimisticLockingTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+  fixtures :people
+
+  def setup
+    @allow_concurrency = ActiveRecord::Base.allow_concurrency
+    ActiveRecord::Base.allow_concurrency = true
+  end
+
+  def teardown
+    ActiveRecord::Base.allow_concurrency = @allow_concurrency
+  end
 
+  # Test that the adapter doesn't blow up on add_lock!
+  def test_sane_find_with_lock
+    assert_nothing_raised do
+      Person.transaction do
+        Person.find 1, :lock => true
+      end
+    end
+  end
+
+  # Test no-blowup for scoped lock.
+  def test_sane_find_with_lock
+    assert_nothing_raised do
+      Person.transaction do
+        Person.with_scope(:find => { :lock => true }) do
+          Person.find 1
+        end
+      end
+    end
+  end
+
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_no_locks_no_wait
+      first, second = duel { Person.find 1 }
+      assert first.end > second.end
+    end
+
+    def test_second_lock_waits
+      first, second = duel { Person.find 1, :lock => true }
+      assert second.end > first.end
+    end
+
+    protected
+      def duel(zzz = 0.2)
+        t0, t1, t2, t3 = nil, nil, nil, nil
+
+        a = Thread.new do
+          t0 = Time.now
+          Person.transaction do
+            yield
+            sleep zzz       # block thread 2 for zzz seconds
+          end
+          t1 = Time.now
+        end
+
+        b = Thread.new do
+          sleep zzz / 2.0   # ensure thread 1 tx starts first
+          t2 = Time.now
+          Person.transaction { yield }
+          t3 = Time.now
+        end
+
+        a.join
+        b.join
+
+        assert t1 > t0 + zzz
+        assert t2 > t0
+        assert t3 > t2
+        [t0.to_f..t1.to_f, t2.to_f..t3.to_f]
+      end
+  end
 end