Azure
diff --git a/‎Directory.Build.props‎
Lines changed: 3 additions & 3 deletions b/‎Directory.Build.props‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1-preview.txt‎
Lines changed: 1531 additions & 0 deletions b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1-preview.txt‎
Lines changed: 1531 additions & 0 deletions
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1.txt‎
Lines changed: 1478 additions & 0 deletions b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1.txt‎
Lines changed: 1478 additions & 0 deletions
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2-preview.txt‎
Lines changed: 1531 additions & 0 deletions b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2-preview.txt‎
Lines changed: 1531 additions & 0 deletions
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2.txt‎
Lines changed: 1478 additions & 0 deletions b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2.txt‎
Lines changed: 1478 additions & 0 deletions
diff --git a/‎Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseManagerCosmos.cs‎
Lines changed: 44 additions & 4 deletions b/‎Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseManagerCosmos.cs‎
Lines changed: 44 additions & 4 deletions
diff --git a/‎Microsoft.Azure.Cosmos/src/CosmosClient.cs‎
Lines changed: 1 addition & 4 deletions b/‎Microsoft.Azure.Cosmos/src/CosmosClient.cs‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs‎
Lines changed: 29 additions & 0 deletions b/‎Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎Microsoft.Azure.Cosmos/src/Handler/TelemetryHandler.cs‎
Lines changed: 3 additions & 2 deletions b/‎Microsoft.Azure.Cosmos/src/Handler/TelemetryHandler.cs‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎Microsoft.Azure.Cosmos/src/Linq/CosmosLinqExtensions.cs‎
Lines changed: 1 addition & 1 deletion b/‎Microsoft.Azure.Cosmos/src/Linq/CosmosLinqExtensions.cs‎
Lines changed: 1 addition & 1 deletion
@@ -1,9 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<ClientOfficialVersion>3.32.0</ClientOfficialVersion>
-		<ClientPreviewVersion>3.32.0</ClientPreviewVersion>
+		<ClientOfficialVersion>3.32.2</ClientOfficialVersion>
+		<ClientPreviewVersion>3.32.2</ClientPreviewVersion>
 		<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
-		<DirectVersion>3.30.2</DirectVersion>
+		<DirectVersion>3.30.4</DirectVersion>
 		<EncryptionOfficialVersion>2.0.1</EncryptionOfficialVersion>
 		<EncryptionPreviewVersion>2.0.1</EncryptionPreviewVersion>
 		<EncryptionPreviewSuffixVersion>preview</EncryptionPreviewSuffixVersion>
 
@@ -190,7 +190,17 @@ await this.leaseUpdater.UpdateLeaseAsync(
                     if (serverLease.Owner != lease.Owner)
                     {
                         DefaultTrace.TraceInformation("Lease with token {0} no need to release lease. The lease was already taken by another host '{1}'.", lease.CurrentLeaseToken, serverLease.Owner);
-                        throw new LeaseLostException(lease);
+                        throw new LeaseLostException(
+                            lease,
+                            CosmosExceptionFactory.Create(
+                                statusCode: HttpStatusCode.PreconditionFailed,
+                                message: $"{lease.CurrentLeaseToken} lease token was taken over by owner '{serverLease.Owner}'",
+                                headers: new Headers(),
+                                stackTrace: default,
+                                trace: NoOpTrace.Singleton,
+                                error: default,
+                                innerException: default),
+                            isGone: false);
                     }
                     serverLease.Owner = null;
                     return serverLease;
@@ -232,7 +242,17 @@ public override async Task<DocumentServiceLease> RenewAsync(DocumentServiceLease
                     if (serverLease.Owner != lease.Owner)
                     {
                         DefaultTrace.TraceInformation("Lease with token {0} was taken over by owner '{1}'", lease.CurrentLeaseToken, serverLease.Owner);
-                        throw new LeaseLostException(lease);
+                        throw new LeaseLostException(
+                            lease,
+                            CosmosExceptionFactory.Create(
+                                statusCode: HttpStatusCode.PreconditionFailed,
+                                message: $"{lease.CurrentLeaseToken} lease token was taken over by owner '{serverLease.Owner}'",
+                                headers: new Headers(),
+                                stackTrace: default,
+                                trace: NoOpTrace.Singleton,
+                                error: default,
+                                innerException: default),
+                            isGone: false);
                     }
                     return serverLease;
                 }).ConfigureAwait(false);
