fix(update): validate DeleteFiles content types and fix Meson build

Author: shuxu.li

src/iceberg/test/meson.build

@@ -120,10 +120,6 @@ iceberg_tests = {
         ),
         'use_data': true,
     },
-    'overwrite_files_test': {
-        'sources': files('overwrite_files_test.cc'),
-        'use_data': true,
-    },
 }
 
 if get_option('rest').enabled()

src/iceberg/test/overwrite_files_test.cc

@@ -526,6 +526,48 @@ TEST_F(OverwriteFilesTest, BulkDeleteFilesEquivalentToRepeatedDeleteFile) {
   EXPECT_EQ(snapshot->summary.at(SnapshotSummaryFields::kTotalDataFiles), "0");
 }
 
+// Content validation: because both sets hold std::shared_ptr<DataFile>, DeleteFiles
+// guards content so a data file cannot be passed as a delete file (or vice versa). A
+// delete file (position/equality) in the data-file set is rejected; the error surfaces
+// at Commit().
+TEST_F(OverwriteFilesTest, BulkDeleteFilesRejectsDeleteFileInDataSet) {
+  auto del_file =
+      MakeDeleteFile("/delete/del_a.parquet", 1L);  // content = positionDeletes
+  DataFileSet data_files;
+  data_files.insert(del_file);
+
+  ICEBERG_UNWRAP_OR_FAIL(auto op, NewOverwrite());
+  op->DeleteFiles(data_files, DeleteFileSet{});
+  auto result = op->Commit();
+  EXPECT_THAT(result, IsError(ErrorKind::kValidationFailed));
+  EXPECT_THAT(result, HasErrorMessage("has delete-file content"));
+}
+
+// A data file (content kData) in the delete-file set is rejected.
+TEST_F(OverwriteFilesTest, BulkDeleteFilesRejectsDataFileInDeleteSet) {
+  DeleteFileSet delete_files;
+  delete_files.insert(file_a_);  // content = kData
+
+  ICEBERG_UNWRAP_OR_FAIL(auto op, NewOverwrite());
+  op->DeleteFiles(DataFileSet{}, delete_files);
+  auto result = op->Commit();
+  EXPECT_THAT(result, IsError(ErrorKind::kValidationFailed));
+  EXPECT_THAT(result, HasErrorMessage("has data-file content"));
+}
+
+// An equality delete file is a valid delete file (content != kData) and is accepted in
+// the delete-file set.
+TEST_F(OverwriteFilesTest, BulkDeleteFilesAcceptsEqualityDeleteInDeleteSet) {
+  auto eq_delete = MakeEqualityDeleteFile("/delete/eq_a.parquet", 1L);
+  DeleteFileSet delete_files;
+  delete_files.insert(eq_delete);
+
+  ICEBERG_UNWRAP_OR_FAIL(auto op, NewOverwrite());
+  op->DeleteFiles(DataFileSet{}, delete_files);
+  op->AddFile(file_b_);
+  EXPECT_THAT(op->Commit(), IsOk());
+}
+
 // =====================================================================================
 // 9.6 Concurrency-validation tests (Req 8.2, 8.3, 9.2-9.5; Properties 6, 7)
 // =====================================================================================

src/iceberg/update/overwrite_files.cc

@@ -76,14 +76,26 @@ OverwriteFiles& OverwriteFiles::DeleteFiles(const DataFileSet& data_files_to_del
                                             const DeleteFileSet& delete_files_to_delete) {
   // Bulk equivalent of repeated DeleteFile(...) plus explicit delete-file removal. Empty
   // sets are no-ops; the set types handle deduplication of repeated entries.
+  //
+  // Because both sets hold std::shared_ptr<DataFile>, content is validated here so a data
+  // file cannot be registered as a delete file (or vice versa): a data file must have
+  // content kData, and a delete file must be a position/equality delete (content !=
+  // kData). This restores the type safety the C++ shared DataFile representation cannot
+  // enforce at compile time.
   for (const auto& file : data_files_to_delete) {
     ICEBERG_BUILDER_CHECK(file != nullptr, "Invalid data file: null");
+    ICEBERG_BUILDER_CHECK(file->content == DataFile::Content::kData,
+                          "Invalid data file to delete: {} has delete-file content",
+                          file->file_path);
     // Dual-track: record for delete-conflict validation AND register for removal.
     deleted_data_files_.insert(file);
     ICEBERG_BUILDER_RETURN_IF_ERROR(DeleteDataFile(file));
   }
   for (const auto& file : delete_files_to_delete) {
     ICEBERG_BUILDER_CHECK(file != nullptr, "Invalid delete file: null");
+    ICEBERG_BUILDER_CHECK(file->content != DataFile::Content::kData,
+                          "Invalid delete file to delete: {} has data-file content",
+                          file->file_path);
     ICEBERG_BUILDER_RETURN_IF_ERROR(DeleteDeleteFile(file));
   }
   return *this;