update original err msg

Azure · Aug 24, 2023 · 3c428e1 · 3c428e1
1 parent 4ecc894
commit 3c428e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/...soft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/AggregateQueryPipelineStage.Client.cs b/...soft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/AggregateQueryPipelineStage.Client.cs
@@ -42,16 +42,6 @@ public static TryCatch<IQueryPipelineStage> MonadicCreate(
                     throw new ArgumentNullException(nameof(monadicCreatePipelineStage));
                 }
 
-                if ((continuationToken != null) && (continuationToken is CosmosElement))
-                {
-                    throw new CosmosException(
-                        "Cannot use non-aggregate continuation token with aggregate queries.",
-                        statusCode: System.Net.HttpStatusCode.BadRequest,
-                        subStatusCode: (int)Documents.SubStatusCodes.MalformedContinuationToken,
-                        activityId: Guid.Empty.ToString(),
-                        requestCharge: default);
-                }
-
                 TryCatch<SingleGroupAggregator> tryCreateSingleGroupAggregator = SingleGroupAggregator.TryCreate(
                     aggregates,
                     aliasToAggregateType,

diff --git a/...c/Query/Core/Pipeline/CrossPartition/Parallel/ParallelCrossPartitionQueryPipelineStage.cs b/...c/Query/Core/Pipeline/CrossPartition/Parallel/ParallelCrossPartitionQueryPipelineStage.cs
@@ -187,7 +187,7 @@ private static TryCatch<CrossFeedRangeState<QueryState>> MonadicExtractState(
             {
                 return TryCatch<CrossFeedRangeState<QueryState>>.FromException(
                     new MalformedContinuationTokenException(
-                        $"Invalid format for continuation token {continuationToken} for {nameof(ParallelCrossPartitionQueryPipelineStage)}"));
+                        $"Invalid format for continuation token {continuationToken} for {nameof(ParallelCrossPartitionQueryPipelineStage)}. Please ensure you are using the continuation token generated by the system and for the continuation of same query as before"));
             }
 
             if (parallelContinuationTokenListRaw.Count == 0)

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemLinqTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemLinqTests.cs
@@ -919,7 +919,7 @@ public async Task LinqCountWithContinuationTokenTest()
             {
                 Assert.IsTrue(exception.StatusCode == System.Net.HttpStatusCode.BadRequest);
                 Assert.IsTrue(exception.SubStatusCode == (int)Documents.SubStatusCodes.MalformedContinuationToken);
-                Assert.IsTrue(exception.Message.Contains("Cannot use non-aggregate continuation token with aggregate queries."));
+                Assert.IsTrue(exception.Message.Contains("ParallelCrossPartitionQueryPipelineStage"));
                 return;
             }
 
@@ -964,7 +964,7 @@ public async Task LinqAverageWithContinuationTokenTest()
             {
                 Assert.IsTrue(exception.StatusCode == System.Net.HttpStatusCode.BadRequest);
                 Assert.IsTrue(exception.SubStatusCode == (int)Documents.SubStatusCodes.MalformedContinuationToken);
-                Assert.IsTrue(exception.Message.Contains("Cannot use non-aggregate continuation token with aggregate queries."));
+                Assert.IsTrue(exception.Message.Contains("ParallelCrossPartitionQueryPipelineStage"));
                 return;
             }