Skip to content

[release/8.0] Keep parameter values out IMemoryCache in RelationalCommandCache #34908

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 2 commits into from
Oct 14, 2024
Merged

[release/8.0] Keep parameter values out IMemoryCache in RelationalCommandCache #34908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f477f7e
Keep parameter values out IMemoryCache in RelationalCommandCache
yinzara Oct 14, 2024
9eaf3fc
Add quirk
roji Oct 14, 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
77 changes: 60 additions & 17 deletions src/EFCore.Relational/Query/Internal/RelationalCommandCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,35 @@ void IPrintableExpression.Print(ExpressionPrinter expressionPrinter)

private readonly struct CommandCacheKey : IEquatable<CommandCacheKey>
{
private static readonly bool UseOldBehavior34201 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue34028", out var enabled34028) && enabled34028;

private readonly Expression _queryExpression;
private readonly IReadOnlyDictionary<string, object?> _parameterValues;
private readonly Dictionary<string, ParameterInfo> _parameterInfos;

// Quirk only
private readonly IReadOnlyDictionary<string, object?>? _parameterValues;

public CommandCacheKey(Expression queryExpression, IReadOnlyDictionary<string, object?> parameterValues)
Copy link

Choose a reason for hiding this comment

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

Man, still getting this leak. Primary constructor still holding it probably

Copy link
Member Author

Choose a reason for hiding this comment

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

@bleapleaper can you please open a new issue with a minimal, runnable repro that shows this still happening after the fix?

Copy link

Choose a reason for hiding this comment

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

Unable to repro with the repro in the issue, but in another project i still see the leak. Investigating further. Too trigger happy on the comments sorry

{
_queryExpression = queryExpression;
_parameterValues = parameterValues;
_parameterInfos = new Dictionary<string, ParameterInfo>();

if (UseOldBehavior34201)
{
_parameterValues = parameterValues;
}
else
{
foreach (var (key, value) in parameterValues)
{
_parameterInfos[key] = new ParameterInfo
{
IsNull = value is null,
ObjectArrayLength = value is object[] arr ? arr.Length : null
};
}
}
}

public override bool Equals(object? obj)
Expand All @@ -126,26 +148,43 @@ public bool Equals(CommandCacheKey commandCacheKey)
return false;
}

if (_parameterValues.Count > 0)
Check.DebugAssert(
_parameterInfos.Count == commandCacheKey._parameterInfos.Count,
"Parameter Count mismatch between identical queries");

if (_parameterInfos.Count > 0)
{
foreach (var (key, value) in _parameterValues)
if (UseOldBehavior34201)
{
if (!commandCacheKey._parameterValues.TryGetValue(key, out var otherValue))
{
return false;
}

// ReSharper disable once ArrangeRedundantParentheses
if ((value == null) != (otherValue == null))
foreach (var (key, value) in _parameterValues!)
{
return false;
if (!_parameterValues.TryGetValue(key, out var otherValue))
{
return false;
}

// ReSharper disable once ArrangeRedundantParentheses
if ((value == null) != (otherValue == null))
{
return false;
}

if (value is IEnumerable
&& value.GetType() == typeof(object[]))
{
// FromSql parameters must have the same number of elements
return ((object[])value).Length == (otherValue as object[])?.Length;
}
}

if (value is IEnumerable
&& value.GetType() == typeof(object[]))
}
else
{
foreach (var (key, info) in _parameterInfos)
{
// FromSql parameters must have the same number of elements
return ((object[])value).Length == (otherValue as object[])?.Length;
if (!commandCacheKey._parameterInfos.TryGetValue(key, out var otherInfo) || info != otherInfo)
{
return false;
}
}
}
}
Expand All @@ -156,4 +195,8 @@ public bool Equals(CommandCacheKey commandCacheKey)
public override int GetHashCode()
=> 0;
}

// Note that we keep only the null-ness of parameters (and array length for FromSql object arrays),
// and avoid referencing the actual parameter data (see #34028).
private readonly record struct ParameterInfo(bool IsNull, int? ObjectArrayLength);
}
Loading