SqlMetadataPrivFlags remove Enum.HasFlag in favor of bitwise operations (#1054)

cmeyertons · web-flow · commit 0256b69452ec · 2021-06-16T15:54:32.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
@@ -427,6 +427,11 @@ internal _SqlMetaData(int ordinal) : base()
             this.ordinal = ordinal;
         }
 
+        private bool HasFlag(_SqlMetadataFlags flag)
+        {
+            return (flags & flag) != 0;
+        }
+
         internal string serverName
         {
             get
@@ -459,47 +464,47 @@ internal string tableName
         public byte Updatability
         {
             get => (byte)(flags & _SqlMetadataFlags.IsUpdatableMask);
-            set => flags = (_SqlMetadataFlags)((value & 0x3) | ((int)flags & ~0x03));
+            set => flags = (_SqlMetadataFlags)((value & (byte)_SqlMetadataFlags.IsUpdatableMask) | ((int)flags & ~(byte)_SqlMetadataFlags.IsUpdatableMask));
         }
 
         public bool IsReadOnly
         {
-            get => (flags & _SqlMetadataFlags.IsUpdatableMask) == 0;
+            get => !HasFlag(_SqlMetadataFlags.IsUpdatableMask);
         }
 
         public bool IsDifferentName
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsDifferentName);
+            get => HasFlag(_SqlMetadataFlags.IsDifferentName);
             set => Set(_SqlMetadataFlags.IsDifferentName, value);
         }
 
         public bool IsKey
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsKey);
+            get => HasFlag(_SqlMetadataFlags.IsKey);
             set => Set(_SqlMetadataFlags.IsKey, value);
         }
 
         public bool IsHidden
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsHidden);
+            get => HasFlag(_SqlMetadataFlags.IsHidden);
             set => Set(_SqlMetadataFlags.IsHidden, value);
         }
 
         public bool IsExpression
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsExpression);
+            get => HasFlag(_SqlMetadataFlags.IsExpression);
             set => Set(_SqlMetadataFlags.IsExpression, value);
         }
 
         public bool IsIdentity
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsIdentity);
+            get => HasFlag(_SqlMetadataFlags.IsIdentity);
             set => Set(_SqlMetadataFlags.IsIdentity, value);
         }
 
         public bool IsColumnSet
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsColumnSet);
+            get => HasFlag(_SqlMetadataFlags.IsColumnSet);
             set => Set(_SqlMetadataFlags.IsColumnSet, value);
         }
 
@@ -746,16 +751,21 @@ internal SqlMetaDataPriv()
 
         public bool IsNullable
         {
-            get => flags.HasFlag(SqlMetaDataPrivFlags.IsNullable);
+            get => HasFlag(SqlMetaDataPrivFlags.IsNullable);
             set => Set(SqlMetaDataPrivFlags.IsNullable, value);
         }
 
         public bool IsMultiValued
         {
-            get => flags.HasFlag(SqlMetaDataPrivFlags.IsMultiValued);
+            get => HasFlag(SqlMetaDataPrivFlags.IsMultiValued);
             set => Set(SqlMetaDataPrivFlags.IsMultiValued, value);
         }
 
+        private bool HasFlag(SqlMetaDataPrivFlags flag)
+        {
+            return (flags & flag) != 0;
+        }
+
         private void Set(SqlMetaDataPrivFlags flag, bool value)
         {
             flags = value ? flags | flag : flags & ~flag;
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
@@ -602,6 +602,11 @@ internal _SqlMetaData(int ordinal) : base()
             this.ordinal = ordinal;
         }
 
