Skip to content

Commit a5549a3

Browse files
committed
more
1 parent 52ec85c commit a5549a3

File tree

2 files changed

+6
-27
lines changed

2 files changed

+6
-27
lines changed

src/Client/Grpc/GrpcDurableEntityClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ public override async Task SignalEntityAsync(
9595
/// <inheritdoc/>
9696
public override Task<EntityMetadata<TState>?> GetEntityAsync<TState>(
9797
EntityInstanceId id, bool includeState = false, CancellationToken cancellation = default)
98-
=> this.GetEntityCoreAsync(id, includeState, this.ToEntityMetadata<TState>, cancellation);
98+
=> this.GetEntityCoreAsync(id, includeState, (e, s) => this.ToEntityMetadata<TState>(e, s), cancellation);
9999

100100
/// <inheritdoc/>
101101
public override AsyncPageable<EntityMetadata> GetAllEntitiesAsync(EntityQuery? filter = null)
102102
=> this.GetAllEntitiesCoreAsync(filter, (x, s) => this.ToEntityMetadata(x, s));
103103

104104
/// <inheritdoc/>
105105
public override AsyncPageable<EntityMetadata<TState>> GetAllEntitiesAsync<TState>(EntityQuery? filter = null)
106-
=> this.GetAllEntitiesCoreAsync(filter, this.ToEntityMetadata<TState>);
106+
=> this.GetAllEntitiesCoreAsync(filter, (x, s) => this.ToEntityMetadata<TState>(x, s));
107107

108108
/// <inheritdoc/>
109109
public override async Task<CleanEntityStorageResult> CleanEntityStorageAsync(

src/Client/OrchestrationServiceClientShim/ShimDurableEntityClient.cs

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ class ShimDurableEntityClient(string name, ShimDurableTaskClientOptions options)
2626

2727
DataConverter Converter => this.options.DataConverter;
2828

29-
/// <summary>
30-
/// Gets a value indicating whether the DataConverter supports async operations (LargePayload enabled).
31-
/// </summary>
32-
bool SupportsAsyncSerialization => this.options.EnableLargePayloadSupport;
33-
3429
/// <inheritdoc/>
3530
public override async Task<CleanEntityStorageResult> CleanEntityStorageAsync(
3631
CleanEntityStorageRequest? request = null,
@@ -61,9 +56,7 @@ public override AsyncPageable<EntityMetadata> GetAllEntitiesAsync(EntityQuery? f
6156

6257
/// <inheritdoc/>
6358
public override AsyncPageable<EntityMetadata<T>> GetAllEntitiesAsync<T>(EntityQuery? filter = null)
64-
=> this.SupportsAsyncSerialization
65-
? this.GetAllEntitiesAsync(this.Convert<T>, filter)
66-
: this.GetAllEntitiesAsync(this.ConvertSync<T>, filter);
59+
=> this.GetAllEntitiesAsync(this.Convert<T>, filter);
6760

6861
/// <inheritdoc/>
6962
public override async Task<EntityMetadata?> GetEntityAsync(
@@ -89,7 +82,7 @@ public override async Task SignalEntityAsync(
8982
Check.NotNull(id.Key);
9083

9184
DateTimeOffset? scheduledTime = options?.SignalTime;
92-
string? serializedInput = this.SupportsAsyncSerialization
85+
string? serializedInput = this.options.EnableLargePayloadSupport
9386
? await this.Converter.SerializeAsync(input, cancellation)
9487
: this.Converter.Serialize(input);
9588

@@ -176,7 +169,7 @@ AsyncPageable<TMetadata> GetAllEntitiesAsync<TMetadata>(
176169

177170
async Task<EntityMetadata<T>> Convert<T>(EntityBackendQueries.EntityMetadata metadata)
178171
{
179-
T? state = this.SupportsAsyncSerialization
172+
T? state = this.options.EnableLargePayloadSupport
180173
? await this.Converter.DeserializeAsync<T>(metadata.SerializedState)
181174
: this.Converter.Deserialize<T>(metadata.SerializedState);
182175

@@ -190,20 +183,6 @@ async Task<EntityMetadata<T>> Convert<T>(EntityBackendQueries.EntityMetadata met
190183
};
191184
}
192185

193-
EntityMetadata<T> ConvertSync<T>(EntityBackendQueries.EntityMetadata metadata)
194-
{
195-
T? state = this.Converter.Deserialize<T>(metadata.SerializedState);
196-
197-
return new(
198-
metadata.EntityId.ConvertFromCore(),
199-
state)
200-
{
201-
LastModifiedTime = metadata.LastModifiedTime,
202-
BacklogQueueSize = metadata.BacklogQueueSize,
203-
LockedBy = metadata.LockedBy,
204-
};
205-
}
206-
207186
async Task<EntityMetadata<T>?> Convert<T>(EntityBackendQueries.EntityMetadata? metadata)
208187
{
209188
if (metadata is null)
@@ -220,7 +199,7 @@ EntityMetadata Convert(EntityBackendQueries.EntityMetadata metadata)
220199
? null
221200
: new SerializedData(metadata.SerializedState, this.Converter)
222201
{
223-
EnableLargePayloadSupport = this.SupportsAsyncSerialization,
202+
EnableLargePayloadSupport = this.options.EnableLargePayloadSupport,
224203
};
225204
return new(new EntityInstanceId(metadata.EntityId.Name, metadata.EntityId.Key), data)
226205
{

0 commit comments

Comments
 (0)