Azure
diff --git a/‎Directory.Build.props
+3-3 b/‎Directory.Build.props
+3-3
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1-preview.txt
+1,531 b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1-preview.txt
+1,531
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1.txt
+1,478 b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.1.txt
+1,478
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2-preview.txt
+1,531 b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2-preview.txt
+1,531
diff --git a/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2.txt
+1,478 b/‎Microsoft.Azure.Cosmos/contracts/API_3.32.2.txt
+1,478
diff --git a/‎Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseManagerCosmos.cs
+44-4 b/‎Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseManagerCosmos.cs
+44-4
diff --git a/‎Microsoft.Azure.Cosmos/src/CosmosClient.cs
+1-4 b/‎Microsoft.Azure.Cosmos/src/CosmosClient.cs
+1-4
diff --git a/‎Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs
+29 b/‎Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs
+29
diff --git a/‎Microsoft.Azure.Cosmos/src/Handler/TelemetryHandler.cs
+3-2 b/‎Microsoft.Azure.Cosmos/src/Handler/TelemetryHandler.cs
+3-2
diff --git a/‎Microsoft.Azure.Cosmos/src/Linq/CosmosLinqExtensions.cs
+1-1 b/‎Microsoft.Azure.Cosmos/src/Linq/CosmosLinqExtensions.cs
+1-1
diff --git a/‎Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs
+15-32 b/‎Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs
+15-32
diff --git a/‎Microsoft.Azure.Cosmos/src/PartitionKeyBuilder.cs
+1-6 b/‎Microsoft.Azure.Cosmos/src/PartitionKeyBuilder.cs
+1-6
diff --git a/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs
+20 b/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs
+20
diff --git a/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlListener.cs
+24 b/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlListener.cs
+24
diff --git a/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlVisitor.cs
+14 b/‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlVisitor.cs
+14
@@ -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>
 
@@ -10,7 +10,6 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Globalization;
-    using System.IO;
     using System.Linq;
     using System.Linq.Expressions;
     using System.Reflection;
@@ -111,10 +110,10 @@ public static SqlQuery TranslateQuery(
         /// </summary>
         /// <param name="inputExpression">Expression to translate.</param>
         /// <param name="context">Context for translation.</param>
-        private static Collection Translate(Expression inputExpression, TranslationContext context)
+        private static Collection Translate(Expression inputExpression, TranslationContext context)
         {
-            Debug.Assert(context != null, "Translation Context should not be null");
-
+            Debug.Assert(context != null, "Translation Context should not be null");
+
             if (inputExpression == null)
             {
                 throw new ArgumentNullException("inputExpression");
@@ -552,7 +551,7 @@ private static SqlScalarExpression ApplyCustomConverters(Expression left, SqlLit
                     else if (memberType == typeof(DateTime))
                     {
                         SqlStringLiteral serializedDateTime = (SqlStringLiteral)right.Literal;
-                        value = DateTime.Parse(serializedDateTime.Value, provider: null, DateTimeStyles.RoundtripKind);
+                        value = DateTime.Parse(serializedDateTime.Value, provider: null, DateTimeStyles.RoundtripKind);
                     }
 
                     if (value != default(object))
@@ -712,23 +711,7 @@ public static SqlScalarExpression VisitConstant(ConstantExpression inputExpressi
 
                 return SqlArrayCreateScalarExpression.Create(arrayItems.ToImmutableArray());
             }
-
-            if (context.linqSerializerOptions?.CustomCosmosSerializer != null)
-            {
-                StringWriter writer = new StringWriter(CultureInfo.InvariantCulture);
-
-                // Use the user serializer for the parameter values so custom conversions are correctly handled
-                using (Stream stream = context.linqSerializerOptions.CustomCosmosSerializer.ToStream(inputExpression.Value))
-                {
-                    using (StreamReader streamReader = new StreamReader(stream))
-                    {
-                        string propertyValue = streamReader.ReadToEnd();
-                        writer.Write(propertyValue);
-                        return CosmosElement.Parse(writer.ToString()).Accept(CosmosElementToSqlScalarExpressionVisitor.Singleton);
-                    }
-                }
-            }
-               
+
             return CosmosElement.Parse(JsonConvert.SerializeObject(inputExpression.Value)).Accept(CosmosElementToSqlScalarExpressionVisitor.Singleton);
         }
 
@@ -757,21 +740,21 @@ private static SqlScalarExpression VisitParameter(ParameterExpression inputExpre
         private static SqlScalarExpression VisitMemberAccess(MemberExpression inputExpression, TranslationContext context)
         {
             SqlScalarExpression memberExpression = ExpressionToSql.VisitScalarExpression(inputExpression.Expression, context);
-            string memberName = inputExpression.Member.GetMemberName(context.linqSerializerOptions);
+            string memberName = inputExpression.Member.GetMemberName(context.linqSerializerOptions);
 
             // if expression is nullable
             if (inputExpression.Expression.Type.IsNullable())
             {
-                MemberNames memberNames = context.memberNames;
-
+                MemberNames memberNames = context.memberNames;
+
                 // ignore .Value 
-                if (memberName == memberNames.Value)
+                if (memberName == memberNames.Value)
                 {
                     return memberExpression;
                 }
 
                 // convert .HasValue to IS_DEFINED expression
-                if (memberName == memberNames.HasValue)
+                if (memberName == memberNames.HasValue)
                 {
                     return SqlFunctionCallScalarExpression.CreateBuiltin("IS_DEFINED", memberExpression);
                 }
@@ -2028,11 +2011,11 @@ public SqlScalarExpression Visit(CosmosString cosmosString)
             {
                 return SqlLiteralScalarExpression.Create(SqlStringLiteral.Create(cosmosString.Value));
             }
-
-            public SqlScalarExpression Visit(CosmosUndefined cosmosUndefined)
-            {
-                return SqlLiteralScalarExpression.Create(SqlUndefinedLiteral.Create());
-            }
+
+            public SqlScalarExpression Visit(CosmosUndefined cosmosUndefined)
+            {
+                return SqlLiteralScalarExpression.Create(SqlUndefinedLiteral.Create());
+            }
         }
         private enum SubqueryKind
         {
 
@@ -11,12 +11,7 @@ namespace Microsoft.Azure.Cosmos
     /// <summary>
     /// Represents a partition key value list in the Azure Cosmos DB service.
     /// </summary>
-#if PREVIEW
-    public
-#else
-    internal
-#endif
-    sealed class PartitionKeyBuilder
+    public sealed class PartitionKeyBuilder
     {
         private readonly List<object> partitionKeyValues;
 
 
@@ -568,6 +568,16 @@ public override SqlObject VisitExistsScalarExpression([NotNull] sqlParser.Exists
             return SqlExistsScalarExpression.Create(subquery);
         }
 
+        public override SqlObject VisitFirstScalarExpression([NotNull] sqlParser.FirstScalarExpressionContext context)
+        {
+            Contract.Requires(context != null);
+            // K_FIRST '(' sql_query ')'
+            Contract.Requires(context.ChildCount == 4);
+
+            SqlQuery subquery = (SqlQuery)this.Visit(context.children[2]);
+            return SqlFirstScalarExpression.Create(subquery);
+        }
+
         public override SqlObject VisitFunctionCallScalarExpression([NotNull] sqlParser.FunctionCallScalarExpressionContext context)
         {
             Contract.Requires(context != null);
@@ -627,6 +637,16 @@ public override SqlObject VisitIn_scalar_expression([NotNull] sqlParser.In_scala
             return SqlInScalarExpression.Create(needle, not, searchList.ToImmutableArray());
         }
 
+        public override SqlObject VisitLastScalarExpression([NotNull] sqlParser.LastScalarExpressionContext context)
+        {
+            Contract.Requires(context != null);
+            // K_LAST '(' sql_query ')'
+            Contract.Requires(context.ChildCount == 4);
+
+            SqlQuery subquery = (SqlQuery)this.Visit(context.children[2]);
+            return SqlLastScalarExpression.Create(subquery);
+        }
+
         public override SqlObject VisitLike_scalar_expression([NotNull] sqlParser.Like_scalar_expressionContext context)
         {
             Contract.Requires(context != null);
 
@@ -562,6 +562,18 @@ internal interface IsqlListener : IParseTreeListener {
 	/// <param name="context">The parse tree.</param>
 	void ExitObjectCreateScalarExpression([NotNull] sqlParser.ObjectCreateScalarExpressionContext context);
 	/// <summary>
+	/// Enter a parse tree produced by the <c>FirstScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterFirstScalarExpression([NotNull] sqlParser.FirstScalarExpressionContext context);
+	/// <summary>
+	/// Exit a parse tree produced by the <c>FirstScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitFirstScalarExpression([NotNull] sqlParser.FirstScalarExpressionContext context);
+	/// <summary>
 	/// Enter a parse tree produced by the <c>ArrayCreateScalarExpression</c>
 	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
 	/// </summary>
@@ -670,6 +682,18 @@ internal interface IsqlListener : IParseTreeListener {
 	/// <param name="context">The parse tree.</param>
 	void ExitArrayScalarExpression([NotNull] sqlParser.ArrayScalarExpressionContext context);
 	/// <summary>
+	/// Enter a parse tree produced by the <c>LastScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterLastScalarExpression([NotNull] sqlParser.LastScalarExpressionContext context);
+	/// <summary>
+	/// Exit a parse tree produced by the <c>LastScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitLastScalarExpression([NotNull] sqlParser.LastScalarExpressionContext context);
+	/// <summary>
 	/// Enter a parse tree produced by the <c>PropertyRefScalarExpressionRecursive</c>
 	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
 	/// </summary>
 
@@ -347,6 +347,13 @@ internal interface IsqlVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitObjectCreateScalarExpression([NotNull] sqlParser.ObjectCreateScalarExpressionContext context);
 	/// <summary>
+	/// Visit a parse tree produced by the <c>FirstScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	Result VisitFirstScalarExpression([NotNull] sqlParser.FirstScalarExpressionContext context);
+	/// <summary>
 	/// Visit a parse tree produced by the <c>ArrayCreateScalarExpression</c>
 	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
 	/// </summary>
@@ -410,6 +417,13 @@ internal interface IsqlVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitArrayScalarExpression([NotNull] sqlParser.ArrayScalarExpressionContext context);
 	/// <summary>
+	/// Visit a parse tree produced by the <c>LastScalarExpression</c>
+	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	Result VisitLastScalarExpression([NotNull] sqlParser.LastScalarExpressionContext context);
+	/// <summary>
 	/// Visit a parse tree produced by the <c>PropertyRefScalarExpressionRecursive</c>
 	/// labeled alternative in <see cref="sqlParser.primary_expression"/>.
 	/// </summary>
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;`