chore: Use keyword to distinguish between the return type and the method.

Author: WZhuo

src/iceberg/table_metadata.cc

@@ -131,8 +131,8 @@ std::string ToString(const MetadataLogEntry& entry) {
 }
 
 Result<std::unique_ptr<TableMetadata>> TableMetadata::Make(
-    const iceberg::Schema& schema, const iceberg::PartitionSpec& spec,
-    const iceberg::SortOrder& sort_order, const std::string& location,
+    const class Schema& schema, const class PartitionSpec& spec,
+    const class SortOrder& sort_order, const std::string& location,
     const std::unordered_map<std::string, std::string>& properties, int format_version) {
   for (const auto& [key, _] : properties) {
     if (TableProperties::reserved_properties().contains(key)) {

src/iceberg/table_metadata.h

@@ -93,11 +93,11 @@ struct ICEBERG_EXPORT TableMetadata {
   /// The highest assigned column ID for the table
   int32_t last_column_id;
   /// A list of schemas
-  std::vector<std::shared_ptr<iceberg::Schema>> schemas;
+  std::vector<std::shared_ptr<class Schema>> schemas;
   /// ID of the table's current schema
   std::optional<int32_t> current_schema_id;
   /// A list of partition specs
-  std::vector<std::shared_ptr<iceberg::PartitionSpec>> partition_specs;
+  std::vector<std::shared_ptr<class PartitionSpec>> partition_specs;
   /// ID of the current partition spec that writers should use by default
   int32_t default_spec_id;
   /// The highest assigned partition field ID across all partition specs for the table
@@ -107,15 +107,15 @@ struct ICEBERG_EXPORT TableMetadata {
   /// ID of the current table snapshot
   int64_t current_snapshot_id;
   /// A list of valid snapshots
-  std::vector<std::shared_ptr<iceberg::Snapshot>> snapshots;
+  std::vector<std::shared_ptr<class Snapshot>> snapshots;
   /// A list of timestamp and snapshot ID pairs that encodes changes to the current
   /// snapshot for the table
   std::vector<SnapshotLogEntry> snapshot_log;
   /// A list of timestamp and metadata file location pairs that encodes changes to the
   /// previous metadata files for the table
   std::vector<MetadataLogEntry> metadata_log;
   /// A list of sort orders
-  std::vector<std::shared_ptr<iceberg::SortOrder>> sort_orders;
+  std::vector<std::shared_ptr<class SortOrder>> sort_orders;
   /// Default sort order id of the table
   int32_t default_sort_order_id;
   /// A map of snapshot references
@@ -128,27 +128,27 @@ struct ICEBERG_EXPORT TableMetadata {
   int64_t next_row_id;
 
   static Result<std::unique_ptr<TableMetadata>> Make(
-      const iceberg::Schema& schema, const iceberg::PartitionSpec& spec,
-      const iceberg::SortOrder& sort_order, const std::string& location,
+      const class Schema& schema, const class PartitionSpec& spec,
+      const class SortOrder& sort_order, const std::string& location,
       const std::unordered_map<std::string, std::string>& properties,
       int format_version = kDefaultTableFormatVersion);
 
   /// \brief Get the list of changes required to create this table metadata from scratch
   std::vector<std::unique_ptr<TableUpdate>> ChangesForCreate() const;
 
   /// \brief Get the current schema, return NotFoundError if not found
-  Result<std::shared_ptr<iceberg::Schema>> Schema() const;
+  Result<std::shared_ptr<class Schema>> Schema() const;
   /// \brief Get the current schema by ID, return NotFoundError if not found
-  Result<std::shared_ptr<iceberg::Schema>> SchemaById(
+  Result<std::shared_ptr<class Schema>> SchemaById(
       std::optional<int32_t> schema_id) const;
   /// \brief Get the current partition spec, return NotFoundError if not found
-  Result<std::shared_ptr<iceberg::PartitionSpec>> PartitionSpec() const;
+  Result<std::shared_ptr<class PartitionSpec>> PartitionSpec() const;
   /// \brief Get the current sort order, return NotFoundError if not found
-  Result<std::shared_ptr<iceberg::SortOrder>> SortOrder() const;
+  Result<std::shared_ptr<class SortOrder>> SortOrder() const;
   /// \brief Get the current snapshot, return NotFoundError if not found
-  Result<std::shared_ptr<iceberg::Snapshot>> Snapshot() const;
+  Result<std::shared_ptr<class Snapshot>> Snapshot() const;
   /// \brief Get the snapshot of this table with the given id
-  Result<std::shared_ptr<iceberg::Snapshot>> SnapshotById(int64_t snapshot_id) const;
+  Result<std::shared_ptr<class Snapshot>> SnapshotById(int64_t snapshot_id) const;
 
   ICEBERG_EXPORT friend bool operator==(const TableMetadata& lhs,
                                         const TableMetadata& rhs);