1

Author: HeartLinked

src/iceberg/test/table_metadata_builder_test.cc

@@ -202,7 +202,7 @@ TEST(TableMetadataBuilderTest, AddSortOrderInvalid) {
   ICEBERG_UNWRAP_OR_FAIL(auto order1,
                          SortOrder::Make(1, std::vector<SortField>{invalid_field}));
   builder->AddSortOrder(std::move(order1));
-  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kCommitFailed));
+  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kValidationFailed));
   ASSERT_THAT(builder->Build(), HasErrorMessage("Cannot find source column"));
 
   // 2. Invalid transform (Day transform on string type)
@@ -212,7 +212,7 @@ TEST(TableMetadataBuilderTest, AddSortOrderInvalid) {
   ICEBERG_UNWRAP_OR_FAIL(auto order2,
                          SortOrder::Make(1, std::vector<SortField>{invalid_transform}));
   builder->AddSortOrder(std::move(order2));
-  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kCommitFailed));
+  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kValidationFailed));
   ASSERT_THAT(builder->Build(), HasErrorMessage("Invalid source type"));
 
   // 3. Without schema
@@ -222,7 +222,7 @@ TEST(TableMetadataBuilderTest, AddSortOrderInvalid) {
   ICEBERG_UNWRAP_OR_FAIL(auto order3,
                          SortOrder::Make(*schema, 1, std::vector<SortField>{field}));
   builder->AddSortOrder(std::move(order3));
-  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kCommitFailed));
+  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kValidationFailed));
   ASSERT_THAT(builder->Build(), HasErrorMessage("Schema with ID"));
 }
 
@@ -270,18 +270,18 @@ TEST(TableMetadataBuilderTest, SetDefaultSortOrderBasic) {
 
   // 4. Setting same order is no-op
   builder = TableMetadataBuilder::BuildFrom(base.get());
-  builder->SetDefaultSortOrder(0);  // Already default (unsorted)
+  builder->SetDefaultSortOrder(0);
   ICEBERG_UNWRAP_OR_FAIL(metadata, builder->Build());
   EXPECT_EQ(metadata->default_sort_order_id, 0);
 }
 
 TEST(TableMetadataBuilderTest, SetDefaultSortOrderInvalid) {
   auto base = CreateBaseMetadata();
 
-  // 1. Try to use -1 (last added) when no order has been added
+  // Try to use -1 (last added) when no order has been added
   auto builder = TableMetadataBuilder::BuildFrom(base.get());
   builder->SetDefaultSortOrder(-1);
-  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kCommitFailed));
+  ASSERT_THAT(builder->Build(), IsError(ErrorKind::kValidationFailed));
   ASSERT_THAT(builder->Build(), HasErrorMessage("no sort order has been added"));
 }
 

src/iceberg/test/table_update_test.cc

@@ -173,10 +173,16 @@ TEST(TableUpdateTest, SetDefaultSortOrderGenerateRequirements) {
   auto new_table_reqs = GenerateRequirements(update, nullptr);
   EXPECT_TRUE(new_table_reqs.empty());
 
-  // Existing table - no requirements
+  // Existing table - generates AssertDefaultSortOrderID requirement
   auto base = CreateBaseMetadata();
   auto existing_table_reqs = GenerateRequirements(update, base.get());
-  EXPECT_TRUE(existing_table_reqs.empty());
+  ASSERT_EQ(existing_table_reqs.size(), 1);
+
+  // Verify it's the correct requirement type
+  auto* assert_sort_order =
+      dynamic_cast<table::AssertDefaultSortOrderID*>(existing_table_reqs[0].get());
+  ASSERT_NE(assert_sort_order, nullptr);
+  EXPECT_EQ(assert_sort_order->sort_order_id(), base->default_sort_order_id);
 }
 
 }  // namespace iceberg