Skip to content

Commit cae8814

Browse files
committed
refactor: expand Snapshot and TableMetadata initialization in tests
1 parent 6c7f8bf commit cae8814

File tree

2 files changed

+70
-8
lines changed

2 files changed

+70
-8
lines changed

src/iceberg/test/table_metadata_builder_test.cc

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,8 +1137,22 @@ TEST(TableMetadataBuilderTest, RemoveSnapshotRef) {
11371137
auto builder = TableMetadataBuilder::BuildFrom(base.get());
11381138

11391139
// Add multiple snapshots
1140-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1}));
1141-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2}));
1140+
builder->AddSnapshot(
1141+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1,
1142+
.parent_snapshot_id = std::nullopt,
1143+
.sequence_number = 0,
1144+
.timestamp_ms = {},
1145+
.manifest_list = "",
1146+
.summary = {},
1147+
.schema_id = std::nullopt}));
1148+
builder->AddSnapshot(
1149+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2,
1150+
.parent_snapshot_id = std::nullopt,
1151+
.sequence_number = 0,
1152+
.timestamp_ms = {},
1153+
.manifest_list = "",
1154+
.summary = {},
1155+
.schema_id = std::nullopt}));
11421156

11431157
// Add multiple refs
11441158
ICEBERG_UNWRAP_OR_FAIL(auto ref1, SnapshotRef::MakeBranch(1));
@@ -1162,8 +1176,22 @@ TEST(TableMetadataBuilderTest, RemoveSnapshot) {
11621176
auto builder = TableMetadataBuilder::BuildFrom(base.get());
11631177

11641178
// Add multiple snapshots
1165-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1}));
1166-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2}));
1179+
builder->AddSnapshot(
1180+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1,
1181+
.parent_snapshot_id = std::nullopt,
1182+
.sequence_number = 0,
1183+
.timestamp_ms = {},
1184+
.manifest_list = "",
1185+
.summary = {},
1186+
.schema_id = std::nullopt}));
1187+
builder->AddSnapshot(
1188+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2,
1189+
.parent_snapshot_id = std::nullopt,
1190+
.sequence_number = 0,
1191+
.timestamp_ms = {},
1192+
.manifest_list = "",
1193+
.summary = {},
1194+
.schema_id = std::nullopt}));
11671195

11681196
ICEBERG_UNWRAP_OR_FAIL(auto metadata, builder->Build());
11691197
ASSERT_EQ(metadata->snapshots.size(), 2);
@@ -1182,8 +1210,22 @@ TEST(TableMetadataBuilderTest, RemoveSnapshotNotExist) {
11821210
auto builder = TableMetadataBuilder::BuildFrom(base.get());
11831211

11841212
// Add multiple snapshots
1185-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1}));
1186-
builder->AddSnapshot(std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2}));
1213+
builder->AddSnapshot(
1214+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 1,
1215+
.parent_snapshot_id = std::nullopt,
1216+
.sequence_number = 0,
1217+
.timestamp_ms = {},
1218+
.manifest_list = "",
1219+
.summary = {},
1220+
.schema_id = std::nullopt}));
1221+
builder->AddSnapshot(
1222+
std::make_shared<Snapshot>(Snapshot{.snapshot_id = 2,
1223+
.parent_snapshot_id = std::nullopt,
1224+
.sequence_number = 0,
1225+
.timestamp_ms = {},
1226+
.manifest_list = "",
1227+
.summary = {},
1228+
.schema_id = std::nullopt}));
11871229

11881230
ICEBERG_UNWRAP_OR_FAIL(auto metadata, builder->Build());
11891231
ASSERT_EQ(metadata->snapshots.size(), 2);

src/iceberg/test/table_test.cc

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,28 @@ class TypedTableTest : public ::testing::Test {
8888
std::vector<SchemaField>{SchemaField::MakeRequired(1, "id", int64()),
8989
SchemaField::MakeOptional(2, "name", string())},
9090
1);
91-
metadata_ = std::make_shared<TableMetadata>(
92-
TableMetadata{.format_version = 2, .schemas = {schema}, .current_schema_id = 1});
91+
metadata_ = std::make_shared<TableMetadata>(TableMetadata{.format_version = 2,
92+
.table_uuid = "",
93+
.location = "",
94+
.last_sequence_number = 0,
95+
.last_updated_ms = {},
96+
.last_column_id = 0,
97+
.schemas = {schema},
98+
.current_schema_id = 1,
99+
.partition_specs = {},
100+
.default_spec_id = 0,
101+
.last_partition_id = 0,
102+
.properties = {},
103+
.current_snapshot_id = 0,
104+
.snapshots = {},
105+
.snapshot_log = {},
106+
.metadata_log = {},
107+
.sort_orders = {},
108+
.default_sort_order_id = 0,
109+
.refs = {},
110+
.statistics = {},
111+
.partition_statistics = {},
112+
.next_row_id = 0});
93113
}
94114

95115
Result<std::shared_ptr<T>> MakeTable(const std::string& name) {

0 commit comments

Comments
 (0)