Update similar files (#838)

dotnet · Dec 22, 2020 · bccf766 · bccf766
1 parent d02bf4b
commit bccf766
Show file tree

Hide file tree

Showing 11 changed files with 340 additions and 368 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/AdapterUtil.SqlClient.cs
@@ -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();

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBuffer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBuffer.cs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -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;
@@ -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();
                             }
                         }
                     }
@@ -1095,7 +1095,7 @@ public override void Close()
 
                     if (null != Statistics)
                     {
-                        ADP.TimerCurrent(out _statistics._closeTimestamp);
+                        _statistics._closeTimestamp = ADP.TimerCurrent();
                     }
                 }
                 catch (Exception ex)
@@ -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
@@ -2070,7 +2070,7 @@ public void ResetStatistics()
                 if (ConnectionState.Open == State)
                 {
                     // update timestamp;
-                    ADP.TimerCurrent(out _statistics._openTimestamp);
+                    _statistics._openTimestamp = ADP.TimerCurrent();
                 }
             }
         }
@@ -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();

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlStatistics.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlStatistics.cs
@@ -127,7 +127,7 @@ internal bool RequestExecutionTimer()
         {
             if (_startExecutionTimestamp == 0)
             {
-                ADP.TimerCurrent(out _startExecutionTimestamp);
+                _startExecutionTimestamp = ADP.TimerCurrent();
                 return true;
             }
             return false;
@@ -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;
         }

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
@@ -119,7 +119,6 @@ internal static int GetTimeoutMilliseconds(long timeoutTime)
             return (int)msecRemaining;
         }
 
-
         internal static long GetTimeout(long timeoutMilliseconds)
         {
             long result;

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -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();
-Original file line number
+Diff line change
@@ Expand Up @@
                 return (int)msecRemaining;
             }
             internal static long GetTimeout(long timeoutMilliseconds)
             {
                 long result;
@@ Expand Down @@