Skip to content

Commit 8a59220

Browse files
HeartLinkedHeartLinked
committed
fix ci
1 parent eb276d6 commit 8a59220

File tree

14 files changed

+74
-74
lines changed

14 files changed

+74
-74
lines changed

‎src/iceberg/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ set(ICEBERG_SOURCES
7777
transform_function.cc
7878
type.cc
7979
update/pending_update.cc
80-
update/replace_sort_order.cc
80+
update/update_sort_order.cc
8181
update/update_properties.cc
8282
util/bucket_util.cc
8383
util/conversions.cc

‎src/iceberg/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ iceberg_sources = files(
9999
'transform_function.cc',
100100
'type.cc',
101101
'update/pending_update.cc',
102-
'update/replace_sort_order.cc',
103102
'update/update_properties.cc',
103+
'update/update_sort_order.cc',
104104
'util/bucket_util.cc',
105105
'util/conversions.cc',
106106
'util/decimal.cc',

‎src/iceberg/table.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ Result<std::shared_ptr<UpdateProperties>> Table::NewUpdateProperties() {
154154
return transaction->NewUpdateProperties();
155155
}
156156

157-
Result<std::shared_ptr<ReplaceSortOrder>> Table::NewReplaceSortOrder() {
157+
Result<std::shared_ptr<UpdateSortOrder>> Table::NewUpdateSortOrder() {
158158
ICEBERG_ASSIGN_OR_RAISE(
159159
auto transaction, Transaction::Make(shared_from_this(), Transaction::Kind::kUpdate,
160160
/*auto_commit=*/true));
161-
return transaction->NewReplaceSortOrder();
161+
return transaction->NewUpdateSortOrder();
162162
}
163163

164164
Result<std::shared_ptr<StagedTable>> StagedTable::Make(

‎src/iceberg/table.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ class ICEBERG_EXPORT Table : public std::enable_shared_from_this<Table> {
132132
/// changes.
133133
virtual Result<std::shared_ptr<UpdateProperties>> NewUpdateProperties();
134134

135-
/// \brief Create a new ReplaceSortOrder to replace the table sort order and commit the
135+
/// \brief Create a new UpdateSortOrder to update the table sort order and commit the
136136
/// changes.
137-
virtual Result<std::shared_ptr<ReplaceSortOrder>> NewReplaceSortOrder();
137+
virtual Result<std::shared_ptr<UpdateSortOrder>> NewUpdateSortOrder();
138138

139139
protected:
140140
Table(TableIdentifier identifier, std::shared_ptr<TableMetadata> metadata,

‎src/iceberg/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ if(ICEBERG_BUILD_BUNDLE)
154154
SOURCES
155155
transaction_test.cc
156156
update_properties_test.cc
157-
replace_sort_order_test.cc)
157+
update_sort_order_test.cc)
158158

159159
endif()
160160

‎src/iceberg/test/sort_order_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ TEST_F(SortOrderTest, MakeInvalidSortOrderEmptyFields) {
193193
auto sort_order = SortOrder::Make(*schema_, 1, std::vector<SortField>{});
194194
EXPECT_THAT(sort_order, IsError(ErrorKind::kInvalidArgument));
195195
EXPECT_THAT(sort_order,
196-
HasErrorMessage("Sort order must have at least one sort field"));
196+
HasErrorMessage("Sorted order must have at least one sort field"));
197197
}
198198

199199
TEST_F(SortOrderTest, MakeInvalidSortOrderUnsortedId) {

src/iceberg/test/replace_sort_order_test.cc renamed to src/iceberg/test/update_sort_order_test.cc

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
#include "iceberg/update/replace_sort_order.h"
20+
#include "iceberg/update/update_sort_order.h"
2121

2222
#include <memory>
2323
#include <string>
@@ -38,10 +38,10 @@
3838

3939
namespace iceberg {
4040

41-
class ReplaceSortOrderTest : public UpdateTestBase {};
41+
class UpdateSortOrderTest : public UpdateTestBase {};
4242

43-
TEST_F(ReplaceSortOrderTest, AddSingleSortFieldAscending) {
44-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
43+
TEST_F(UpdateSortOrderTest, AddSingleSortFieldAscending) {
44+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
4545
auto ref = NamedReference::Make("x").value();
4646
auto term = UnboundTransform::Make(std::move(ref), Transform::Identity()).value();
4747

@@ -60,8 +60,8 @@ TEST_F(ReplaceSortOrderTest, AddSingleSortFieldAscending) {
6060
EXPECT_EQ(field.null_order(), NullOrder::kFirst);
6161
}
6262

63-
TEST_F(ReplaceSortOrderTest, AddSingleSortFieldDescending) {
64-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
63+
TEST_F(UpdateSortOrderTest, AddSingleSortFieldDescending) {
64+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
6565
auto ref = NamedReference::Make("y").value();
6666
auto term = UnboundTransform::Make(std::move(ref), Transform::Identity()).value();
6767

@@ -80,8 +80,8 @@ TEST_F(ReplaceSortOrderTest, AddSingleSortFieldDescending) {
8080
EXPECT_EQ(field.null_order(), NullOrder::kLast);
8181
}
8282

83-
TEST_F(ReplaceSortOrderTest, AddMultipleSortFields) {
84-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
83+
TEST_F(UpdateSortOrderTest, AddMultipleSortFields) {
84+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
8585
auto ref1 = NamedReference::Make("y").value();
8686
auto term1 = UnboundTransform::Make(std::move(ref1), Transform::Identity()).value();
8787

@@ -112,8 +112,8 @@ TEST_F(ReplaceSortOrderTest, AddMultipleSortFields) {
112112
EXPECT_EQ(field2.null_order(), NullOrder::kLast);
113113
}
114114

115-
TEST_F(ReplaceSortOrderTest, AddSortFieldWithTruncateTransform) {
116-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
115+
TEST_F(UpdateSortOrderTest, AddSortFieldWithTruncateTransform) {
116+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
117117

118118
auto ref = NamedReference::Make("x").value();
119119
auto term = UnboundTransform::Make(std::move(ref), Transform::Truncate(10)).value();
@@ -133,8 +133,8 @@ TEST_F(ReplaceSortOrderTest, AddSortFieldWithTruncateTransform) {
133133
EXPECT_EQ(field.direction(), SortDirection::kAscending);
134134
}
135135

136-
TEST_F(ReplaceSortOrderTest, AddSortFieldWithBucketTransform) {
137-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
136+
TEST_F(UpdateSortOrderTest, AddSortFieldWithBucketTransform) {
137+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
138138

139139
auto ref = NamedReference::Make("y").value();
140140
auto term = UnboundTransform::Make(std::move(ref), Transform::Bucket(10)).value();
@@ -154,8 +154,8 @@ TEST_F(ReplaceSortOrderTest, AddSortFieldWithBucketTransform) {
154154
EXPECT_EQ(field.direction(), SortDirection::kDescending);
155155
}
156156

157-
TEST_F(ReplaceSortOrderTest, AddSortFieldNullTerm) {
158-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
157+
TEST_F(UpdateSortOrderTest, AddSortFieldNullTerm) {
158+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
159159

160160
update->AddSortField(nullptr, SortDirection::kAscending, NullOrder::kFirst);
161161

@@ -164,8 +164,8 @@ TEST_F(ReplaceSortOrderTest, AddSortFieldNullTerm) {
164164
EXPECT_THAT(result, HasErrorMessage("Term cannot be null"));
165165
}
166166

167-
TEST_F(ReplaceSortOrderTest, AddSortFieldInvalidTransform) {
168-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
167+
TEST_F(UpdateSortOrderTest, AddSortFieldInvalidTransform) {
168+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
169169

170170
// Try to apply day transform to a long field (invalid - day requires date/timestamp)
171171
auto ref = NamedReference::Make("x").value();
@@ -178,8 +178,8 @@ TEST_F(ReplaceSortOrderTest, AddSortFieldInvalidTransform) {
178178
EXPECT_THAT(result, HasErrorMessage("not a valid input type"));
179179
}
180180

181-
TEST_F(ReplaceSortOrderTest, AddSortFieldNonExistentField) {
182-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
181+
TEST_F(UpdateSortOrderTest, AddSortFieldNonExistentField) {
182+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
183183

184184
auto ref = NamedReference::Make("nonexistent").value();
185185
auto term = UnboundTransform::Make(std::move(ref), Transform::Identity()).value();
@@ -191,8 +191,8 @@ TEST_F(ReplaceSortOrderTest, AddSortFieldNonExistentField) {
191191
EXPECT_THAT(result, HasErrorMessage("Cannot find"));
192192
}
193193

194-
TEST_F(ReplaceSortOrderTest, CaseSensitiveTrue) {
195-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
194+
TEST_F(UpdateSortOrderTest, CaseSensitiveTrue) {
195+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
196196

197197
auto ref = NamedReference::Make("X").value(); // Uppercase
198198
auto term = UnboundTransform::Make(std::move(ref), Transform::Identity()).value();
@@ -205,8 +205,8 @@ TEST_F(ReplaceSortOrderTest, CaseSensitiveTrue) {
205205
EXPECT_THAT(result, IsError(ErrorKind::kValidationFailed));
206206
}
207207

208-
TEST_F(ReplaceSortOrderTest, CaseSensitiveFalse) {
209-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
208+
TEST_F(UpdateSortOrderTest, CaseSensitiveFalse) {
209+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
210210
auto ref = NamedReference::Make("X").value(); // Uppercase
211211
auto term = UnboundTransform::Make(std::move(ref), Transform::Identity()).value();
212212

@@ -224,9 +224,9 @@ TEST_F(ReplaceSortOrderTest, CaseSensitiveFalse) {
224224
EXPECT_EQ(sort_order->fields()[0].source_id(), 1);
225225
}
226226

227-
TEST_F(ReplaceSortOrderTest, ReplaceExistingSortOrder) {
227+
TEST_F(UpdateSortOrderTest, ReplaceExistingSortOrder) {
228228
// First, set an initial sort order
229-
ICEBERG_UNWRAP_OR_FAIL(auto update1, table_->NewReplaceSortOrder());
229+
ICEBERG_UNWRAP_OR_FAIL(auto update1, table_->NewUpdateSortOrder());
230230

231231
auto ref1 = NamedReference::Make("x").value();
232232
auto term1 = UnboundTransform::Make(std::move(ref1), Transform::Identity()).value();
@@ -236,7 +236,7 @@ TEST_F(ReplaceSortOrderTest, ReplaceExistingSortOrder) {
236236
// Now replace with a different sort order
237237
ICEBERG_UNWRAP_OR_FAIL(auto reloaded, catalog_->LoadTable(table_ident_));
238238

239-
ICEBERG_UNWRAP_OR_FAIL(auto update2, reloaded->NewReplaceSortOrder());
239+
ICEBERG_UNWRAP_OR_FAIL(auto update2, reloaded->NewUpdateSortOrder());
240240
auto ref2 = NamedReference::Make("y").value();
241241
auto term2 = UnboundTransform::Make(std::move(ref2), Transform::Identity()).value();
242242
update2->AddSortField(std::move(term2), SortDirection::kDescending, NullOrder::kLast);
@@ -254,8 +254,8 @@ TEST_F(ReplaceSortOrderTest, ReplaceExistingSortOrder) {
254254
EXPECT_EQ(field.null_order(), NullOrder::kLast);
255255
}
256256

257-
TEST_F(ReplaceSortOrderTest, EmptySortOrder) {
258-
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewReplaceSortOrder());
257+
TEST_F(UpdateSortOrderTest, EmptySortOrder) {
258+
ICEBERG_UNWRAP_OR_FAIL(auto update, table_->NewUpdateSortOrder());
259259

260260
// Don't add any sort fields
261261
auto result = update->Commit();

‎src/iceberg/transaction.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "iceberg/table_requirements.h"
2929
#include "iceberg/table_update.h"
3030
#include "iceberg/update/pending_update.h"
31-
#include "iceberg/update/replace_sort_order.h"
3231
#include "iceberg/update/update_properties.h"
32+
#include "iceberg/update/update_sort_order.h"
3333
#include "iceberg/util/macros.h"
3434

3535
namespace iceberg {
@@ -76,10 +76,10 @@ Status Transaction::Apply(PendingUpdate& update) {
7676
metadata_builder_->UpgradeFormatVersion(result.format_version_.value());
7777
}
7878
} break;
79-
case PendingUpdate::Kind::kReplaceSortOrder: {
80-
auto& replace_sort_order = static_cast<ReplaceSortOrder&>(update);
81-
ICEBERG_ASSIGN_OR_RAISE(ReplaceSortOrder::ApplyResult result,
82-
replace_sort_order.Apply());
79+
case PendingUpdate::Kind::kUpdateSortOrder: {
80+
auto& update_sort_order = static_cast<UpdateSortOrder&>(update);
81+
ICEBERG_ASSIGN_OR_RAISE(UpdateSortOrder::ApplyResult result,
82+
update_sort_order.Apply());
8383
metadata_builder_->SetDefaultSortOrder(result.sort_order_);
8484
} break;
8585
default:
@@ -140,11 +140,11 @@ Result<std::shared_ptr<UpdateProperties>> Transaction::NewUpdateProperties() {
140140
return update_properties;
141141
}
142142

143-
Result<std::shared_ptr<ReplaceSortOrder>> Transaction::NewReplaceSortOrder() {
144-
ICEBERG_ASSIGN_OR_RAISE(std::shared_ptr<ReplaceSortOrder> replace_sort_order,
145-
ReplaceSortOrder::Make(shared_from_this()));
146-
ICEBERG_RETURN_UNEXPECTED(AddUpdate(replace_sort_order));
147-
return replace_sort_order;
143+
Result<std::shared_ptr<UpdateSortOrder>> Transaction::NewUpdateSortOrder() {
144+
ICEBERG_ASSIGN_OR_RAISE(std::shared_ptr<UpdateSortOrder> update_sort_order,
145+
UpdateSortOrder::Make(shared_from_this()));
146+
ICEBERG_RETURN_UNEXPECTED(AddUpdate(update_sort_order));
147+
return update_sort_order;
148148
}
149149

150150
} // namespace iceberg

‎src/iceberg/transaction.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ class ICEBERG_EXPORT Transaction : public std::enable_shared_from_this<Transacti
6060
/// changes.
6161
Result<std::shared_ptr<UpdateProperties>> NewUpdateProperties();
6262

63-
/// \brief Create a new ReplaceSortOrder to replace the table sort order and commit the
63+
/// \brief Create a new UpdateSortOrder to update the table sort order and commit the
6464
/// changes.
65-
Result<std::shared_ptr<ReplaceSortOrder>> NewReplaceSortOrder();
65+
Result<std::shared_ptr<UpdateSortOrder>> NewUpdateSortOrder();
6666

6767
private:
6868
Transaction(std::shared_ptr<Table> table, Kind kind, bool auto_commit);

‎src/iceberg/type_fwd.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class Transaction;
178178
/// \brief Update family.
179179
class PendingUpdate;
180180
class UpdateProperties;
181-
class ReplaceSortOrder;
181+
class UpdateSortOrder;
182182

183183
/// ----------------------------------------------------------------------------
184184
/// TODO: Forward declarations below are not added yet.

0 commit comments

Comments
 (0)