Merge branch 'master' of https://github.com/mbdavid/LiteDB

Author: kcsombrio

LiteDB.Shell/Commands/Help.cs

@@ -28,7 +28,7 @@ public void Execute(StringScanner s, Env env)
             // getting all HelpAttributes inside assemblies
             var helps = AppDomain.CurrentDomain.GetAssemblies()
                 .SelectMany(x => x.GetTypes())
-                .Select(x => CustomAttributeExtensions.GetCustomAttributes(typeof(HelpAttribute), true).FirstOrDefault())
+                .Select(x => CustomAttributeExtensions.GetCustomAttributes(x, typeof(HelpAttribute), true).FirstOrDefault())
                 .Where(x => x != null)
                 .Select(x => x as HelpAttribute)
                 .ToArray();
@@ -49,4 +49,4 @@ public void Execute(StringScanner s, Env env)
             }
         }
     }
-}
+}

LiteDB.Tests/Engine/Transactions_Tests.cs

@@ -8,6 +8,8 @@
 
 namespace LiteDB.Tests.Engine
 {
+    using System;
+
     public class Transactions_Tests
     {
         [Fact]
@@ -222,5 +224,50 @@ public void Test_Transaction_States()
                 person.Count().Should().Be(20);
             }
         }
+
+        private class BlockingStream : MemoryStream
+        {
+            public readonly AutoResetEvent   Blocked       = new AutoResetEvent(false);
+            public readonly ManualResetEvent ShouldUnblock = new ManualResetEvent(false);
+            public          bool             ShouldBlock;
+
+            public override void Write(byte[] buffer, int offset, int count)
+            {
+                if (this.ShouldBlock)
+                {
+                    this.Blocked.Set();
+                    this.ShouldUnblock.WaitOne();
+                    this.Blocked.Reset();
+                }
+                base.Write(buffer, offset, count);
+            }
+        }
+
+        [Fact]
+        public void Test_Transaction_ReleaseWhenFailToStart()
+        {
+            var    blockingStream             = new BlockingStream();
+            var    db                         = new LiteDatabase(blockingStream) { Timeout = TimeSpan.FromSeconds(1) };
+            Thread lockerThread               = null;
+            try
+            {
+                lockerThread = new Thread(() =>
+                {
+                    db.GetCollection<Person>().Insert(new Person());
+                    blockingStream.ShouldBlock = true;
+                    db.Checkpoint();
+                    db.Dispose();
+                });
+                lockerThread.Start();
+                blockingStream.Blocked.WaitOne(1000).Should().BeTrue();
+                Assert.Throws<LiteException>(() => db.GetCollection<Person>().Insert(new Person())).Message.Should().Contain("timeout");
+                Assert.Throws<LiteException>(() => db.GetCollection<Person>().Insert(new Person())).Message.Should().Contain("timeout");
+            }
+            finally
+            {
+                blockingStream.ShouldUnblock.Set();
+                lockerThread?.Join();
+            }
+        }
     }
 }

LiteDB/Engine/Services/TransactionMonitor.cs

@@ -73,7 +73,21 @@ public TransactionService GetTransaction(bool create, bool queryOnly, out bool i
                 // enter in lock transaction after release _transaction lock
                 if (alreadyLock == false)
                 {
-                    _locker.EnterTransaction();
+                    try
+                    {
+                        _locker.EnterTransaction();
+                    }
+                    catch
+                    {
+                        transaction.Dispose();
+                        lock (_transactions)
+                        {
+                            // return pages
+                            _freePages += transaction.MaxTransactionSize;
+                            _transactions.Remove(transaction.TransactionID);
+                        }
+                        throw;
+                    }
                 }
 
                 // do not store in thread query-only transaction

LiteDB/Utils/Constants.cs

@@ -129,10 +129,8 @@ public static void ENSURE(bool conditional, string message = null)
                 {
                     Debug.Fail(message);
                 }
-                else
-                {
-                    throw new Exception("LiteDB ENSURE: " + message);
-                }
+                
+                throw new Exception("LiteDB ENSURE: " + message);
             }
         }
 
@@ -148,10 +146,8 @@ public static void ENSURE(bool ifTest, bool conditional, string message = null)
                 {
                     Debug.Fail(message);
                 }
-                else
-                {
-                    throw new Exception("LiteDB ENSURE: " + message);
-                }
+                
+                throw new Exception("LiteDB ENSURE: " + message);
             }
         }
 
@@ -168,10 +164,8 @@ public static void DEBUG(bool conditional, string message = null)
                 {
                     Debug.Fail(message);
                 }
-                else
-                {
-                    throw new Exception("LiteDB DEBUG: " + message);
-                }
+                
+                throw new Exception("LiteDB DEBUG: " + message);
             }
         }
     }