Fix GlobalComparer.cs boxing regression

Nexus-Mods · Oct 30, 2024 · f366ac6 · f366ac6
1 parent 24d83aa
commit f366ac6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+### 0.9.92 - 30/10/2024
+* Fix a regression in the GlobalCompare that was boxing an enum (resulting in a lot of allocations)
+
 ### 0.9.91 - 15/10/2024
 * Attempt to fix an issue with Nuget and package resolution
 

diff --git a/src/NexusMods.MnemonicDB.Abstractions/GlobalComparer.cs b/src/NexusMods.MnemonicDB.Abstractions/GlobalComparer.cs
@@ -19,7 +19,7 @@ public static unsafe int Compare(byte* aPtr, int aLen, byte* bPtr, int bLen)
         var prefixA = (KeyPrefix*)aPtr;
         var prefixB = (KeyPrefix*)bPtr;
 
-        var cmp = prefixA->Index.CompareTo(prefixB->Index);
+        var cmp = ((byte)prefixA->Index).CompareTo((byte)prefixB->Index);
         if (cmp != 0)
             return cmp;
 
@@ -30,13 +30,13 @@ public static unsafe int Compare(byte* aPtr, int aLen, byte* bPtr, int bLen)
             IndexType.AEVTCurrent or IndexType.AEVTHistory => AEVTComparator.Compare(aPtr, aLen, bPtr, bLen),
             IndexType.AVETCurrent or IndexType.AVETHistory => AVETComparator.Compare(aPtr, aLen, bPtr, bLen),
             IndexType.VAETCurrent or IndexType.VAETHistory => VAETComparator.Compare(aPtr, aLen, bPtr, bLen),
-            _ => throw new ArgumentOutOfRangeException()
+            _ => ThrowArgumentOutOfRangeException()
         };
     }
 
     public static int Compare(in Datom a, in Datom b)
     {
-        var cmp = a.Prefix.Index.CompareTo(b.Prefix.Index);
+        var cmp = ((byte)a.Prefix.Index).CompareTo((byte)b.Prefix.Index);
         if (cmp != 0)
             return cmp;
 
@@ -47,10 +47,15 @@ public static int Compare(in Datom a, in Datom b)
             IndexType.AEVTCurrent or IndexType.AEVTHistory => AEVTComparator.Compare(a, b),
             IndexType.AVETCurrent or IndexType.AVETHistory => AVETComparator.Compare(a, b),
             IndexType.VAETCurrent or IndexType.VAETHistory => VAETComparator.Compare(a, b),
-            _ => throw new ArgumentOutOfRangeException()
+            _ => ThrowArgumentOutOfRangeException()
         };
     }
 
+    private static int ThrowArgumentOutOfRangeException()
+    {
+        throw new ArgumentOutOfRangeException();
+    }
+
     /// <inheritdoc />
     public unsafe int Compare(byte[]? x, byte[]? y)
     {