Subpartitioning: Fixes handling of split physical partitions (#3879)

* Initial Commit DO NOT REVIEW * bug fix, needs Direct Package Changes * fix for change feed and query plus tests * clean up * query + clean up --------- Co-authored-by: Kiran Kumar Kolli <[email protected]>
Azure · Jun 12, 2023 · ea10439 · ea10439
1 parent b924209
commit ea10439
Show file tree

Hide file tree

Showing 3 changed files with 527 additions and 7 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/FeedRange/FeedRanges/FeedRangePartitionKey.cs b/Microsoft.Azure.Cosmos/src/FeedRange/FeedRanges/FeedRangePartitionKey.cs
@@ -4,11 +4,13 @@
 
 namespace Microsoft.Azure.Cosmos
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Azure.Cosmos.Routing;
     using Microsoft.Azure.Cosmos.Tracing;
+    using Microsoft.Azure.Documents;
 
     /// <summary>
     /// FeedRange that represents an exact Partition Key value.
@@ -31,8 +33,13 @@ public FeedRangePartitionKey(PartitionKey partitionKey)
             return Task.FromResult(
                 new List<Documents.Routing.Range<string>>
                 {
-                    Documents.Routing.Range<string>.GetPointRange(
-                        this.PartitionKey.InternalKey.GetEffectivePartitionKeyString(partitionKeyDefinition))
+                    Documents.Routing.PartitionKeyInternal.GetEffectivePartitionKeyRange(
+                        partitionKeyDefinition,
+                        new Documents.Routing.Range<Documents.Routing.PartitionKeyInternal>(
+                            min: this.PartitionKey.InternalKey,
+                            max: this.PartitionKey.InternalKey,
+                            isMinInclusive: true,
+                            isMaxInclusive: true))
                 });
         }
 

diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryPartitionProvider.cs b/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryPartitionProvider.cs
@@ -147,11 +147,7 @@ internal PartitionedQueryExecutionInfo ConvertPartitionedQueryExecutionInfo(
             List<Documents.Routing.Range<string>> effectiveRanges = new List<Documents.Routing.Range<string>>(queryInfoInternal.QueryRanges.Count);
             foreach (Documents.Routing.Range<PartitionKeyInternal> internalRange in queryInfoInternal.QueryRanges)
             {
-                effectiveRanges.Add(new Documents.Routing.Range<string>(
-                     internalRange.Min.GetEffectivePartitionKeyString(partitionKeyDefinition, false),
-                     internalRange.Max.GetEffectivePartitionKeyString(partitionKeyDefinition, false),
-                     internalRange.IsMinInclusive,
-                     internalRange.IsMaxInclusive));
+                effectiveRanges.Add(PartitionKeyInternal.GetEffectivePartitionKeyRange(partitionKeyDefinition, internalRange));
             }
 
             effectiveRanges.Sort(Documents.Routing.Range<string>.MinComparer.Instance);