Skip to content

Commit b660cba

Browse files
gty404wgtmac
gty404
authored and
wgtmac
committed
fix build failure
1 parent bcb72d5 commit b660cba

4 files changed

Lines changed: 21 additions & 34 deletions

File tree

‎src/iceberg/test/metadata_serde_test.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ TEST(MetadataSerdeTest, DeserializeV1Valid) {
9696
auto expected_schema = std::make_shared<Schema>(
9797
std::vector<SchemaField>{SchemaField::MakeRequired(1, "x", int64()),
9898
SchemaField::MakeRequired(2, "y", int64()),
99-
SchemaField::MakeRequired(3, "z", int64())},
100-
/*schema_id=*/std::nullopt);
99+
SchemaField::MakeRequired(3, "z", int64())});
101100

102101
auto expected_spec_result = PartitionSpec::Make(
103102
/*spec_id=*/0,

‎src/iceberg/test/residual_evaluator_test.cc‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class ResidualEvaluatorTest : public ::testing::Test {
9090
TEST_F(ResidualEvaluatorTest, IdentityTransformResiduals) {
9191
auto schema = std::make_shared<Schema>(
9292
std::vector<SchemaField>{SchemaField::MakeOptional(50, "dateint", int32()),
93-
SchemaField::MakeOptional(51, "hour", int32())},
94-
std::nullopt);
93+
SchemaField::MakeOptional(51, "hour", int32())});
9594

9695
auto identity_transform = Transform::Identity();
9796
PartitionField pt_field(50, 1000, "dateint", identity_transform);
@@ -158,8 +157,7 @@ TEST_F(ResidualEvaluatorTest, IdentityTransformResiduals) {
158157
TEST_F(ResidualEvaluatorTest, CaseInsensitiveIdentityTransformResiduals) {
159158
auto schema = std::make_shared<Schema>(
160159
std::vector<SchemaField>{SchemaField::MakeOptional(50, "dateint", int32()),
161-
SchemaField::MakeOptional(51, "hour", int32())},
162-
std::nullopt);
160+
SchemaField::MakeOptional(51, "hour", int32())});
163161

164162
auto identity_transform = Transform::Identity();
165163
PartitionField pt_field(50, 1000, "dateint", identity_transform);
@@ -249,8 +247,7 @@ TEST_F(ResidualEvaluatorTest, UnpartitionedResiduals) {
249247
TEST_F(ResidualEvaluatorTest, In) {
250248
auto schema = std::make_shared<Schema>(
251249
std::vector<SchemaField>{SchemaField::MakeOptional(50, "dateint", int32()),
252-
SchemaField::MakeOptional(51, "hour", int32())},
253-
std::nullopt);
250+
SchemaField::MakeOptional(51, "hour", int32())});
254251

255252
auto identity_transform = Transform::Identity();
256253
PartitionField pt_field(50, 1000, "dateint", identity_transform);
@@ -276,8 +273,7 @@ TEST_F(ResidualEvaluatorTest, In) {
276273
TEST_F(ResidualEvaluatorTest, NotIn) {
277274
auto schema = std::make_shared<Schema>(
278275
std::vector<SchemaField>{SchemaField::MakeOptional(50, "dateint", int32()),
279-
SchemaField::MakeOptional(51, "hour", int32())},
280-
std::nullopt);
276+
SchemaField::MakeOptional(51, "hour", int32())});
281277

282278
auto identity_transform = Transform::Identity();
283279
PartitionField pt_field(50, 1000, "dateint", identity_transform);
@@ -304,8 +300,7 @@ TEST_F(ResidualEvaluatorTest, NotIn) {
304300
TEST_F(ResidualEvaluatorTest, IsNaN) {
305301
auto schema = std::make_shared<Schema>(
306302
std::vector<SchemaField>{SchemaField::MakeOptional(50, "double", float64()),
307-
SchemaField::MakeOptional(51, "float", float32())},
308-
std::nullopt);
303+
SchemaField::MakeOptional(51, "float", float32())});
309304

310305
// Test double field
311306
auto identity_transform = Transform::Identity();
@@ -353,8 +348,7 @@ TEST_F(ResidualEvaluatorTest, IsNaN) {
353348
TEST_F(ResidualEvaluatorTest, NotNaN) {
354349
auto schema = std::make_shared<Schema>(
355350
std::vector<SchemaField>{SchemaField::MakeOptional(50, "double", float64()),
356-
SchemaField::MakeOptional(51, "float", float32())},
357-
std::nullopt);
351+
SchemaField::MakeOptional(51, "float", float32())});
358352

359353
// Test double field
360354
auto identity_transform = Transform::Identity();
@@ -401,8 +395,7 @@ TEST_F(ResidualEvaluatorTest, NotNaN) {
401395

402396
TEST_F(ResidualEvaluatorTest, IntegerTruncateTransformResiduals) {
403397
auto schema = std::make_shared<Schema>(
404-
std::vector<SchemaField>{SchemaField::MakeOptional(50, "value", int32())},
405-
std::nullopt);
398+
std::vector<SchemaField>{SchemaField::MakeOptional(50, "value", int32())});
406399

407400
// Valid partitions would be 0, 10, 20...90, 100 etc.
408401
auto truncate_transform = Transform::Truncate(10);
@@ -518,8 +511,7 @@ TEST_F(ResidualEvaluatorTest, IntegerTruncateTransformResiduals) {
518511

519512
TEST_F(ResidualEvaluatorTest, StringTruncateTransformResiduals) {
520513
auto schema = std::make_shared<Schema>(
521-
std::vector<SchemaField>{SchemaField::MakeOptional(50, "value", string())},
522-
std::nullopt);
514+
std::vector<SchemaField>{SchemaField::MakeOptional(50, "value", string())});
523515

524516
// Valid partitions would be two letter strings for eg: ab, bc etc
525517
auto truncate_transform = Transform::Truncate(2);

‎src/iceberg/test/rest_json_internal_test.cc‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ namespace iceberg::rest {
3737
// Helper function to create a simple schema for testing
3838
static std::shared_ptr<Schema> MakeSimpleSchema() {
3939
return std::make_shared<Schema>(
40-
std::vector<SchemaField>{SchemaField(1, "id", int32(), false), // required
41-
SchemaField(2, "data", string(), true)}, // optional
42-
std::nullopt);
40+
std::vector<SchemaField>{SchemaField(1, "id", int32(), false), // required
41+
SchemaField(2, "data", string(), true)});
4342
}
4443

4544
// Helper function to create a simple TableMetadata for testing
@@ -1013,31 +1012,28 @@ INSTANTIATE_TEST_SUITE_P(
10131012
.json_str =
10141013
R"({"name":"my_table","schema":{"type":"struct","fields":[{"id":1,"name":"id","type":"int","required":true}]}})",
10151014
.expected_model = {.name = "my_table",
1016-
.schema = std::make_shared<Schema>(
1017-
std::vector<SchemaField>{
1018-
SchemaField(1, "id", int32(), false)}, // required
1019-
std::nullopt)}},
1015+
.schema =
1016+
std::make_shared<Schema>(std::vector<SchemaField>{
1017+
SchemaField(1, "id", int32(), false)})}},
10201018
// stage-create field is missing (should default to false)
10211019
CreateTableRequestDeserializeParam{
10221020
.test_name = "MissingStageCreate",
10231021
.json_str =
10241022
R"({"name":"my_table","schema":{"type":"struct","fields":[{"id":1,"name":"id","type":"int","required":true}]}})",
10251023
.expected_model = {.name = "my_table",
1026-
.schema = std::make_shared<Schema>(
1027-
std::vector<SchemaField>{
1028-
SchemaField(1, "id", int32(), false)}, // required
1029-
std::nullopt),
1024+
.schema =
1025+
std::make_shared<Schema>(std::vector<SchemaField>{
1026+
SchemaField(1, "id", int32(), false)}),
10301027
.stage_create = false}},
10311028
// Properties field is missing (should deserialize to empty map)
10321029
CreateTableRequestDeserializeParam{
10331030
.test_name = "MissingProperties",
10341031
.json_str =
10351032
R"({"name":"my_table","schema":{"type":"struct","fields":[{"id":1,"name":"id","type":"int","required":true}]}})",
10361033
.expected_model = {.name = "my_table",
1037-
.schema = std::make_shared<Schema>(
1038-
std::vector<SchemaField>{
1039-
SchemaField(1, "id", int32(), false)}, // required
1040-
std::nullopt)}}),
1034+
.schema =
1035+
std::make_shared<Schema>(std::vector<SchemaField>{
1036+
SchemaField(1, "id", int32(), false)})}}),
10411037
[](const ::testing::TestParamInfo<CreateTableRequestDeserializeParam>& info) {
10421038
return info.param.test_name;
10431039
});

‎src/iceberg/test/schema_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ std::shared_ptr<iceberg::StructType> MakeStructType(Args&&... args) {
3939
template <typename... Args>
4040
std::unique_ptr<iceberg::Schema> MakeSchema(Args&&... args) {
4141
return std::make_unique<iceberg::Schema>(
42-
std::vector<iceberg::SchemaField>{std::move(args)...}, std::nullopt);
42+
std::vector<iceberg::SchemaField>{std::move(args)...});
4343
}
4444

4545
TEST(SchemaTest, Basics) {

0 commit comments

Comments
 (0)