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

Update similar files #838

Merged
merged 3 commits into from
Dec 22, 2020
+340 −368
Merged

Update similar files #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e86b3a0
sync trivial differences between netfx and netcore and reformat both …
Wraith2 Dec 3, 2020
4cd1a0a
update obfuscate call
Wraith2 Dec 4, 2020
f950014
add cached bool expanatory comment
Wraith2 Dec 22, 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
5 changes: 0 additions & 5 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,11 +609,6 @@ internal static Delegate FindBuilder(MulticastDelegate mcd)
return null;
}

internal static void TimerCurrent(out long ticks)
{
ticks = DateTime.UtcNow.ToFileTimeUtc();
}

internal static long TimerCurrent()
{
return DateTime.UtcNow.ToFileTimeUtc();
Expand Down
217 changes: 103 additions & 114 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBuffer.cs
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public bool StatisticsEnabled
if (null == _statistics)
{
_statistics = new SqlStatistics();
ADP.TimerCurrent(out _statistics._openTimestamp);
_statistics._openTimestamp = ADP.TimerCurrent();
}
// set statistics on the parser
// update timestamp;
Expand All @@ -385,7 +385,7 @@ public bool StatisticsEnabled
TdsParser parser = Parser;
Debug.Assert(parser != null, "Where's the parser?");
parser.Statistics = null;
ADP.TimerCurrent(out _statistics._closeTimestamp);
_statistics._closeTimestamp = ADP.TimerCurrent();
}
}
}
Expand Down Expand Up @@ -1095,7 +1095,7 @@ public override void Close()

if (null != Statistics)
{
ADP.TimerCurrent(out _statistics._closeTimestamp);
_statistics._closeTimestamp = ADP.TimerCurrent();
}
}
catch (Exception ex)
Expand Down Expand Up @@ -1709,7 +1709,7 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
if (StatisticsEnabled ||
(s_diagnosticListener.IsEnabled(SqlClientDiagnosticListenerExtensions.SqlAfterExecuteCommand) && statistics != null))
{
ADP.TimerCurrent(out _statistics._openTimestamp);
_statistics._openTimestamp = ADP.TimerCurrent();
tdsInnerConnection.Parser.Statistics = _statistics;
}
else
Expand Down Expand Up @@ -2070,7 +2070,7 @@ public void ResetStatistics()
if (ConnectionState.Open == State)
{
// update timestamp;
ADP.TimerCurrent(out _statistics._openTimestamp);
_statistics._openTimestamp = ADP.TimerCurrent();
}
}
}
Expand All @@ -2094,7 +2094,7 @@ private void UpdateStatistics()
if (ConnectionState.Open == State)
{
// update timestamp
ADP.TimerCurrent(out _statistics._closeTimestamp);
_statistics._closeTimestamp = ADP.TimerCurrent();
}
// delegate the rest of the work to the SqlStatistics class
Statistics.UpdateStatistics();
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlStatistics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ internal bool RequestExecutionTimer()
{
if (_startExecutionTimestamp == 0)
{
ADP.TimerCurrent(out _startExecutionTimestamp);
_startExecutionTimestamp = ADP.TimerCurrent();
return true;
}
return false;
Expand All @@ -138,7 +138,7 @@ internal void RequestNetworkServerTimer()
Debug.Assert(_startExecutionTimestamp != 0, "No network time expected outside execution period");
if (_startNetworkServerTimestamp == 0)
{
ADP.TimerCurrent(out _startNetworkServerTimestamp);
_startNetworkServerTimestamp = ADP.TimerCurrent();
}
_waitForReply = true;
}
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ internal static int GetTimeoutMilliseconds(long timeoutTime)
return (int)msecRemaining;
}


internal static long GetTimeout(long timeoutMilliseconds)
{
long result;
Expand Down
5 changes: 0 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/AdapterUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,11 +2271,6 @@ static internal bool NeedManualEnlistment()
return false;
}

static internal void TimerCurrent(out long ticks)
{
ticks = DateTime.UtcNow.ToFileTimeUtc();
}

static internal long TimerCurrent()
{
return DateTime.UtcNow.ToFileTimeUtc();
Expand Down
Loading