bug fix for Time conversion; run code clean up on both of the projects that were part of the bug fix

Author: David Coe

csharp/src/Apache.Arrow.Adbc/C/CAdbcDriverImporter.cs

@@ -1010,7 +1010,7 @@ public unsafe override Schema GetParameterSchema()
 #else
                             Marshal.GetDelegateForFunctionPointer<StatementGetParameterSchema>(Driver.StatementGetParameterSchema)
 #endif
-                            (statement, caller.CreateSchema(), & caller._error));
+                            (statement, caller.CreateSchema(), &caller._error));
                     }
                     return caller.ImportSchema();
                 }

csharp/src/Apache.Arrow.Adbc/Extensions/IArrowArrayExtensions.cs

@@ -111,22 +111,20 @@ public static class IArrowArrayExtensions
 #else
                 case ArrowTypeId.Time32:
                     Time32Array time32Array = (Time32Array)arrowArray;
-                    int? time32 = time32Array.GetValue(index);
-                    if (time32 == null) { return null; }
+                    if (time32Array.IsNull(index)) { return null; }
                     return ((Time32Type)time32Array.Data.DataType).Unit switch
                     {
-                        TimeUnit.Second => TimeSpan.FromSeconds(time32.Value),
-                        TimeUnit.Millisecond => TimeSpan.FromMilliseconds(time32.Value),
+                        TimeUnit.Second => TimeSpan.FromSeconds(time32Array.GetSeconds(index)!.Value),
+                        TimeUnit.Millisecond => TimeSpan.FromMilliseconds(time32Array.GetMilliSeconds(index)!.Value),
                         _ => throw new InvalidDataException("Unsupported time unit for Time32Type")
                     };
                 case ArrowTypeId.Time64:
                     Time64Array time64Array = (Time64Array)arrowArray;
-                    long? time64 = time64Array.GetValue(index);
-                    if (time64 == null) { return null; }
+                    if (time64Array.IsNull(index)) { return null; }
                     return ((Time64Type)time64Array.Data.DataType).Unit switch
                     {
-                        TimeUnit.Microsecond => TimeSpan.FromTicks(time64.Value * 10),
-                        TimeUnit.Nanosecond => TimeSpan.FromTicks(time64.Value / 100),
+                        TimeUnit.Microsecond => TimeSpan.FromTicks(time64Array.GetMicroSeconds(index)!.Value * 10),
+                        TimeUnit.Nanosecond => TimeSpan.FromTicks(time64Array.GetNanoSeconds(index)!.Value / 100),
                         _ => throw new InvalidDataException("Unsupported time unit for Time64Type")
                     };
 #endif
@@ -257,9 +255,9 @@ public static class IArrowArrayExtensions
                     switch (time64Type.Unit)
                     {
                         case TimeUnit.Microsecond:
-                            return (array, index) => array.IsNull(index) ? null : TimeSpan.FromTicks(((Time64Array)array).GetValue(index)!.Value * 10);
+                            return (array, index) => array.IsNull(index) ? null : TimeSpan.FromTicks(((Time64Array)array).GetMicroSeconds(index)!.Value * 10);
                         case TimeUnit.Nanosecond:
-                            return (array, index) => array.IsNull(index) ? null : TimeSpan.FromTicks(((Time64Array)array).GetValue(index)!.Value / 100);
+                            return (array, index) => array.IsNull(index) ? null : TimeSpan.FromTicks(((Time64Array)array).GetNanoSeconds(index)!.Value / 100);
                         default:
                             throw new InvalidDataException("Unsupported time unit for Time64Type");
                     }

csharp/src/Apache.Arrow.Adbc/Extensions/MarshalExtensions.cs

@@ -16,7 +16,6 @@
  */
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
 

csharp/src/Client/AdbcParameter.cs

@@ -15,10 +15,10 @@
 * limitations under the License.
 */
 
-using System.Data.Common;
+using System;
 using System.Data;
+using System.Data.Common;
 using System.Diagnostics.CodeAnalysis;
-using System;
 
 namespace Apache.Arrow.Adbc.Client
 {

csharp/src/Client/SchemaConverter.cs

@@ -89,7 +89,7 @@ public static DataTable ConvertArrowSchema(Schema schema, AdbcStatement adbcStat
                     row[SchemaTableColumn.NumericPrecision] = decimal32Type.Precision;
                     row[SchemaTableColumn.NumericScale] = decimal32Type.Scale;
                 }
-                else if (f.DataType is Decimal128Type decimal64Type)
+                else if (f.DataType is Decimal64Type decimal64Type)
                 {
                     row[SchemaTableColumn.NumericPrecision] = decimal64Type.Precision;
                     row[SchemaTableColumn.NumericScale] = decimal64Type.Scale;
@@ -194,7 +194,7 @@ public static Type GetArrowType(Field f, DecimalBehavior decimalBehavior, Struct
                     return typeof(string);
 
                 case ArrowTypeId.Struct:
-                    return  structBehavior == StructBehavior.JsonString ? typeof(string) : typeof(Dictionary<string, object?>);
+                    return structBehavior == StructBehavior.JsonString ? typeof(string) : typeof(Dictionary<string, object?>);
 
                 case ArrowTypeId.Timestamp:
                     return typeof(DateTimeOffset);
@@ -203,7 +203,8 @@ public static Type GetArrowType(Field f, DecimalBehavior decimalBehavior, Struct
                     return typeof(DBNull);
 
                 case ArrowTypeId.Interval:
-                    switch (((IntervalType)f.DataType).Unit) {
+                    switch (((IntervalType)f.DataType).Unit)
+                    {
                         case IntervalUnit.MonthDayNanosecond:
                             return typeof(MonthDayNanosecondInterval);
                         case IntervalUnit.DayTime:
@@ -227,7 +228,7 @@ public static Type GetArrowArrayType(IArrowType dataType)
                 case ArrowTypeId.Boolean:
                     return typeof(BooleanArray);
                 case ArrowTypeId.Decimal128:
-                        return typeof(Decimal128Array);
+                    return typeof(Decimal128Array);
                 case ArrowTypeId.Decimal256:
                     return typeof(Decimal256Array);
                 case ArrowTypeId.Time32: