Skip to content

Commit b8c5696

Browse files
kundadebdattakundadebdatta
authored
Merge branch 'master' into users/kundadebdatta/4982_support_ppaf_for_gateway_mode
2 parents 56c50f8 + 300a3e3 commit b8c5696

41 files changed

Lines changed: 9934 additions & 9456 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@
5959
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
6060
</ItemGroup>
6161

62-
<!-- Code Analyzers -->
6362
<ItemGroup>
64-
<PackageReference Include="Microsoft.Codex.Analyzers" Version="1.0.5" PrivateAssets="All" />
65-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
6663
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
64+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
6765
</ItemGroup>
6866

6967
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@
5454
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
5555
</ItemGroup>
5656

57-
<!-- Code Analyzers -->
5857
<ItemGroup>
59-
<PackageReference Include="Microsoft.Codex.Analyzers" Version="1.0.5" PrivateAssets="All" />
60-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
6158
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
59+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
6260
</ItemGroup>
6361

6462
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎Microsoft.Azure.Cosmos/FaultInjection/src/FaultInjection.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@
6767
<PackageReference Include="System.Text.Json" Version="8.0.5" />
6868
</ItemGroup>
6969

70-
<!-- Code Analyzers -->
71-
<ItemGroup>
72-
<PackageReference Include="Microsoft.Codex.Analyzers" Version="1.0.5" PrivateAssets="All" />
73-
</ItemGroup>
74-
7570
<PropertyGroup Condition=" '$(ProjectRef)' != 'True' ">
7671
<SignAssembly>true</SignAssembly>
7772
<DelaySign>true</DelaySign>

‎Microsoft.Azure.Cosmos/src/Authorization/TokenCredentialCache.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ private async ValueTask<AccessToken> RefreshCachedTokenWithRetryHelperAsync(
219219
lastException = requestFailedException;
220220
getTokenTrace.AddDatum(
221221
$"RequestFailedException at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
222-
requestFailedException);
222+
requestFailedException.Message);
223223

224-
DefaultTrace.TraceError($"TokenCredential.GetToken() failed with RequestFailedException. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
224+
DefaultTrace.TraceError($"TokenCredential.GetToken() failed with RequestFailedException. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
225225

226226
// Don't retry on auth failures
227227
if (requestFailedException.Status == (int)HttpStatusCode.Unauthorized ||
@@ -236,10 +236,10 @@ private async ValueTask<AccessToken> RefreshCachedTokenWithRetryHelperAsync(
236236
lastException = operationCancelled;
237237
getTokenTrace.AddDatum(
238238
$"OperationCanceledException at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
239-
operationCancelled);
239+
operationCancelled.Message);
240240

241241
DefaultTrace.TraceError(
242-
$"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
242+
$"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
243243

244244
throw CosmosExceptionFactory.CreateRequestTimeoutException(
245245
message: ClientResources.FailedToGetAadToken,
@@ -255,10 +255,10 @@ private async ValueTask<AccessToken> RefreshCachedTokenWithRetryHelperAsync(
255255
lastException = exception;
256256
getTokenTrace.AddDatum(
257257
$"Exception at {DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}",
258-
exception);
258+
exception.Message);
259259

260260
DefaultTrace.TraceError(
261-
$"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException}");
261+
$"TokenCredential.GetTokenAsync() failed. scope = {string.Join(";", this.tokenRequestContext.Scopes)}, retry = {retry}, Exception = {lastException.Message}");
262262
}
263263
}
264264
}
@@ -339,7 +339,7 @@ private async void StartBackgroundTokenRefreshLoop()
339339

340340
DefaultTrace.TraceWarning(
341341
"BackgroundTokenRefreshLoop() - Unable to refresh token credential cache. Exception: {0}",
342-
ex.ToString());
342+
ex.Message);
343343

344344
// Since it failed retry again in with half the token life span again.
345345
if (!this.userDefinedBackgroundTokenCredentialRefreshInterval.HasValue && this.cachedAccessToken.HasValue)

‎Microsoft.Azure.Cosmos/src/DocumentClient.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ private async Task OpenPrivateAsync(CancellationToken cancellationToken)
687687
enableAsyncCacheExceptionNoSharing: this.enableAsyncCacheExceptionNoSharing);
688688
this.partitionKeyRangeCache = new PartitionKeyRangeCache(this, this.GatewayStoreModel, this.collectionCache, this.GlobalEndpointManager, this.enableAsyncCacheExceptionNoSharing);
689689

690-
DefaultTrace.TraceWarning("{0} occurred while OpenAsync. Exception Message: {1}", ex.ToString(), ex.Message);
690+
DefaultTrace.TraceWarning("Exception occurred while OpenAsync. Exception Message: {0}", ex.Message);
691691
}
692692
}
693693

