Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Performance: Adds finalizer optimizations in a few places #1857

Merged
merged 2 commits into from
Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ namespace Microsoft.Azure.Cosmos
public class TransactionalBatchResponse : IReadOnlyList<TransactionalBatchOperationResult>, IDisposable
#pragma warning restore CA1710 // Identifiers should have correct suffix
{
private bool isDisposed;

private List<TransactionalBatchOperationResult> results;

/// <summary>
Expand Down Expand Up @@ -198,7 +196,6 @@ virtual IEnumerable<string> GetActivityIds()
public void Dispose()
{
this.Dispose(true);
GC.SuppressFinalize(this);
}

/// <inheritdoc />
Expand Down Expand Up @@ -385,9 +382,8 @@ private static async Task<TransactionalBatchResponse> PopulateFromContentAsync(
/// <param name="disposing">Indicates whether to dispose managed resources or not.</param>
protected virtual void Dispose(bool disposing)
{
if (disposing && !this.isDisposed)
if (disposing)
{
this.isDisposed = true;
if (this.Operations != null)
{
foreach (ItemBatchOperation operation in this.Operations)
Expand Down
6 changes: 1 addition & 5 deletions Microsoft.Azure.Cosmos/src/DocumentClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1376,11 +1376,7 @@ public void Dispose()
this.storeClientFactory = null;
}

if (this.AddressResolver != null)
{
this.AddressResolver.Dispose();
this.AddressResolver = null;
}
this.AddressResolver = null;

if (this.httpClient != null)
{
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Azure.Cosmos/src/GatewayStoreModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ public virtual async Task<AccountProperties> GetDatabaseAccountAsync(Func<ValueT
public void Dispose()
{
this.Dispose(true);
GC.SuppressFinalize(this);
}

private void CaptureSessionToken(
Expand Down
7 changes: 1 addition & 6 deletions Microsoft.Azure.Cosmos/src/Routing/GatewayAddressCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Microsoft.Azure.Cosmos.Routing
using Microsoft.Azure.Documents.Rntbd;
using Microsoft.Azure.Documents.Routing;

internal class GatewayAddressCache : IAddressCache, IDisposable
internal class GatewayAddressCache : IAddressCache
{
private const string protocolFilterFormat = "{0} eq {1}";

Expand Down Expand Up @@ -515,11 +515,6 @@ await ClientExtensions.ParseResponseAsync(httpResponseMessage))
}
}

public void Dispose()
{
GC.SuppressFinalize(this);
}

internal Tuple<PartitionKeyRangeIdentity, PartitionAddressInformation> ToPartitionAddressAndRange(string collectionRid, IList<Address> addresses)
{
Address address = addresses.First();
Expand Down
10 changes: 1 addition & 9 deletions Microsoft.Azure.Cosmos/src/Routing/GlobalAddressResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft.Azure.Cosmos.Routing
/// AddressCache implementation for client SDK. Supports cross region address routing based on
/// avaialbility and preference list.
/// </summary>
internal sealed class GlobalAddressResolver : IAddressResolver, IDisposable
internal sealed class GlobalAddressResolver : IAddressResolver
{
private const int MaxBackupReadRegions = 3;

Expand Down Expand Up @@ -153,14 +153,6 @@ private IAddressResolver GetAddressResolver(DocumentServiceRequest request)
return this.GetOrAddEndpoint(endpoint).AddressResolver;
}

public void Dispose()
{
foreach (EndpointCache endpointCache in this.addressCacheByEndpoint.Values)
{
endpointCache.AddressCache.Dispose();
}
}

private EndpointCache GetOrAddEndpoint(Uri endpoint)
{
// The GetorAdd is followed by a call to .Count which in a ConcurrentDictionary
Expand Down
17 changes: 8 additions & 9 deletions Microsoft.Azure.Cosmos/src/SecureStringHMACSHA256Helper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,19 @@ public void Dispose()
GC.SuppressFinalize(this);
}

~SecureStringHMACSHA256Helper() => this.Dispose(false);

private void Dispose(bool disposing)
{
if (disposing)
if (this.algorithmHandle != IntPtr.Zero)
{
if (this.algorithmHandle != null)
int status = NativeMethods.BCryptCloseAlgorithmProvider(this.algorithmHandle, 0);
if (status != 0)
{
int status = NativeMethods.BCryptCloseAlgorithmProvider(this.algorithmHandle, 0);
if (status != 0)
{
DefaultTrace.TraceError("Failed to close algorithm provider: {0}", status);
}

this.algorithmHandle = IntPtr.Zero;
DefaultTrace.TraceError("Failed to close algorithm provider: {0}", status);
}

this.algorithmHandle = IntPtr.Zero;
}
}

Expand Down
8 changes: 0 additions & 8 deletions Microsoft.Azure.Cosmos/src/SessionContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -472,14 +472,6 @@ public SessionContainerState(string hostName)
{
this.hostName = hostName;
}

~SessionContainerState()
{
if (this.rwlock != null)
{
this.rwlock.Dispose();
}
}
}

private sealed class SessionContainerSnapshot
Expand Down