Skip to content

4.x: Improve MaxBy cleanup/initialization #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2018
Merged

4.x: Improve MaxBy cleanup/initialization #679

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d893fd
4.x: Improve MaxBy cleanup/initialization
akarnokd Jun 27, 2018
aab7125
Clear the _lastKey as well
akarnokd Jun 27, 2018
11269fe
Add cleanup to the keySelector crash
akarnokd Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/MaxBy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ public MaxBy(IObservable<TSource> source, Func<TSource, TKey> keySelector, IComp

internal sealed class _ : Sink<TSource, IList<TSource>>
{
private readonly MaxBy<TSource, TKey> _parent;
readonly Func<TSource, TKey> _keySelector;
readonly IComparer<TKey> _comparer;
private bool _hasValue;
private TKey _lastKey;
private List<TSource> _list;

public _(MaxBy<TSource, TKey> parent, IObserver<IList<TSource>> observer)
: base(observer)
{
_parent = parent;
_keySelector = parent._keySelector;
_comparer = parent._comparer;

_hasValue = false;
_lastKey = default(TKey);
_list = new List<TSource>();
}

Expand All @@ -45,10 +45,12 @@ public override void OnNext(TSource value)
var key = default(TKey);
try
{
key = _parent._keySelector(value);
key = _keySelector(value);
}
catch (Exception ex)
{
_list = null;
_lastKey = default;
ForwardOnError(ex);
return;
}
Expand All @@ -64,10 +66,12 @@ public override void OnNext(TSource value)
{
try
{
comparison = _parent._comparer.Compare(key, _lastKey);
comparison = _comparer.Compare(key, _lastKey);
}
catch (Exception ex)
{
_list = null;
_lastKey = default;
ForwardOnError(ex);
return;
}
Expand All @@ -85,9 +89,19 @@ public override void OnNext(TSource value)
}
}

public override void OnError(Exception error)
{
_lastKey = default;
_list = null;
base.OnError(error);
}

public override void OnCompleted()
{
ForwardOnNext(_list);
var list = _list;
_list = null;
_lastKey = default;
ForwardOnNext(list);
ForwardOnCompleted();
}
}
Expand Down