Merge branch 'users/ealsur/bulkretry503' of https://github.com/Azure/…

…azure-cosmos-dotnet-v3 into users/ealsur/bulkretry503
Azure · Dec 16, 2020 · a2ae814 · a2ae814
2 parents 0b462bd + c44ab3a
commit a2ae814
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 212 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs b/Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs
@@ -292,7 +292,8 @@ internal class RequestInvokerHandler : RequestHandler
                 operationType == OperationType.SqlQuery ||
                 operationType == OperationType.QueryPlan ||
                 operationType == OperationType.Batch ||
-                operationType == OperationType.ExecuteJavaScript)
+                operationType == OperationType.ExecuteJavaScript ||
+                operationType == OperationType.CompleteUserTransaction)
             {
                 return HttpMethod.Post;
             }

diff --git a/Microsoft.Azure.Cosmos/src/Json/JsonWriter.JsonBinaryWriter.cs b/Microsoft.Azure.Cosmos/src/Json/JsonWriter.JsonBinaryWriter.cs
@@ -21,8 +21,6 @@ namespace Microsoft.Azure.Cosmos.Json
 #endif
     abstract partial class JsonWriter : IJsonWriter
     {
-        internal static bool EnableEncodedStrings = false;
-
         /// <summary>
         /// Concrete implementation of <see cref="JsonWriter"/> that knows how to serialize to binary encoding.
         /// </summary>
@@ -738,23 +736,20 @@ private void WriteFieldNameOrString(bool isFieldName, Utf8Span utf8Span)
                             throw new InvalidOperationException($"Unable to serialize a {nameof(JsonBinaryEncoding.MultiByteTypeMarker)} of length: {multiByteTypeMarker.Length}");
                     }
                 }
-                else if (EnableEncodedStrings 
-                    && isFieldName
+                else if (isFieldName
                     && (utf8Span.Length >= MinReferenceStringLength)
                     && this.TryRegisterStringValue(utf8Span))
                 {
                     // Work is done in the check
                 }
-                else if (EnableEncodedStrings
-                    && !isFieldName
+                else if (!isFieldName
                     && (utf8Span.Length == JsonBinaryEncoding.GuidLength)
                     && JsonBinaryEncoding.TryEncodeGuidString(utf8Span.Span, this.binaryWriter.Cursor))
                 {
                     // Encoded value as guid string
                     this.binaryWriter.Position += JsonBinaryEncoding.EncodedGuidLength;
                 }
-                else if (EnableEncodedStrings
-                    && !isFieldName
+                else if (!isFieldName
                     && (utf8Span.Length == JsonBinaryEncoding.GuidWithQuotesLength)
                     && (utf8Span.Span[0] == '"')
                     && (utf8Span.Span[JsonBinaryEncoding.GuidWithQuotesLength - 1] == '"')
@@ -765,16 +760,13 @@ private void WriteFieldNameOrString(bool isFieldName, Utf8Span utf8Span)
                     this.binaryWriter.Cursor[0] = JsonBinaryEncoding.TypeMarker.DoubleQuotedLowercaseGuidString;
                     this.binaryWriter.Position += JsonBinaryEncoding.EncodedGuidLength;
                 }
-                else if (EnableEncodedStrings
-                    && !isFieldName
+                else if (!isFieldName
                     && JsonBinaryEncoding.TryEncodeCompressedString(utf8Span.Span, this.binaryWriter.Cursor, out int bytesWritten))
                 {
                     // Encoded value as a compressed string
                     this.binaryWriter.Position += bytesWritten;
                 }
-                else if (
-                    EnableEncodedStrings 
-                    && !isFieldName
+                else if (!isFieldName
                     && (utf8Span.Length >= MinReferenceStringLength)
                     && (utf8Span.Length <= MaxReferenceStringLength)
                     && this.TryRegisterStringValue(utf8Span))

diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/CrossPartition/Parallel/EpkRangeComparer.cs b/Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/CrossPartition/Parallel/EpkRangeComparer.cs
diff --git a/...c/Query/Core/Pipeline/CrossPartition/Parallel/ParallelCrossPartitionQueryPipelineStage.cs b/...c/Query/Core/Pipeline/CrossPartition/Parallel/ParallelCrossPartitionQueryPipelineStage.cs
@@ -83,18 +83,26 @@ public async ValueTask<bool> MoveNextAsync(ITrace trace)
             else
             {
                 // left most and any non null continuations
-                List<FeedRangeState<QueryState>> feedRangeStates = crossPartitionState
+                IOrderedEnumerable<FeedRangeState<QueryState>> feedRangeStates = crossPartitionState
                     .Value
                     .ToArray()
-                    .OrderBy(tuple => (FeedRangeEpk)tuple.FeedRange, EpkRangeComparer.Singleton)
-                    .ToList();
+                    .OrderBy(tuple => ((FeedRangeEpk)tuple.FeedRange).Range.Min);
+
                 List<ParallelContinuationToken> activeParallelContinuationTokens = new List<ParallelContinuationToken>();
-                for (int i = 0; i < feedRangeStates.Count; i++)
+                {
+                    FeedRangeState<QueryState> firstState = feedRangeStates.First();
+                    ParallelContinuationToken firstParallelContinuationToken = new ParallelContinuationToken(
+                        token: firstState.State != null ? ((CosmosString)firstState.State.Value).Value : null,
+                        range: ((FeedRangeEpk)firstState.FeedRange).Range);
+
+                    activeParallelContinuationTokens.Add(firstParallelContinuationToken);
+                }
+
+                foreach (FeedRangeState<QueryState> feedRangeState in feedRangeStates.Skip(1))
                 {
                     this.cancellationToken.ThrowIfCancellationRequested();
 
-                    FeedRangeState<QueryState> feedRangeState = feedRangeStates[i];
-                    if ((i == 0) || (feedRangeState.State != null))
+                    if (feedRangeState.State != null)
                     {
                         ParallelContinuationToken parallelContinuationToken = new ParallelContinuationToken(
                             token: feedRangeState.State != null ? ((CosmosString)feedRangeState.State.Value).Value : null,