Remove the MultiThreadedSpatialOSConnectionHandler (#1367)

* Remove the MultiThreadedSpatialOSConnectionHandler
Remove CommandMetaDataManager and CommandMetaDataAggregate

* Changelog and upgrade guide

* put back parameter name

* Re-factor CommandMetaData to remove request context directly
Stop naming things `s`

* Squash nested Dictionaries into single instance

Author: zeroZshadow

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - `WorkerConnector.HandleWorkerConnectionFailure` has been removed and `WorkerConnector.Connect` now throws exceptions for connection errors instead. [#1365](https://github.com/spatialos/gdk-for-unity/pull/1365)
 - `WorkerConnector` no longer destroys itself in `Dispose`. [#1365](https://github.com/spatialos/gdk-for-unity/pull/1365)
+- `MultiThreadedSpatialOSConnectionHandler` and `SpatialOSConnectionHandlerBuilder.SetThreadingMode` have been removed. [#1367](https://github.com/spatialos/gdk-for-unity/pull/1367)
 
 ### Added
 

UPGRADE_GUIDE.md

@@ -2,6 +2,10 @@
 
 ## From `0.3.5` to `0.3.6`
 
+### Multithreaded connection removed
+
+The `MultiThreadedSpatialOSConnectionHandler` has been removed and the method `SpatialOSConnectionHandlerBuilder.SetThreadingMode` has been removed to reflect this change.
+
 ### WorkerConnector changes
 
 There are two related changes that you will need to adjust for.

test-project/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentCommandDiffDeserializer.cs

@@ -25,7 +25,7 @@ public void AddRequestToDiff(CommandRequestOp op, ViewDiff diff)
                 diff.AddCommandRequest(request, ComponentId, 1);
             }
 
-            public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaDataAggregate commandMetaData)
+            public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaData commandMetaData)
             {
                 global::Improbable.TestSchema.SomeType? rawResponse = null;
                 if (op.StatusCode == StatusCode.Success)
@@ -34,7 +34,7 @@ public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaDa
                 }
 
                 var commandContext = commandMetaData.GetContext<global::Improbable.TestSchema.SomeType>(ComponentId, 1, op.RequestId);
-                commandMetaData.MarkIdForRemoval(ComponentId, 1, op.RequestId);
+                commandMetaData.RemoveRequest(ComponentId, 1, op.RequestId);
 
                 var response = new BarCommand.ReceivedResponse(
                     commandContext.SendingEntity,

workers/unity/Packages/io.improbable.gdk.core/.codegen/Source/Generators/Core/CommandDiffDeserializerGenerator.cs

@@ -52,7 +52,7 @@ public void AddRequestToDiff(CommandRequestOp op, ViewDiff diff)
         diff.AddCommandRequest(request, ComponentId, {command.CommandIndex});
     }}
 
