New 5.0.3 with more debug info

mbdavid · Feb 21, 2020 · 48957dd · zamis · Feb 24, 2020 · maxkatz6
1 parent 17e8031
commit 48957dd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/LiteDB/Engine/Pages/CollectionPage.cs b/LiteDB/Engine/Pages/CollectionPage.cs
@@ -41,7 +41,7 @@ public CollectionPage(PageBuffer buffer)
         {
             ENSURE(this.PageType == PageType.Collection, "page type must be collection page");
 
-            if (this.PageType != PageType.Collection) throw new LiteException(0, $"Invalid CollectionPage buffer on {PageID}");
+            if (this.PageType != PageType.Collection) LiteException.InvalidPageType(PageType.Collection, this);
 
             // create new buffer area to store BsonDocument indexes
             var area = _buffer.Slice(PAGE_HEADER_SIZE, PAGE_SIZE - PAGE_HEADER_SIZE);

diff --git a/LiteDB/Engine/Pages/DataPage.cs b/LiteDB/Engine/Pages/DataPage.cs
@@ -18,7 +18,7 @@ public DataPage(PageBuffer buffer)
         {
             ENSURE(this.PageType == PageType.Data, "page type must be data page");
 
-            if (this.PageType != PageType.Data) throw new LiteException(0, $"Invalid DataPage buffer on {PageID}");
+            if (this.PageType != PageType.Data) LiteException.InvalidPageType(PageType.Data, this);
         }
 
         /// <summary>

diff --git a/LiteDB/Engine/Pages/IndexPage.cs b/LiteDB/Engine/Pages/IndexPage.cs
@@ -18,7 +18,7 @@ public IndexPage(PageBuffer buffer)
         {
             ENSURE(this.PageType == PageType.Index, "page type must be index page");
 
-            if (this.PageType != PageType.Index) throw new LiteException(0, $"Invalid IndexPage buffer on {PageID}");
+            if (this.PageType != PageType.Index) LiteException.InvalidPageType(PageType.Index, this);
         }
 
         /// <summary>

diff --git a/LiteDB/LiteDB.csproj b/LiteDB/LiteDB.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
-    <AssemblyVersion>5.0.2</AssemblyVersion>
-    <FileVersion>5.0.2</FileVersion>
-    <VersionPrefix>5.0.2</VersionPrefix>
+    <AssemblyVersion>5.0.3</AssemblyVersion>
+    <FileVersion>5.0.3</FileVersion>
+    <VersionPrefix>5.0.3</VersionPrefix>
     <Authors>Maurício David</Authors>
     <Product>LiteDB</Product>
     <Description>LiteDB - A lightweight embedded .NET NoSQL document store in a single datafile</Description>
     <Copyright>MIT</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Title>LiteDB</Title>
     <PackageId>LiteDB</PackageId>
-    <PackageVersion>5.0.2</PackageVersion>
+    <PackageVersion>5.0.3</PackageVersion>
     <PackageTags>database nosql embedded</PackageTags>
     <PackageIcon>icon_64x64.png</PackageIcon>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>

diff --git a/LiteDB/Utils/LiteException.cs b/LiteDB/Utils/LiteException.cs
@@ -1,6 +1,7 @@
 using LiteDB.Engine;
 using System;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using static LiteDB.Constants;
 
@@ -268,6 +269,19 @@ internal static LiteException InvalidTypedName(string type)
             return new LiteException(INVALID_TYPED_NAME, "Type '{0}' not found in current domain (_type format is 'Type.FullName, AssemblyName').", type);
         }
 
+        internal static LiteException InvalidPageType(PageType pageType, BasePage page)
+        {
+            var sb = new StringBuilder($"Invalid {pageType} on {page.PageID}. ");
+
+            sb.Append($"Full zero: {page.Buffer.All(0)}. ");
+            sb.Append($"Page Type: {page.PageType}. ");
+            sb.Append($"Prev/Next: {page.PrevPageID}/{page.NextPageID}. ");
+            sb.Append($"UniqueID: {page.Buffer.UniqueID}. ");
+            sb.Append($"ShareCounter: {page.Buffer.ShareCounter}. ");
+
+            return new LiteException(0, sb.ToString());
+        }
+
         #endregion
     }
 }