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

Caching access to virtual properties #24775

Merged
merged 5 commits into from
Apr 28, 2021
Merged

Caching access to virtual properties #24775

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
355530d
Caching access to virtual properties
vonzshik Apr 27, 2021
2ea8fa5
MOAR VIRTUAL DISPATCH ELIMINATION
roji Apr 27, 2021
729e498
Devirtualize SingleQueryResultCoordinator
roji Apr 28, 2021
361c83d
Fixes
roji Apr 28, 2021
a95dd10
No point in seting a property just to overwrite it
vonzshik Apr 28, 2021
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
16 changes: 7 additions & 9 deletions src/EFCore.Relational/Query/Internal/SingleQueryResultCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.EntityFrameworkCore.Query.Internal
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public class SingleQueryResultCoordinator
public sealed class SingleQueryResultCoordinator
{
/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand All @@ -20,49 +20,47 @@ public class SingleQueryResultCoordinator
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public SingleQueryResultCoordinator()
{
ResultContext = new ResultContext();
}
=> ResultContext = new ResultContext();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual ResultContext ResultContext { get; }
public ResultContext ResultContext { get; }

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual bool ResultReady { get; set; }
public bool ResultReady { get; set; }

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual bool? HasNext { get; set; }
public bool? HasNext { get; set; }

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual IList<SingleQueryCollectionContext?> Collections { get; } = new List<SingleQueryCollectionContext?>();
public IList<SingleQueryCollectionContext?> Collections { get; } = new List<SingleQueryCollectionContext?>();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual void SetSingleQueryCollectionContext(
public void SetSingleQueryCollectionContext(
int collectionId,
SingleQueryCollectionContext singleQueryCollectionContext)
{
Expand Down
36 changes: 20 additions & 16 deletions src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ private sealed class Enumerator : IEnumerator<T>

private IRelationalCommand? _relationalCommand;
private RelationalDataReader? _dataReader;
private DbDataReader? _dbDataReader;
private SingleQueryResultCoordinator? _resultCoordinator;

public Enumerator(SingleQueryingEnumerable<T> queryingEnumerable)
Expand Down Expand Up @@ -164,7 +165,7 @@ public bool MoveNext()
if (_dataReader == null)
{
_relationalQueryContext.ExecutionStrategyFactory.Create()
.Execute(this, (_, enumerator) => InitializeReader(enumerator), null);
.Execute(this, static (_, enumerator) => InitializeReader(enumerator), null);
}

var hasNext = _resultCoordinator!.HasNext ?? _dataReader!.Read();
Expand All @@ -177,23 +178,21 @@ public bool MoveNext()
_resultCoordinator.ResultReady = true;
_resultCoordinator.HasNext = null;
Current = _shaper(
_relationalQueryContext, _dataReader!.DbDataReader, _resultCoordinator.ResultContext,
_resultCoordinator);
_relationalQueryContext, _dbDataReader!, _resultCoordinator.ResultContext, _resultCoordinator);
if (_resultCoordinator.ResultReady)
{
// We generated a result so null out previously stored values
_resultCoordinator.ResultContext.Values = null;
break;
}

if (!_dataReader.Read())
if (!_dataReader!.Read())
{
_resultCoordinator.HasNext = false;
// Enumeration has ended, materialize last element
_resultCoordinator.ResultReady = true;
Current = _shaper(
_relationalQueryContext, _dataReader.DbDataReader, _resultCoordinator.ResultContext,
_resultCoordinator);
_relationalQueryContext, _dbDataReader!, _resultCoordinator.ResultContext, _resultCoordinator);

break;
}
Expand Down Expand Up @@ -225,14 +224,15 @@ private static bool InitializeReader(Enumerator enumerator)
var relationalCommand = enumerator._relationalCommand = enumerator._relationalQueryContext.Connection.RentCommand();
relationalCommand.PopulateFrom(relationalCommandTemplate);

enumerator._dataReader = relationalCommand.ExecuteReader(
var dataReader = enumerator._dataReader = relationalCommand.ExecuteReader(
new RelationalCommandParameterObject(
enumerator._relationalQueryContext.Connection,
enumerator._relationalQueryContext.ParameterValues,
enumerator._relationalCommandCache.ReaderColumns,
enumerator._relationalQueryContext.Context,
enumerator._relationalQueryContext.CommandLogger,
enumerator._detailedErrorsEnabled));
enumerator._dbDataReader = dataReader.DbDataReader;
roji marked this conversation as resolved.
Show resolved Hide resolved

enumerator._resultCoordinator = new SingleQueryResultCoordinator();

Expand All @@ -248,6 +248,7 @@ public void Dispose()
_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
_dataReader.Dispose();
_dataReader = null;
_dbDataReader = null;
}
}

Expand All @@ -265,9 +266,11 @@ private sealed class AsyncEnumerator : IAsyncEnumerator<T>
private readonly bool _standAloneStateManager;
private readonly bool _detailedErrorsEnabled;
private readonly IConcurrencyDetector? _concurrencyDetector;
private readonly CancellationToken _cancellationToken;

private IRelationalCommand? _relationalCommand;
private RelationalDataReader? _dataReader;
private DbDataReader? _dbDataReader;
private SingleQueryResultCoordinator? _resultCoordinator;

