Refactor decimal reader. Make numeric reader sealed

Giorgi · Jul 6, 2024 · efea40d · efea40d
1 parent 9c0dbf8
commit efea40d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/DuckDB.NET.Data/Internal/Reader/DecimalVectorDataReader.cs b/DuckDB.NET.Data/Internal/Reader/DecimalVectorDataReader.cs
@@ -4,16 +4,19 @@
 
 namespace DuckDB.NET.Data.Internal.Reader;
 
-internal sealed class DecimalVectorDataReader : NumericVectorDataReader
+internal sealed class DecimalVectorDataReader : VectorDataReaderBase
 {
     private readonly DuckDBType decimalType;
+    private readonly NumericVectorDataReader numericVectorDataReader;
 
     internal unsafe DecimalVectorDataReader(IntPtr vector, void* dataPointer, ulong* validityMaskPointer, DuckDBType columnType, string columnName) : base(dataPointer, validityMaskPointer, columnType, columnName)
     {
         using var logicalType = NativeMethods.Vectors.DuckDBVectorGetColumnType(vector);
         Scale = NativeMethods.LogicalType.DuckDBDecimalScale(logicalType);
         Precision = NativeMethods.LogicalType.DuckDBDecimalWidth(logicalType);
         decimalType = NativeMethods.LogicalType.DuckDBDecimalInternalType(logicalType);
+
+        numericVectorDataReader = new NumericVectorDataReader(dataPointer, validityMaskPointer, columnType, columnName);
     }
 
     internal byte Scale { get; }
@@ -22,7 +25,7 @@ internal unsafe DecimalVectorDataReader(IntPtr vector, void* dataPointer, ulong*
 
     protected override T GetValidValue<T>(ulong offset, Type targetType)
     {
-        if (DuckDBType!= DuckDBType.Decimal)
+        if (DuckDBType != DuckDBType.Decimal)
         {
             return base.GetValidValue<T>(offset, targetType);
         }
@@ -54,7 +57,7 @@ private decimal GetDecimal(ulong offset)
                 return decimal.Divide(GetFieldData<long>(offset), pow);
             case DuckDBType.HugeInt:
                 {
-                    var hugeInt = GetBigInteger(offset, false);
+                    var hugeInt = numericVectorDataReader.GetBigInteger(offset, false);
 
                     var result = (decimal)BigInteger.DivRem(hugeInt, (BigInteger)pow, out var remainder);
 
@@ -65,4 +68,9 @@ private decimal GetDecimal(ulong offset)
         }
     }
 
+    public override void Dispose()
+    {
+        numericVectorDataReader.Dispose();
+        base.Dispose();
+    }
 }
diff --git a/DuckDB.NET.Data/Internal/Reader/NumericVectorDataReader.cs b/DuckDB.NET.Data/Internal/Reader/NumericVectorDataReader.cs
@@ -6,7 +6,7 @@
 
 namespace DuckDB.NET.Data.Internal.Reader;
 
-internal class NumericVectorDataReader : VectorDataReaderBase
+internal sealed class NumericVectorDataReader : VectorDataReaderBase
 {
     internal unsafe NumericVectorDataReader(void* dataPointer, ulong* validityMaskPointer, DuckDBType columnType, string columnName) : base(dataPointer, validityMaskPointer, columnType, columnName)
     {
@@ -85,7 +85,7 @@ internal override object GetValue(ulong offset, Type targetType)
         throw new InvalidCastException($"Cannot cast from {value.GetType().Name} to {targetType.Name} in column {ColumnName}");
     }
 
-    protected unsafe BigInteger GetBigInteger(ulong offset, bool unsigned)
+    internal unsafe BigInteger GetBigInteger(ulong offset, bool unsigned)
     {
         if (unsigned)
         {
@@ -99,7 +99,7 @@ protected unsafe BigInteger GetBigInteger(ulong offset, bool unsigned)
         }
     }
 
-    protected T GetBigInteger<T>(ulong offset, bool unsigned)
+    private T GetBigInteger<T>(ulong offset, bool unsigned)
     {
         var bigInteger = GetBigInteger(offset, unsigned);