Skip to content

Query : Fixes Skip + Order By Bug #5221

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 12 commits into from
Jun 3, 2025
Merged

Query : Fixes Skip + Order By Bug #5221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cbc070a
init
Maya-Painter May 29, 2025
6972ee2
fix
Maya-Painter May 29, 2025
cd235d3
nit
Maya-Painter May 29, 2025
5ad97da
update baseline test
Maya-Painter May 29, 2025
4d983f8
Merge branch 'master' into users/mayapainter/skiporderbybug
Maya-Painter May 30, 2025
a6ca845
move fix upstream
Maya-Painter May 30, 2025
3c29134
Merge branch 'users/mayapainter/skiporderbybug' of https://github.com…
Maya-Painter May 30, 2025
84b8b48
simplify check
Maya-Painter Jun 2, 2025
257ef5c
Merge branch 'master' into users/mayapainter/skiporderbybug
Maya-Painter Jun 3, 2025
9c88dc9
Add more tests
Maya-Painter Jun 3, 2025
a702ad8
Merge branch 'users/mayapainter/skiporderbybug' of https://github.com…
Maya-Painter Jun 3, 2025
d1b351a
Merge branch 'master' into users/mayapainter/skiporderbybug
Maya-Painter Jun 3, 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
2 changes: 1 addition & 1 deletion Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/PipelineFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public static TryCatch<IQueryPipelineStage> MonadicCreate(
}
else if (queryInfo.HasLimit && (queryInfo.Limit.Value > 0))
{
top = (queryInfo.Offset ?? 0) + queryInfo.Limit.Value;
top = Math.Min((queryInfo.Offset ?? 0) + queryInfo.Limit.Value, int.MaxValue);
}
else
{
Expand Down
13 changes: 13 additions & 0 deletions ...ulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.TestOrderByTranslation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,19 @@ FROM root
ORDER BY root["FamilyId"] ASC]]></SqlQuery>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[OrderBy -> Skip]]></Description>
<Expression><![CDATA[query.OrderBy(f => f.FamilyId).Skip(1)]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
ORDER BY root["FamilyId"] ASC
OFFSET 1 LIMIT 2147483647]]></SqlQuery>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Select -> order by]]></Description>
Expand Down
20 changes: 20 additions & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemLinqTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,26 @@ public async Task LinqSelectEverythingWithoutQueryableTest()
Assert.AreEqual(2, (await this.FetchResults<ToDoActivity>(queryDefinition)).Count);
}

[TestMethod]
public async Task LinqSkipOrderBy()
{
IList<ToDoActivity> itemList = await ToDoActivity.CreateRandomItems(this.Container, 3, randomPartitionKey: true);
IQueryable<ToDoActivity> queryable = this.Container.GetItemLinqQueryable<ToDoActivity>()
.OrderBy(x => x.cost)
.Skip(1);

FeedIterator<ToDoActivity> feedIterator = queryable.ToFeedIterator();

int count = 0;
while (feedIterator.HasMoreResults)
{
FeedResponse<ToDoActivity> feedResponse = feedIterator.ReadNextAsync().Result;
count += feedResponse.Count;
}

Assert.AreEqual(2, count);
}

private class NumberLinqItem
{
public string id;
Expand Down
3 changes: 2 additions & 1 deletion ....Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Linq/LinqGeneralBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1983,7 +1983,8 @@ orderby f.FamilyId
select f.FamilyId));
inputs.Add(new LinqTestInput("OrderBy -> Select", b => getQuery(b).OrderBy(f => f.FamilyId).Select(f => f.FamilyId)));
inputs.Add(new LinqTestInput("OrderBy -> Select -> Take", b => getQuery(b).OrderBy(f => f.FamilyId).Select(f => f.FamilyId).Take(10)));
inputs.Add(new LinqTestInput("OrderBy -> Select -> Select", b => getQuery(b).OrderBy(f => f.FamilyId).Select(f => f.FamilyId).Select(x => x)));
inputs.Add(new LinqTestInput("OrderBy -> Select -> Select", b => getQuery(b).OrderBy(f => f.FamilyId).Select(f => f.FamilyId).Select(x => x)));
inputs.Add(new LinqTestInput("OrderBy -> Skip", b => getQuery(b).OrderBy(f => f.FamilyId).Skip(1)));

