move snapshot plpdata to shared (#2126)

dotnet · Aug 21, 2023 · 3185ce2 · 3185ce2
1 parent 610a2c2
commit 3185ce2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/...osoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs b/...osoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs
@@ -3100,18 +3100,6 @@ internal void CloneCleanupAltMetaDataSetArray()
 
         sealed partial class StateSnapshot
         {
-            private sealed class PLPData
-            {
-                public readonly ulong SnapshotLongLen;
-                public readonly ulong SnapshotLongLenLeft;
-
-                public PLPData(ulong snapshotLongLen, ulong snapshotLongLenLeft)
-                {
-                    SnapshotLongLen = snapshotLongLen;
-                    SnapshotLongLenLeft = snapshotLongLenLeft;
-                }
-            }
-
             private sealed partial class PacketData
             {
                 public byte[] Buffer;
@@ -3150,7 +3138,7 @@ partial void SetStackInternal(string value)
             private PacketData _sparePacket;
 
             internal byte[] _plpBuffer;
-            private PLPData _plpData;
+
 
             private int _snapshotInBuffCount;
 

diff --git a/...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs b/...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs
@@ -3267,9 +3267,6 @@ sealed partial class StateSnapshot
             private bool _snapshotReceivedColumnMetadata = false;
             private bool _snapshotAttentionReceived;
 
-            private ulong _snapshotLongLen;
-            private ulong _snapshotLongLenLeft;
-
             public StateSnapshot(TdsParserStateObject state)
             {
                 _snapshotInBuffs = new List<PacketData>();
@@ -3347,8 +3344,10 @@ internal void Snap()
                 _snapshotMessageStatus = _stateObj._messageStatus;
                 // _nullBitmapInfo must be cloned before it is updated
                 _snapshotNullBitmapInfo = _stateObj._nullBitmapInfo;
-                _snapshotLongLen = _stateObj._longlen;
-                _snapshotLongLenLeft = _stateObj._longlenleft;
+                if (_stateObj._longlen != 0 || _stateObj._longlenleft != 0)
+                {
+                    _plpData = new PLPData(_stateObj._longlen, _stateObj._longlenleft);
+                }
                 _snapshotCleanupMetaData = _stateObj._cleanupMetaData;
                 // _cleanupAltMetaDataSetArray must be cloned bofore it is updated
                 _snapshotCleanupAltMetaDataSetArray = _stateObj._cleanupAltMetaDataSetArray;
@@ -3401,8 +3400,8 @@ internal void ResetSnapshotState()
                 _stateObj._partialHeaderBytesRead = 0;
 
                 // reset plp state
-                _stateObj._longlen = _snapshotLongLen;
-                _stateObj._longlenleft = _snapshotLongLenLeft;
+                _stateObj._longlen = _plpData?.SnapshotLongLen ?? 0;
+                _stateObj._longlenleft = _plpData?.SnapshotLongLenLeft ?? 0;
 
                 _stateObj._snapshotReplay = true;
 

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -1104,18 +1104,31 @@ private void DumpBuffer() {
 
         sealed partial class StateSnapshot
         {
+            private sealed class PLPData
+            {
+                public readonly ulong SnapshotLongLen;
+                public readonly ulong SnapshotLongLenLeft;
+
+                public PLPData(ulong snapshotLongLen, ulong snapshotLongLenLeft)
+                {
+                    SnapshotLongLen = snapshotLongLen;
+                    SnapshotLongLenLeft = snapshotLongLenLeft;
+                }
+            }
+
             private int _snapshotInBuffCurrent;
             private int _snapshotInBytesUsed;
             private int _snapshotInBytesPacket;
 
+            private PLPData _plpData;
+
             private byte _snapshotMessageStatus;
 
             private NullBitmap _snapshotNullBitmapInfo;
             private _SqlMetaDataSet _snapshotCleanupMetaData;
             private _SqlMetaDataSetCollection _snapshotCleanupAltMetaDataSetArray;
 
             private TdsParserStateObject _stateObj;
-
 #if DEBUG
             private int _rollingPend = 0;
             private int _rollingPendCount = 0;