fix: resolve review comments

Signed-off-by: Junwang Zhao <[email protected]>

Author: zhjwpku

src/iceberg/manifest_entry.cc

@@ -20,10 +20,8 @@
 #include "iceberg/manifest_entry.h"
 
 #include <memory>
-#include <optional>
 #include <vector>
 
-#include "iceberg/schema.h"
 #include "iceberg/schema_field.h"
 #include "iceberg/type.h"
 
@@ -138,11 +136,11 @@ const SchemaField ManifestEntry::SEQUENCE_NUMBER =
 const SchemaField ManifestEntry::FILE_SEQUENCE_NUMBER =
     SchemaField::MakeOptional(4, "file_sequence_number", std::make_shared<LongType>());
 
-Schema ManifestEntry::GetSchema(StructType partition_type) {
+StructType ManifestEntry::GetSchema(StructType partition_type) {
   return GetSchemaFromDataFileType(DataFile::GetType(partition_type));
 }
 
-Schema ManifestEntry::GetSchemaFromDataFileType(StructType datafile_type) {
+StructType ManifestEntry::GetSchemaFromDataFileType(StructType datafile_type) {
   std::vector<SchemaField> fields;
 
   fields.push_back(STATUS);
@@ -155,7 +153,7 @@ Schema ManifestEntry::GetSchemaFromDataFileType(StructType datafile_type) {
       2, "data_file", std::make_shared<StructType>(DataFile::GetType(datafile_type)));
   fields.push_back(data_file_type_field);
 
-  return {std::move(fields), /*schema_id=*/std::nullopt};
+  return StructType(std::move(fields));
 }
 
 }  // namespace iceberg

src/iceberg/manifest_entry.h

@@ -246,8 +246,8 @@ struct ICEBERG_EXPORT ManifestEntry {
   static const SchemaField SEQUENCE_NUMBER;
   static const SchemaField FILE_SEQUENCE_NUMBER;
 
-  static Schema GetSchema(StructType partition_type);
-  static Schema GetSchemaFromDataFileType(StructType datafile_type);
+  static StructType GetSchema(StructType partition_type);
+  static StructType GetSchemaFromDataFileType(StructType datafile_type);
 };
 
 }  // namespace iceberg

src/iceberg/manifest_list.cc

@@ -19,7 +19,9 @@
 
 #include "iceberg/manifest_list.h"
 
-#include "iceberg/schema.h"
+#include <vector>
+
+#include "iceberg/schema_field.h"
 #include "iceberg/type.h"
 
 namespace iceberg {
@@ -78,7 +80,7 @@ const SchemaField ManifestFile::KEY_METADATA =
 const SchemaField ManifestFile::FIRST_ROW_ID =
     SchemaField::MakeOptional(520, "first_row_id", std::make_shared<LongType>());
 
-Schema ManifestFile::schema() {
+StructType ManifestFile::Schema() {
   std::vector<SchemaField> fields;
   fields.push_back(MANIFEST_PATH);
   fields.push_back(MANIFEST_LENGTH);
@@ -97,7 +99,7 @@ Schema ManifestFile::schema() {
   fields.push_back(KEY_METADATA);
   fields.push_back(FIRST_ROW_ID);
 
-  return {std::move(fields), /*schema_id=*/std::nullopt};
+  return StructType(std::move(fields));
 }
 
 }  // namespace iceberg

src/iceberg/manifest_list.h

@@ -28,7 +28,6 @@
 
 #include "iceberg/iceberg_export.h"
 #include "iceberg/result.h"
-#include "iceberg/schema_field.h"
 #include "iceberg/type_fwd.h"
 
 namespace iceberg {
@@ -180,7 +179,7 @@ struct ICEBERG_EXPORT ManifestFile {
   static const SchemaField KEY_METADATA;
   static const SchemaField FIRST_ROW_ID;
 
-  static Schema schema();
+  static StructType Schema();
 };
 
 /// Snapshots are embedded in table metadata, but the list of manifests for a snapshot are