From 4682f3d5a84bf38d49de5e33d236898b06906e71 Mon Sep 17 00:00:00 2001 From: sebastianburckhardt Date: Wed, 6 Sep 2023 15:04:16 -0700 Subject: [PATCH 1/2] rename OperationBatch to EntityBatch --- .../{OperationBatchRequest.cs => EntityBatchRequest.cs} | 2 +- .../{OperationBatchResult.cs => EntityBatchResult.cs} | 2 +- src/DurableTask.Core/Entities/TaskEntity.cs | 2 +- src/DurableTask.Core/Logging/LogEvents.cs | 4 ++-- src/DurableTask.Core/Logging/LogHelper.cs | 4 ++-- src/DurableTask.Core/TaskEntityDispatcher.cs | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename src/DurableTask.Core/Entities/OperationFormat/{OperationBatchRequest.cs => EntityBatchRequest.cs} (97%) rename src/DurableTask.Core/Entities/OperationFormat/{OperationBatchResult.cs => EntityBatchResult.cs} (98%) diff --git a/src/DurableTask.Core/Entities/OperationFormat/OperationBatchRequest.cs b/src/DurableTask.Core/Entities/OperationFormat/EntityBatchRequest.cs similarity index 97% rename from src/DurableTask.Core/Entities/OperationFormat/OperationBatchRequest.cs rename to src/DurableTask.Core/Entities/OperationFormat/EntityBatchRequest.cs index 0abf0138b..1a08a8ac5 100644 --- a/src/DurableTask.Core/Entities/OperationFormat/OperationBatchRequest.cs +++ b/src/DurableTask.Core/Entities/OperationFormat/EntityBatchRequest.cs @@ -18,7 +18,7 @@ namespace DurableTask.Core.Entities.OperationFormat /// /// A request for execution of a batch of operations on an entity. /// - public class OperationBatchRequest + public class EntityBatchRequest { // NOTE: Actions must be serializable by a variety of different serializer types to support out-of-process execution. // To ensure maximum compatibility, all properties should be public and settable by default. diff --git a/src/DurableTask.Core/Entities/OperationFormat/OperationBatchResult.cs b/src/DurableTask.Core/Entities/OperationFormat/EntityBatchResult.cs similarity index 98% rename from src/DurableTask.Core/Entities/OperationFormat/OperationBatchResult.cs rename to src/DurableTask.Core/Entities/OperationFormat/EntityBatchResult.cs index 0d2718ad3..4037675a6 100644 --- a/src/DurableTask.Core/Entities/OperationFormat/OperationBatchResult.cs +++ b/src/DurableTask.Core/Entities/OperationFormat/EntityBatchResult.cs @@ -18,7 +18,7 @@ namespace DurableTask.Core.Entities.OperationFormat /// /// The results of executing a batch of operations on the entity out of process. /// - public class OperationBatchResult + public class EntityBatchResult { // NOTE: Actions must be serializable by a variety of different serializer types to support out-of-process execution. // To ensure maximum compatibility, all properties should be public and settable by default. diff --git a/src/DurableTask.Core/Entities/TaskEntity.cs b/src/DurableTask.Core/Entities/TaskEntity.cs index 960bf14bc..b3277a9ff 100644 --- a/src/DurableTask.Core/Entities/TaskEntity.cs +++ b/src/DurableTask.Core/Entities/TaskEntity.cs @@ -25,6 +25,6 @@ public abstract class TaskEntity /// /// Execute a batch of operations on an entity. /// - public abstract Task ExecuteOperationBatchAsync(OperationBatchRequest operations, EntityExecutionOptions options); + public abstract Task ExecuteOperationBatchAsync(EntityBatchRequest operations); } } diff --git a/src/DurableTask.Core/Logging/LogEvents.cs b/src/DurableTask.Core/Logging/LogEvents.cs index 786981c0f..b0fc93ad8 100644 --- a/src/DurableTask.Core/Logging/LogEvents.cs +++ b/src/DurableTask.Core/Logging/LogEvents.cs @@ -1184,7 +1184,7 @@ void IEventSourceEvent.WriteEventSource() => /// internal class EntityBatchExecuting : StructuredLogEvent, IEventSourceEvent { - public EntityBatchExecuting(OperationBatchRequest request) + public EntityBatchExecuting(EntityBatchRequest request) { this.InstanceId = request.InstanceId; this.OperationCount = request.Operations.Count; @@ -1223,7 +1223,7 @@ void IEventSourceEvent.WriteEventSource() => /// internal class EntityBatchExecuted : StructuredLogEvent, IEventSourceEvent { - public EntityBatchExecuted(OperationBatchRequest request, OperationBatchResult result) + public EntityBatchExecuted(EntityBatchRequest request, EntityBatchResult result) { this.InstanceId = request.InstanceId; this.OperationCount = request.Operations.Count; diff --git a/src/DurableTask.Core/Logging/LogHelper.cs b/src/DurableTask.Core/Logging/LogHelper.cs index 7bea8da2b..61d2dc05c 100644 --- a/src/DurableTask.Core/Logging/LogHelper.cs +++ b/src/DurableTask.Core/Logging/LogHelper.cs @@ -566,7 +566,7 @@ internal void RenewOrchestrationWorkItemFailed(TaskOrchestrationWorkItem workIte /// Logs that an entity operation batch is about to start executing. /// /// The batch request. - internal void EntityBatchExecuting(OperationBatchRequest request) + internal void EntityBatchExecuting(EntityBatchRequest request) { if (this.IsStructuredLoggingEnabled) { @@ -579,7 +579,7 @@ internal void EntityBatchExecuting(OperationBatchRequest request) /// /// The batch request. /// The batch result. - internal void EntityBatchExecuted(OperationBatchRequest request, OperationBatchResult result) + internal void EntityBatchExecuted(EntityBatchRequest request, EntityBatchResult result) { if (this.IsStructuredLoggingEnabled) { diff --git a/src/DurableTask.Core/TaskEntityDispatcher.cs b/src/DurableTask.Core/TaskEntityDispatcher.cs index 0e9f0990f..8a1151199 100644 --- a/src/DurableTask.Core/TaskEntityDispatcher.cs +++ b/src/DurableTask.Core/TaskEntityDispatcher.cs @@ -800,10 +800,10 @@ void ProcessSendStartMessage(WorkItemEffects effects, OrchestrationRuntimeState #endregion - async Task ExecuteViaMiddlewareAsync(Work workToDoNow, OrchestrationInstance instance, string serializedEntityState) + async Task ExecuteViaMiddlewareAsync(Work workToDoNow, OrchestrationInstance instance, string serializedEntityState) { // the request object that will be passed to the worker - var request = new OperationBatchRequest() + var request = new EntityBatchRequest() { InstanceId = instance.InstanceId, EntityState = serializedEntityState, @@ -828,7 +828,7 @@ await this.dispatchPipeline.RunAsync(dispatchContext, async _ => // Check to see if the custom middleware intercepted and substituted the orchestration execution // with its own execution behavior, providing us with the end results. If so, we can terminate // the dispatch pipeline here. - var resultFromMiddleware = dispatchContext.GetProperty(); + var resultFromMiddleware = dispatchContext.GetProperty(); if (resultFromMiddleware != null) { return; @@ -854,7 +854,7 @@ await this.dispatchPipeline.RunAsync(dispatchContext, async _ => dispatchContext.SetProperty(result); }); - var result = dispatchContext.GetProperty(); + var result = dispatchContext.GetProperty(); this.logHelper.EntityBatchExecuted(request, result); From a0b15554d0b04e776253687fd34d91c2bf0c3cd6 Mon Sep 17 00:00:00 2001 From: sebastianburckhardt Date: Wed, 6 Sep 2023 15:45:41 -0700 Subject: [PATCH 2/2] fix accidentally commited change from another PR --- src/DurableTask.Core/Entities/TaskEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DurableTask.Core/Entities/TaskEntity.cs b/src/DurableTask.Core/Entities/TaskEntity.cs index b3277a9ff..4452c298f 100644 --- a/src/DurableTask.Core/Entities/TaskEntity.cs +++ b/src/DurableTask.Core/Entities/TaskEntity.cs @@ -25,6 +25,6 @@ public abstract class TaskEntity /// /// Execute a batch of operations on an entity. /// - public abstract Task ExecuteOperationBatchAsync(EntityBatchRequest operations); + public abstract Task ExecuteOperationBatchAsync(EntityBatchRequest operations, EntityExecutionOptions options); } }