@@ -245,7 +265,17 @@ public override async Task<DocumentServiceLease> UpdatePropertiesAsync(DocumentS
             if (lease.Owner != this.options.HostName)
             {
                 DefaultTrace.TraceInformation("Lease with token '{0}' was taken over by owner '{1}' before lease properties update", lease.CurrentLeaseToken, lease.Owner);
-                throw new LeaseLostException(lease);
+                throw new LeaseLostException(
+                    lease,
+                    CosmosExceptionFactory.Create(
+                        statusCode: HttpStatusCode.PreconditionFailed,
+                        message: $"{lease.CurrentLeaseToken} lease token was taken over by owner '{lease.Owner}'",
+                        headers: new Headers(),
+                        stackTrace: default,
+                        trace: NoOpTrace.Singleton,
+                        error: default,
+                        innerException: default),
+                    isGone: false);
             }
 
             return await this.leaseUpdater.UpdateLeaseAsync(
@@ -257,7 +287,17 @@ public override async Task<DocumentServiceLease> UpdatePropertiesAsync(DocumentS
                     if (serverLease.Owner != lease.Owner)
                     {
                         DefaultTrace.TraceInformation("Lease with token '{0}' was taken over by owner '{1}'", lease.CurrentLeaseToken, serverLease.Owner);
-                        throw new LeaseLostException(lease);
+                        throw new LeaseLostException(
+                            lease,
+                            CosmosExceptionFactory.Create(
+                                statusCode: HttpStatusCode.PreconditionFailed,
+                                message: $"{lease.CurrentLeaseToken} lease token was taken over by owner '{serverLease.Owner}'",
+                                headers: new Headers(),
+                                stackTrace: default,
+                                trace: NoOpTrace.Singleton,
+                                error: default,
+                                innerException: default),
+                            isGone: false);
                     }
                     serverLease.Properties = lease.Properties;
                     return serverLease;
 
@@ -115,11 +115,8 @@ public class CosmosClient : IDisposable
 
         static CosmosClient()
         {
-#if PREVIEW
             HttpConstants.Versions.CurrentVersion = HttpConstants.Versions.v2020_07_15;
-#else
-            HttpConstants.Versions.CurrentVersion = HttpConstants.Versions.v2018_12_31;
-#endif
+
             HttpConstants.Versions.CurrentVersionUTF8 = Encoding.UTF8.GetBytes(HttpConstants.Versions.CurrentVersion);
 
             ServiceInteropWrapper.AssembliesExist = new Lazy<bool>(() =>
 
@@ -161,6 +161,14 @@ public virtual async Task<ResponseMessage> SendAsync(
 
                     if (feedRange != null)
                     {
+                        if (!request.OperationType.IsPointOperation()) 
+                        {
+                            feedRange = await RequestInvokerHandler.ResolveFeedRangeBasedOnPrefixContainerAsync(
+                                feedRange: feedRange,
+                                cosmosContainerCore: cosmosContainerCore,
+                                cancellationToken: cancellationToken);
+                        }
+                        
                         if (feedRange is FeedRangePartitionKey feedRangePartitionKey)
                         {
                             if (cosmosContainerCore == null && object.ReferenceEquals(feedRangePartitionKey.PartitionKey, Cosmos.PartitionKey.None))
@@ -480,5 +488,26 @@ private static bool IsClientNoResponseSet(CosmosClientOptions clientOptions, Ope
                 && clientOptions.EnableContentResponseOnWrite.HasValue
                 && RequestInvokerHandler.IsItemNoRepsonseSet(clientOptions.EnableContentResponseOnWrite.Value, operationType);
         }
+
+        internal static async Task<FeedRange> ResolveFeedRangeBasedOnPrefixContainerAsync(
+            FeedRange feedRange,
+            ContainerInternal cosmosContainerCore,
+            CancellationToken cancellationToken)
+        {
+            if (feedRange is FeedRangePartitionKey feedRangePartitionKey)
+            {
+                PartitionKeyDefinition partitionKeyDefinition = await cosmosContainerCore
+                    .GetPartitionKeyDefinitionAsync(cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (partitionKeyDefinition != null && partitionKeyDefinition.Kind == PartitionKind.MultiHash
+                    && feedRangePartitionKey.PartitionKey.InternalKey?.Components?.Count < partitionKeyDefinition.Paths?.Count)
+                {
+                   feedRange = new FeedRangeEpk(feedRangePartitionKey.PartitionKey.InternalKey.GetEPKRangeForPrefixPartitionKey(partitionKeyDefinition));
+                }
+            }
+
+            return feedRange;
+        }
     }
 }
@@ -40,11 +40,12 @@ public override async Task<ResponseMessage> SendAsync(
                                 resourceType: request.ResourceType,
                                 consistencyLevel: request.Headers?[Documents.HttpConstants.HttpHeaders.ConsistencyLevel],
                                 requestCharge: response.Headers.RequestCharge,
-                                subStatusCode: response.Headers.SubStatusCode);
+                                subStatusCode: response.Headers.SubStatusCode,
+                                trace: response.Trace);
                 }
                 catch (Exception ex)
                 {
-                    DefaultTrace.TraceError("Error while collecting telemetry information : " + ex.Message);
+                    DefaultTrace.TraceError("Error while collecting telemetry information : {0}", ex);
                 }
             }
             return response;
 
@@ -186,7 +186,7 @@ public static FeedIterator<T> ToFeedIterator<T>(this IQueryable<T> query)
         /// <code language="c#">
         /// <![CDATA[
         /// IOrderedQueryable<ToDoActivity> linqQueryable = this.Container.GetItemLinqQueryable<ToDoActivity>();
-        /// using (FeedIterator setIterator = linqQueryable.Where(item => (item.taskNum < 100)).ToFeedIterator()
+        /// using (FeedIterator setIterator = linqQueryable.Where(item => (item.taskNum < 100)).ToStreamIterator())
         /// ]]>
         /// </code>
         /// </example>
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,12 @@ public override async Task<ResponseMessage> SendAsync(`
`40`	`40`	`resourceType: request.ResourceType,`
`41`	`41`	`consistencyLevel: request.Headers?[Documents.HttpConstants.HttpHeaders.ConsistencyLevel],`
`42`	`42`	`requestCharge: response.Headers.RequestCharge,`
`43`		`- subStatusCode: response.Headers.SubStatusCode);`
	`43`	`+ subStatusCode: response.Headers.SubStatusCode,`
	`44`	`+ trace: response.Trace);`
`44`	`45`	`}`
`45`	`46`	`catch (Exception ex)`
`46`	`47`	`{`
`47`		`- DefaultTrace.TraceError("Error while collecting telemetry information : " + ex.Message);`
	`48`	`+ DefaultTrace.TraceError("Error while collecting telemetry information : {0}", ex);`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`return response;`