1.0.19-beta: Concurrency issue fixed

adospace · Jun 27, 2024 · 0b57ea9 · 0b57ea9
1 parent ef08bea
commit 0b57ea9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -14,7 +14,7 @@ jobs:
 
     env:
       Solution_Name: ./src/ReactorData.sln
-      Version: 1.0.18-beta
+      Version: 1.0.19-beta
 
     steps:
     - name: Checkout

diff --git a/src/ReactorData/Implementation/ModelContext.Operation.cs b/src/ReactorData/Implementation/ModelContext.Operation.cs
@@ -203,7 +203,7 @@ internal override async ValueTask Do(ModelContext context)
                     }
                     else
                     {
-                        set.Add(entityKey, entity);
+                        set.TryAdd(entityKey, entity);
                     }
 
                     queryTypesToNofity.Add(entityType);
@@ -253,9 +253,8 @@ internal override ValueTask Do(ModelContext context)
         {
             HashSet<Type> queryTypesToNofity = [];
             HashSet<IEntity> changedEntities = [];
-            ConcurrentDictionary<Type, HashSet<IEntity>> entitiesChanged = [];
 
-            foreach (var (Entity, Status) in context._operationQueue)
+            foreach (var (Entity, _) in context._operationQueue)
             {
                 changedEntities.Add(Entity);
 
@@ -268,7 +267,7 @@ internal override ValueTask Do(ModelContext context)
 
             foreach (var queryTypeToNofity in queryTypesToNofity)
             {
-                context.NotifyChanges(queryTypeToNofity, changedEntities.ToArray());
+                context.NotifyChanges(queryTypeToNofity, [.. changedEntities]);
             }
 
             return ValueTask.CompletedTask;
@@ -362,7 +361,7 @@ internal override async ValueTask Do(ModelContext context)
                         case EntityStatus.Deleted:
                             {
                                 var set = context._sets.GetOrAdd(Entity.GetType(), []);
-                                set.Remove(Entity.GetKey().EnsureNotNull());
+                                set.TryRemove(Entity.GetKey().EnsureNotNull(), out var _);
 
                                 queryTypesToNofity.Add(Entity.GetType());
                             }

diff --git a/src/ReactorData/Implementation/ModelContext.cs b/src/ReactorData/Implementation/ModelContext.cs
@@ -14,7 +14,7 @@ namespace ReactorData.Implementation;
 
 partial class ModelContext : IModelContext
 {
-    private readonly ConcurrentDictionary<Type, Dictionary<object, IEntity>> _sets = [];
+    private readonly ConcurrentDictionary<Type, ConcurrentDictionary<object, IEntity>> _sets = [];
 
     private readonly Queue<(IEntity Entity, EntityStatus Status)> _operationQueue = [];