-    public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaDataAggregate commandMetaData)
+    public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaData commandMetaData)
     {{
         {command.FqnResponseType}? rawResponse = null;
         if (op.StatusCode == StatusCode.Success)
@@ -61,7 +61,7 @@ public void AddResponseToDiff(CommandResponseOp op, ViewDiff diff, CommandMetaDa
         }}
 
         var commandContext = commandMetaData.GetContext<{command.FqnRequestType}>(ComponentId, {command.CommandIndex}, op.RequestId);
-        commandMetaData.MarkIdForRemoval(ComponentId, {command.CommandIndex}, op.RequestId);
+        commandMetaData.RemoveRequest(ComponentId, {command.CommandIndex}, op.RequestId);
 
         var response = new {command.PascalCaseName}.ReceivedResponse(
             commandContext.SendingEntity,

workers/unity/Packages/io.improbable.gdk.core/Worker/CommandMetaData.cs

@@ -28,10 +28,8 @@ public class CommandMetaData
 
         private readonly HashSet<long> internalRequestIds = new HashSet<long>();
 
-        private readonly Dictionary<uint, Dictionary<uint, ICommandMetaDataStorage>> componentIdToCommandIdToStorage =
-            new Dictionary<uint, Dictionary<uint, ICommandMetaDataStorage>>();
-
-        private List<CommandIds> requestsToRemove = new List<CommandIds>();
+        private readonly Dictionary<(uint componentId, uint commandId), ICommandMetaDataStorage> componentCommandToStorage =
+            new Dictionary<(uint componentId, uint commandId), ICommandMetaDataStorage>();
 
         public CommandMetaData()
         {
@@ -46,96 +44,46 @@ public CommandMetaData()
             foreach (var (componentId, type) in storageTypes)
             {
                 var instance = (ICommandMetaDataStorage) Activator.CreateInstance(type);
-
-                if (!componentIdToCommandIdToStorage.TryGetValue(componentId,
-                    out var commandIdToStorage))
-                {
-                    commandIdToStorage = new Dictionary<uint, ICommandMetaDataStorage>();
-                    componentIdToCommandIdToStorage.Add(componentId, commandIdToStorage);
-                }
-
-                commandIdToStorage.Add(instance.CommandId, instance);
+                componentCommandToStorage.Add((componentId, instance.CommandId), instance);
             }
 
-            componentIdToCommandIdToStorage.Add(0, new Dictionary<uint, ICommandMetaDataStorage>
-            {
-                { 0, new WorldCommandMetaDataStorage() }
-            });
+            componentCommandToStorage.Add((0, 0), new WorldCommandMetaDataStorage());
         }
 
-        public void MarkIdForRemoval(uint componentId, uint commandId, long internalRequestId)
+        public void RemoveRequest(uint componentId, uint commandId, long internalRequestId)
         {
-            requestsToRemove.Add(new CommandIds(componentId, commandId, internalRequestId));
-        }
-
-        public void FlushRemovedIds()
-        {
-            foreach (var commandIds in requestsToRemove)
-            {
-                var s = GetCommandDiffStorage(commandIds.ComponentId, commandIds.CommandId);
-                s.RemoveMetaData(commandIds.InternalRequestId);
-                internalRequestIds.Remove(commandIds.InternalRequestId);
-            }
-
-            requestsToRemove.Clear();
+            var commandMetaDataStorage = GetCommandDiffStorage(componentId, commandId);
+            commandMetaDataStorage.RemoveMetaData(internalRequestId);
+            internalRequestIds.Remove(internalRequestId);
         }
 
         public void AddRequest<T>(uint componentId, uint commandId, in CommandContext<T> context)
         {
-            var s = (ICommandPayloadStorage<T>) GetCommandDiffStorage(componentId, commandId);
-            s.AddRequest(in context);
+            var commandPayloadStorage = (ICommandPayloadStorage<T>) GetCommandDiffStorage(componentId, commandId);
+            commandPayloadStorage.AddRequest(in context);
         }
 
         public void AddInternalRequestId(uint componentId, uint commandId, long requestId, long internalRequestId)
         {
             internalRequestIds.Add(internalRequestId);
-            var s = GetCommandDiffStorage(componentId, commandId);
-            s.SetInternalRequestId(internalRequestId, requestId);
+            var commandMetaDataStorage = GetCommandDiffStorage(componentId, commandId);
+            commandMetaDataStorage.SetInternalRequestId(internalRequestId, requestId);
         }
 
         public CommandContext<T> GetContext<T>(uint componentId, uint commandId, long internalRequestId)
         {
-            var s = (ICommandPayloadStorage<T>) GetCommandDiffStorage(componentId, commandId);
-            return s.GetPayload(internalRequestId);
-        }
-
-        internal bool ContainsCommandMetaData(long internalRequestId)
-        {
-            return internalRequestIds.Contains(internalRequestId);
-        }
-
-        internal bool IsEmpty()
-        {
-            return internalRequestIds.Count == 0;
+            var commandPayloadStorage = (ICommandPayloadStorage<T>) GetCommandDiffStorage(componentId, commandId);
+            return commandPayloadStorage.GetPayload(internalRequestId);
         }
 
         private ICommandMetaDataStorage GetCommandDiffStorage(uint componentId, uint commandId)
         {
-            if (!componentIdToCommandIdToStorage.TryGetValue(componentId, out var commandIdToStorage))
-            {
-                throw new ArgumentException($"Can not find command meta data. Unknown component ID {componentId}");
-            }
-
-            if (!commandIdToStorage.TryGetValue(commandId, out var storage))
+            if (!componentCommandToStorage.TryGetValue((componentId, commandId), out var storage))
             {
-                throw new ArgumentException($"Can not find command meta data storage. Unknown command ID {commandId}");
+                throw new ArgumentException($"Can not find command metadata. Unknown command ID {commandId} on component {componentId}.");
             }
 
             return storage;
         }
-
-        private readonly struct CommandIds
-        {
-            public readonly uint ComponentId;
-            public readonly uint CommandId;
-            public readonly long InternalRequestId;
-
-            public CommandIds(uint componentId, uint commandId, long internalRequestId)
-            {
-                ComponentId = componentId;
-                CommandId = commandId;
-                InternalRequestId = internalRequestId;
-            }
-        }
     }
 }

