Optimise GetInt32.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/Core/BinaryRow.cs

@@ -69,6 +69,29 @@ protected override void GetDataOffsets(ReadOnlySpan<byte> data, int[] dataOffset
 			}
 		}
 
+		protected override int GetInt32Core(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition)
+		{
+			var isUnsigned = (columnDefinition.ColumnFlags & ColumnFlags.Unsigned) != 0;
+			switch (columnDefinition.ColumnType)
+			{
+			case ColumnType.Tiny:
+				return isUnsigned ? (int) data[0] : (sbyte) data[0];
+
+			case ColumnType.Int24:
+			case ColumnType.Long:
+				return isUnsigned ? checked((int) MemoryMarshal.Read<uint>(data)) : MemoryMarshal.Read<int>(data);
+
+			case ColumnType.Longlong:
+				return isUnsigned ? checked((int) MemoryMarshal.Read<ulong>(data)) : checked((int) MemoryMarshal.Read<long>(data));
+
+			case ColumnType.Short:
+				return isUnsigned ? (int) MemoryMarshal.Read<ushort>(data) : MemoryMarshal.Read<short>(data);
+
+			default:
+				throw new FormatException();
+			}
+		}
+
 		protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition)
 		{
 			var isUnsigned = (columnDefinition.ColumnFlags & ColumnFlags.Unsigned) != 0;

src/MySqlConnector/Core/Row.cs

@@ -200,29 +200,37 @@ public short GetInt16(int ordinal)
 
 		public int GetInt32(int ordinal)
 		{
-			var value = GetValue(ordinal);
-			if (value is int)
-				return (int) value;
+			if (ordinal < 0 || ordinal > ResultSet.ColumnDefinitions!.Length)
+				throw new ArgumentOutOfRangeException(nameof(ordinal), "value must be between 0 and {0}.".FormatInvariant(ResultSet.ColumnDefinitions!.Length));
 
-			if (value is sbyte)
-				return (sbyte) value;
-			if (value is byte)
-				return (byte) value;
-			if (value is short)
-				return (short) value;
-			if (value is ushort)
-				return (ushort) value;
-			if (value is uint)
-				return checked((int) (uint) value);
-			if (value is long)
-				return checked((int) (long) value);
-			if (value is ulong)
-				return checked((int) (ulong) value);
-			if (value is decimal)
-				return (int) (decimal) value;
-			return (int) value;
+			if (m_dataOffsets[ordinal] == -1)
+				throw new InvalidCastException();
+
+			var columnDefinition = ResultSet.ColumnDefinitions[ordinal];
+			if ((columnDefinition.ColumnType != ColumnType.Tiny &&
+				columnDefinition.ColumnType != ColumnType.Short &&
+				columnDefinition.ColumnType != ColumnType.Int24 &&
+				columnDefinition.ColumnType != ColumnType.Long &&
+				columnDefinition.ColumnType != ColumnType.Longlong &&
+				columnDefinition.ColumnType != ColumnType.Bit &&
+				columnDefinition.ColumnType != ColumnType.Year &&
+				columnDefinition.ColumnType != ColumnType.Decimal) ||
+				(columnDefinition.ColumnType == ColumnType.Tiny && Connection.TreatTinyAsBoolean && columnDefinition.ColumnLength == 1 && (columnDefinition.ColumnFlags & ColumnFlags.Unsigned) == 0))
+			{
+				throw new InvalidCastException("Can't convert {0} to Int32".FormatInvariant(ResultSet.ColumnTypes![ordinal]));
+			}
+
+			var data = m_data.Slice(m_dataOffsets[ordinal], m_dataLengths[ordinal]).Span;
+
+			if (columnDefinition.ColumnType == ColumnType.Bit)
+				return checked((int) ReadBit(data, columnDefinition));
+			else if (columnDefinition.ColumnType == ColumnType.Decimal)
+				return (int) (decimal) GetValue(ordinal);
+			return GetInt32Core(data, columnDefinition);
 		}
 
+		protected abstract int GetInt32Core(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition);
+
 		public long GetInt64(int ordinal)
 		{
 			var value = GetValue(ordinal);
@@ -433,7 +441,7 @@ protected static Guid CreateGuidFromBytes(MySqlGuidFormat guidFormat, ReadOnlySp
 #endif
 		}
 
-		protected static object ReadBit(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition)
+		protected static ulong ReadBit(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition)
 		{
 			if ((columnDefinition.ColumnFlags & ColumnFlags.Binary) == 0)
 			{

src/MySqlConnector/Core/TextRow.cs

@@ -31,6 +31,9 @@ protected override void GetDataOffsets(ReadOnlySpan<byte> data, int[] dataOffset
 			}
 		}
 
+		protected override int GetInt32Core(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition) =>
+			!Utf8Parser.TryParse(data, out int value, out var bytesConsumed) || bytesConsumed != data.Length ? throw new OverflowException() : value;
+
 		protected override object GetValueCore(ReadOnlySpan<byte> data, ColumnDefinitionPayload columnDefinition)
 		{
 			var isUnsigned = (columnDefinition.ColumnFlags & ColumnFlags.Unsigned) != 0;