Revert "Upgrade to the latest mnemonicdb and fix associated bugs (#2836)"

This reverts commit 61e2ade.

Author: erri120

Directory.Packages.props

@@ -16,8 +16,8 @@
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
     <PackageVersion Include="Nerdbank.FullDuplexStream" Version="1.1.12" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
-    <PackageVersion Include="NexusMods.MnemonicDB" Version="0.9.121" />
-    <PackageVersion Include="NexusMods.MnemonicDB.Abstractions" Version="0.9.121" />
+    <PackageVersion Include="NexusMods.MnemonicDB" Version="0.9.114" />
+    <PackageVersion Include="NexusMods.MnemonicDB.Abstractions" Version="0.9.114" />
     <PackageVersion Include="NexusMods.Hashing.xxHash3.Paths" Version="3.0.3" />
     <PackageVersion Include="NexusMods.Hashing.xxHash3" Version="3.0.3" />
     <PackageVersion Include="NexusMods.Paths" Version="0.15.0" />
@@ -140,7 +140,7 @@
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="ini-parser-netstandard" Version="2.5.2" />
     <PackageVersion Include="Mutagen.Bethesda.Skyrim" Version="0.44.0" />
-    <PackageVersion Include="NexusMods.MnemonicDB.SourceGenerator" Version="0.9.121" />
+    <PackageVersion Include="NexusMods.MnemonicDB.SourceGenerator" Version="0.9.114" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.14" />
     <PackageVersion Include="OneOf" Version="3.0.271" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />

src/Abstractions/NexusMods.Abstractions.Library.Models/LibraryItem.cs

@@ -38,7 +38,7 @@ public partial struct ReadOnly
         public bool TryGetAsDownloadedFile(out DownloadedFile.ReadOnly result) {
             // This is same as source generator would make, just that we don't
             // currently don't autogenerate conversions for multiple levels of include.
-            var casted = new DownloadedFile.ReadOnly(Db, EntitySegment, Id);
+            var casted = new DownloadedFile.ReadOnly(Db, IndexSegment, Id);
             if (casted.IsValid()) {
                 result = casted;
                 return true;
@@ -54,7 +54,7 @@ public bool TryGetAsDownloadedFile(out DownloadedFile.ReadOnly result) {
         public bool TryGetAsLocalFile(out LocalFile.ReadOnly result) {
             // This is same as source generator would make, just that we don't
             // currently don't autogenerate conversions for multiple levels of include.
-            var casted = new LocalFile.ReadOnly(Db, EntitySegment, Id);
+            var casted = new LocalFile.ReadOnly(Db, IndexSegment, Id);
             if (casted.IsValid()) {
                 result = casted;
                 return true;

src/Abstractions/NexusMods.Abstractions.Loadouts/Models/DiskStateExtensions.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using DynamicData.Kernel;
 using NexusMods.Abstractions.GameLocators;
 using NexusMods.MnemonicDB.Abstractions;
@@ -43,11 +42,8 @@ public static GameInstallMetadata.ReadOnly GetMetadata(this GameInstallation ins
         // Get an as-of db for the last applied loadout
         var asOfDb = metadata.Db.Connection.AsOf(txId);
         // Get the attributes for the entries in the disk state
-
-        var ret = DiskStateEntry.FindByGame(asOfDb, metadata.Id);
-        asOfDb.BulkCache(ret.EntityIds);
-        
-        return ret;
+        var segment = asOfDb.Datoms(DiskStateEntry.Game, metadata.Id);
+        return new Entities<DiskStateEntry.ReadOnly>(new EntityIds(segment, 0, segment.Count), asOfDb);
     }
 
     /// <summary>
@@ -57,7 +53,7 @@ public static GameInstallMetadata.ReadOnly GetMetadata(this GameInstallation ins
     {
         return DiskStateAsOf(metadata, TxId.From(tx.Id.Value));
     }
-
+    
     /// <summary>
     /// Load the disk state of the game as of the last applied loadout
     /// </summary>
@@ -66,9 +62,14 @@ public static GameInstallMetadata.ReadOnly GetMetadata(this GameInstallation ins
         // No previously applied loadout, return an empty state
         if (!metadata.Contains(GameInstallMetadata.LastSyncedLoadout))
         {
-            return new(new EntityIds { Data = new byte[sizeof(uint)] }, metadata.Db);
+            return EmptyState;
         }
-
         return metadata.DiskStateAsOf(metadata.LastSyncedLoadoutTransaction);
     }
+    
+    private static readonly Entities<DiskStateEntry.ReadOnly> EmptyState = new();
+    
+
+
+    
 }

src/Abstractions/NexusMods.Abstractions.Resources.DB/PersistedDbResourceLoader.cs

@@ -69,11 +69,16 @@ public ValueTask<Resource<byte[]>> LoadResourceAsync(TResourceIdentifier resourc
         var db = _connection.Db;
         var (entityId, innerResourceIdentifier) = resourceIdentifier;
 
+        var persistedResourceId = Optional<EntityId>.None;
         var indexSegment = db.Datoms(entityId);
-        if (!_referenceAttribute.TryGetValue(indexSegment, out var persistedResourceId))
-            return null;
-        
-        var persistedResource = PersistedDbResource.Load(db, persistedResourceId);
+        foreach (var datom in indexSegment)
+        {
+            if (!datom.A.Equals(_referenceAttributeId)) continue;
+            persistedResourceId = _referenceAttribute.ReadValue(datom.ValueSpan, datom.Prefix.ValueTag, _connection.AttributeResolver);
+        }
+
+        if (!persistedResourceId.HasValue) return null;
+        var persistedResource = PersistedDbResource.Load(db, persistedResourceId.Value);
 
         if (!persistedResource.IsValid()) return null;
         if (persistedResource.IsExpired) return null;

src/NexusMods.DataModel.SchemaVersions/Migrations/_0005_MD5Hashes.cs

@@ -40,7 +40,7 @@ public Task Prepare(IDb db)
             .Select(entity =>
             {
                 // NOTE(erri120): need to use the IndexSegment because we don't want resolved datoms for removed attributes
-                foreach (var datom in entity.EntitySegment)
+                foreach (var datom in entity.IndexSegment)
                 {
                     if (attributesToRemove.Contains(datom.A)) return datom;
                 }