Skip to content

move-fetch-expander #34

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
iatsuta merged 3 commits into from
Feb 6, 2026
Merged

move-fetch-expander #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b46ffb1
move-fetch-expander
iatsuta Feb 6, 2026
db52684
fix
iatsuta Feb 6, 2026
cf0ef56
upd
iatsuta Feb 6, 2026
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
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="IvAt.CommonFramework" Version="2.1.13" />
<PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.13" />
<PackageVersion Include="IvAt.CommonFramework" Version="2.1.14" />
<PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.14" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
Expand Down
0 ...e/Fetching/FetchRuleExpanderExtensions.cs → ...s/Fetching/FetchRuleExpanderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...le.Runtime/Fetching/IFetchRuleExpander.cs → ...stractions/Fetching/IFetchRuleExpander.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/GenericQueryable.Abstractions/Fetching/UntypedFetchRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
namespace GenericQueryable.Fetching;

public record UntypedFetchRule<TSource>(string Path) : FetchRule<TSource>;
public sealed record UntypedFetchRule<TSource>(string Path) : FetchRule<TSource>;
2 changes: 1 addition & 1 deletion src/GenericQueryable.Runtime/Fetching/FetchRuleHeaderExpander.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class FetchRuleHeaderExpander(IEnumerable<FetchRuleHeaderInfo> fetchRuleH
{
if (fetchRule is FetchRuleHeader<TSource> fetchRuleHeader)
{
return cache.GetOrAdd(typeof(TSource),
return cache.GetOrAdd(fetchRuleHeader.GetType(),
_ => headersDict
.GetValueOrDefault(typeof(TSource))
.EmptyIfNull()
Expand Down
3 changes: 1 addition & 2 deletions src/GenericQueryable.Runtime/Fetching/FetchService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace GenericQueryable.Fetching;

public abstract class FetchService([FromKeyedServices(RootFetchRuleExpander.Key)] IFetchRuleExpander fetchRuleExpander) : IFetchService
{
private readonly ConcurrentDictionary<Type, ConcurrentDictionary<Type, object>> rootCache = [];
private readonly ConcurrentDictionary<Type, object> rootCache = [];

public virtual IQueryable<TSource> ApplyFetch<TSource>(IQueryable<TSource> source, FetchRule<TSource> fetchRule)
where TSource : class => this.GetApplyFetchFunc(fetchRule).Invoke(source);
Expand All @@ -20,7 +20,6 @@ private Func<IQueryable<TSource>, IQueryable<TSource>> GetApplyFetchFunc<TSource
where TSource : class
{
return this.rootCache
.GetOrAdd(typeof(TSource), _ => new ConcurrentDictionary<Type, object>())
.GetOrAdd(fetchRule.GetType(), _ => new ConcurrentDictionary<FetchRule<TSource>, Func<IQueryable<TSource>, IQueryable<TSource>>>())
.Pipe(v => (ConcurrentDictionary<FetchRule<TSource>, Func<IQueryable<TSource>, IQueryable<TSource>>>)v)
.GetOrAdd(fetchRule, _ =>
Expand Down
2 changes: 1 addition & 1 deletion src/GenericQueryable.Runtime/Fetching/RootFetchRuleExpander.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class RootFetchRuleExpander(IEnumerable<IFetchRuleExpander> expanders) :
else
{
return cache
.GetOrAdd(typeof(TSource), _ => new ConcurrentDictionary<FetchRule<TSource>, PropertyFetchRule<TSource>?>())
.GetOrAdd(fetchRule.GetType(), _ => new ConcurrentDictionary<FetchRule<TSource>, PropertyFetchRule<TSource>?>())
.Pipe(innerCache => (ConcurrentDictionary<FetchRule<TSource>, PropertyFetchRule<TSource>?>)innerCache)
.GetOrAdd(fetchRule, _ =>
{
Expand Down
2 changes: 1 addition & 1 deletion src/__SolutionItems/CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[assembly: AssemblyProduct("GenericQueryable")]
[assembly: AssemblyCompany("IvAt")]

[assembly: AssemblyVersion("2.1.13.0")]
[assembly: AssemblyVersion("2.1.14.0")]
[assembly: AssemblyInformationalVersion("changes at build")]

#if DEBUG
Expand Down
Loading