Skip to content

Query: Refactors Optimistic Direct Execution to be turned on by default on .NET SDK #4225

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 38 commits into from
Jan 24, 2024
Merged

Query: Refactors Optimistic Direct Execution to be turned on by default on .NET SDK #4225

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c5afef5
Turned on ODe by default
akotalwar Dec 21, 2023
1829fac
update subpartitioning tests to include ODE
NaluTripician Jan 2, 2024
1bac380
Updated contracts
akotalwar Jan 3, 2024
caf86c6
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 3, 2024
2fe5471
adds multihash test cases
NaluTripician Jan 3, 2024
f1aae84
Updated client serialization test output
akotalwar Jan 3, 2024
fa4b47f
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 3, 2024
492425c
Updated OffsetLimitPageSize() test
akotalwar Jan 4, 2024
255d13b
Revert changes to Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos…
akotalwar Jan 4, 2024
f4514db
Updated EndToEndTraceWriterBaselineTests.ReadManyAsync baseline test
akotalwar Jan 4, 2024
094e886
Removed account details
akotalwar Jan 5, 2024
cc1db80
Updated performance benchmark results
akotalwar Jan 5, 2024
ab69838
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 6, 2024
4fb4163
Set enableODE to true for some of the tests
akotalwar Jan 10, 2024
badcfd0
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 10, 2024
eb85e34
Updated Feed token tests to test ODE and non ODE cases
akotalwar Jan 10, 2024
426f6b0
Added ODE testing for Session token regression test
akotalwar Jan 12, 2024
8f0ce41
Updated AggregateQueryTests() and CosmosMultiHashTest()
akotalwar Jan 12, 2024
e30479f
Reverted changes to OffsetLimitPageSize()
akotalwar Jan 13, 2024
a8e01e8
Added ODE testing to AggregateFunctionAsync()
akotalwar Jan 15, 2024
53ed6dc
Removed account details from baseline tests
akotalwar Jan 15, 2024
0110e90
Added assert to confirm that the right document is being returned eve…
akotalwar Jan 16, 2024
07e1a9e
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 16, 2024
ac55208
Updated location of foreach loop for ODE
akotalwar Jan 16, 2024
2e2e35a
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 16, 2024
ddea7d0
Updated baselines
akotalwar Jan 17, 2024
5af47e4
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 17, 2024
0918378
Fixed comments
akotalwar Jan 19, 2024
021cad9
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 19, 2024
2b068e0
Cleaned up code
akotalwar Jan 19, 2024
78ea0e4
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 19, 2024
131112c
Fixed baselines
akotalwar Jan 19, 2024
f84c9d9
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 19, 2024
4ebd3a8
Updated more baselines
akotalwar Jan 19, 2024
3d3c7f7
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 19, 2024
cd871ad
Setting QueryRequestRateTest() to not use ODE
akotalwar Jan 22, 2024
ede9b21
Merge branch 'users/akotalwar/TurnOnODEByDefault' of https://github.c…
akotalwar Jan 22, 2024
d4df81c
Merge branch 'master' into users/akotalwar/TurnOnODEByDefault
akotalwar Jan 23, 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
Prev Previous commit
Next Next commit
Updated Feed token tests to test ODE and non ODE cases
  • Loading branch information
@akotalwar
akotalwar committed Jan 10, 2024
commit eb85e344204875d3d0d99921bbfa73090283e051
149 changes: 79 additions & 70 deletions ....Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/FeedToken/QueryFeedTokenTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,19 @@ public async Task InexistentPKRangeId()
string feedRangeSerialization = JsonConvert.SerializeObject(new { PKRangeId = "10" });
FeedRange feedRange = FeedRange.FromJsonString(feedRangeSerialization);

FeedIterator<ToDoActivity> feedIterator = container.GetItemQueryIterator<ToDoActivity>(
queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"),
feedRange: feedRange,
continuationToken: null,
requestOptions: new QueryRequestOptions() { EnableOptimisticDirectExecution = true }
);

