Skip to content

Commit ce5774b

Browse files
committed
fix: make error message consistent with Java impl
1 parent 5bf6c2b commit ce5774b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/iceberg/sort_order.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ Status SortOrder::Validate(const Schema& schema) const {
9090
for (const auto& field : fields_) {
9191
auto schema_field = schema.FindFieldById(field.source_id());
9292
if (!schema_field.has_value() || schema_field.value() == std::nullopt) {
93-
return InvalidArgument("Cannot find schema field for sort field: {}", field);
93+
return InvalidArgument("Cannot find source column for sort field: {}", field);
9494
}
9595

9696
const auto& source_type = schema_field.value().value().get().type();
9797

9898
if (!field.transform()->CanTransform(*source_type)) {
99-
return InvalidArgument("Cannot transform schema field type {} with transform {}",
99+
return InvalidArgument("Invalid source type {} for transform {}",
100100
source_type->ToString(), field.transform()->ToString());
101101
}
102102
}
@@ -116,12 +116,12 @@ Result<std::unique_ptr<SortOrder>> SortOrder::Make(const Schema& schema, int32_t
116116
for (const auto& field : fields) {
117117
ICEBERG_ASSIGN_OR_RAISE(auto schema_field, schema.FindFieldById(field.source_id()));
118118
if (schema_field == std::nullopt) {
119-
return InvalidArgument("Cannot find schema field for sort field: {}", field);
119+
return InvalidArgument("Cannot find source column for sort field: {}", field);
120120
}
121121

122122
const auto& source_type = schema_field.value().get().type();
123123
if (field.transform()->CanTransform(*source_type) == false) {
124-
return InvalidArgument("Cannot transform schema field type {} with transform {}",
124+
return InvalidArgument("Invalid source type {} for transform {}",
125125
source_type->ToString(), field.transform()->ToString());
126126
}
127127
}

src/iceberg/sort_order.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ICEBERG_EXPORT SortOrder : public util::Formattable {
7474

7575
/// \brief Validates the sort order against a schema.
7676
/// \param schema The schema to validate against.
77-
/// \return Error status if the sort order is not bound to the schema.
77+
/// \return Error status if the sort order has any invalid transform.
7878
Status Validate(const Schema& schema) const;
7979

8080
/// \brief Create a SortOrder.

src/iceberg/test/sort_order_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ TEST_F(SortOrderMakeTest, MakeInvalidSortOrderNonPrimitiveField) {
231231
auto sort_order = SortOrder::Make(
232232
schema_with_struct, 1, std::vector<SortField>{*sort_field1_, sort_field_invalid});
233233
EXPECT_THAT(sort_order, IsError(ErrorKind::kInvalidArgument));
234-
EXPECT_THAT(sort_order, HasErrorMessage("Cannot transform schema field type"));
234+
EXPECT_THAT(sort_order, HasErrorMessage("Invalid source type"));
235235
}
236236

237237
TEST_F(SortOrderMakeTest, MakeInvalidSortOrderFieldNotInSchema) {
@@ -241,7 +241,7 @@ TEST_F(SortOrderMakeTest, MakeInvalidSortOrderFieldNotInSchema) {
241241
auto sort_order = SortOrder::Make(
242242
*schema_, 1, std::vector<SortField>{*sort_field1_, sort_field_invalid});
243243
EXPECT_THAT(sort_order, IsError(ErrorKind::kInvalidArgument));
244-
EXPECT_THAT(sort_order, HasErrorMessage("Cannot find schema field for sort field"));
244+
EXPECT_THAT(sort_order, HasErrorMessage("Cannot find source column for sort field"));
245245
}
246246

247247
TEST_F(SortOrderMakeTest, MakeUnboundSortOrder) {
@@ -254,7 +254,7 @@ TEST_F(SortOrderMakeTest, MakeUnboundSortOrder) {
254254
auto validate_status = sort_order.value()->Validate(*schema_);
255255
EXPECT_THAT(validate_status, IsError(ErrorKind::kInvalidArgument));
256256
EXPECT_THAT(validate_status,
257-
HasErrorMessage("Cannot find schema field for sort field"));
257+
HasErrorMessage("Cannot find source column for sort field"));
258258
}
259259

260260
} // namespace iceberg

0 commit comments

Comments
 (0)