workers/unity/Packages/io.improbable.gdk.core/Worker/CommandMetaDataAggregate.cs

@@ -68,7 +68,7 @@ public static void DeserializeAndApplyCommandRequestReceived(CommandRequestOp op
         }
 
         public static void DeserializeAndApplyCommandResponseReceived(CommandResponseOp op, ViewDiff viewDiff,
-            CommandMetaDataAggregate commandMetaData)
+            CommandMetaData commandMetaData)
         {
             if (!CommandIdsToCommandDeserializer.TryGetValue((op.Response.ComponentId, op.Response.CommandIndex),
                 out var deserializer))
@@ -81,53 +81,53 @@ public static void DeserializeAndApplyCommandResponseReceived(CommandResponseOp
         }
 
         public static void ApplyCreateEntityResponse(CreateEntityResponseOp op, ViewDiff viewDiff,
-            CommandMetaDataAggregate commandMetaData)
+            CommandMetaData commandMetaData)
         {
             var context = commandMetaData.GetContext<WorldCommands.CreateEntity.Request>(0, 0, op.RequestId);
             var response =
                 new WorldCommands.CreateEntity.ReceivedResponse(op, context.SendingEntity, context.Request,
                     context.RequestId);
 
-            commandMetaData.MarkIdForRemoval(0, 0, op.RequestId);
+            commandMetaData.RemoveRequest(0, 0, op.RequestId);
 
             viewDiff.AddCreateEntityResponse(response);
         }
 
         public static void ApplyDeleteEntityResponse(DeleteEntityResponseOp op, ViewDiff viewDiff,
-            CommandMetaDataAggregate commandMetaData)
+            CommandMetaData commandMetaData)
         {
             var context = commandMetaData.GetContext<WorldCommands.DeleteEntity.Request>(0, 0, op.RequestId);
             var response =
                 new WorldCommands.DeleteEntity.ReceivedResponse(op, context.SendingEntity, context.Request,
                     context.RequestId);
 
-            commandMetaData.MarkIdForRemoval(0, 0, op.RequestId);
+            commandMetaData.RemoveRequest(0, 0, op.RequestId);
 
             viewDiff.AddDeleteEntityResponse(response);
         }
 
         public static void ApplyReserveEntityIdsResponse(ReserveEntityIdsResponseOp op, ViewDiff viewDiff,
-            CommandMetaDataAggregate commandMetaData)
+            CommandMetaData commandMetaData)
         {
             var context = commandMetaData.GetContext<WorldCommands.ReserveEntityIds.Request>(0, 0, op.RequestId);
             var response =
                 new WorldCommands.ReserveEntityIds.ReceivedResponse(op, context.SendingEntity, context.Request,
                     context.RequestId);
 
-            commandMetaData.MarkIdForRemoval(0, 0, op.RequestId);
+            commandMetaData.RemoveRequest(0, 0, op.RequestId);
 
             viewDiff.AddReserveEntityIdsResponse(response);
         }
 
         public static void ApplyEntityQueryResponse(EntityQueryResponseOp op, ViewDiff viewDiff,
-            CommandMetaDataAggregate commandMetaData)
+            CommandMetaData commandMetaData)
         {
             var context = commandMetaData.GetContext<WorldCommands.EntityQuery.Request>(0, 0, op.RequestId);
             var response =
                 new WorldCommands.EntityQuery.ReceivedResponse(op, context.SendingEntity, context.Request,
                     context.RequestId);
 
-            commandMetaData.MarkIdForRemoval(0, 0, op.RequestId);
+            commandMetaData.RemoveRequest(0, 0, op.RequestId);
 
             viewDiff.AddEntityQueryResponse(response);
         }