Merge branch 'develop' into Appender-Data-Chunk

Giorgi · Giorgi · commit 01f05343a10c · 2024-04-22T12:45:12.000+04:00
diff --git a/DuckDB.NET.Data/DuckDBDataReader.cs b/DuckDB.NET.Data/DuckDBDataReader.cs
@@ -78,16 +78,14 @@ private bool InitChunkData()
 
             vectorReaders = new VectorDataReaderBase[fieldCount];
 
-            for (int i = 0; i < fieldCount; i++)
+            for (int index = 0; index < fieldCount; index++)
             {
-                var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(currentChunk, i);
+                var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(currentChunk, index);
 
-                var vectorData = NativeMethods.Vectors.DuckDBVectorGetData(vector);
-                var vectorValidityMask = NativeMethods.Vectors.DuckDBVectorGetValidity(vector);
+                using var logicalType = NativeMethods.Query.DuckDBColumnLogicalType(ref currentResult, index);
 
-                vectorReaders[i] = VectorDataReaderFactory.CreateReader(vector, vectorData, vectorValidityMask,
-                                                                        NativeMethods.Query.DuckDBColumnType(ref currentResult, i),
-                                                                        NativeMethods.Query.DuckDBColumnName(ref currentResult, i).ToManagedString(false));
+                vectorReaders[index] = VectorDataReaderFactory.CreateReader(vector, logicalType,
+                                                                            NativeMethods.Query.DuckDBColumnName(ref currentResult, index).ToManagedString(false));
             }
 
             return currentChunkRowCount > 0;
diff --git a/DuckDB.NET.Data/Internal/Reader/ListVectorDataReader.cs b/DuckDB.NET.Data/Internal/Reader/ListVectorDataReader.cs
@@ -18,15 +18,10 @@ internal unsafe ListVectorDataReader(IntPtr vector, void* dataPointer, ulong* va
         using var logicalType = NativeMethods.Vectors.DuckDBVectorGetColumnType(vector);
         using var childType = IsList ? NativeMethods.LogicalType.DuckDBListTypeChildType(logicalType) : NativeMethods.LogicalType.DuckDBArrayTypeChildType(logicalType);
 
-        var type = NativeMethods.LogicalType.DuckDBGetTypeId(childType);
-
         var childVector = IsList ? NativeMethods.Vectors.DuckDBListVectorGetChild(vector) : NativeMethods.Vectors.DuckDBArrayVectorGetChild(vector);
 
-        var childVectorData = NativeMethods.Vectors.DuckDBVectorGetData(childVector);
-        var childVectorValidity = NativeMethods.Vectors.DuckDBVectorGetValidity(childVector);
-
         arraySize = IsList ? 0 : (ulong)NativeMethods.LogicalType.DuckDBArrayVectorGetSize(logicalType);
-        listDataReader = VectorDataReaderFactory.CreateReader(childVector, childVectorData, childVectorValidity, type, columnName);
+        listDataReader = VectorDataReaderFactory.CreateReader(childVector, childType, columnName);
     }
 
     protected override Type GetColumnType()
diff --git a/DuckDB.NET.Data/Internal/Reader/MapVectorDataReader.cs b/DuckDB.NET.Data/Internal/Reader/MapVectorDataReader.cs
@@ -18,19 +18,13 @@ internal unsafe MapVectorDataReader(IntPtr vector, void* dataPointer, ulong* val
         using var keyTypeLogical = NativeMethods.LogicalType.DuckDBMapTypeKeyType(logicalType);
         using var valueTypeLogical = NativeMethods.LogicalType.DuckDBMapTypeValueType(logicalType);
 
-        var keyType = NativeMethods.LogicalType.DuckDBGetTypeId(keyTypeLogical);
-        var valueType = NativeMethods.LogicalType.DuckDBGetTypeId(valueTypeLogical);
-
         var childVector = NativeMethods.Vectors.DuckDBListVectorGetChild(vector);
 
         var keyVector = NativeMethods.Vectors.DuckDBStructVectorGetChild(childVector, 0);
         var valueVector = NativeMethods.Vectors.DuckDBStructVectorGetChild(childVector, 1);
 
-        keyReader = VectorDataReaderFactory.CreateReader(keyVector, NativeMethods.Vectors.DuckDBVectorGetData(keyVector),
-                                                                    NativeMethods.Vectors.DuckDBVectorGetValidity(keyVector), keyType, columnName);
-
-        valueReader = VectorDataReaderFactory.CreateReader(valueVector, NativeMethods.Vectors.DuckDBVectorGetData(valueVector),
-                                                                        NativeMethods.Vectors.DuckDBVectorGetValidity(valueVector), valueType, columnName);
+        keyReader = VectorDataReaderFactory.CreateReader(keyVector, keyTypeLogical, columnName);
+        valueReader = VectorDataReaderFactory.CreateReader(valueVector, valueTypeLogical, columnName);
     }
 
     protected override Type GetColumnType()
