2

Author: HeartLinked

src/iceberg/table_metadata.cc

@@ -483,14 +483,13 @@ Result<int32_t> TableMetadataBuilder::AddSortOrderInternal(
   if (impl_->sort_orders_by_id.find(new_order_id) != impl_->sort_orders_by_id.end()) {
     // update last_added_order_id if the order was added in this set of changes (since it
     // is now the last)
-    bool is_new_order = false;
-    for (const auto& change : impl_->changes) {
-      auto* add_sort_order = dynamic_cast<table::AddSortOrder*>(change.get());
-      if (add_sort_order && add_sort_order->sort_order()->order_id() == new_order_id) {
-        is_new_order = true;
-        break;
-      }
-    }
+    bool is_new_order =
+        impl_->last_added_order_id.has_value() &&
+        std::ranges::find_if(impl_->changes, [new_order_id](const auto& change) {
+          auto* add_sort_order = dynamic_cast<table::AddSortOrder*>(change.get());
+          return add_sort_order &&
+                 add_sort_order->sort_order()->order_id() == new_order_id;
+        }) != impl_->changes.cend();
     impl_->last_added_order_id =
         is_new_order ? std::make_optional(new_order_id) : std::nullopt;
     return new_order_id;

src/iceberg/table_update.cc

@@ -123,11 +123,18 @@ Status AddSortOrder::GenerateRequirements(TableUpdateContext& context) const {
 // SetDefaultSortOrder
 
 void SetDefaultSortOrder::ApplyTo(TableMetadataBuilder& builder) const {
-  throw IcebergError(std::format("{} not implemented", __FUNCTION__));
+  builder.SetDefaultSortOrder(sort_order_id_);
 }
 
 Status SetDefaultSortOrder::GenerateRequirements(TableUpdateContext& context) const {
-  return NotImplemented("SetDefaultTableSortOrder::GenerateRequirements not implemented");
+  const TableMetadata* base = context.base();
+  if (base != nullptr && !context.is_replace()) {
+    context.AddRequirement(
+        // For table updates, assert that the current default sort order ID matches what
+        // we expect
+        std::make_unique<AssertDefaultSortOrderID>(base->default_sort_order_id));
+  }
+  return {};
 }
 
 // AddSnapshot