|
@@ -11,21 +11,8 @@ namespace System.Linq
|
|
|
{
|
|
|
public static partial class AsyncEnumerable
|
|
|
{
|
|
|
- public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, TKey> outerKeySelector, Func<TInner, TKey> innerKeySelector, Func<TOuter, TInner, TResult> resultSelector)
|
|
|
- {
|
|
|
- if (outer == null)
|
|
|
- throw Error.ArgumentNull(nameof(outer));
|
|
|
- if (inner == null)
|
|
|
- throw Error.ArgumentNull(nameof(inner));
|
|
|
- if (outerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(outerKeySelector));
|
|
|
- if (innerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(innerKeySelector));
|
|
|
- if (resultSelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(resultSelector));
|
|
|
-
|
|
|
- return new JoinAsyncIterator<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
- }
|
|
|
+ public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, TKey> outerKeySelector, Func<TInner, TKey> innerKeySelector, Func<TOuter, TInner, TResult> resultSelector) =>
|
|
|
+ Join(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
|
|
|
public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, TKey> outerKeySelector, Func<TInner, TKey> innerKeySelector, Func<TOuter, TInner, TResult> resultSelector, IEqualityComparer<TKey> comparer)
|
|
|
{
|
|
@@ -43,39 +30,8 @@ namespace System.Linq
|
|
|
return new JoinAsyncIterator<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer);
|
|
|
}
|
|
|
|
|
|
- public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, ValueTask<TKey>> outerKeySelector, Func<TInner, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, ValueTask<TResult>> resultSelector)
|
|
|
- {
|
|
|
- if (outer == null)
|
|
|
- throw Error.ArgumentNull(nameof(outer));
|
|
|
- if (inner == null)
|
|
|
- throw Error.ArgumentNull(nameof(inner));
|
|
|
- if (outerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(outerKeySelector));
|
|
|
- if (innerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(innerKeySelector));
|
|
|
- if (resultSelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(resultSelector));
|
|
|
-
|
|
|
- return new JoinAsyncIteratorWithTask<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
- }
|
|
|
-
|
|
|
-#if !NO_DEEP_CANCELLATION
|
|
|
- public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, CancellationToken, ValueTask<TKey>> outerKeySelector, Func<TInner, CancellationToken, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, CancellationToken, ValueTask<TResult>> resultSelector)
|
|
|
- {
|
|
|
- if (outer == null)
|
|
|
- throw Error.ArgumentNull(nameof(outer));
|
|
|
- if (inner == null)
|
|
|
- throw Error.ArgumentNull(nameof(inner));
|
|
|
- if (outerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(outerKeySelector));
|
|
|
- if (innerKeySelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(innerKeySelector));
|
|
|
- if (resultSelector == null)
|
|
|
- throw Error.ArgumentNull(nameof(resultSelector));
|
|
|
-
|
|
|
- return new JoinAsyncIteratorWithTaskAndCancellation<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
- }
|
|
|
-#endif
|
|
|
+ public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, ValueTask<TKey>> outerKeySelector, Func<TInner, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, ValueTask<TResult>> resultSelector) =>
|
|
|
+ Join<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
|
|
|
public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, ValueTask<TKey>> outerKeySelector, Func<TInner, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, ValueTask<TResult>> resultSelector, IEqualityComparer<TKey> comparer)
|
|
|
{
|
|
@@ -94,6 +50,9 @@ namespace System.Linq
|
|
|
}
|
|
|
|
|
|
#if !NO_DEEP_CANCELLATION
|
|
|
+ public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, CancellationToken, ValueTask<TKey>> outerKeySelector, Func<TInner, CancellationToken, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, CancellationToken, ValueTask<TResult>> resultSelector) =>
|
|
|
+ Join<TOuter, TInner, TKey, TResult>(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer: null);
|
|
|
+
|
|
|
public static IAsyncEnumerable<TResult> Join<TOuter, TInner, TKey, TResult>(this IAsyncEnumerable<TOuter> outer, IAsyncEnumerable<TInner> inner, Func<TOuter, CancellationToken, ValueTask<TKey>> outerKeySelector, Func<TInner, CancellationToken, ValueTask<TKey>> innerKeySelector, Func<TOuter, TInner, CancellationToken, ValueTask<TResult>> resultSelector, IEqualityComparer<TKey> comparer)
|
|
|
{
|
|
|
if (outer == null)
|