// Descending
inputs.Add(new LinqTestInput("Select -> order by", b => getQuery(b).Select(family => family.FamilyId).OrderByDescending(id => id)));
Expand Down
1 change: 0 additions & 1 deletion ...zure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/CosmosUndefinedQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ namespace Microsoft.Azure.Cosmos.EmulatorTests.Query
using System.Collections.ObjectModel;
using System.Linq;
using System.Threading.Tasks;
using Azure;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.CosmosElements.Numbers;
using Microsoft.Azure.Cosmos.Json;
Expand Down
2 changes: 0 additions & 2 deletions ...ft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/MockCosmosQueryClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
using Microsoft.Azure.Cosmos.Query.Core;
using Microsoft.Azure.Cosmos.Query.Core.QueryPlan;
using Microsoft.Azure.Documents;
using Microsoft.Azure.Cosmos.Diagnostics;
using Microsoft.Azure.Cosmos.Query.Core.Monads;
using Microsoft.Azure.Cosmos.Query.Core.Pipeline;
using Microsoft.Azure.Cosmos.Tracing;
using Microsoft.Azure.Cosmos.Query.Core.Pipeline.Pagination;

Expand Down
2 changes: 2 additions & 0 deletions ...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/NegativeQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ async Task ImplementationAsync(Container container, IReadOnlyList<CosmosObject>
("QueryInfo.Offset", "SELECT c.name FROM c OFFSET 2147483648 LIMIT 10"),
("QueryInfo.Limit", "SELECT c.name FROM c OFFSET 10 LIMIT 2147483648"),
("QueryInfo.Top", "SELECT TOP 2147483648 c.name FROM c"),
("QueryInfo.Offset", "SELECT c.name FROM c ORDER BY c.name OFFSET 2147483648 LIMIT 10"),
("QueryInfo.Limit", "SELECT c.name FROM c ORDER BY c.name OFFSET 10 LIMIT 2147483648")
})
try
{
Expand Down
4 changes: 0 additions & 4 deletions ...Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/PopulateIndexMetricsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.Query.Core.Metrics;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.Azure.Documents;
using Newtonsoft.Json;
using Microsoft.Azure.Cosmos.SDK.EmulatorTests.QueryOracle;

[TestClass]
Expand Down
4 changes: 0 additions & 4 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/QueryAdvisorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ namespace Microsoft.Azure.Cosmos.EmulatorTests.Query
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.Query.Core.Metrics;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.Azure.Documents;
using Newtonsoft.Json;
using Microsoft.Azure.Cosmos.SDK.EmulatorTests.QueryOracle;

[TestClass]
Expand Down
2 changes: 0 additions & 2 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/QueryTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ namespace Microsoft.Azure.Cosmos.EmulatorTests.Query
using System.Collections.ObjectModel;
using System.Linq;
using System.Net;
using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.Query.Core.Pipeline;
using Microsoft.Azure.Cosmos.Routing;
using Microsoft.Azure.Cosmos.SDK.EmulatorTests;
using Microsoft.Azure.Cosmos.Tracing;
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/SanityQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ namespace Microsoft.Azure.Cosmos.EmulatorTests.Query
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.CosmosElements.Numbers;
using Microsoft.Azure.Cosmos.Query.Core;
using Microsoft.Azure.Cosmos.Query.Core.QueryPlan;
using Microsoft.Azure.Cosmos.SDK.EmulatorTests.QueryOracle;
using Microsoft.Azure.Cosmos.Tracing;
using Microsoft.Azure.Documents;
Expand Down
Loading