+        private bool HasFlag(_SqlMetadataFlags flag)
+        {
+            return (flags & flag) != 0;
+        }
+
         internal string serverName
         {
             get
@@ -634,47 +639,47 @@ internal string tableName
         public byte Updatability
         {
             get => (byte)(flags & _SqlMetadataFlags.IsUpdatableMask);
-            set => flags = (_SqlMetadataFlags)((value & 0x3) | ((int)flags & ~0x03));
+            set => flags = (_SqlMetadataFlags)((value & (byte)_SqlMetadataFlags.IsUpdatableMask) | ((int)flags & ~(byte)_SqlMetadataFlags.IsUpdatableMask));
         }
 
         public bool IsReadOnly
         {
-            get => (flags & _SqlMetadataFlags.IsUpdatableMask) == 0;
+            get => !HasFlag(_SqlMetadataFlags.IsUpdatableMask);
         }
 
         public bool IsDifferentName
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsDifferentName);
+            get => HasFlag(_SqlMetadataFlags.IsDifferentName);
             set => Set(_SqlMetadataFlags.IsDifferentName, value);
         }
 
         public bool IsKey
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsKey);
+            get => HasFlag(_SqlMetadataFlags.IsKey);
             set => Set(_SqlMetadataFlags.IsKey, value);
         }
 
         public bool IsHidden
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsHidden);
+            get => HasFlag(_SqlMetadataFlags.IsHidden);
             set => Set(_SqlMetadataFlags.IsHidden, value);
         }
 
         public bool IsExpression
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsExpression);
+            get => HasFlag(_SqlMetadataFlags.IsExpression);
             set => Set(_SqlMetadataFlags.IsExpression, value);
         }
 
         public bool IsIdentity
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsIdentity);
+            get => HasFlag(_SqlMetadataFlags.IsIdentity);
             set => Set(_SqlMetadataFlags.IsIdentity, value);
         }
 
         public bool IsColumnSet
         {
-            get => flags.HasFlag(_SqlMetadataFlags.IsColumnSet);
+            get => HasFlag(_SqlMetadataFlags.IsColumnSet);
             set => Set(_SqlMetadataFlags.IsColumnSet, value);
         }
 
@@ -1054,16 +1059,21 @@ internal SqlMetaDataPriv()
 
         public bool IsNullable
         {
-            get => flags.HasFlag(SqlMetaDataPrivFlags.IsNullable);
+            get => HasFlag(SqlMetaDataPrivFlags.IsNullable);
             set => Set(SqlMetaDataPrivFlags.IsNullable, value);
         }
 
         public bool IsMultiValued
         {
-            get => flags.HasFlag(SqlMetaDataPrivFlags.IsMultiValued);
+            get => HasFlag(SqlMetaDataPrivFlags.IsMultiValued);
             set => Set(SqlMetaDataPrivFlags.IsMultiValued, value);
         }
 
