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

Query: Dedupe certain query enumerators #20727

Merged
merged 1 commit into from
Apr 27, 2020
Merged

Query: Dedupe certain query enumerators #20727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 25 additions & 16 deletions ...e.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,24 @@ public string ToQueryString()
private sealed class Enumerator : IEnumerator<T>
{
private readonly QueryingEnumerable<T> _queryingEnumerable;
private readonly CosmosQueryContext _cosmosQueryContext;
private readonly SelectExpression _selectExpression;
private readonly Func<CosmosQueryContext, JObject, T> _shaper;
private readonly Type _contextType;
private readonly string _partitionKey;
private readonly IDiagnosticsLogger<DbLoggerCategory.Query> _logger;

private IEnumerator<JObject> _enumerator;

public Enumerator(QueryingEnumerable<T> queryingEnumerable)
{
_queryingEnumerable = queryingEnumerable;
_cosmosQueryContext = queryingEnumerable._cosmosQueryContext;
_shaper = queryingEnumerable._shaper;
_selectExpression = queryingEnumerable._selectExpression;
_contextType = queryingEnumerable._contextType;
_partitionKey = queryingEnumerable._partitionKey;
_logger = queryingEnumerable._logger;
}

public T Current { get; private set; }
Expand All @@ -107,16 +120,16 @@ public bool MoveNext()
{
try
{
using (_queryingEnumerable._cosmosQueryContext.ConcurrencyDetector.EnterCriticalSection())
using (_cosmosQueryContext.ConcurrencyDetector.EnterCriticalSection())
{
if (_enumerator == null)
{
var sqlQuery = _queryingEnumerable.GenerateQuery();

_enumerator = _queryingEnumerable._cosmosQueryContext.CosmosClient
_enumerator = _cosmosQueryContext.CosmosClient
.ExecuteSqlQuery(
_queryingEnumerable._selectExpression.Container,
_queryingEnumerable._partitionKey,
_selectExpression.Container,
_partitionKey,
sqlQuery)
.GetEnumerator();
}
Expand All @@ -125,15 +138,15 @@ public bool MoveNext()

Current
= hasNext
? _queryingEnumerable._shaper(_queryingEnumerable._cosmosQueryContext, _enumerator.Current)
? _shaper(_cosmosQueryContext, _enumerator.Current)
: default;

return hasNext;
}
}
catch (Exception exception)
{
_queryingEnumerable._logger.QueryIterationFailed(_queryingEnumerable._contextType, exception);
_logger.QueryIterationFailed(_contextType, exception);

throw;
}
Expand All @@ -150,24 +163,23 @@ public void Dispose()

private sealed class AsyncEnumerator : IAsyncEnumerator<T>
{
private IAsyncEnumerator<JObject> _enumerator;
private readonly QueryingEnumerable<T> _queryingEnumerable;
private readonly CosmosQueryContext _cosmosQueryContext;
private readonly SelectExpression _selectExpression;
private readonly Func<CosmosQueryContext, JObject, T> _shaper;
private readonly ISqlExpressionFactory _sqlExpressionFactory;
private readonly IQuerySqlGeneratorFactory _querySqlGeneratorFactory;
private readonly Type _contextType;
private readonly string _partitionKey;
private readonly IDiagnosticsLogger<DbLoggerCategory.Query> _logger;
private readonly CancellationToken _cancellationToken;

private IAsyncEnumerator<JObject> _enumerator;

public AsyncEnumerator(QueryingEnumerable<T> queryingEnumerable, CancellationToken cancellationToken)
{
_queryingEnumerable = queryingEnumerable;
_cosmosQueryContext = queryingEnumerable._cosmosQueryContext;
_shaper = queryingEnumerable._shaper;
_selectExpression = queryingEnumerable._selectExpression;
_sqlExpressionFactory = queryingEnumerable._sqlExpressionFactory;
_querySqlGeneratorFactory = queryingEnumerable._querySqlGeneratorFactory;
_contextType = queryingEnumerable._contextType;
_partitionKey = queryingEnumerable._partitionKey;
_logger = queryingEnumerable._logger;
Expand All @@ -184,16 +196,13 @@ public async ValueTask<bool> MoveNextAsync()
{
if (_enumerator == null)
{
var selectExpression = (SelectExpression)new InExpressionValuesExpandingExpressionVisitor(
_sqlExpressionFactory, _cosmosQueryContext.ParameterValues).Visit(_selectExpression);
var sqlQuery = _queryingEnumerable.GenerateQuery();

_enumerator = _cosmosQueryContext.CosmosClient
.ExecuteSqlQueryAsync(
_selectExpression.Container,
_partitionKey,
_querySqlGeneratorFactory.Create().GetSqlQuery(
selectExpression,
_cosmosQueryContext.ParameterValues))
sqlQuery)
.GetAsyncEnumerator(_cancellationToken);
}

Expand Down
Loading