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.

Sign up for GitHub

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

Optimizing Eventsource memory allocations and removing an extra comment. #684

Merged
merged 14 commits into from
Aug 21, 2020
Merged

Optimizing Eventsource memory allocations and removing an extra comment. #684

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
683192c
Issue 681 and issue 92
Aug 11, 2020
858dbb9
Addressing comments.
Aug 11, 2020
611667c
Rerun fixed issues with fixed VM
Aug 11, 2020
67c3e68
triggering new build in the pipeline.
Aug 12, 2020
23e7074
Null Reference checker
Aug 14, 2020
72a7f1f
Adding Extra functions to event source for improving perf without if …
Aug 19, 2020
bfe5a06
Removing a deleted EventSource file from Netcore
Aug 20, 2020
da56526
Removing all "null" strings. Renaming All "NonEvent" methods.
Aug 21, 2020
3322448
fix errors
Aug 21, 2020
4699a10
Merge branch 'master' into Issue-92-issue-681
cheenamalhotra Aug 21, 2020
1a237eb
Fixing Comments on the PR
Aug 21, 2020
805550e
Merge branch 'Issue-92-issue-681' of https://github.com/JRahnama/SqlC…
Aug 21, 2020
2c6a5a5
fix typo
Aug 21, 2020
cfae48b
fixing null values
Aug 21, 2020
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
4 changes: 2 additions & 2 deletions ...Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/DbConnectionOptions.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ private static void DebugTraceKeyValuePair(string keyname, string keyvalue, Dict
// don't trace passwords ever!
if (null != keyvalue)
{
SqlClientEventSource.Log.AdvancedTraceEvent("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}', KeyValue='{1}'", keyname, keyvalue);
SqlClientEventSource.Log.AdvancedTraceEventExcluded("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}', KeyValue='{1}'", keyname, keyvalue);
}
else
{
SqlClientEventSource.Log.AdvancedTraceEvent("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}'", keyname);
SqlClientEventSource.Log.AdvancedTraceEventExcluded("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}'", keyname);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
}
}
}
SqlClientEventSource.Log.PoolerTraceEvent("<prov.DbConnectionPool.CreateObject|RES|CPOOL> {0}, Connection {1}, Added to pool.", ObjectID, newObj != null ? newObj?.ObjectID.ToString() ?? "null" : "null");
SqlClientEventSource.Log.PoolerTraceEvent("<prov.DbConnectionPool.CreateObject|RES|CPOOL> {0}, Connection {1}, Added to pool.", ObjectID, newObj != null ? newObj?.ObjectID ?? 0 : -1);
DavoudEshtehari marked this conversation as resolved.
Show resolved Hide resolved

// Reset the error wait:
_errorWait = ERROR_WAIT_DEFAULT;
Expand Down Expand Up @@ -1287,7 +1287,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
}

// Do not use this pooled connection if access token is about to expire soon before we can connect.
if(null != obj && obj.IsAccessTokenExpired)
if (null != obj && obj.IsAccessTokenExpired)
{
DestroyObject(obj);
obj = null;
Expand Down
Loading