Skip to content

Add LockMode.UpgradeSkipLocked (#2005) #3681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add LockMode.UpgradeSkipLocked (#2005) #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc076a4
Add LockMode.UpgradeSkipLocked (#2005)
PleasantD Jul 21, 2025
b1d678d
Merge branch 'master' into GH2005-Add-UpgradeSkipLocked
hazzik Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/NHibernate.Config.Templates/PostgreSQL.cfg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ for your own use before compile tests in VisualStudio.
<property name="connection.connection_string">
Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Enlist=true;
</property>
<property name="dialect">NHibernate.Dialect.PostgreSQL83Dialect</property>
<property name="dialect">NHibernate.Dialect.PostgreSQL95Dialect</property>
</session-factory>
</hibernate-configuration>
12 changes: 12 additions & 0 deletions src/NHibernate.Test/Async/Legacy/ParentChildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,11 +953,14 @@ public async Task LockingAsync()
s3.Count = 3;
Simple s4 = new Simple();
s4.Count = 4;
Simple s5 = new Simple();
s5.Count = 5;

await (s.SaveAsync(s1, (long) 1));
await (s.SaveAsync(s2, (long) 2));
await (s.SaveAsync(s3, (long) 3));
await (s.SaveAsync(s4, (long) 4));
await (s.SaveAsync(s5, (long) 5));
Assert.AreEqual(LockMode.Write, s.GetCurrentLockMode(s1));
await (tx.CommitAsync());
s.Close();
Expand All @@ -972,6 +975,8 @@ public async Task LockingAsync()
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
s4 = (Simple) await (s.LoadAsync(typeof(Simple), (long) 4, LockMode.UpgradeNoWait));
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
s5 = (Simple) await (s.LoadAsync(typeof(Simple), (long) 5, LockMode.UpgradeSkipLocked));
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s5));

s1 = (Simple) await (s.LoadAsync(typeof(Simple), (long) 1, LockMode.Upgrade)); //upgrade
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s1));
Expand All @@ -981,14 +986,18 @@ public async Task LockingAsync()
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
s4 = (Simple) await (s.LoadAsync(typeof(Simple), (long) 4, LockMode.Upgrade));
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
s5 = (Simple) await (s.LoadAsync(typeof(Simple), (long) 5, LockMode.Upgrade));
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s4));

await (s.LockAsync(s2, LockMode.Upgrade)); //upgrade
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s2));
await (s.LockAsync(s3, LockMode.Upgrade));
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
await (s.LockAsync(s1, LockMode.UpgradeNoWait));
await (s.LockAsync(s4, LockMode.None));
await (s.LockAsync(s5, LockMode.UpgradeSkipLocked));
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s5));

await (tx.CommitAsync());
tx = s.BeginTransaction();
Expand All @@ -997,6 +1006,7 @@ public async Task LockingAsync()
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s1));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s2));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s5));

await (s.LockAsync(s1, LockMode.Read)); //upgrade
Assert.AreEqual(LockMode.Read, s.GetCurrentLockMode(s1));
Expand All @@ -1017,11 +1027,13 @@ public async Task LockingAsync()
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s1));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s2));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s5));

await (s.DeleteAsync(s1));
await (s.DeleteAsync(s2));
await (s.DeleteAsync(s3));
await (s.DeleteAsync(s4));
await (s.DeleteAsync(s5));
await (tx.CommitAsync());
s.Close();
}
Expand Down
12 changes: 12 additions & 0 deletions src/NHibernate.Test/Legacy/ParentChildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,11 +942,14 @@ public void Locking()
s3.Count = 3;
Simple s4 = new Simple();
s4.Count = 4;
Simple s5 = new Simple();
s5.Count = 5;

s.Save(s1, (long) 1);
s.Save(s2, (long) 2);
s.Save(s3, (long) 3);
s.Save(s4, (long) 4);
s.Save(s5, (long) 5);
Assert.AreEqual(LockMode.Write, s.GetCurrentLockMode(s1));
tx.Commit();
s.Close();
Expand All @@ -961,6 +964,8 @@ public void Locking()
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
s4 = (Simple) s.Load(typeof(Simple), (long) 4, LockMode.UpgradeNoWait);
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
s5 = (Simple) s.Load(typeof(Simple), (long) 5, LockMode.UpgradeSkipLocked);
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s5));

s1 = (Simple) s.Load(typeof(Simple), (long) 1, LockMode.Upgrade); //upgrade
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s1));
Expand All @@ -970,14 +975,18 @@ public void Locking()
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
s4 = (Simple) s.Load(typeof(Simple), (long) 4, LockMode.Upgrade);
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
s5 = (Simple) s.Load(typeof(Simple), (long) 5, LockMode.Upgrade);
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s4));

s.Lock(s2, LockMode.Upgrade); //upgrade
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s2));
s.Lock(s3, LockMode.Upgrade);
Assert.AreEqual(LockMode.Upgrade, s.GetCurrentLockMode(s3));
s.Lock(s1, LockMode.UpgradeNoWait);
s.Lock(s4, LockMode.None);
s.Lock(s5, LockMode.UpgradeSkipLocked);
Assert.AreEqual(LockMode.UpgradeNoWait, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.UpgradeSkipLocked, s.GetCurrentLockMode(s5));

tx.Commit();
tx = s.BeginTransaction();
Expand All @@ -986,6 +995,7 @@ public void Locking()
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s1));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s2));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s5));

s.Lock(s1, LockMode.Read); //upgrade
Assert.AreEqual(LockMode.Read, s.GetCurrentLockMode(s1));
Expand All @@ -1006,11 +1016,13 @@ public void Locking()
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s1));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s2));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s4));
Assert.AreEqual(LockMode.None, s.GetCurrentLockMode(s5));

s.Delete(s1);
s.Delete(s2);
s.Delete(s3);
s.Delete(s4);
s.Delete(s5);
tx.Commit();
s.Close();
}
Expand Down
Loading
Loading