Move some internals into Pipeline folder (#1497)

App-vNext · Aug 17, 2023 · c21a307 · c21a307
1 parent 149ed82
commit c21a307
Show file tree

Hide file tree

Showing 36 changed files with 498 additions and 496 deletions.
diff --git a/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs b/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using Polly.Telemetry;
+using Polly.Utils.Pipeline;
 
 namespace Polly.Registry;
 
@@ -288,7 +289,7 @@ private static PipelineComponent CreatePipelineComponent<TBuilder>(
             return pipeline;
         }
 
-        return PipelineComponent.CreateReloadable(pipeline, context.ReloadTokenProducer(), () => factory().BuildPipelineComponent(), telemetry);
+        return PipelineComponentFactory.CreateReloadable(pipeline, context.ReloadTokenProducer(), () => factory().BuildPipelineComponent(), telemetry);
     }
 
     private GenericRegistry<TResult> GetGenericRegistry<TResult>()

diff --git a/src/Polly.Core/ResiliencePipeline.Async.cs b/src/Polly.Core/ResiliencePipeline.Async.cs
@@ -24,7 +24,7 @@ public async ValueTask ExecuteAsync<TState>(
 
         InitializeAsyncContext(context);
 
-        var outcome = await ExecuteCore(
+        var outcome = await Component.ExecuteCore(
             static async (context, state) =>
             {
                 try
@@ -59,7 +59,7 @@ public async ValueTask ExecuteAsync(
 
         InitializeAsyncContext(context);
 
-        var outcome = await ExecuteCore(
+        var outcome = await Component.ExecuteCore(
             static async (context, state) =>
             {
                 try
@@ -98,7 +98,7 @@ public async ValueTask ExecuteAsync<TState>(
 
         try
         {
-            var outcome = await ExecuteCore(
+            var outcome = await Component.ExecuteCore(
                 static async (context, state) =>
                 {
                     try
@@ -139,7 +139,7 @@ public async ValueTask ExecuteAsync(
 
         try
         {
-            var outcome = await ExecuteCore(
+            var outcome = await Component.ExecuteCore(
                 static async (context, state) =>
                 {
                     try

diff --git a/src/Polly.Core/ResiliencePipeline.AsyncT.cs b/src/Polly.Core/ResiliencePipeline.AsyncT.cs
@@ -29,7 +29,7 @@ public ValueTask<Outcome<TResult>> ExecuteOutcomeAsync<TResult, TState>(
 
         InitializeAsyncContext<TResult>(context);
 
-        return ExecuteCore(callback, context, state);
+        return Component.ExecuteCore(callback, context, state);
     }
 
     /// <summary>
@@ -52,7 +52,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult, TState>(
 
         InitializeAsyncContext<TResult>(context);
 
-        var outcome = await ExecuteCore(
+        var outcome = await Component.ExecuteCore(
             static async (context, state) =>
             {
                 try
@@ -87,7 +87,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult>(
 
         InitializeAsyncContext<TResult>(context);
 
-        var outcome = await ExecuteCore(
+        var outcome = await Component.ExecuteCore(
             static async (context, state) =>
             {
                 try
@@ -126,7 +126,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult, TState>(
 
         try
         {
-            var outcome = await ExecuteCore(
+            var outcome = await Component.ExecuteCore(
                 static async (context, state) =>
                 {
                     try
@@ -167,7 +167,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult>(
 
         try
         {
-            var outcome = await ExecuteCore(
+            var outcome = await Component.ExecuteCore(
                 static async (context, state) =>
                 {
                     try

diff --git a/src/Polly.Core/ResiliencePipeline.Sync.cs b/src/Polly.Core/ResiliencePipeline.Sync.cs
@@ -23,7 +23,7 @@ public void Execute<TState>(
 
         InitializeSyncContext(context);
 
-        ExecuteCoreSync(
+        Component.ExecuteCoreSync(
             static (context, state) =>
             {
                 try
@@ -55,7 +55,7 @@ public void Execute(
 
         InitializeSyncContext(context);
 
-        ExecuteCoreSync(
+        Component.ExecuteCoreSync(
             static (context, state) =>
             {
                 try
@@ -91,7 +91,7 @@ public void Execute<TState>(
 
         try
         {
-            ExecuteCoreSync(
+            Component.ExecuteCoreSync(
                 static (context, state) =>
                 {
                     try
@@ -129,7 +129,7 @@ public void Execute(
 
         try
         {
-            ExecuteCoreSync(
+            Component.ExecuteCoreSync(
                 static (context, state) =>
                 {
                     try
@@ -168,7 +168,7 @@ public void Execute<TState>(
 
         try
         {
-            ExecuteCoreSync(
+            Component.ExecuteCoreSync(
                 static (_, state) =>
                 {
                     try
@@ -203,7 +203,7 @@ public void Execute(Action callback)
 
         try
         {
-            ExecuteCoreSync(
+            Component.ExecuteCoreSync(
                 static (_, state) =>
                 {
                     try

diff --git a/src/Polly.Core/ResiliencePipeline.SyncT.cs b/src/Polly.Core/ResiliencePipeline.SyncT.cs
@@ -25,7 +25,7 @@ public TResult Execute<TResult, TState>(
 
         InitializeSyncContext<TResult>(context);
 
-        return ExecuteCoreSync(
+        return Component.ExecuteCoreSync(
            static (context, state) =>
            {
                try
@@ -59,7 +59,7 @@ public TResult Execute<TResult>(
 
         InitializeSyncContext<TResult>(context);
 
-        return ExecuteCoreSync(
+        return Component.ExecuteCoreSync(
             static (context, state) =>
             {
                 try
@@ -94,7 +94,7 @@ public TResult Execute<TResult>(
 
         try
         {
-            return ExecuteCoreSync(
+            return Component.ExecuteCoreSync(
                 static (context, state) =>
                 {
                     try
@@ -130,7 +130,7 @@ public TResult Execute<TResult>(Func<TResult> callback)
 
         try
         {
-            return ExecuteCoreSync(
+            return Component.ExecuteCoreSync(
                 static (_, state) =>
                 {
                     try
@@ -168,7 +168,7 @@ public TResult Execute<TResult, TState>(Func<TState, TResult> callback, TState s
 
         try
         {
-            return ExecuteCoreSync(
+            return Component.ExecuteCoreSync(
                 static (_, state) =>
                 {
                     try
@@ -210,7 +210,7 @@ public TResult Execute<TResult, TState>(
 
         try
         {
-            return ExecuteCoreSync(
+            return Component.ExecuteCoreSync(
                 static (context, state) =>
                 {
                     try

diff --git a/src/Polly.Core/ResiliencePipeline.cs b/src/Polly.Core/ResiliencePipeline.cs
@@ -1,3 +1,5 @@
+using Polly.Utils.Pipeline;
+
 namespace Polly;
 
 /// <summary>
@@ -25,25 +27,4 @@ internal ResiliencePipeline(PipelineComponent component, DisposeBehavior dispose
     internal PipelineComponent Component { get; }
 
     internal ComponentDisposeHelper DisposeHelper { get; }
-
-    internal ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState>(
-        Func<ResilienceContext, TState, ValueTask<Outcome<TResult>>> callback,
-        ResilienceContext context,
-        TState state) => Component.ExecuteCore(callback, context, state);
-
-    private Outcome<TResult> ExecuteCoreSync<TResult, TState>(
-        Func<ResilienceContext, TState, Outcome<TResult>> callback,
-        ResilienceContext context,
-        TState state)
-    {
-        return ExecuteCore(
-            static (context, state) =>
-            {
-                var result = state.callback(context, state.state);
-
-                return new ValueTask<Outcome<TResult>>(result);
-            },
-            context,
-            (callback, state)).GetResult();
-    }
 }
diff --git a/src/Polly.Core/ResiliencePipelineBuilderBase.cs b/src/Polly.Core/ResiliencePipelineBuilderBase.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using Polly.Telemetry;
+using Polly.Utils.Pipeline;
 
 namespace Polly;
 
@@ -123,7 +124,7 @@ internal PipelineComponent BuildPipelineComponent()
             throw new InvalidOperationException("The resilience pipeline must contain unique resilience strategies.");
         }
 
-        return PipelineComponent.CreateComposite(components, new ResilienceStrategyTelemetry(source, TelemetryListener), TimeProvider);
+        return PipelineComponentFactory.CreateComposite(components, new ResilienceStrategyTelemetry(source, TelemetryListener), TimeProvider);
     }
 
     private PipelineComponent CreateComponent(Entry entry)

diff --git a/src/Polly.Core/ResiliencePipelineBuilderExtensions.cs b/src/Polly.Core/ResiliencePipelineBuilderExtensions.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using Polly.Utils.Pipeline;
 
 namespace Polly;
 
@@ -27,7 +28,7 @@ public static TBuilder AddPipeline<TBuilder>(this TBuilder builder, ResiliencePi
         Guard.NotNull(builder);
         Guard.NotNull(pipeline);
 
-        builder.AddPipelineComponent(_ => PipelineComponent.FromPipeline(pipeline), EmptyOptions.Instance);
+        builder.AddPipelineComponent(_ => PipelineComponentFactory.FromPipeline(pipeline), EmptyOptions.Instance);
         return builder;
     }
 
@@ -49,7 +50,7 @@ public static ResiliencePipelineBuilder<TResult> AddPipeline<TResult>(this Resil
         Guard.NotNull(builder);
         Guard.NotNull(pipeline);
 
-        builder.AddPipelineComponent(_ => PipelineComponent.FromPipeline(pipeline), EmptyOptions.Instance);
+        builder.AddPipelineComponent(_ => PipelineComponentFactory.FromPipeline(pipeline), EmptyOptions.Instance);
         return builder;
     }
 
@@ -72,7 +73,7 @@ public static TBuilder AddStrategy<TBuilder>(this TBuilder builder, Func<Strateg
         Guard.NotNull(factory);
         Guard.NotNull(options);
 
-        builder.AddPipelineComponent(context => PipelineComponent.FromStrategy(factory(context)), options);
+        builder.AddPipelineComponent(context => PipelineComponentFactory.FromStrategy(factory(context)), options);
         return builder;
     }
 
@@ -95,7 +96,7 @@ public static ResiliencePipelineBuilder AddStrategy(
         Guard.NotNull(factory);
         Guard.NotNull(options);
 
-        builder.AddPipelineComponent(context => PipelineComponent.FromStrategy(factory(context)), options);
+        builder.AddPipelineComponent(context => PipelineComponentFactory.FromStrategy(factory(context)), options);
         return builder;
     }
 
@@ -119,7 +120,7 @@ public static ResiliencePipelineBuilder<TResult> AddStrategy<TResult>(
         Guard.NotNull(factory);
         Guard.NotNull(options);
 
-        builder.AddPipelineComponent(context => PipelineComponent.FromStrategy(factory(context)), options);
+        builder.AddPipelineComponent(context => PipelineComponentFactory.FromStrategy(factory(context)), options);
         return builder;
     }
 

diff --git a/src/Polly.Core/ResiliencePipelineT.cs b/src/Polly.Core/ResiliencePipelineT.cs
@@ -1,3 +1,5 @@
+using Polly.Utils.Pipeline;
+
 namespace Polly;
 
 /// <summary>

diff --git a/src/Polly.Core/Utils/Pipeline/BridgeComponent.TResult.cs b/src/Polly.Core/Utils/Pipeline/BridgeComponent.TResult.cs
@@ -0,0 +1,37 @@
+namespace Polly.Utils.Pipeline;
+
+[DebuggerDisplay("{Strategy}")]
+internal sealed class BridgeComponent<T> : BridgeComponentBase
+{
+    public BridgeComponent(ResilienceStrategy<T> strategy)
+        : base(strategy) => Strategy = strategy;
+
+    public ResilienceStrategy<T> Strategy { get; }
+
+    internal override ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState>(
+        Func<ResilienceContext, TState, ValueTask<Outcome<TResult>>> callback,
+        ResilienceContext context,
+        TState state)
+    {
+        // Check if we can cast directly, thus saving some cycles and improving the performance
+        if (callback is Func<ResilienceContext, TState, ValueTask<Outcome<T>>> casted)
+        {
+            return TaskHelper.ConvertValueTask<T, TResult>(
+                Strategy.ExecuteCore(casted, context, state),
+                context);
+        }
+        else
+        {
+            var valueTask = Strategy.ExecuteCore(
+                static async (context, state) =>
+                {
+                    var outcome = await state.callback(context, state.state).ConfigureAwait(context.ContinueOnCapturedContext);
+                    return outcome.AsOutcome<T>();
+                },
+                context,
+                (callback, state));
+
+            return TaskHelper.ConvertValueTask<T, TResult>(valueTask, context);
+        }
+    }
+}
diff --git a/src/Polly.Core/Utils/Pipeline/BridgeComponent.cs b/src/Polly.Core/Utils/Pipeline/BridgeComponent.cs
@@ -0,0 +1,15 @@
+namespace Polly.Utils.Pipeline;
+
+[DebuggerDisplay("{Strategy}")]
+internal sealed class BridgeComponent : BridgeComponentBase
+{
+    public BridgeComponent(ResilienceStrategy strategy)
+        : base(strategy) => Strategy = strategy;
+
+    public ResilienceStrategy Strategy { get; }
+
+    internal override ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState>(
+        Func<ResilienceContext, TState, ValueTask<Outcome<TResult>>> callback,
+        ResilienceContext context,
+        TState state) => Strategy.ExecuteCore(callback, context, state);
+}