Tran test fixes

dasatomic · Dec 13, 2021 · 0c0c694 · 0c0c694
1 parent 87990ac
commit 0c0c694
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/PageManager/ITransaction.cs b/PageManager/ITransaction.cs
@@ -24,7 +24,7 @@ public interface ITransaction : IAsyncDisposable, IDisposable
         TransactionState GetTransactionState();
         Task<Releaser> AcquireLock(ulong pageId, LockTypeEnum lockType);
         Task<Releaser> AcquireLockWithCallerOwnership(ulong pageId, LockTypeEnum lockType);
-        void VerifyLock(ulong pageId, LockTypeEnum expectedLock);
+        bool VerifyLock(ulong pageId, LockTypeEnum expectedLock);
         public bool AmIHoldingALock(ulong pageId, out LockTypeEnum lockType);
         public void RegisterTempFolder(DirectoryInfo tempFolder);
     }

diff --git a/PageManager/LogManager/NotLoggedTransaction.cs b/PageManager/LogManager/NotLoggedTransaction.cs
@@ -59,8 +59,6 @@ public Task Rollback()
 
         public ulong TranscationId() => 0;
 
-        public void VerifyLock(ulong pageId, LockTypeEnum expectedLock)
-        {
-        }
+        public bool VerifyLock(ulong pageId, LockTypeEnum expectedLock) => true;
     }
 }
diff --git a/PageManager/LogManager/ReadonlyTransaction.cs b/PageManager/LogManager/ReadonlyTransaction.cs
@@ -4,6 +4,7 @@
 using PageManager.Exceptions;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -111,20 +112,24 @@ public Task Rollback()
 
         public ulong TranscationId() => this.transactionId;
 
-        public void VerifyLock(ulong pageId, LockTypeEnum expectedLock)
+        public bool VerifyLock(ulong pageId, LockTypeEnum expectedLock)
         {
             if (expectedLock == LockTypeEnum.Exclusive)
             {
-                throw new TranNotHoldingLock();
+                Debug.Assert(false);
+                return false;
             }
 
             lock (lck)
             {
                 if (!this.locksHeld.ContainsKey(this.lockManager.LockIdForPage(pageId)))
                 {
-                    throw new TranNotHoldingLock();
+                    Debug.Assert(false);
+                    return false;
                 }
             }
+
+            return true;
         }
 
         public bool AmIHoldingALock(ulong pageId, out LockTypeEnum lockType)

diff --git a/PageManager/LogManager/Transaction.cs b/PageManager/LogManager/Transaction.cs
@@ -236,7 +236,7 @@ public bool AmIHoldingALock(ulong pageId, out LockTypeEnum lockType)
             return false;
         }
 
-        public void VerifyLock(ulong pageId, LockTypeEnum expectedLock)
+        public bool VerifyLock(ulong pageId, LockTypeEnum expectedLock)
         {
             int lockId = this.pageManager.GetLockManager().LockIdForPage(pageId);
 
@@ -246,15 +246,21 @@ public void VerifyLock(ulong pageId, LockTypeEnum expectedLock)
                 {
                     if ((int)lockHeld < (int)expectedLock)
                     {
-                        System.Diagnostics.Debug.Assert(false);
-                        throw new TranNotHoldingLock();
+#if DEBUG
+                        System.Diagnostics.Debug.Assert(AssertOnNoLock);
+#endif
+                        return false;
                     }
                 }
                 else
                 {
-                    System.Diagnostics.Debug.Assert(false);
-                    throw new TranNotHoldingLock();
+#if DEBUG
+                        System.Diagnostics.Debug.Assert(AssertOnNoLock);
+#endif
+                    return false;
                 }
+
+                return true;
             }
         }
 
@@ -267,5 +273,9 @@ public void RegisterTempFolder(DirectoryInfo tempFolder)
         {
             this.tempDirectoriesToCleanUp.Enqueue(tempFolder);
         }
+
+#if DEBUG
+        public bool AssertOnNoLock = true;
+#endif
     }
 }
diff --git a/tests/LogManagerTests/TranLockTests.cs b/tests/LogManagerTests/TranLockTests.cs
@@ -28,24 +28,26 @@ public async Task LockCheck()
         {
             await using ITransaction tran1 = logManager.CreateTransaction(pageManager);
             using var releaser = await tran1.AcquireLock(1, LockTypeEnum.Shared);
-            tran1.VerifyLock(1, LockTypeEnum.Shared);
+            Assert.IsTrue(tran1.VerifyLock(1, LockTypeEnum.Shared));
         }
 
         [Test]
         public async Task LockCheckDowngrade()
         {
             await using ITransaction tran1 = logManager.CreateTransaction(pageManager);
             using var releaser = await tran1.AcquireLock(1, LockTypeEnum.Exclusive);
-            tran1.VerifyLock(1, LockTypeEnum.Shared);
+            Assert.IsTrue(tran1.VerifyLock(1, LockTypeEnum.Shared));
         }
 
+#if DEBUG
         [Test]
         public async Task LockCheckUpgrade()
         {
             await using ITransaction tran1 = logManager.CreateTransaction(pageManager);
             using var releaser = await tran1.AcquireLock(1, LockTypeEnum.Shared);
-            Assert.Throws<TranNotHoldingLock>(() => tran1.VerifyLock(1, LockTypeEnum.Exclusive));
+            Assert.IsFalse(tran1.VerifyLock(1, LockTypeEnum.Exclusive));
         }
+#endif
 
         [Test]
         public async Task LockNotReleased()
@@ -63,7 +65,7 @@ public async Task AcquireLoop()
             for (int i = 0; i < 1000; i++)
             {
                 using var releaser = await tran1.AcquireLock((ulong)i, LockTypeEnum.Shared);
-                tran1.VerifyLock((ulong)i, LockTypeEnum.Shared);
+                Assert.IsTrue(tran1.VerifyLock((ulong)i, LockTypeEnum.Shared));
             }
         }
     }

diff --git a/tests/Test.Common/DummyTran.cs b/tests/Test.Common/DummyTran.cs
@@ -65,8 +65,6 @@ public ulong TranscationId()
             return 42;
         }
 
-        public void VerifyLock(ulong pageId, LockTypeEnum expectedLock)
-        {
-        }
+        public bool VerifyLock(ulong pageId, LockTypeEnum expectedLock) => true;
     }
 }