Fix correctness issue when writing deletion vectors in Delta Lake

trinodb · Jan 8, 2025 · 24e6382 · 24e6382
1 parent ae84dfd
commit 24e6382
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMergeSink.java
@@ -408,6 +408,7 @@ private Slice writeDeletionVector(
     {
         String tablePath = rootTableLocation.toString();
         String sourceRelativePath = relativePath(tablePath, sourcePath);
+        DeletionVectorEntry oldDeletionVector = deletionVectors.get(sourceRelativePath);
 
         DeletionVectorEntry deletionVectorEntry;
         try {
@@ -426,7 +427,7 @@ private Slice writeDeletionVector(
                     deletion.partitionValues,
                     readStatistics(parquetMetadata, dataColumns, rowCount),
                     Optional.of(deletionVectorEntry));
-            DeltaLakeMergeResult result = new DeltaLakeMergeResult(deletion.partitionValues, Optional.of(sourceRelativePath), Optional.empty(), Optional.of(newFileInfo));
+            DeltaLakeMergeResult result = new DeltaLakeMergeResult(deletion.partitionValues, Optional.of(sourceRelativePath), Optional.ofNullable(oldDeletionVector), Optional.of(newFileInfo));
             return utf8Slice(mergeResultJsonCodec.toJson(result));
         }
         catch (Throwable e) {

diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeBasic.java
@@ -1392,6 +1392,16 @@ public void testDeletionVectorsRandomPrefix()
         assertUpdate("DROP TABLE " + tableName);
     }
 
+    @Test
+    void testDeletionVectorsRepeat()
+    {
+        try (TestTable table = newTrinoTable("test_dv", "(x int) WITH (deletion_vectors_enabled = true)", List.of("1", "2", "3"))) {
+            assertUpdate("DELETE FROM " + table.getName() + " WHERE x = 1", 1);
+            assertUpdate("DELETE FROM " + table.getName() + " WHERE x = 2", 1);
+            assertThat(query("SELECT * FROM " + table.getName())).matches("VALUES 3");
+        }
+    }
+
     @Test
     public void testUnsupportedVacuumDeletionVectors()
             throws Exception