feat: add update sort order (#432)

Author: HeartLinked

src/iceberg/CMakeLists.txt

@@ -77,6 +77,7 @@ set(ICEBERG_SOURCES
     transform_function.cc
     type.cc
     update/pending_update.cc
+    update/update_sort_order.cc
     update/update_properties.cc
     util/bucket_util.cc
     util/conversions.cc

src/iceberg/expression/term.h

@@ -151,6 +151,8 @@ class ICEBERG_EXPORT BoundReference
 
   std::shared_ptr<Type> type() const override { return field_.type(); }
 
+  int32_t field_id() const { return field_.field_id(); }
+
   bool MayProduceNull() const override { return field_.optional(); }
 
   bool Equals(const BoundTerm& other) const override;

src/iceberg/meson.build

@@ -100,6 +100,7 @@ iceberg_sources = files(
     'type.cc',
     'update/pending_update.cc',
     'update/update_properties.cc',
+    'update/update_sort_order.cc',
     'util/bucket_util.cc',
     'util/conversions.cc',
     'util/decimal.cc',

src/iceberg/sort_order.cc

@@ -111,7 +111,7 @@ Result<std::unique_ptr<SortOrder>> SortOrder::Make(const Schema& schema, int32_t
   }
 
   if (fields.empty() && sort_id != kUnsortedOrderId) [[unlikely]] {
-    return InvalidArgument("Sort order must have at least one sort field");
+    return InvalidArgument("Sort order must have at least one sort field.");
   }
 
   auto sort_order = std::unique_ptr<SortOrder>(new SortOrder(sort_id, std::move(fields)));

src/iceberg/table.cc

@@ -154,6 +154,13 @@ Result<std::shared_ptr<UpdateProperties>> Table::NewUpdateProperties() {
   return transaction->NewUpdateProperties();
 }
 
+Result<std::shared_ptr<UpdateSortOrder>> Table::NewUpdateSortOrder() {
+  ICEBERG_ASSIGN_OR_RAISE(
+      auto transaction, Transaction::Make(shared_from_this(), Transaction::Kind::kUpdate,
+                                          /*auto_commit=*/true));
+  return transaction->NewUpdateSortOrder();
+}
+
 Result<std::shared_ptr<StagedTable>> StagedTable::Make(
     TableIdentifier identifier, std::shared_ptr<TableMetadata> metadata,
     std::string metadata_location, std::shared_ptr<FileIO> io,

src/iceberg/table.h

@@ -132,6 +132,10 @@ class ICEBERG_EXPORT Table : public std::enable_shared_from_this<Table> {
   /// changes.
   virtual Result<std::shared_ptr<UpdateProperties>> NewUpdateProperties();
 
+  /// \brief Create a new UpdateSortOrder to update the table sort order and commit the
+  /// changes.
+  virtual Result<std::shared_ptr<UpdateSortOrder>> NewUpdateSortOrder();
+
  protected:
   Table(TableIdentifier identifier, std::shared_ptr<TableMetadata> metadata,
         std::string metadata_location, std::shared_ptr<FileIO> io,

src/iceberg/table_metadata.cc

@@ -29,6 +29,7 @@
 #include <ranges>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 
 #include <nlohmann/json.hpp>
@@ -426,7 +427,7 @@ class TableMetadataBuilder::Impl {
   Status SetDefaultSortOrder(int32_t order_id);
   Result<int32_t> AddSortOrder(const SortOrder& order);
   Status SetProperties(const std::unordered_map<std::string, std::string>& updated);
-  Status RemoveProperties(const std::vector<std::string>& removed);
+  Status RemoveProperties(const std::unordered_set<std::string>& removed);
 
   std::unique_ptr<TableMetadata> Build();
 
@@ -590,7 +591,7 @@ Status TableMetadataBuilder::Impl::SetProperties(
 }
 
 Status TableMetadataBuilder::Impl::RemoveProperties(
-    const std::vector<std::string>& removed) {
+    const std::unordered_set<std::string>& removed) {
   // If removed is empty, return early (no-op)
   if (removed.empty()) {
     return {};
@@ -820,7 +821,7 @@ TableMetadataBuilder& TableMetadataBuilder::SetProperties(
 }
 
 TableMetadataBuilder& TableMetadataBuilder::RemoveProperties(
-    const std::vector<std::string>& removed) {
+    const std::unordered_set<std::string>& removed) {
   ICEBERG_BUILDER_RETURN_IF_ERROR(impl_->RemoveProperties(removed));
   return *this;
 }

src/iceberg/table_metadata.h

@@ -394,7 +394,7 @@ class ICEBERG_EXPORT TableMetadataBuilder : public ErrorCollector {
   ///
   /// \param removed Set of property keys to remove
   /// \return Reference to this builder for method chaining
-  TableMetadataBuilder& RemoveProperties(const std::vector<std::string>& removed);
+  TableMetadataBuilder& RemoveProperties(const std::unordered_set<std::string>& removed);
 
   /// \brief Set the table location
   ///

src/iceberg/table_update.h

@@ -26,6 +26,7 @@
 #include <optional>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "iceberg/iceberg_export.h"
@@ -379,10 +380,10 @@ class ICEBERG_EXPORT SetProperties : public TableUpdate {
 /// \brief Represents removing table properties
 class ICEBERG_EXPORT RemoveProperties : public TableUpdate {
  public:
-  explicit RemoveProperties(std::vector<std::string> removed)
+  explicit RemoveProperties(std::unordered_set<std::string> removed)
       : removed_(std::move(removed)) {}
 
-  const std::vector<std::string>& removed() const { return removed_; }
+  const std::unordered_set<std::string>& removed() const { return removed_; }
 
   void ApplyTo(TableMetadataBuilder& builder) const override;
 
@@ -391,7 +392,7 @@ class ICEBERG_EXPORT RemoveProperties : public TableUpdate {
   Kind kind() const override { return Kind::kRemoveProperties; }
 
  private:
-  std::vector<std::string> removed_;
+  std::unordered_set<std::string> removed_;
 };
 
 /// \brief Represents setting the table location

src/iceberg/test/CMakeLists.txt

@@ -154,7 +154,8 @@ if(ICEBERG_BUILD_BUNDLE)
                    USE_BUNDLE
                    SOURCES
                    transaction_test.cc
-                   update_properties_test.cc)
+                   update_properties_test.cc
+                   update_sort_order_test.cc)
 
 endif()