Akka.Streams: Have SelectAsyncUnordered use local async function instead of ContinueWith
#7531
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2808,7 +2808,7 @@ private sealed class Logic : InAndOutGraphStageLogic | |
| public Logic(Attributes inheritedAttributes, SelectAsyncUnordered<TIn, TOut> stage) : base(stage.Shape) | ||
| { | ||
| _stage = stage; | ||
| var attr = inheritedAttributes.GetAttribute<ActorAttributes.SupervisionStrategy>(); | ||
| _decider = attr != null ? attr.Decider : Deciders.StoppingDecider; | ||
|
|
||
| _taskCallback = GetAsyncCallback<Result<TOut>>(TaskCompleted); | ||
|
|
@@ -2827,8 +2827,10 @@ public override void OnPush() | |
| if (task.IsCompleted) | ||
| TaskCompleted(Result.FromTask(task)); | ||
| else | ||
| { | ||
| // use an async local function to await the task and then run the task callback | ||
| _ = RunTask(task); | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| { | ||
|
|
@@ -2838,6 +2840,20 @@ public override void OnPush() | |
|
|
||
| if (Todo < _stage._parallelism && !HasBeenPulled(_stage.In)) | ||
| TryPull(_stage.In); | ||
| return; | ||
|
|
||
| async Task RunTask(Task<TOut> tt) | ||
|
Member
Author
There was a problem hiding this comment. Use an Replicates the same work we did on #7521 |
||
| { | ||
| try | ||
| { | ||
| var result = Result.Success(await tt); | ||
| _taskCallback(result); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| _taskCallback(Result.Failure<TOut>(ex)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public override void OnUpstreamFinish() | ||
|
|
@@ -2909,42 +2925,22 @@ private int Todo | |
|
|
||
| private readonly int _parallelism; | ||
| private readonly Func<TIn, Task<TOut>> _mapFunc; | ||
|
|
||
| public readonly Inlet<TIn> In = new("SelectAsyncUnordered.in"); | ||
|
|
||
| public readonly Outlet<TOut> Out = new("SelectAsyncUnordered.out"); | ||
|
|
||
| public SelectAsyncUnordered(int parallelism, Func<TIn, Task<TOut>> mapFunc) | ||
| { | ||
| _parallelism = parallelism; | ||
| _mapFunc = mapFunc; | ||
| Shape = new FlowShape<TIn, TOut>(In, Out); | ||
| } | ||
|
|
||
| protected override Attributes InitialAttributes { get; } = Attributes.CreateName("selectAsyncUnordered"); | ||
|
|
||
| public override FlowShape<TIn, TOut> Shape { get; } | ||
|
|
||
| protected override GraphStageLogic CreateLogic(Attributes inheritedAttributes) | ||
| => new Logic(inheritedAttributes, this); | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer get
AggregateExceptions here unless the test completes immediately, in which case we might have to harden this in the future.