Perf | avoid boxing of SqlGuid in SqlBuffer (dotnet#2306)

wilbit · web-flow · commit 9602271e20a1 · 2024-01-19T15:43:41.000-08:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -5504,7 +5504,7 @@ internal static object GetNullSqlValue(SqlBuffer nullVal, SqlMetaDataPriv md, Sq
                     break;
 
                 case SqlDbType.UniqueIdentifier:
-                    nullVal.SqlGuid = SqlGuid.Null;
+                    nullVal.SetToNullOfType(SqlBuffer.StorageType.SqlGuid);
                     break;
 
                 case SqlDbType.Bit:
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -6310,7 +6310,7 @@ internal static object GetNullSqlValue(
                     break;
 
                 case SqlDbType.UniqueIdentifier:
-                    nullVal.SqlGuid = SqlGuid.Null;
+                    nullVal.SetToNullOfType(SqlBuffer.StorageType.SqlGuid);
                     break;
 
                 case SqlDbType.Bit:
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.netfx.cs
@@ -152,10 +152,6 @@ private static void GetNullOutputParameterSmi(SmiMetaData metaData, SqlBuffer ta
                     // special case SqlBinary, 'cause tds parser never sets SqlBuffer to null, just to empty!
                     targetBuffer.SqlBinary = SqlBinary.Null;
                 }
-                else if (SqlBuffer.StorageType.SqlGuid == stype)
-                {
-                    targetBuffer.SqlGuid = SqlGuid.Null;
-                }
                 else
                 {
                     targetBuffer.SetToNullOfType(stype);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs
@@ -109,7 +109,7 @@ internal struct Storage
         private bool _isNull;
         private StorageType _type;
         private Storage _value;
-        private object _object;    // String, SqlBinary, SqlCachedBuffer, SqlGuid, SqlString, SqlXml
+        private object _object;    // String, SqlBinary, SqlCachedBuffer, SqlString, SqlXml
 
         internal SqlBuffer()
         {
@@ -815,14 +815,17 @@ internal SqlGuid SqlGuid
                 }
                 else if (StorageType.SqlGuid == _type)
                 {
-                    return IsNull ? SqlGuid.Null : (SqlGuid)_object;
+                    return IsNull ? SqlGuid.Null : new SqlGuid(_value._guid);
                 }
                 return (SqlGuid)SqlValue; // anything else we haven't thought of goes through boxing.
             }
             set
             {
                 Debug.Assert(IsEmpty, "setting value a second time?");
-                _object = value;
+                if (!value.IsNull)
+                {
+                    _value._guid = value.Value;
+                }
                 _type = StorageType.SqlGuid;
                 _isNull = value.IsNull;
             }

Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,6 @@ private static void GetNullOutputParameterSmi(SmiMetaData metaData, SqlBuffer ta`
`152`	`152`	`// special case SqlBinary, 'cause tds parser never sets SqlBuffer to null, just to empty!`
`153`	`153`	`targetBuffer.SqlBinary = SqlBinary.Null;`
`154`	`154`	`}`
`155`		`- else if (SqlBuffer.StorageType.SqlGuid == stype)`
`156`		`- {`
`157`		`- targetBuffer.SqlGuid = SqlGuid.Null;`
`158`		`- }`
`159`	`155`	`else`
`160`	`156`	`{`
`161`	`157`	`targetBuffer.SetToNullOfType(stype);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ internal struct Storage`
`109`	`109`	`private bool _isNull;`
`110`	`110`	`private StorageType _type;`
`111`	`111`	`private Storage _value;`
`112`		`- private object _object; // String, SqlBinary, SqlCachedBuffer, SqlGuid, SqlString, SqlXml`
	`112`	`+ private object _object; // String, SqlBinary, SqlCachedBuffer, SqlString, SqlXml`
`113`	`113`
`114`	`114`	`internal SqlBuffer()`
`115`	`115`	`{`
`@@ -815,14 +815,17 @@ internal SqlGuid SqlGuid`
`815`	`815`	`}`
`816`	`816`	`else if (StorageType.SqlGuid == _type)`
`817`	`817`	`{`
`818`		`- return IsNull ? SqlGuid.Null : (SqlGuid)_object;`
	`818`	`+ return IsNull ? SqlGuid.Null : new SqlGuid(_value._guid);`
`819`	`819`	`}`
`820`	`820`	`return (SqlGuid)SqlValue; // anything else we haven't thought of goes through boxing.`
`821`	`821`	`}`
`822`	`822`	`set`
`823`	`823`	`{`
`824`	`824`	`Debug.Assert(IsEmpty, "setting value a second time?");`
`825`		`- _object = value;`
	`825`	`+ if (!value.IsNull)`
	`826`	`+ {`
	`827`	`+ _value._guid = value.Value;`
	`828`	`+ }`
`826`	`829`	`_type = StorageType.SqlGuid;`
`827`	`830`	`_isNull = value.IsNull;`
`828`	`831`	`}`