public AsyncEnumerator(SingleQueryingEnumerable<T> queryingEnumerable)
Expand All @@ -279,6 +282,7 @@ public AsyncEnumerator(SingleQueryingEnumerable<T> queryingEnumerable)
_queryLogger = queryingEnumerable._queryLogger;
_standAloneStateManager = queryingEnumerable._standAloneStateManager;
_detailedErrorsEnabled = queryingEnumerable._detailedErrorsEnabled;
_cancellationToken = _relationalQueryContext.CancellationToken;
Current = default!;

_concurrencyDetector = queryingEnumerable._threadSafetyChecksEnabled
Expand All @@ -301,14 +305,14 @@ public async ValueTask<bool> MoveNextAsync()
await _relationalQueryContext.ExecutionStrategyFactory.Create()
.ExecuteAsync(
this,
(_, enumerator, cancellationToken) => InitializeReaderAsync(enumerator, cancellationToken),
static (_, enumerator, cancellationToken) => InitializeReaderAsync(enumerator, cancellationToken),
null,
_relationalQueryContext.CancellationToken)
_cancellationToken)
.ConfigureAwait(false);
}

var hasNext = _resultCoordinator!.HasNext
?? await _dataReader!.ReadAsync(_relationalQueryContext.CancellationToken).ConfigureAwait(false);
?? await _dataReader!.ReadAsync(_cancellationToken).ConfigureAwait(false);
Current = default!;

if (hasNext)
Expand All @@ -318,23 +322,21 @@ await _relationalQueryContext.ExecutionStrategyFactory.Create()
_resultCoordinator.ResultReady = true;
_resultCoordinator.HasNext = null;
Current = _shaper(
_relationalQueryContext, _dataReader!.DbDataReader, _resultCoordinator.ResultContext,
_resultCoordinator);
_relationalQueryContext, _dbDataReader!, _resultCoordinator.ResultContext, _resultCoordinator);
if (_resultCoordinator.ResultReady)
{
// We generated a result so null out previously stored values
_resultCoordinator.ResultContext.Values = null;
break;
}

if (!await _dataReader.ReadAsync(_relationalQueryContext.CancellationToken).ConfigureAwait(false))
if (!await _dataReader!.ReadAsync(_cancellationToken).ConfigureAwait(false))
{
_resultCoordinator.HasNext = false;
// Enumeration has ended, materialize last element
_resultCoordinator.ResultReady = true;
Current = _shaper(
_relationalQueryContext, _dataReader.DbDataReader, _resultCoordinator.ResultContext,
_resultCoordinator);
_relationalQueryContext, _dbDataReader!, _resultCoordinator.ResultContext, _resultCoordinator);

break;
}
Expand Down Expand Up @@ -366,7 +368,7 @@ private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator
var relationalCommand = enumerator._relationalCommand = enumerator._relationalQueryContext.Connection.RentCommand();
relationalCommand.PopulateFrom(relationalCommandTemplate);

enumerator._dataReader = await relationalCommand.ExecuteReaderAsync(
var dataReader = enumerator._dataReader = await relationalCommand.ExecuteReaderAsync(
new RelationalCommandParameterObject(
enumerator._relationalQueryContext.Connection,
enumerator._relationalQueryContext.ParameterValues,
Expand All @@ -376,6 +378,7 @@ private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator
enumerator._detailedErrorsEnabled),
cancellationToken)
.ConfigureAwait(false);
enumerator._dbDataReader = dataReader.DbDataReader;

enumerator._resultCoordinator = new SingleQueryResultCoordinator();

Expand All @@ -392,6 +395,7 @@ public ValueTask DisposeAsync()

var dataReader = _dataReader;
_dataReader = null;
_dbDataReader = null;

return dataReader.DisposeAsync();
}
Expand Down
20 changes: 7 additions & 13 deletions src/EFCore.Relational/Query/Internal/SplitQueryResultCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Query.Internal
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public class SplitQueryResultCoordinator
public sealed class SplitQueryResultCoordinator
{
/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand All @@ -21,43 +21,39 @@ public class SplitQueryResultCoordinator
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public SplitQueryResultCoordinator()
{
ResultContext = new ResultContext();
}
=> ResultContext = new ResultContext();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual ResultContext ResultContext { get; }
public ResultContext ResultContext { get; }

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual IList<SplitQueryCollectionContext?> Collections { get; } = new List<SplitQueryCollectionContext?>();
public IList<SplitQueryCollectionContext?> Collections { get; } = new List<SplitQueryCollectionContext?>();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual IList<SplitQueryDataReaderContext?> DataReaders { get; } = new List<SplitQueryDataReaderContext?>();
public IList<SplitQueryDataReaderContext?> DataReaders { get; } = new List<SplitQueryDataReaderContext?>();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual void SetDataReader(
int collectionId,
RelationalDataReader relationalDataReader)
public void SetDataReader(int collectionId, RelationalDataReader relationalDataReader)
{
while (DataReaders.Count <= collectionId)
{
Expand All @@ -73,9 +69,7 @@ public virtual void SetDataReader(
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual void SetSplitQueryCollectionContext(
int collectionId,
SplitQueryCollectionContext splitQueryCollectionContext)
public void SetSplitQueryCollectionContext(int collectionId, SplitQueryCollectionContext splitQueryCollectionContext)
{
while (Collections.Count <= collectionId)
{
Expand Down
Loading