Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit e8e93b4

Browse files
zeroZshadowzeroZshadow
authored
MessageList cleanup (#1203)
* Cleanup MessageList and MessagesSpan Now follows the same Slice API as Memory<T> and Span<T> Removed unused enumerator from MessageList as its unable to use ref returns (C# 8 only)
1 parent eb7114e commit e8e93b4

23 files changed

+255
-374
lines changed

‎test-project/Assets/Generated/Source/improbable/dependentschema/DependentComponentComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentCommandDiffStorage.cs‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public class DiffBarCommandCommandStorage : IComponentCommandDiffStorage
1515
, IDiffCommandRequestStorage<BarCommand.ReceivedRequest>
1616
, IDiffCommandResponseStorage<BarCommand.ReceivedResponse>
1717
{
18-
private MessageList<BarCommand.ReceivedRequest> requestStorage =
18+
private readonly MessageList<BarCommand.ReceivedRequest> requestStorage =
1919
new MessageList<BarCommand.ReceivedRequest>();
2020

21-
private MessageList<BarCommand.ReceivedResponse> responseStorage =
21+
private readonly MessageList<BarCommand.ReceivedResponse> responseStorage =
2222
new MessageList<BarCommand.ReceivedResponse>();
2323

2424
private readonly RequestComparer requestComparer = new RequestComparer();
@@ -70,12 +70,12 @@ public void AddResponse(BarCommand.ReceivedResponse response)
7070
responseStorage.Add(response);
7171
}
7272

73-
public ReceivedMessagesSpan<BarCommand.ReceivedRequest> GetRequests()
73+
public MessagesSpan<BarCommand.ReceivedRequest> GetRequests()
7474
{
75-
return new ReceivedMessagesSpan<BarCommand.ReceivedRequest>(requestStorage);
75+
return requestStorage.Slice();
7676
}
7777

78-
public ReceivedMessagesSpan<BarCommand.ReceivedRequest> GetRequests(EntityId targetEntityId)
78+
public MessagesSpan<BarCommand.ReceivedRequest> GetRequests(EntityId targetEntityId)
7979
{
8080
if (!requestsSorted)
8181
{
@@ -84,16 +84,15 @@ public void AddResponse(BarCommand.ReceivedResponse response)
8484
}
8585

8686
var (firstIndex, count) = requestStorage.GetEntityRange(targetEntityId);
87-
88-
return new ReceivedMessagesSpan<BarCommand.ReceivedRequest>(requestStorage, firstIndex, count);
87+
return requestStorage.Slice(firstIndex, count);
8988
}
9089

91-
public ReceivedMessagesSpan<BarCommand.ReceivedResponse> GetResponses()
90+
public MessagesSpan<BarCommand.ReceivedResponse> GetResponses()
9291
{
93-
return new ReceivedMessagesSpan<BarCommand.ReceivedResponse>(responseStorage);
92+
return responseStorage.Slice();
9493
}
9594

96-
public ReceivedMessagesSpan<BarCommand.ReceivedResponse> GetResponse(long requestId)
95+
public MessagesSpan<BarCommand.ReceivedResponse> GetResponse(long requestId)
9796
{
9897
if (!responsesSorted)
9998
{
@@ -102,12 +101,9 @@ public void AddResponse(BarCommand.ReceivedResponse response)
102101
}
103102

104103
var responseIndex = responseStorage.GetResponseIndex(requestId);
105-
if (responseIndex < 0)
106-
{
107-
return ReceivedMessagesSpan<BarCommand.ReceivedResponse>.Empty();
108-
}
109-
110-
return new ReceivedMessagesSpan<BarCommand.ReceivedResponse>(responseStorage, responseIndex, 1);
104+
return responseIndex.HasValue
105+
? responseStorage.Slice(responseIndex.Value, 1)
106+
: MessagesSpan<BarCommand.ReceivedResponse>.Empty();
111107
}
112108

113109
private class RequestComparer : IComparer<BarCommand.ReceivedRequest>
@@ -132,10 +128,10 @@ public class BarCommandCommandsToSendStorage : ICommandSendStorage, IComponentCo
132128
, ICommandRequestSendStorage<BarCommand.Request>
133129
, ICommandResponseSendStorage<BarCommand.Response>
134130
{
135-
private MessageList<CommandRequestWithMetaData<BarCommand.Request>> requestStorage =
131+
private readonly MessageList<CommandRequestWithMetaData<BarCommand.Request>> requestStorage =
136132
new MessageList<CommandRequestWithMetaData<BarCommand.Request>>();
137133

138-
private MessageList<BarCommand.Response> responseStorage =
134+
private readonly MessageList<BarCommand.Response> responseStorage =
139135
new MessageList<BarCommand.Response>();
140136

141137
public uint GetComponentId()

‎test-project/Assets/Generated/Source/improbable/dependentschema/DependentDataComponentComponentDiffStorage.cs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -141,39 +141,37 @@ public List<EntityId> GetComponentsRemoved()
141141
return componentsRemoved;
142142
}
143143

144-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
144+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
145145
{
146-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
146+
return updateStorage.Slice();
147147
}
148148

149-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
149+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
150150
{
151151
var range = updateStorage.GetEntityRange(entityId);
152-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
153-
range.Count);
152+
return updateStorage.Slice(range.FirstIndex, range.Count);
154153
}
155154

156-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
155+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
157156
{
158-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
157+
return authorityChanges.Slice();
159158
}
160159

161-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
160+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
162161
{
163162
var range = authorityChanges.GetEntityRange(entityId);
164-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
163+
return authorityChanges.Slice(range.FirstIndex, range.Count);
165164
}
166165

167-
ReceivedMessagesSpan<ComponentEventReceived<FooEvent.Event>> IDiffEventStorage<FooEvent.Event>.GetEvents(EntityId entityId)
166+
MessagesSpan<ComponentEventReceived<FooEvent.Event>> IDiffEventStorage<FooEvent.Event>.GetEvents(EntityId entityId)
168167
{
169168
var range = fooEventEventStorage.GetEntityRange(entityId);
170-
return new ReceivedMessagesSpan<ComponentEventReceived<FooEvent.Event>>(
171-
fooEventEventStorage, range.FirstIndex, range.Count);
169+
return fooEventEventStorage.Slice(range.FirstIndex, range.Count);
172170
}
173171

174-
ReceivedMessagesSpan<ComponentEventReceived<FooEvent.Event>> IDiffEventStorage<FooEvent.Event>.GetEvents()
172+
MessagesSpan<ComponentEventReceived<FooEvent.Event>> IDiffEventStorage<FooEvent.Event>.GetEvents()
175173
{
176-
return new ReceivedMessagesSpan<ComponentEventReceived<FooEvent.Event>>(fooEventEventStorage);
174+
return fooEventEventStorage.Slice();
177175
}
178176

179177
void IDiffEventStorage<FooEvent.Event>.AddEvent(ComponentEventReceived<FooEvent.Event> ev)

‎test-project/Assets/Generated/Source/improbable/tests/DependencyTestChildComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/tests/DependencyTestComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/tests/DependencyTestGrandchildComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveEntityComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapKeyComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

‎test-project/Assets/Generated/Source/improbable/testschema/ExhaustiveMapValueComponentDiffStorage.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,26 @@ public List<EntityId> GetComponentsRemoved()
130130
return componentsRemoved;
131131
}
132132

133-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
133+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates()
134134
{
135-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage);
135+
return updateStorage.Slice();
136136
}
137137

138-
public ReceivedMessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
138+
public MessagesSpan<ComponentUpdateReceived<Update>> GetUpdates(EntityId entityId)
139139
{
140140
var range = updateStorage.GetEntityRange(entityId);
141-
return new ReceivedMessagesSpan<ComponentUpdateReceived<Update>>(updateStorage, range.FirstIndex,
142-
range.Count);
141+
return updateStorage.Slice(range.FirstIndex, range.Count);
143142
}
144143

145-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
144+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges()
146145
{
147-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges);
146+
return authorityChanges.Slice();
148147
}
149148

150-
public ReceivedMessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
149+
public MessagesSpan<AuthorityChangeReceived> GetAuthorityChanges(EntityId entityId)
151150
{
152151
var range = authorityChanges.GetEntityRange(entityId);
153-
return new ReceivedMessagesSpan<AuthorityChangeReceived>(authorityChanges, range.FirstIndex, range.Count);
152+
return authorityChanges.Slice(range.FirstIndex, range.Count);
154153
}
155154
}
156155
}

0 commit comments

Comments
 (0)