diff --git a/DuckDB.NET.Data/Internal/Reader/StructVectorDataReader.cs b/DuckDB.NET.Data/Internal/Reader/StructVectorDataReader.cs
@@ -22,14 +22,9 @@ internal unsafe StructVectorDataReader(IntPtr vector, void* dataPointer, ulong*
         {
             var name = NativeMethods.LogicalType.DuckDBStructTypeChildName(logicalType, index).ToManagedString();
             var childVector = NativeMethods.Vectors.DuckDBStructVectorGetChild(vector, index);
-
-            var childVectorData = NativeMethods.Vectors.DuckDBVectorGetData(childVector);
-            var childVectorValidity = NativeMethods.Vectors.DuckDBVectorGetValidity(childVector);
-
+            
             using var childType = NativeMethods.LogicalType.DuckDBStructTypeChildType(logicalType, index);
-            var type = NativeMethods.LogicalType.DuckDBGetTypeId(childType);
-
-            structDataReaders[name] = VectorDataReaderFactory.CreateReader(childVector, childVectorData, childVectorValidity, type, columnName);
+            structDataReaders[name] = VectorDataReaderFactory.CreateReader(childVector, childType, columnName);
         }
     }
 
diff --git a/DuckDB.NET.Data/Internal/Reader/VectorDataReaderFactory.cs b/DuckDB.NET.Data/Internal/Reader/VectorDataReaderFactory.cs
@@ -5,8 +5,12 @@ namespace DuckDB.NET.Data.Internal.Reader;
 
 internal static class VectorDataReaderFactory
 {
-    public static unsafe VectorDataReaderBase CreateReader(IntPtr vector, void* dataPointer, ulong* validityMaskPointer, DuckDBType columnType, string columnName)
+    public static unsafe VectorDataReaderBase CreateReader(IntPtr vector, DuckDBLogicalType logicalColumnType, string columnName)
     {
+        var columnType = NativeMethods.LogicalType.DuckDBGetTypeId(logicalColumnType);
+        var dataPointer = NativeMethods.Vectors.DuckDBVectorGetData(vector);
+        var validityMaskPointer = NativeMethods.Vectors.DuckDBVectorGetValidity(vector);
+
         return columnType switch
         {
             DuckDBType.Uuid => new GuidVectorDataReader(dataPointer, validityMaskPointer, columnType, columnName),
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 0.10.2
+next-version: 0.10.3
 branches:
   develop:
     increment: None

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,9 @@ internal unsafe StructVectorDataReader(IntPtr vector, void* dataPointer, ulong*`
`22`	`22`	`{`
`23`	`23`	`var name = NativeMethods.LogicalType.DuckDBStructTypeChildName(logicalType, index).ToManagedString();`
`24`	`24`	`var childVector = NativeMethods.Vectors.DuckDBStructVectorGetChild(vector, index);`
`25`		`-`
`26`		`- var childVectorData = NativeMethods.Vectors.DuckDBVectorGetData(childVector);`
`27`		`- var childVectorValidity = NativeMethods.Vectors.DuckDBVectorGetValidity(childVector);`
`28`		`-`
	`25`	`+`
`29`	`26`	`using var childType = NativeMethods.LogicalType.DuckDBStructTypeChildType(logicalType, index);`
`30`		`- var type = NativeMethods.LogicalType.DuckDBGetTypeId(childType);`
`31`		`-`
`32`		`- structDataReaders[name] = VectorDataReaderFactory.CreateReader(childVector, childVectorData, childVectorValidity, type, columnName);`
	`27`	`+ structDataReaders[name] = VectorDataReaderFactory.CreateReader(childVector, childType, columnName);`
`33`	`28`	`}`
`34`	`29`	`}`
`35`	`30`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,12 @@ namespace DuckDB.NET.Data.Internal.Reader;`
`5`	`5`
`6`	`6`	`internal static class VectorDataReaderFactory`
`7`	`7`	`{`
`8`		`- public static unsafe VectorDataReaderBase CreateReader(IntPtr vector, void* dataPointer, ulong* validityMaskPointer, DuckDBType columnType, string columnName)`
	`8`	`+ public static unsafe VectorDataReaderBase CreateReader(IntPtr vector, DuckDBLogicalType logicalColumnType, string columnName)`
`9`	`9`	`{`
	`10`	`+ var columnType = NativeMethods.LogicalType.DuckDBGetTypeId(logicalColumnType);`
	`11`	`+ var dataPointer = NativeMethods.Vectors.DuckDBVectorGetData(vector);`
	`12`	`+ var validityMaskPointer = NativeMethods.Vectors.DuckDBVectorGetValidity(vector);`
	`13`	`+`
`10`	`14`	`return columnType switch`
`11`	`15`	`{`
`12`	`16`	`DuckDBType.Uuid => new GuidVectorDataReader(dataPointer, validityMaskPointer, columnType, columnName),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-next-version: 0.10.2`
	`1`	`+next-version: 0.10.3`
`2`	`2`	`branches:`
`3`	`3`	`develop:`
`4`	`4`	`increment: None`