@@ -1030,7 +1030,9 @@ internal virtual void Initialize(Uri serviceEndpoint,
10301030
// UnobservedTaskException by using ContinueWith method w/ TaskContinuationOptions.OnlyOnFaulted
10311031
// and accessing the Exception property on the target task.
10321032
#pragma warning disable VSTHRD110 // Observe result of async calls
1033+
#pragma warning disable CDX1000 // DontConvertExceptionToObject
10331034
initTask.ContinueWith(t => DefaultTrace.TraceWarning("initializeTask failed {0}", t.Exception), TaskContinuationOptions.OnlyOnFaulted);
1035+
#pragma warning restore CDX1000 // DontConvertExceptionToObject
10341036
#pragma warning restore VSTHRD110 // Observe result of async calls
10351037

10361038
this.traceId = Interlocked.Increment(ref DocumentClient.idCounter);
@@ -1357,7 +1359,7 @@ public void Dispose()
13571359
catch (Exception exception)
13581360
{
13591361
DefaultTrace.TraceWarning("Exception {0} thrown during dispose of HttpClient, this could happen if there are inflight request during the dispose of client",
1360-
exception);
1362+
exception.Message);
13611363
}
13621364

13631365
this.httpClient = null;
@@ -1625,8 +1627,8 @@ internal virtual async Task EnsureValidClientAsync(ITrace trace)
16251627
}
16261628
catch (Exception e)
16271629
{
1628-
DefaultTrace.TraceWarning("EnsureValidClientAsync initializeTask failed {0}", e);
1629-
childTrace.AddDatum("initializeTask failed", e);
1630+
DefaultTrace.TraceWarning("EnsureValidClientAsync initializeTask failed {0}", e.Message);
1631+
childTrace.AddDatum("initializeTask failed", e.Message);
16301632
throw;
16311633
}
16321634

‎Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,27 @@ public override SqlObject VisitGroup_by_clause([NotNull] sqlParser.Group_by_clau
355355
public override SqlObject VisitOrder_by_clause([NotNull] sqlParser.Order_by_clauseContext context)
356356
{
357357
Contract.Requires(context != null);
358-
359-
List<SqlOrderByItem> orderByItems = new List<SqlOrderByItem>();
360-
foreach (sqlParser.Order_by_itemContext orderByItemContext in context.order_by_items().order_by_item())
361-
{
362-
SqlOrderByItem orderByItem = (SqlOrderByItem)this.VisitOrder_by_item(orderByItemContext);
363-
orderByItems.Add(orderByItem);
364-
}
365-
366-
return SqlOrderByClause.Create(orderByItems.ToImmutableArray());
358+
359+
bool rank = context.K_RANK() != null;
360+
List<SqlOrderByItem> orderByItems = new List<SqlOrderByItem>();
361+
if (rank)
362+
{
363+
foreach (sqlParser.Score_expression_order_by_itemContext scoreOrderByItemContext in context.score_expression_order_by_items().score_expression_order_by_item())
364+
{
365+
SqlOrderByItem orderByItem = (SqlOrderByItem)this.VisitScore_expression_order_by_item(scoreOrderByItemContext);
366+
orderByItems.Add(orderByItem);
367+
}
368+
}
369+
else
370+
{
371+
foreach (sqlParser.Order_by_itemContext orderByItemContext in context.order_by_items().order_by_item())
372+
{
373+
SqlOrderByItem orderByItem = (SqlOrderByItem)this.VisitOrder_by_item(orderByItemContext);
374+
orderByItems.Add(orderByItem);
375+
}
376+
}
377+
378+
return SqlOrderByClause.Create(rank, orderByItems.ToImmutableArray());
367379
}
368380

369381
public override SqlObject VisitOrder_by_item([NotNull] sqlParser.Order_by_itemContext context)
@@ -388,6 +400,31 @@ public override SqlObject VisitOrder_by_item([NotNull] sqlParser.Order_by_itemCo
388400
}
389401
}
390402

403+
return SqlOrderByItem.Create(expression, isDescending);
404+
}
405+
406+
public override SqlObject VisitScore_expression_order_by_item([NotNull] sqlParser.Score_expression_order_by_itemContext context)
407+
{
408+
Contract.Requires(context != null);
409+
410+
SqlFunctionCallScalarExpression expression = (SqlFunctionCallScalarExpression)this.Visit(context.function_call_scalar_expression());
411+
bool? isDescending = null;
412+
if (context.sort_order() != null)
413+
{
414+
if (context.sort_order().K_ASC() != null)
415+
{
416+
isDescending = false;
417+
}
418+
else if (context.sort_order().K_DESC() != null)
419+
{
420+
isDescending = true;
421+
}
422+
else
423+
{
424+
throw new ArgumentOutOfRangeException($"Unknown sort order : {context.sort_order()}.");
425+
}
426+
}
427+
391428
return SqlOrderByItem.Create(expression, isDescending);
392429
}
393430

0 commit comments

Comments
 (0)