use consistent naming of DataFileType

wgtmac · wgtmac · commit 5cc6756f2a85 · 2025-11-08T20:13:11.000+08:00
diff --git a/src/iceberg/v2_metadata.cc b/src/iceberg/v2_metadata.cc
@@ -36,7 +36,7 @@ ManifestEntryAdapterV2::ManifestEntryAdapterV2(
 
 std::shared_ptr<Schema> ManifestEntryAdapterV2::EntrySchema(
     std::shared_ptr<StructType> partition_type) {
-  return WrapFileSchema(FileType(std::move(partition_type)));
+  return WrapFileSchema(DataFileType(std::move(partition_type)));
 }
 std::shared_ptr<Schema> ManifestEntryAdapterV2::WrapFileSchema(
     std::shared_ptr<StructType> file_schema) {
@@ -49,7 +49,7 @@ std::shared_ptr<Schema> ManifestEntryAdapterV2::WrapFileSchema(
                                 ManifestEntry::kDataFileField, std::move(file_schema)),
   });
 }
-std::shared_ptr<StructType> ManifestEntryAdapterV2::FileType(
+std::shared_ptr<StructType> ManifestEntryAdapterV2::DataFileType(
     std::shared_ptr<StructType> partition_type) {
   return std::make_shared<StructType>(std::vector<SchemaField>{
       DataFile::kContent.AsRequired(),
diff --git a/src/iceberg/v2_metadata.h b/src/iceberg/v2_metadata.h
@@ -36,7 +36,8 @@ class ManifestEntryAdapterV2 : public ManifestEntryAdapter {
 
   static std::shared_ptr<Schema> EntrySchema(std::shared_ptr<StructType> partition_type);
   static std::shared_ptr<Schema> WrapFileSchema(std::shared_ptr<StructType> file_schema);
-  static std::shared_ptr<StructType> FileType(std::shared_ptr<StructType> partition_type);
+  static std::shared_ptr<StructType> DataFileType(
+      std::shared_ptr<StructType> partition_type);
 
  protected:
   Result<std::optional<int64_t>> GetSequenceNumber(
diff --git a/src/iceberg/v3_metadata.cc b/src/iceberg/v3_metadata.cc
@@ -37,7 +37,7 @@ ManifestEntryAdapterV3::ManifestEntryAdapterV3(
 
 std::shared_ptr<Schema> ManifestEntryAdapterV3::EntrySchema(
     std::shared_ptr<StructType> partition_type) {
-  return WrapFileSchema(FileType(std::move(partition_type)));
+  return WrapFileSchema(DataFileType(std::move(partition_type)));
 }
 
 std::shared_ptr<Schema> ManifestEntryAdapterV3::WrapFileSchema(
@@ -52,7 +52,7 @@ std::shared_ptr<Schema> ManifestEntryAdapterV3::WrapFileSchema(
   });
 }
 
-std::shared_ptr<StructType> ManifestEntryAdapterV3::FileType(
+std::shared_ptr<StructType> ManifestEntryAdapterV3::DataFileType(
     std::shared_ptr<StructType> partition_type) {
   return std::make_shared<StructType>(std::vector<SchemaField>{
       DataFile::kContent.AsRequired(),
diff --git a/src/iceberg/v3_metadata.h b/src/iceberg/v3_metadata.h
@@ -37,7 +37,8 @@ class ManifestEntryAdapterV3 : public ManifestEntryAdapter {
 
   static std::shared_ptr<Schema> EntrySchema(std::shared_ptr<StructType> partition_type);
   static std::shared_ptr<Schema> WrapFileSchema(std::shared_ptr<StructType> file_schema);
-  static std::shared_ptr<StructType> FileType(std::shared_ptr<StructType> partition_type);
+  static std::shared_ptr<StructType> DataFileType(
+      std::shared_ptr<StructType> partition_type);
 
  protected:
   Result<std::optional<int64_t>> GetSequenceNumber(

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ ManifestEntryAdapterV3::ManifestEntryAdapterV3(`
`37`	`37`
`38`	`38`	`std::shared_ptr<Schema> ManifestEntryAdapterV3::EntrySchema(`
`39`	`39`	`std::shared_ptr<StructType> partition_type) {`
`40`		`- return WrapFileSchema(FileType(std::move(partition_type)));`
	`40`	`+ return WrapFileSchema(DataFileType(std::move(partition_type)));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`std::shared_ptr<Schema> ManifestEntryAdapterV3::WrapFileSchema(`
`@@ -52,7 +52,7 @@ std::shared_ptr<Schema> ManifestEntryAdapterV3::WrapFileSchema(`
`52`	`52`	`});`
`53`	`53`	`}`
`54`	`54`
`55`		`-std::shared_ptr<StructType> ManifestEntryAdapterV3::FileType(`
	`55`	`+std::shared_ptr<StructType> ManifestEntryAdapterV3::DataFileType(`
`56`	`56`	`std::shared_ptr<StructType> partition_type) {`
`57`	`57`	`return std::make_shared<StructType>(std::vector<SchemaField>{`
`58`	`58`	`DataFile::kContent.AsRequired(),`