+        private bool HasFlag(SqlMetaDataPrivFlags flag)
+        {
+            return (flags & flag) != 0;
+        }
+
         private void Set(SqlMetaDataPrivFlags flag, bool value)
         {
             flags = value ? flags | flag : flags & ~flag;

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,11 @@ internal _SqlMetaData(int ordinal) : base()`
`427`	`427`	`this.ordinal = ordinal;`
`428`	`428`	`}`
`429`	`429`
	`430`	`+ private bool HasFlag(_SqlMetadataFlags flag)`
	`431`	`+ {`
	`432`	`+ return (flags & flag) != 0;`
	`433`	`+ }`
	`434`	`+`
`430`	`435`	`internal string serverName`
`431`	`436`	`{`
`432`	`437`	`get`
`@@ -459,47 +464,47 @@ internal string tableName`
`459`	`464`	`public byte Updatability`
`460`	`465`	`{`
`461`	`466`	`get => (byte)(flags & _SqlMetadataFlags.IsUpdatableMask);`
`462`		`- set => flags = (_SqlMetadataFlags)((value & 0x3) \| ((int)flags & ~0x03));`
	`467`	`+ set => flags = (_SqlMetadataFlags)((value & (byte)_SqlMetadataFlags.IsUpdatableMask) \| ((int)flags & ~(byte)_SqlMetadataFlags.IsUpdatableMask));`
`463`	`468`	`}`
`464`	`469`
`465`	`470`	`public bool IsReadOnly`
`466`	`471`	`{`
`467`		`- get => (flags & _SqlMetadataFlags.IsUpdatableMask) == 0;`
	`472`	`+ get => !HasFlag(_SqlMetadataFlags.IsUpdatableMask);`
`468`	`473`	`}`
`469`	`474`
`470`	`475`	`public bool IsDifferentName`
`471`	`476`	`{`
`472`		`- get => flags.HasFlag(_SqlMetadataFlags.IsDifferentName);`
	`477`	`+ get => HasFlag(_SqlMetadataFlags.IsDifferentName);`
`473`	`478`	`set => Set(_SqlMetadataFlags.IsDifferentName, value);`
`474`	`479`	`}`
`475`	`480`
`476`	`481`	`public bool IsKey`
`477`	`482`	`{`
`478`		`- get => flags.HasFlag(_SqlMetadataFlags.IsKey);`
	`483`	`+ get => HasFlag(_SqlMetadataFlags.IsKey);`
`479`	`484`	`set => Set(_SqlMetadataFlags.IsKey, value);`
`480`	`485`	`}`
`481`	`486`
`482`	`487`	`public bool IsHidden`
`483`	`488`	`{`
`484`		`- get => flags.HasFlag(_SqlMetadataFlags.IsHidden);`
	`489`	`+ get => HasFlag(_SqlMetadataFlags.IsHidden);`
`485`	`490`	`set => Set(_SqlMetadataFlags.IsHidden, value);`
`486`	`491`	`}`
`487`	`492`
`488`	`493`	`public bool IsExpression`
`489`	`494`	`{`
`490`		`- get => flags.HasFlag(_SqlMetadataFlags.IsExpression);`
	`495`	`+ get => HasFlag(_SqlMetadataFlags.IsExpression);`
`491`	`496`	`set => Set(_SqlMetadataFlags.IsExpression, value);`
`492`	`497`	`}`
`493`	`498`
`494`	`499`	`public bool IsIdentity`
`495`	`500`	`{`
`496`		`- get => flags.HasFlag(_SqlMetadataFlags.IsIdentity);`
	`501`	`+ get => HasFlag(_SqlMetadataFlags.IsIdentity);`
`497`	`502`	`set => Set(_SqlMetadataFlags.IsIdentity, value);`
`498`	`503`	`}`
`499`	`504`
`500`	`505`	`public bool IsColumnSet`
`501`	`506`	`{`
`502`		`- get => flags.HasFlag(_SqlMetadataFlags.IsColumnSet);`
	`507`	`+ get => HasFlag(_SqlMetadataFlags.IsColumnSet);`
`503`	`508`	`set => Set(_SqlMetadataFlags.IsColumnSet, value);`
`504`	`509`	`}`
`505`	`510`
`@@ -746,16 +751,21 @@ internal SqlMetaDataPriv()`
`746`	`751`
`747`	`752`	`public bool IsNullable`
`748`	`753`	`{`
`749`		`- get => flags.HasFlag(SqlMetaDataPrivFlags.IsNullable);`
	`754`	`+ get => HasFlag(SqlMetaDataPrivFlags.IsNullable);`
`750`	`755`	`set => Set(SqlMetaDataPrivFlags.IsNullable, value);`
`751`	`756`	`}`
`752`	`757`
`753`	`758`	`public bool IsMultiValued`
`754`	`759`	`{`
`755`		`- get => flags.HasFlag(SqlMetaDataPrivFlags.IsMultiValued);`
	`760`	`+ get => HasFlag(SqlMetaDataPrivFlags.IsMultiValued);`
`756`	`761`	`set => Set(SqlMetaDataPrivFlags.IsMultiValued, value);`
`757`	`762`	`}`
`758`	`763`
	`764`	`+ private bool HasFlag(SqlMetaDataPrivFlags flag)`
	`765`	`+ {`
	`766`	`+ return (flags & flag) != 0;`
	`767`	`+ }`
	`768`	`+`
`759`	`769`	`private void Set(SqlMetaDataPrivFlags flag, bool value)`
`760`	`770`	`{`
`761`	`771`	`flags = value ? flags \| flag : flags & ~flag;`
Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,11 @@ internal _SqlMetaData(int ordinal) : base()`
`602`	`602`	`this.ordinal = ordinal;`
`603`	`603`	`}`
`604`	`604`
	`605`	`+ private bool HasFlag(_SqlMetadataFlags flag)`
	`606`	`+ {`
	`607`	`+ return (flags & flag) != 0;`
	`608`	`+ }`
	`609`	`+`
`605`	`610`	`internal string serverName`
`606`	`611`	`{`
`607`	`612`	`get`
`@@ -634,47 +639,47 @@ internal string tableName`
`634`	`639`	`public byte Updatability`
`635`	`640`	`{`
`636`	`641`	`get => (byte)(flags & _SqlMetadataFlags.IsUpdatableMask);`
`637`		`- set => flags = (_SqlMetadataFlags)((value & 0x3) \| ((int)flags & ~0x03));`
	`642`	`+ set => flags = (_SqlMetadataFlags)((value & (byte)_SqlMetadataFlags.IsUpdatableMask) \| ((int)flags & ~(byte)_SqlMetadataFlags.IsUpdatableMask));`
`638`	`643`	`}`
`639`	`644`
`640`	`645`	`public bool IsReadOnly`
`641`	`646`	`{`
`642`		`- get => (flags & _SqlMetadataFlags.IsUpdatableMask) == 0;`
	`647`	`+ get => !HasFlag(_SqlMetadataFlags.IsUpdatableMask);`
`643`	`648`	`}`
`644`	`649`
`645`	`650`	`public bool IsDifferentName`
`646`	`651`	`{`
`647`		`- get => flags.HasFlag(_SqlMetadataFlags.IsDifferentName);`
	`652`	`+ get => HasFlag(_SqlMetadataFlags.IsDifferentName);`
`648`	`653`	`set => Set(_SqlMetadataFlags.IsDifferentName, value);`
`649`	`654`	`}`
`650`	`655`
`651`	`656`	`public bool IsKey`
`652`	`657`	`{`
`653`		`- get => flags.HasFlag(_SqlMetadataFlags.IsKey);`
	`658`	`+ get => HasFlag(_SqlMetadataFlags.IsKey);`
`654`	`659`	`set => Set(_SqlMetadataFlags.IsKey, value);`
`655`	`660`	`}`
`656`	`661`
`657`	`662`	`public bool IsHidden`
`658`	`663`	`{`
`659`		`- get => flags.HasFlag(_SqlMetadataFlags.IsHidden);`
	`664`	`+ get => HasFlag(_SqlMetadataFlags.IsHidden);`
`660`	`665`	`set => Set(_SqlMetadataFlags.IsHidden, value);`
`661`	`666`	`}`
`662`	`667`
`663`	`668`	`public bool IsExpression`
`664`	`669`	`{`
`665`		`- get => flags.HasFlag(_SqlMetadataFlags.IsExpression);`
	`670`	`+ get => HasFlag(_SqlMetadataFlags.IsExpression);`
`666`	`671`	`set => Set(_SqlMetadataFlags.IsExpression, value);`
`667`	`672`	`}`
`668`	`673`
`669`	`674`	`public bool IsIdentity`
`670`	`675`	`{`
`671`		`- get => flags.HasFlag(_SqlMetadataFlags.IsIdentity);`
	`676`	`+ get => HasFlag(_SqlMetadataFlags.IsIdentity);`
`672`	`677`	`set => Set(_SqlMetadataFlags.IsIdentity, value);`
`673`	`678`	`}`
`674`	`679`
`675`	`680`	`public bool IsColumnSet`
`676`	`681`	`{`
`677`		`- get => flags.HasFlag(_SqlMetadataFlags.IsColumnSet);`
	`682`	`+ get => HasFlag(_SqlMetadataFlags.IsColumnSet);`
`678`	`683`	`set => Set(_SqlMetadataFlags.IsColumnSet, value);`
`679`	`684`	`}`
`680`	`685`
`@@ -1054,16 +1059,21 @@ internal SqlMetaDataPriv()`
`1054`	`1059`
`1055`	`1060`	`public bool IsNullable`
`1056`	`1061`	`{`
`1057`		`- get => flags.HasFlag(SqlMetaDataPrivFlags.IsNullable);`
	`1062`	`+ get => HasFlag(SqlMetaDataPrivFlags.IsNullable);`
`1058`	`1063`	`set => Set(SqlMetaDataPrivFlags.IsNullable, value);`
`1059`	`1064`	`}`
`1060`	`1065`
`1061`	`1066`	`public bool IsMultiValued`
`1062`	`1067`	`{`
`1063`		`- get => flags.HasFlag(SqlMetaDataPrivFlags.IsMultiValued);`
	`1068`	`+ get => HasFlag(SqlMetaDataPrivFlags.IsMultiValued);`
`1064`	`1069`	`set => Set(SqlMetaDataPrivFlags.IsMultiValued, value);`
`1065`	`1070`	`}`
`1066`	`1071`
	`1072`	`+ private bool HasFlag(SqlMetaDataPrivFlags flag)`
	`1073`	`+ {`
	`1074`	`+ return (flags & flag) != 0;`
	`1075`	`+ }`
	`1076`	`+`
`1067`	`1077`	`private void Set(SqlMetaDataPrivFlags flag, bool value)`
`1068`	`1078`	`{`
`1069`	`1079`	`flags = value ? flags \| flag : flags & ~flag;`