Skip to content
Merged
Changes from all commits
Commits
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
52 changes: 52 additions & 0 deletions crates/storage/src/replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ impl Warehouse {
metadata.format_version()
)));
}
if !metadata.default_partition_spec().fields().is_empty() {
return Err(Error::Storage(format!(
"{table}: replacing files needs an unpartitioned table"
)));
}
let found = metadata.current_snapshot_id();
if found != Some(expected_head) {
return Err(moved(table, Some(expected_head), found));
Expand Down Expand Up @@ -958,6 +963,20 @@ mod tests {
assert_eq!(all_ids(&new_file), [1, 2, 30, 40]);
}

/// Every file under `dir`.
fn walkdir(dir: &Path) -> Vec<std::path::PathBuf> {
let mut files = Vec::new();
for entry in std::fs::read_dir(dir).unwrap() {
let path = entry.unwrap().path();
if path.is_dir() {
files.extend(walkdir(&path));
} else {
files.push(path);
}
}
files
}

/// Count the entries in a directory.
fn count(dir: &Path) -> usize {
std::fs::read_dir(dir).unwrap().count()
Expand Down Expand Up @@ -1246,6 +1265,39 @@ mod tests {
assert_eq!(wh.snapshots(&old).await.unwrap(), [first.snapshot]);
}

#[tokio::test]
async fn only_unpartitioned_tables_are_replaced() {
let dir = tempfile::tempdir().unwrap();
let (wh, _) = orders(dir.path()).await;
let parts = TableRef::new(infostash_model::Layer::Raw, "parts");
let schema = iceberg::arrow::arrow_schema_to_schema_auto_assign_ids(&ids_schema()).unwrap();
let spec = iceberg::spec::PartitionSpec::builder(schema.clone())
.add_partition_field("id", "id", iceberg::spec::Transform::Identity)
.unwrap()
.build()
.unwrap();
let creation = TableCreation::builder()
.name(parts.name.clone())
.schema(schema)
.partition_spec(spec)
.build();
let raw = NamespaceIdent::new(parts.layer.namespace().to_string());
wh.catalog.create_table(&raw, creation).await.unwrap();

let refused = wh
.prepare_replace(&parts, 1, swap_in(vec![], &[2]), &job("j"))
.await;
assert!(
matches!(&refused, Err(Error::Storage(m)) if m.contains("unpartitioned")),
"{refused:?}"
);
let parquet = walkdir(dir.path())
.into_iter()
.filter(|p| p.extension().is_some_and(|e| e == "parquet"))
.count();
assert_eq!(parquet, 0);
}

/// The catalog also reads an `iceberg_tables` in its older layout, which
/// has no `iceberg_type` column, and appends to tables in it. The swap
/// must fit that layout too.
Expand Down
Loading