Skip to content
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

Jump to bottom

Set capacity for TruncatedCollection(IQueryable, int, boolean) overload #1183

Merged
merged 9 commits into from
Mar 26, 2024
Merged

Set capacity for TruncatedCollection(IQueryable, int, boolean) overload #1183

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
644bca7
Set capacity for TruncatedCollection(IQueryable, int, boolean) overload
senioroman4uk Mar 2, 2024
f8caf8f
add page size to benchmark sample productsController.Get
senioroman4uk Mar 4, 2024
4e8c7ee
Mark TruncatedCollectionOverloads that are only used in tests as obso…
senioroman4uk Mar 4, 2024
bc1844d
Set capacity for TruncatedCollection(IEnumerable, int, long?)
senioroman4uk Mar 4, 2024
9e4a4de
Fix defaultCapacity => DefaultCapacity
senioroman4uk Mar 4, 2024
136a7b6
Update public api baselines
Mar 8, 2024
2d44f3c
update deprecation message for Truncated collection overloads
Mar 8, 2024
9f4be7a
change link to the List implementation to latest dotnet
Mar 19, 2024
8ed862f
Update src/Microsoft.AspNetCore.OData/Query/Container/TruncatedCollec…
senioroman4uk Mar 25, 2024
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
2 changes: 1 addition & 1 deletion sample/BenchmarkServer/Controllers/ProductsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public ProductsController(ProductsContext context)
}

[HttpGet]
[EnableQuery]
[EnableQuery(PageSize = 3000)]
public IActionResult Get()
{
return Ok(products);
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.OData/Query/Container/TruncatedCollectionOfT.cs
View file
Open in desktop
senioroman4uk marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ public class TruncatedCollection<T> : List<T>, ITruncatedCollection, IEnumerable
/// <param name="source">The collection to be truncated.</param>
/// <param name="pageSize">The page size.</param>
public TruncatedCollection(IEnumerable<T> source, int pageSize)
: base(source.Take(checked(pageSize + 1)))
: base(checked(pageSize + 1))
{
var items = source.Take(checked(pageSize + 1));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to do something like this to avoid the same calculation again (and opening it up for potential inconsistencies in the future)?

Suggested change
var items = source.Take(checked(pageSize + 1));
var items = source.Take(Capacity);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, applied

AddRange(items);
Initialize(pageSize);
}

Expand All @@ -54,8 +56,10 @@ public TruncatedCollection(IQueryable<T> source, int pageSize) : this(source, pa
// NOTE: The queryable version calls Queryable.Take which actually gets translated to the backend query where as
// the enumerable version just enumerates and is inefficient.
public TruncatedCollection(IQueryable<T> source, int pageSize, bool parameterize)
: base(Take(source, pageSize, parameterize))
: base(checked(pageSize + 1))
senioroman4uk marked this conversation as resolved.
Show resolved Hide resolved
{
var items = Take(source, pageSize, parameterize);
AddRange(items);
Initialize(pageSize);
}

Expand Down