CosmosException exception = await Assert.ThrowsExceptionAsync<CosmosException>(() => feedIterator.ReadNextAsync());
Assert.AreEqual(HttpStatusCode.Gone, exception.StatusCode);
Assert.AreEqual((int)Documents.SubStatusCodes.PartitionKeyRangeGone, exception.SubStatusCode);
foreach (bool enableODE in new bool[] { false, true })
{
FeedIterator<ToDoActivity> feedIterator = container.GetItemQueryIterator<ToDoActivity>(
queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"),
feedRange: feedRange,
continuationToken: null,
requestOptions: new QueryRequestOptions() { EnableOptimisticDirectExecution = enableODE }
);

CosmosException exception = await Assert.ThrowsExceptionAsync<CosmosException>(() => feedIterator.ReadNextAsync());
Assert.AreEqual(HttpStatusCode.Gone, exception.StatusCode);
Assert.AreEqual((int)Documents.SubStatusCodes.PartitionKeyRangeGone, exception.SubStatusCode);
}
}
finally
{
Expand Down Expand Up @@ -148,65 +151,68 @@ public async Task ParallelizeQueryThroughTokens()

Assert.IsTrue(feedTokens.Count > 1, " RUs of the container needs to be increased to ensure at least 2 partitions.");

List<Task<List<string>>> tasks = feedTokens.Select(async feedToken =>
foreach (bool enableODE in new bool[] { false, true })
{
List<string> results = new List<string>();
FeedIteratorInternal feedIterator = container.GetItemQueryStreamIterator(
queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"),
feedRange: feedToken,
continuationToken: null,
requestOptions: new QueryRequestOptions() { MaxItemCount = 10 }) as FeedIteratorInternal;
string continuation = null;
while (feedIterator.HasMoreResults)
List<Task<List<string>>> tasks = feedTokens.Select(async feedToken =>
{
using (ResponseMessage responseMessage =
await feedIterator.ReadNextAsync(this.cancellationToken))
List<string> results = new List<string>();
FeedIteratorInternal feedIterator = container.GetItemQueryStreamIterator(
queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"),
feedRange: feedToken,
continuationToken: null,
requestOptions: new QueryRequestOptions() { MaxItemCount = 10, EnableOptimisticDirectExecution = enableODE }) as FeedIteratorInternal;
string continuation = null;
while (feedIterator.HasMoreResults)
{
if (responseMessage.IsSuccessStatusCode)
using (ResponseMessage responseMessage =
await feedIterator.ReadNextAsync(this.cancellationToken))
{
using (StreamReader reader = new StreamReader(responseMessage.Content))
if (responseMessage.IsSuccessStatusCode)
{
string json = await reader.ReadToEndAsync();
JArray documents = (JArray)JObject.Parse(json).SelectToken("Documents");
foreach(JObject document in documents)
using (StreamReader reader = new StreamReader(responseMessage.Content))
{
results.Add(document.SelectToken("id").ToString());
string json = await reader.ReadToEndAsync();
JArray documents = (JArray)JObject.Parse(json).SelectToken("Documents");
foreach (JObject document in documents)
{
results.Add(document.SelectToken("id").ToString());
}
}
}
}

continuation = responseMessage.ContinuationToken;
break;
continuation = responseMessage.ContinuationToken;
break;
}
}
}

feedIterator = container.GetItemQueryStreamIterator(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, continuationToken: continuation, requestOptions: new QueryRequestOptions() { MaxItemCount = 10 }) as FeedIteratorInternal;
while (feedIterator.HasMoreResults)
{
using (ResponseMessage responseMessage =
await feedIterator.ReadNextAsync(this.cancellationToken))
feedIterator = container.GetItemQueryStreamIterator(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, continuationToken: continuation, requestOptions: new QueryRequestOptions() { MaxItemCount = 10, EnableOptimisticDirectExecution = enableODE }) as FeedIteratorInternal;
while (feedIterator.HasMoreResults)
{
if (responseMessage.IsSuccessStatusCode)
using (ResponseMessage responseMessage =
await feedIterator.ReadNextAsync(this.cancellationToken))
{
using (StreamReader reader = new StreamReader(responseMessage.Content))
if (responseMessage.IsSuccessStatusCode)
{
string json = await reader.ReadToEndAsync();
JArray documents = (JArray)JObject.Parse(json).SelectToken("Documents");
foreach (JObject document in documents)
using (StreamReader reader = new StreamReader(responseMessage.Content))
{
results.Add(document.SelectToken("id").ToString());
string json = await reader.ReadToEndAsync();
JArray documents = (JArray)JObject.Parse(json).SelectToken("Documents");
foreach (JObject document in documents)
{
results.Add(document.SelectToken("id").ToString());
}
}
}
}
}
}

return results;
}).ToList();
return results;
}).ToList();

await Task.WhenAll(tasks);
await Task.WhenAll(tasks);

CollectionAssert.AreEquivalent(generatedIds, tasks.SelectMany(t => t.Result).ToList());
CollectionAssert.AreEquivalent(generatedIds, tasks.SelectMany(t => t.Result).ToList());
}
}
finally
{
Expand Down Expand Up @@ -247,39 +253,42 @@ public async Task ParallelizeQueryThroughTokens_OfT()

Assert.IsTrue(feedTokens.Count > 1, " RUs of the container needs to be increased to ensure at least 2 partitions.");

List<Task<List<string>>> tasks = feedTokens.Select(async feedToken =>
foreach (bool enableODE in new bool[] { false, true })
{
List<string> results = new List<string>();
FeedIterator<ToDoActivity> feedIterator = container.GetItemQueryIterator<ToDoActivity>(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, requestOptions: new QueryRequestOptions() { MaxItemCount = 10 });
string continuation = null;
while (feedIterator.HasMoreResults)
List<Task<List<string>>> tasks = feedTokens.Select(async feedToken =>
{
FeedResponse<ToDoActivity> response = await feedIterator.ReadNextAsync();
foreach (ToDoActivity toDoActivity in response)
List<string> results = new List<string>();
FeedIterator<ToDoActivity> feedIterator = container.GetItemQueryIterator<ToDoActivity>(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, requestOptions: new QueryRequestOptions() { MaxItemCount = 10, EnableOptimisticDirectExecution = enableODE });
string continuation = null;
while (feedIterator.HasMoreResults)
{
results.Add(toDoActivity.id);
}
FeedResponse<ToDoActivity> response = await feedIterator.ReadNextAsync();
foreach (ToDoActivity toDoActivity in response)
{
results.Add(toDoActivity.id);
}

continuation = response.ContinuationToken;
break;
}
continuation = response.ContinuationToken;
break;
}

feedIterator = container.GetItemQueryIterator<ToDoActivity>(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, continuationToken: continuation, requestOptions: new QueryRequestOptions() { MaxItemCount = 10 });
while (feedIterator.HasMoreResults)
{
FeedResponse<ToDoActivity> response = await feedIterator.ReadNextAsync();
foreach (ToDoActivity toDoActivity in response)
feedIterator = container.GetItemQueryIterator<ToDoActivity>(queryDefinition: new QueryDefinition("select * from T where STARTSWITH(T.id, \"BasicItem\")"), feedRange: feedToken, continuationToken: continuation, requestOptions: new QueryRequestOptions() { MaxItemCount = 10, EnableOptimisticDirectExecution = enableODE });
while (feedIterator.HasMoreResults)
{
results.Add(toDoActivity.id);
FeedResponse<ToDoActivity> response = await feedIterator.ReadNextAsync();
foreach (ToDoActivity toDoActivity in response)
{
results.Add(toDoActivity.id);
}
}
}

return results;
}).ToList();
return results;
}).ToList();

await Task.WhenAll(tasks);
await Task.WhenAll(tasks);

CollectionAssert.AreEquivalent(generatedIds, tasks.SelectMany(t => t.Result).ToList());
CollectionAssert.AreEquivalent(generatedIds, tasks.SelectMany(t => t.Result).ToList());
}
}
finally
{
Expand Down