Revert mars state machine changes (#1357)

dotnet · Oct 19, 2021 · 884c67c · 884c67c
1 parent 2be3980
commit 884c67c
Show file tree

Hide file tree

Showing 11 changed files with 443 additions and 672 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -614,7 +614,6 @@
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNIMarsQueuedPacket.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNINpHandle.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNIPacket.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\SNI\SNIPacket.Debug.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNIPhysicalHandle.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNIProxy.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SNI\SNIStreams.cs" />

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs
@@ -35,94 +35,63 @@ internal enum SNIProviders
     /// <summary>
     /// SMUX packet header
     /// </summary>
-    internal struct SNISMUXHeader
+    internal sealed class SNISMUXHeader
     {
         public const int HEADER_LENGTH = 16;
 
-        public byte SMID { get; private set; }
-        public byte Flags { get; private set; }
-        public ushort SessionId { get; private set; }
-        public uint Length { get; private set; }
-        public uint SequenceNumber { get; private set; }
-        public uint Highwater { get; private set; }
-
-        public void Set(byte smid, byte flags, ushort sessionID, uint length, uint sequenceNumber, uint highwater)
-        {
-            SMID = smid;
-            Flags = flags;
-            SessionId = sessionID;
-            Length = length;
-            SequenceNumber = sequenceNumber;
-            Highwater = highwater;
-        }
+        public byte SMID;
+        public byte flags;
+        public ushort sessionId;
+        public uint length;
+        public uint sequenceNumber;
+        public uint highwater;
 
         public void Read(byte[] bytes)
         {
             SMID = bytes[0];
-            Flags = bytes[1];
-            SessionId = BitConverter.ToUInt16(bytes, 2);
-            Length = BitConverter.ToUInt32(bytes, 4) - SNISMUXHeader.HEADER_LENGTH;
-            SequenceNumber = BitConverter.ToUInt32(bytes, 8);
-            Highwater = BitConverter.ToUInt32(bytes, 12);
+            flags = bytes[1];
+            sessionId = BitConverter.ToUInt16(bytes, 2);
+            length = BitConverter.ToUInt32(bytes, 4) - SNISMUXHeader.HEADER_LENGTH;
+            sequenceNumber = BitConverter.ToUInt32(bytes, 8);
+            highwater = BitConverter.ToUInt32(bytes, 12);
         }
 
         public void Write(Span<byte> bytes)
         {
-            uint value = Highwater;
+            uint value = highwater;
             // access the highest element first to cause the largest range check in the jit, then fill in the rest of the value and carry on as normal
             bytes[15] = (byte)((value >> 24) & 0xff);
             bytes[12] = (byte)(value & 0xff); // BitConverter.GetBytes(_currentHeader.highwater).CopyTo(headerBytes, 12);
             bytes[13] = (byte)((value >> 8) & 0xff);
             bytes[14] = (byte)((value >> 16) & 0xff);
 
             bytes[0] = SMID; // BitConverter.GetBytes(_currentHeader.SMID).CopyTo(headerBytes, 0);
-            bytes[1] = Flags; // BitConverter.GetBytes(_currentHeader.flags).CopyTo(headerBytes, 1);
+            bytes[1] = flags; // BitConverter.GetBytes(_currentHeader.flags).CopyTo(headerBytes, 1);
 
-            value = SessionId;
+            value = sessionId;
             bytes[2] = (byte)(value & 0xff); // BitConverter.GetBytes(_currentHeader.sessionId).CopyTo(headerBytes, 2);
             bytes[3] = (byte)((value >> 8) & 0xff);
 
-            value = Length;
+            value = length;
             bytes[4] = (byte)(value & 0xff); // BitConverter.GetBytes(_currentHeader.length).CopyTo(headerBytes, 4);
             bytes[5] = (byte)((value >> 8) & 0xff);
             bytes[6] = (byte)((value >> 16) & 0xff);
             bytes[7] = (byte)((value >> 24) & 0xff);
 
-            value = SequenceNumber;
+            value = sequenceNumber;
             bytes[8] = (byte)(value & 0xff); // BitConverter.GetBytes(_currentHeader.sequenceNumber).CopyTo(headerBytes, 8);
             bytes[9] = (byte)((value >> 8) & 0xff);
             bytes[10] = (byte)((value >> 16) & 0xff);
             bytes[11] = (byte)((value >> 24) & 0xff);
 
         }
-
-        public SNISMUXHeader Clone()
-        {
-            SNISMUXHeader copy = new SNISMUXHeader();
-            copy.SMID = SMID;
-            copy.Flags = Flags;
-            copy.SessionId = SessionId;
-            copy.Length = Length;
-            copy.SequenceNumber = SequenceNumber;
-            copy.Highwater = Highwater;
-            return copy;
-        }
-
-        public void Clear()
-        {
-            SMID = 0;
-            Flags = 0;
-            SessionId = 0;
-            Length = 0;
-            SequenceNumber = 0;
-            Highwater = 0;
-        }
     }
 
     /// <summary>
     /// SMUX packet flags
     /// </summary>
-    internal enum SNISMUXFlags : uint
+    [Flags]
+    internal enum SNISMUXFlags
     {
         SMUX_SYN = 1,       // Begin SMUX connection
         SMUX_ACK = 2,       // Acknowledge SMUX packets