Skip to content

Query: Fixes non streaming order by queries to not be tagged as passthrough queries #5273

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
microsoft-github-policy-service merged 6 commits into from
Jul 8, 2025
Merged

Query: Fixes non streaming order by queries to not be tagged as passthrough queries #5273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5d3d67
Fix for non streaming order by queries in the case that query request…
neildsh Jul 3, 2025
bb061f4
Add some more test coverage
neildsh Jul 7, 2025
6dd3769
code clean up
neildsh Jul 7, 2025
9991a6c
Fix up broken test
neildsh Jul 8, 2025
dfe32e5
Merge branch 'master' into users/ndeshpan/passthroughFix
neildsh Jul 8, 2025
9fc607a
Merge branch 'master' into users/ndeshpan/passthroughFix
neildsh Jul 8, 2025
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: 3 additions & 1 deletion Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/CosmosQueryExecutionContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ private static async Task<TryCatch<IQueryPipelineStage>> TryCreateCoreContextAsy
bool hasDistinct = sqlQuery.SelectClause.HasDistinct;
bool hasGroupBy = sqlQuery.GroupByClause != default;
bool hasAggregates = AggregateProjectionDetector.HasAggregate(sqlQuery.SelectClause.SelectSpec);
bool createPassthroughQuery = !hasAggregates && !hasDistinct && !hasGroupBy;
bool hasOrderBy = sqlQuery.OrderByClause != default;
bool createPassthroughQuery = !hasAggregates && !hasDistinct && !hasGroupBy && !hasOrderBy;

if (createPassthroughQuery)
{
Expand Down Expand Up @@ -305,6 +306,7 @@ private static async Task<TryCatch<IQueryPipelineStage>> TryCreateFromPartitione
&& partitionedQueryExecutionInfo.QueryRanges[0].IsSingleValue);
bool serverStreamingQuery = !partitionedQueryExecutionInfo.QueryInfo.HasAggregates
&& !partitionedQueryExecutionInfo.QueryInfo.HasDistinct
&& !partitionedQueryExecutionInfo.QueryInfo.HasNonStreamingOrderBy
&& !partitionedQueryExecutionInfo.QueryInfo.HasGroupBy;
bool streamingSinglePartitionQuery = singleLogicalPartitionKeyQuery && serverStreamingQuery;

Expand Down
19 changes: 18 additions & 1 deletion ...Core/Pipeline/CrossPartition/HybridSearch/HybridSearchCrossPartitionQueryPipelineStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ public static TryCatch<IQueryPipelineStage> MonadicCreate(
{
TryCatch<IQueryPipelineStage> ComponentPipelineFactory(QueryInfo rewrittenQueryInfo)
{
HybridSearchDebugTraceHelpers.TraceQuerySpec(sqlQuerySpec);

return PipelineFactory.MonadicCreate(
documentContainer,
sqlQuerySpec,
Expand Down Expand Up @@ -289,6 +291,8 @@ private async ValueTask<bool> MoveNextAsync_DrainSingletonComponentAsync(ITrace

QueryPage page = sourceStage.Current.Result;

HybridSearchDebugTraceHelpers.TraceQueryResultTSVHeader(1);

List<CosmosElement> documents = new List<CosmosElement>(page.Documents.Count);
foreach (CosmosElement cosmosElement in page.Documents)
{
Expand Down Expand Up @@ -950,6 +954,19 @@ private static class HybridSearchDebugTraceHelpers
private const bool Enabled = false;
#pragma warning disable CS0162 // Unreachable code detected

[Conditional("DEBUG")]
public static void TraceQuerySpec(SqlQuerySpec querySpec)
{
if (Enabled)
{
CosmosSerializerCore serializerCore = new CosmosSerializerCore();
System.IO.Stream stream = serializerCore.ToStreamSqlQuerySpec(querySpec, ResourceType.Document);
string content = new System.IO.StreamReader(stream).ReadToEnd();
System.Diagnostics.Trace.WriteLine(content);
System.Diagnostics.Trace.WriteLine("\n");
}
}

[Conditional("DEBUG")]
public static void TraceQueryResults(IReadOnlyList<HybridSearchQueryResult> queryResults, int componentCount)
{
Expand Down Expand Up @@ -1026,7 +1043,7 @@ private static StringBuilder AppendQueryResult(HybridSearchQueryResult queryResu
return builder;
}

private static void TraceQueryResultTSVHeader(int componentCount)
public static void TraceQueryResultTSVHeader(int componentCount)
{
StringBuilder builder = new StringBuilder();
builder.Append("_rid");
Expand Down
Loading
Loading