Fix AccessViolation in appender

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

Hide file tree

Showing 3 changed files with 55 additions and 10 deletions.
diff --git a/DuckDB.NET.Data/DuckDBAppender.cs b/DuckDB.NET.Data/DuckDBAppender.cs
@@ -39,13 +39,6 @@ internal unsafe DuckDBAppender(Native.DuckDBAppender appender, string qualifiedT
         }
 
         dataChunk = NativeMethods.DataChunks.DuckDBCreateDataChunk(logicalTypeHandles, columnCount);
-
-        for (long index = 0; index < vectorWriters.LongLength; index++)
-        {
-            var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(dataChunk, index);
-
-            vectorWriters[index] = VectorDataWriterFactory.CreateWriter(vector, logicalTypes[index]);
-        }
     }
 
     public DuckDBAppenderRow CreateRow()
@@ -55,10 +48,12 @@ public DuckDBAppenderRow CreateRow()
             throw new InvalidOperationException("Appender is already closed");
         }
 
-        if (rowCount == DuckDBVectorSize)
+        if (rowCount % DuckDBVectorSize==0)
         {
             AppendDataChunk();
 
+            InitVectorWriters();
+
             rowCount = 0;
         }
 
@@ -101,6 +96,23 @@ public void Dispose()
         }
     }
 
+    private unsafe void InitVectorWriters()
+    {
+        for (long index = 0; index < vectorWriters.LongLength; index++)
+        {
+            var vector = NativeMethods.DataChunks.DuckDBDataChunkGetVector(dataChunk, index);
+
+            if (vectorWriters[index] == null)
+            {
+                vectorWriters[index] = VectorDataWriterFactory.CreateWriter(vector, logicalTypes[index]); 
+            }
+            else
+            {
+                vectorWriters[index].InitializerWriter();
+            }
+        }
+    }
+
     private void AppendDataChunk()
     {
         NativeMethods.DataChunks.DuckDBDataChunkSetSize(dataChunk, rowCount);

diff --git a/DuckDB.NET.Test/DuckDBManagedAppenderTests.cs b/DuckDB.NET.Test/DuckDBManagedAppenderTests.cs
@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
+using Bogus;
 using Xunit;
 
 namespace DuckDB.NET.Test;
@@ -406,7 +407,6 @@ public void TableWithSchema()
         Command.CommandText = "SELECT * FROM managedAppenderTestSchema.managedAppenderTest";
         using (var reader = Command.ExecuteReader())
         {
-
             var readRowIndex = 0;
             while (reader.Read())
             {
@@ -426,6 +426,39 @@ public void TableWithSchema()
         }
     }
 
+    [Fact]
+    public void ManagedAppenderOnTableAndColumns()
+    {
+        var table = "CREATE TABLE managedAppenderTest2(a INTEGER, b VARCHAR, c DateTime);";
+        Command.CommandText = table;
+        Command.ExecuteNonQuery();
+
+        var rows = 5000;
+        var date = DateTime.Today;
+
+        var categories = Enumerable.Range(0, rows)
+            .Select(i => new { id = i, name = Faker.Lorem.Word().OrNull(Faker), date = date.AddDays(i) })
+            .ToList();
+
+        using (var appender = Connection.CreateAppender("managedAppenderTest2"))
+        {
+            foreach (var item in categories)
+            {
+                var row = appender.CreateRow();
+                row
+                    .AppendValue(item.id)
+                    .AppendValue(item.name)
+                    .AppendValue(item.date)
+                    .EndRow();
+            }
+        }
+
+        var list = Connection.Query<(int id, string name, DateTime date)>("SELECT a, b, c FROM managedAppenderTest2").Select(tuple => new { tuple.id, tuple.name, tuple.date}).ToList();
+
+        list.Should().HaveCount(rows);
+        list.Should().BeEquivalentTo(categories);
+    }
+
     [Theory]
     [InlineData("")]
     [InlineData("MY # SÇHËMÁ")]

diff --git a/DuckDB.NET.Test/Test.csproj b/DuckDB.NET.Test/Test.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.5.1" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="Dapper" Version="2.1.24" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />