Place the implementation of private functions together

Author: gty404

src/iceberg/table_metadata.cc

@@ -706,23 +706,6 @@ Status TableMetadataBuilder::Impl::RemoveSchemas(const std::vector<int32_t>& sch
   return {};
 }
 
-int32_t TableMetadataBuilder::Impl::ReuseOrCreateNewSortOrderId(
-    const SortOrder& new_order) {
-  if (new_order.is_unsorted()) {
-    return SortOrder::kUnsortedOrderId;
-  }
-  // determine the next order id
-  int32_t new_order_id = SortOrder::kInitialSortOrderId;
-  for (const auto& order : metadata_.sort_orders) {
-    if (order->SameOrder(new_order)) {
-      return order->order_id();
-    } else if (new_order_id <= order->order_id()) {
-      new_order_id = order->order_id() + 1;
-    }
-  }
-  return new_order_id;
-}
-
 Result<int32_t> TableMetadataBuilder::Impl::AddSchema(const Schema& schema,
                                                       int32_t new_last_column_id) {
   if (new_last_column_id < metadata_.last_column_id) {
@@ -765,6 +748,70 @@ Result<int32_t> TableMetadataBuilder::Impl::AddSchema(const Schema& schema,
   return new_schema_id;
 }
 
+Result<std::unique_ptr<TableMetadata>> TableMetadataBuilder::Impl::Build() {
+  // 1. Validate metadata consistency through TableMetadata#Validate
+
+  // 2. Update last_updated_ms if there are changes
+  if (metadata_.last_updated_ms == kInvalidLastUpdatedMs) {
+    metadata_.last_updated_ms =
+        TimePointMs{std::chrono::duration_cast<std::chrono::milliseconds>(
+            std::chrono::system_clock::now().time_since_epoch())};
+  }
+
+  auto current_schema_id = metadata_.current_schema_id.value_or(Schema::kInitialSchemaId);
+  auto schema_it = schemas_by_id_.find(current_schema_id);
+  ICEBERG_PRECHECK(schema_it != schemas_by_id_.end(),
+                   "Current schema ID {} not found in schemas", current_schema_id);
+  const auto& current_schema = schema_it->second;
+  {
+    auto spec_it = specs_by_id_.find(metadata_.default_spec_id);
+    // FIXME(GuoTao.yu): Default spec must exist after we support update partition spec
+    if (spec_it != specs_by_id_.end()) {
+      ICEBERG_RETURN_UNEXPECTED(
+          spec_it->second->Validate(*current_schema, /*allow_missing_fields=*/false));
+    }
+    auto sort_order_it = sort_orders_by_id_.find(metadata_.default_sort_order_id);
+    ICEBERG_PRECHECK(sort_order_it != sort_orders_by_id_.end(),
+                     "Default sort order ID {} not found in sort orders",
+                     metadata_.default_sort_order_id);
+    ICEBERG_RETURN_UNEXPECTED(sort_order_it->second->Validate(*current_schema));
+  }
+
+  // 3. Buildup metadata_log from base metadata
+  int32_t max_metadata_log_size =
+      metadata_.properties.Get(TableProperties::kMetadataPreviousVersionsMax);
+  if (base_ != nullptr && !previous_metadata_location_.empty()) {
+    metadata_.metadata_log.emplace_back(base_->last_updated_ms,
+                                        previous_metadata_location_);
+  }
+  if (metadata_.metadata_log.size() > max_metadata_log_size) {
+    metadata_.metadata_log.erase(metadata_.metadata_log.begin(),
+                                 metadata_.metadata_log.end() - max_metadata_log_size);
+  }
+
+  // TODO(anyone): 4. update snapshot_log
+
+  // 5. Create and return the TableMetadata
+  return std::make_unique<TableMetadata>(std::move(metadata_));
+}
+
+int32_t TableMetadataBuilder::Impl::ReuseOrCreateNewSortOrderId(
+    const SortOrder& new_order) {
+  if (new_order.is_unsorted()) {
+    return SortOrder::kUnsortedOrderId;
+  }
+  // determine the next order id
+  int32_t new_order_id = SortOrder::kInitialSortOrderId;
+  for (const auto& order : metadata_.sort_orders) {
+    if (order->SameOrder(new_order)) {
+      return order->order_id();
+    } else if (new_order_id <= order->order_id()) {
+      new_order_id = order->order_id() + 1;
+    }
+  }
+  return new_order_id;
+}
+
 int32_t TableMetadataBuilder::Impl::ReuseOrCreateNewSchemaId(
     const Schema& new_schema) const {
   // if the schema already exists, use its id; otherwise use the highest id + 1
@@ -816,53 +863,6 @@ Result<std::unique_ptr<SortOrder>> TableMetadataBuilder::Impl::UpdateSortOrderSc
   return SortOrder::Make(sort_order.order_id(), std::move(new_fields));
 }
 
-Result<std::unique_ptr<TableMetadata>> TableMetadataBuilder::Impl::Build() {
-  // 1. Validate metadata consistency through TableMetadata#Validate
-
-  // 2. Update last_updated_ms if there are changes
-  if (metadata_.last_updated_ms == kInvalidLastUpdatedMs) {
-    metadata_.last_updated_ms =
-        TimePointMs{std::chrono::duration_cast<std::chrono::milliseconds>(
-            std::chrono::system_clock::now().time_since_epoch())};
-  }
-
-  auto current_schema_id = metadata_.current_schema_id.value_or(Schema::kInitialSchemaId);
-  auto schema_it = schemas_by_id_.find(current_schema_id);
-  ICEBERG_PRECHECK(schema_it != schemas_by_id_.end(),
-                   "Current schema ID {} not found in schemas", current_schema_id);
-  const auto& current_schema = schema_it->second;
-  {
-    auto spec_it = specs_by_id_.find(metadata_.default_spec_id);
-    // FIXME(GuoTao.yu): Default spec must exist after we support update partition spec
-    if (spec_it != specs_by_id_.end()) {
-      ICEBERG_RETURN_UNEXPECTED(
-          spec_it->second->Validate(*current_schema, /*allow_missing_fields=*/false));
-    }
-    auto sort_order_it = sort_orders_by_id_.find(metadata_.default_sort_order_id);
-    ICEBERG_PRECHECK(sort_order_it != sort_orders_by_id_.end(),
-                     "Default sort order ID {} not found in sort orders",
-                     metadata_.default_sort_order_id);
-    ICEBERG_RETURN_UNEXPECTED(sort_order_it->second->Validate(*current_schema));
-  }
-
-  // 3. Buildup metadata_log from base metadata
-  int32_t max_metadata_log_size =
-      metadata_.properties.Get(TableProperties::kMetadataPreviousVersionsMax);
-  if (base_ != nullptr && !previous_metadata_location_.empty()) {
-    metadata_.metadata_log.emplace_back(base_->last_updated_ms,
-                                        previous_metadata_location_);
-  }
-  if (metadata_.metadata_log.size() > max_metadata_log_size) {
-    metadata_.metadata_log.erase(metadata_.metadata_log.begin(),
-                                 metadata_.metadata_log.end() - max_metadata_log_size);
-  }
-
-  // TODO(anyone): 4. update snapshot_log
-
-  // 5. Create and return the TableMetadata
-  return std::make_unique<TableMetadata>(std::move(metadata_));
-}
-
 TableMetadataBuilder::TableMetadataBuilder(int8_t format_version)
     : impl_(std::make_unique<Impl>(format_version)) {}