fix conflict

Author: xiao.dong

src/iceberg/manifest_reader.cc

@@ -55,4 +55,13 @@ Result<std::unique_ptr<ManifestListReader>> ManifestListReader::MakeReader(
   return std::make_unique<ManifestListReaderImpl>(std::move(reader), std::move(schema));
 }
 
+Result<std::unique_ptr<ManifestListReader>> CreateManifestListReader(
+    std::string_view file_path) {
+  return NotImplemented("CreateManifestListReader is not implemented yet.");
+}
+
+Result<std::unique_ptr<ManifestReader>> CreateManifestReader(std::string_view file_path) {
+  return NotImplemented("CreateManifestReader is not implemented yet.");
+}
+
 }  // namespace iceberg

src/iceberg/manifest_reader.h

@@ -56,15 +56,11 @@ class ICEBERG_EXPORT ManifestListReader {
 /// \param file_path Path to the manifest list file.
 /// \return A Result containing the reader or an error.
 Result<std::unique_ptr<ManifestListReader>> CreateManifestListReader(
-    std::string_view file_path) {
-  return NotImplemented("CreateManifestListReader is not implemented yet.");
-}
+    std::string_view file_path);
 
 /// \brief Creates a reader for a manifest file.
 /// \param file_path Path to the manifest file.
 /// \return A Result containing the reader or an error.
-Result<std::unique_ptr<ManifestReader>> CreateManifestReader(std::string_view file_path) {
-  return NotImplemented("CreateManifestReader is not implemented yet.");
-}
+Result<std::unique_ptr<ManifestReader>> CreateManifestReader(std::string_view file_path);
 
 }  // namespace iceberg

src/iceberg/table_scan.cc

@@ -168,16 +168,16 @@ Result<std::vector<std::shared_ptr<FileScanTask>>> DataTableScan::PlanFiles() co
   std::vector<std::shared_ptr<FileScanTask>> tasks;
   for (const auto& manifest_file : manifest_files) {
     ICEBERG_ASSIGN_OR_RAISE(auto manifest_reader,
-                            CreateManifestReader(manifest_file->manifest_path));
+                            CreateManifestReader(manifest_file.manifest_path));
     ICEBERG_ASSIGN_OR_RAISE(auto manifests, manifest_reader->Entries());
 
     // TODO(gty404): filter manifests using partition spec and filter expression
 
     for (auto& manifest_entry : manifests) {
-      const auto& data_file = manifest_entry->data_file;
+      const auto& data_file = manifest_entry.data_file;
       switch (data_file->content) {
         case DataFile::Content::kData:
-          tasks.emplace_back(std::make_shared<FileScanTask>(manifest_entry->data_file));
+          tasks.emplace_back(std::make_shared<FileScanTask>(manifest_entry.data_file));
           break;
         case DataFile::Content::kPositionDeletes:
         case DataFile::Content::kEqualityDeletes: