Skip to content

fix: current-snapshot-id serialized to -1 in TableMetadata.json #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2024
Merged

fix: current-snapshot-id serialized to -1 in TableMetadata.json #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1451ac
Fix current snapshot id
c-thiel Dec 4, 2024
e508bcd
keep empty refs object for V2
c-thiel Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 113 additions & 4 deletions crates/iceberg/src/spec/table_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,10 +1010,14 @@ pub(super) mod _serde {
.collect(),
default_spec_id: v.default_spec.spec_id(),
last_partition_id: v.last_partition_id,
properties: Some(v.properties),
current_snapshot_id: v.current_snapshot_id.or(Some(-1)),
properties: if v.properties.is_empty() {
None
} else {
Some(v.properties)
},
current_snapshot_id: v.current_snapshot_id,
snapshots: if v.snapshots.is_empty() {
Some(vec![])
None
} else {
Some(
v.snapshots
Expand Down Expand Up @@ -1091,7 +1095,7 @@ pub(super) mod _serde {
} else {
Some(v.properties)
},
current_snapshot_id: v.current_snapshot_id.or(Some(-1)),
current_snapshot_id: v.current_snapshot_id,
snapshots: if v.snapshots.is_empty() {
None
} else {
Expand Down Expand Up @@ -1279,6 +1283,7 @@ mod tests {
"timestamp-ms": 1515100
}
],
"refs": {},
"sort-orders": [
{
"order-id": 0,
Expand Down Expand Up @@ -1349,7 +1354,11 @@ mod tests {
refs: HashMap::new(),
};

let expected_json_value = serde_json::to_value(&expected).unwrap();
check_table_metadata_serde(data, expected);

let json_value = serde_json::from_str::<serde_json::Value>(data).unwrap();
assert_eq!(json_value, expected_json_value);
}

#[test]
Expand Down Expand Up @@ -1519,6 +1528,106 @@ mod tests {
check_table_metadata_serde(data, expected);
}

#[test]
fn test_table_data_v2_no_snapshots() {
let data = r#"
{
"format-version" : 2,
"table-uuid": "fb072c92-a02b-11e9-ae9c-1bb7bc9eca94",
"location": "s3://b/wh/data.db/table",
"last-sequence-number" : 1,
"last-updated-ms": 1515100955770,
"last-column-id": 1,
"schemas": [
{
"schema-id" : 1,
"type" : "struct",
"fields" :[
{
"id": 1,
"name": "struct_name",
"required": true,
"type": "fixed[1]"
}
]
}
],
"current-schema-id" : 1,
"partition-specs": [
{
"spec-id": 0,
"fields": []
}
],
"refs": {},
"default-spec-id": 0,
"last-partition-id": 1000,
"metadata-log": [
{
"metadata-file": "s3://bucket/.../v1.json",
"timestamp-ms": 1515100
}
],
"sort-orders": [
{
"order-id": 0,
"fields": []
}
],
"default-sort-order-id": 0
}
"#;

let schema = Schema::builder()
.with_schema_id(1)
.with_fields(vec![Arc::new(NestedField::required(
1,
"struct_name",
Type::Primitive(PrimitiveType::Fixed(1)),
))])
.build()
.unwrap();

let partition_spec = BoundPartitionSpec::builder(schema.clone())
.with_spec_id(0)
.build()
.unwrap();

let expected = TableMetadata {
format_version: FormatVersion::V2,
table_uuid: Uuid::parse_str("fb072c92-a02b-11e9-ae9c-1bb7bc9eca94").unwrap(),
location: "s3://b/wh/data.db/table".to_string(),
last_updated_ms: 1515100955770,
last_column_id: 1,
schemas: HashMap::from_iter(vec![(1, Arc::new(schema))]),
current_schema_id: 1,
partition_specs: HashMap::from_iter(vec![(
0,
partition_spec.clone().into_schemaless().into(),
)]),
default_spec: partition_spec.into(),
last_partition_id: 1000,
default_sort_order_id: 0,
sort_orders: HashMap::from_iter(vec![(0, SortOrder::unsorted_order().into())]),
snapshots: HashMap::default(),
current_snapshot_id: None,
last_sequence_number: 1,
properties: HashMap::new(),
snapshot_log: Vec::new(),
metadata_log: vec![MetadataLog {
metadata_file: "s3://bucket/.../v1.json".to_string(),
timestamp_ms: 1515100,
}],
refs: HashMap::new(),
};

let expected_json_value = serde_json::to_value(&expected).unwrap();
check_table_metadata_serde(data, expected);

let json_value = serde_json::from_str::<serde_json::Value>(data).unwrap();
assert_eq!(json_value, expected_json_value);
}

#[test]
fn test_current_snapshot_id_must_match_main_branch() {
let data = r#"
Expand Down
2 changes: 2 additions & 0 deletions crates/iceberg/src/spec/table_metadata_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ mod tests {
assert_eq!(metadata.last_partition_id, 1000);
assert_eq!(metadata.last_column_id, 3);
assert_eq!(metadata.snapshots.len(), 0);
assert_eq!(metadata.current_snapshot_id, None);
assert_eq!(metadata.refs.len(), 0);
assert_eq!(metadata.properties.len(), 0);
assert_eq!(metadata.metadata_log.len(), 0);
Expand Down Expand Up @@ -1268,6 +1269,7 @@ mod tests {
assert_eq!(metadata.last_partition_id, UNPARTITIONED_LAST_ASSIGNED_ID);
assert_eq!(metadata.last_column_id, 0);
assert_eq!(metadata.snapshots.len(), 0);
assert_eq!(metadata.current_snapshot_id, None);
assert_eq!(metadata.refs.len(), 0);
assert_eq!(metadata.properties.len(), 0);
assert_eq!(metadata.metadata_log.len(), 0);
Expand Down
Loading