Skip to content

Fix/Improve TruncatedCollectionOfT #1492

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

Draft
WanjohiSammy wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Fix/Improve TruncatedCollectionOfT #1492

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ad1d87
trying optimize TruncatedCollectionOfT and add support for IAsyncEnum…
WanjohiSammy Jun 25, 2025
a3b8eb7
refactor
WanjohiSammy Jun 25, 2025
359c2f9
Add some tests
WanjohiSammy Jun 25, 2025
dec2126
Refactor
WanjohiSammy Jun 25, 2025
e54873d
Try handling IAsyncEnumerable
WanjohiSammy Jun 26, 2025
f2ef421
Update src/Microsoft.AspNetCore.OData/Query/Container/TruncatedCollec…
WanjohiSammy Jun 26, 2025
9a885d9
some refactor
WanjohiSammy Jul 4, 2025
35a0ea9
Merge branch 'fix/improve-truncatedcollection' of https://github.com/…
WanjohiSammy Jul 4, 2025
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
3 changes: 2 additions & 1 deletion src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -35,6 +35,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0-preview.5.25277.114" />
</ItemGroup>

<ItemGroup>
Expand Down
92 changes: 77 additions & 15 deletions src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8914,13 +8914,39 @@
</summary>
<typeparam name="T">The collection element type.</typeparam>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Collections.Generic.List{`0},System.Int32,System.Nullable{System.Int64},System.Boolean)">
<summary>
Private constructor used by static Create methods and public constructors.
</summary>
<param name="items">The list of items in the collection.</param>
<param name="pageSize">The maximum number of items per page.</param>
<param name="totalCount">The total number of items in the source collection, if known.</param>
<param name="isTruncated">Indicates whether the collection is truncated.</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Collections.Generic.IAsyncEnumerable{`0},System.Int32,System.Nullable{System.Int64},System.Boolean)">
<summary>
Private constructor used by static Create methods and public constructors.
</summary>
<param name="asyncSource">The asynchronous source of items (pageSize + 1) in the collection.</param>
<param name="pageSize">The maximum number of items per page.</param>
<param name="totalCount">The total number of items in the source collection, if known.</param>
<param name="isTruncated">Indicates whether the collection is truncated.</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0},System.Int32)">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
</summary>
<param name="source">The collection to be truncated.</param>
<param name="pageSize">The page size.</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0},System.Int32,System.Nullable{System.Int64})">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
</summary>
<param name="source">The queryable collection to be truncated.</param>
<param name="pageSize">The page size.</param>
<param name="totalCount">The total count.</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Linq.IQueryable{`0},System.Int32)">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
Expand All @@ -8936,39 +8962,75 @@
<param name="pageSize">The page size.</param>
<param name="parameterize">Flag indicating whether constants should be parameterized</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0},System.Int32,System.Nullable{System.Int64})">
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection{`0})">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
Wrapper used internally by the backward-compatible constructors.
</summary>
<param name="source">The queryable collection to be truncated.</param>
<param name="other">An instance of <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/>.</param>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Collections.Generic.IEnumerable{`0},System.Int32)">
<summary>
Create a truncated collection from an <see cref="T:System.Collections.Generic.IEnumerable`1"/>.
</summary>
<param name="source">The collection to be truncated.</param>
<param name="pageSize">The page size.</param>
<param name="totalCount">The total count.</param>
<returns>An instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"></see></returns>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Linq.IQueryable{`0},System.Int32,System.Nullable{System.Int64})">
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Collections.Generic.IEnumerable{`0},System.Int32,System.Nullable{System.Int64})">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
Create a truncated collection from an <see cref="T:System.Collections.Generic.IEnumerable`1"/>.
</summary>
<param name="source">The queryable collection to be truncated.</param>
<param name="source">The collection to be truncated.</param>
<param name="pageSize">The page size.</param>
<param name="totalCount">The total count.</param>
<returns>An instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"></see></returns>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.#ctor(System.Linq.IQueryable{`0},System.Int32,System.Nullable{System.Int64},System.Boolean)">
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Linq.IQueryable{`0},System.Int32)">
<summary>
Initializes a new instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/> class.
Create a truncated collection from an <see cref="T:System.Linq.IQueryable`1"/>.
</summary>
<param name="source">The queryable collection to be truncated.</param>
<param name="source">The collection to be truncated.</param>
<param name="pageSize">The page size.</param>
<returns>An instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"></see></returns>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Linq.IQueryable{`0},System.Int32,System.Nullable{System.Int64})">
<summary>
Create a truncated collection from an <see cref="T:System.Linq.IQueryable`1"/>.
</summary>
<param name="source">The collection to be truncated.</param>
<param name="pageSize">The page size.</param>
<param name="totalCount">The total count.</param>
<param name="parameterize">Flag indicating whether constants should be parameterized</param>
<returns>An instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"></see></returns>
</member>
<!-- Badly formed XML comment ignored for member "M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Linq.IQueryable{`0},System.Int32,System.Boolean)" -->
<!-- Badly formed XML comment ignored for member "M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Create(System.Linq.IQueryable{`0},System.Int32,System.Nullable{System.Int64},System.Boolean)" -->
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.CreateAsync(System.Collections.Generic.IAsyncEnumerable{`0},System.Int32,System.Nullable{System.Int64},System.Threading.CancellationToken)">
<summary>
Create an async truncated collection from an <see cref="T:System.Collections.Generic.IAsyncEnumerable`1"/>.
</summary>
<param name="source">The AsyncEnumerable to be truncated.</param>
<param name="pageSize">The page size.</param>
<param name="totalCount">The total count. Default is null.</param>
<param name="cancellationToken">Cancellation token for async operations. Default is <see cref="!:default"/></param>
<returns>An instance of the <see cref="T:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1"/></returns>
</member>
<member name="P:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.PageSize">
<inheritdoc />
<inheritdoc/>
</member>
<member name="P:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.TotalCount">
<inheritdoc/>
</member>
<member name="P:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.IsTruncated">
<inheritdoc />
<inheritdoc/>
</member>
<member name="P:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.TotalCount">
<inheritdoc />
<member name="P:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.Count">
<inheritdoc/>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.GetEnumerator">
<inheritdoc/>
</member>
<member name="M:Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection`1.GetAsyncEnumerator(System.Threading.CancellationToken)">
<inheritdoc/>
</member>
<member name="T:Microsoft.AspNetCore.OData.Query.DefaultODataQueryRequestParser">
<summary>
Expand Down
12 changes: 12 additions & 0 deletions src/Microsoft.AspNetCore.OData/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ Microsoft.AspNetCore.OData.ODataMiniOptions.SetVersion(Microsoft.OData.ODataVers
Microsoft.AspNetCore.OData.ODataMiniOptions.SkipToken() -> Microsoft.AspNetCore.OData.ODataMiniOptions
Microsoft.AspNetCore.OData.ODataMiniOptions.TimeZone.get -> System.TimeZoneInfo
Microsoft.AspNetCore.OData.ODataMiniOptions.Version.get -> Microsoft.OData.ODataVersion
Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Count.get -> int
Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.CountAsync() -> System.Threading.Tasks.Task<int>
Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.GetAsyncEnumerator(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IAsyncEnumerator<T>
Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.GetEnumerator() -> System.Collections.Generic.IEnumerator<T>
Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.this[int index].get -> T
Microsoft.AspNetCore.OData.Query.IODataQueryEndpointFilter
Microsoft.AspNetCore.OData.Query.IODataQueryEndpointFilter.OnFilterExecutedAsync(object responseValue, Microsoft.AspNetCore.OData.Extensions.ODataQueryFilterInvocationContext context) -> System.Threading.Tasks.ValueTask<object>
Microsoft.AspNetCore.OData.Query.IODataQueryEndpointFilter.OnFilterExecutingAsync(Microsoft.AspNetCore.OData.Extensions.ODataQueryFilterInvocationContext context) -> System.Threading.Tasks.ValueTask
Expand Down Expand Up @@ -78,6 +83,13 @@ static Microsoft.AspNetCore.OData.ODataEndpointConventionBuilderExtensions.WithO
static Microsoft.AspNetCore.OData.ODataEndpointConventionBuilderExtensions.WithODataVersion<TBuilder>(this TBuilder builder, Microsoft.OData.ODataVersion version) -> TBuilder
static Microsoft.AspNetCore.OData.ODataServiceCollectionExtensions.AddOData(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
static Microsoft.AspNetCore.OData.ODataServiceCollectionExtensions.AddOData(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.OData.ODataMiniOptions> setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Collections.Generic.IEnumerable<T> source, int pageSize) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Collections.Generic.IEnumerable<T> source, int pageSize, long? totalCount) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Linq.IQueryable<T> source, int pageSize) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Linq.IQueryable<T> source, int pageSize, bool parameterize) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Linq.IQueryable<T> source, int pageSize, long? totalCount) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.Create(System.Linq.IQueryable<T> source, int pageSize, long? totalCount, bool parameterize) -> Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>
static Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>.CreateAsync(System.Collections.Generic.IAsyncEnumerable<T> source, int pageSize, long? totalCount = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.OData.Query.Container.TruncatedCollection<T>>
static Microsoft.AspNetCore.OData.Query.ODataQueryOptions<TEntity>.BindAsync(Microsoft.AspNetCore.Http.HttpContext context, System.Reflection.ParameterInfo parameter) -> System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.OData.Query.ODataQueryOptions<TEntity>>
static Microsoft.AspNetCore.OData.Query.ODataQueryOptions<TEntity>.PopulateMetadata(System.Reflection.ParameterInfo parameter, Microsoft.AspNetCore.Builder.EndpointBuilder builder) -> void
static readonly Microsoft.AspNetCore.OData.Query.Wrapper.SelectExpandWrapperConverter.MapperProvider -> System.Func<Microsoft.OData.Edm.IEdmModel, Microsoft.OData.Edm.IEdmStructuredType, Microsoft.AspNetCore.OData.Query.Container.IPropertyMapper>
Expand Down
Loading