address feedback

Author: wgtmac

src/iceberg/data/delete_loader.cc

@@ -110,13 +110,19 @@ Result<PositionDeleteIndex> DeleteLoader::LoadPositionDeletes(
   PositionDeleteIndex index;
 
   for (const auto& file : delete_files) {
+    if (file->referenced_data_file.has_value() &&
+        file->referenced_data_file.value() != data_file_path) {
+      continue;
+    }
+
     if (file->IsDeletionVector()) {
       ICEBERG_RETURN_UNEXPECTED(LoadDV(*file, index));
+      continue;
     }
 
     ICEBERG_PRECHECK(file->content == DataFile::Content::kPositionDeletes,
                      "Expected position delete file but got content type {}",
-                     static_cast<int>(file->content));
+                     ToString(file->content));
 
     ICEBERG_RETURN_UNEXPECTED(LoadPositionDelete(*file, index, data_file_path));
   }

src/iceberg/data/delete_loader.h

@@ -29,7 +29,6 @@
 #include "iceberg/iceberg_export.h"
 #include "iceberg/result.h"
 #include "iceberg/type_fwd.h"
-#include "iceberg/util/struct_like_set.h"
 
 namespace iceberg {
 

src/iceberg/test/delete_loader_test.cc

@@ -193,6 +193,20 @@ TEST_F(DeleteLoaderTest, LoadPositionDeletesFiltersByDataFilePath) {
   ASSERT_TRUE(result_none.value().IsEmpty());
 }
 
+TEST_F(DeleteLoaderTest, LoadPositionDeletesSkipsMismatchedReferencedDataFile) {
+  auto delete_file = std::make_shared<DataFile>(DataFile{
+      .content = DataFile::Content::kPositionDeletes,
+      .file_path = "missing-pos-delete.parquet",
+      .file_format = FileFormatType::kParquet,
+      .referenced_data_file = "other-data.parquet",
+  });
+
+  std::vector<std::shared_ptr<DataFile>> files = {delete_file};
+  auto result = loader_->LoadPositionDeletes(files, "data.parquet");
+  ASSERT_THAT(result, IsOk());
+  ASSERT_TRUE(result.value().IsEmpty());
+}
+
 TEST_F(DeleteLoaderTest, LoadPositionDeletesRejectsDV) {
   auto dv_file = std::make_shared<DataFile>(DataFile{
       .content = DataFile::Content::kPositionDeletes,

src/iceberg/type_fwd.h

@@ -188,6 +188,9 @@ class ArrayLike;
 class MapLike;
 class StructLike;
 class StructLikeAccessor;
+template <bool kValidate>
+class StructLikeSet;
+using UncheckedStructLikeSet = StructLikeSet<false>;
 
 /// \brief Catalog
 class Catalog;

src/iceberg/util/struct_like_set.h

@@ -101,10 +101,6 @@ class ICEBERG_TEMPLATE_CLASS_EXPORT StructLikeSet {
   std::unordered_set<std::unique_ptr<StructLike>, KeyHash, KeyEqual> set_;
 };
 
-/// \brief Type alias for StructLikeSet without schema validation, for callers
-/// that guarantee schema conformance.
-using UncheckedStructLikeSet = StructLikeSet<false>;
-
 extern template class ICEBERG_EXTERN_TEMPLATE_CLASS_EXPORT StructLikeSet<true>;
 extern template class ICEBERG_EXTERN_TEMPLATE_CLASS_EXPORT StructLikeSet<false>;