Skip to content

Commit ebc0671

Browse files
committed
test(reader): drop delete-size tests covered elsewhere
Keep only the footer cases in the delete_file_loader test; the missing file and lazy read are covered by test_load_deletes_reports_unknown_size_failures and test_read_encrypted_positional_delete_file. Remove the equality-delete parse test, which test_unknown_size_equality_deletes_are_resolved_once_and_cached already covers through load_deletes.
1 parent b2981e2 commit ebc0671

2 files changed

Lines changed: 1 addition & 81 deletions

File tree

‎crates/iceberg/src/arrow/caching_delete_file_loader.rs‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,41 +1433,6 @@ mod tests {
14331433
assert!(error.retryable());
14341434
}
14351435

1436-
#[tokio::test]
1437-
async fn test_delete_file_loader_parses_equality_deletes_of_unknown_size() {
1438-
let tmp_dir = TempDir::new().unwrap();
1439-
let table_location = tmp_dir.path().as_os_str().to_str().unwrap();
1440-
let eq_delete_file_path = setup_write_equality_delete_file_1(table_location);
1441-
1442-
let basic_delete_file_loader =
1443-
BasicDeleteFileLoader::new(FileIO::new_with_fs(), ScanMetrics::new());
1444-
let known = basic_delete_file_loader
1445-
.parquet_to_batch_stream(
1446-
&eq_delete_file_path,
1447-
Some(std::fs::metadata(&eq_delete_file_path).unwrap().len()),
1448-
None,
1449-
)
1450-
.await
1451-
.unwrap();
1452-
let unknown = basic_delete_file_loader
1453-
.parquet_to_batch_stream(&eq_delete_file_path, None, None)
1454-
.await
1455-
.unwrap();
1456-
1457-
let eq_ids = HashSet::from_iter(vec![2, 3, 4, 6, 8]);
1458-
let known = CachingDeleteFileLoader::parse_equality_deletes_record_batch_stream(
1459-
known,
1460-
eq_ids.clone(),
1461-
)
1462-
.await
1463-
.unwrap();
1464-
let unknown =
1465-
CachingDeleteFileLoader::parse_equality_deletes_record_batch_stream(unknown, eq_ids)
1466-
.await
1467-
.unwrap();
1468-
assert_eq!(unknown, known);
1469-
}
1470-
14711436
#[tokio::test]
14721437
async fn test_parse_positional_deletes_rejects_negative_positions() {
14731438
let schema = crate::arrow::delete_filter::tests::create_pos_del_schema();

‎crates/iceberg/src/arrow/delete_file_loader.rs‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -354,26 +354,9 @@ mod tests {
354354
}
355355

356356
#[tokio::test]
357-
async fn unknown_delete_size_still_reports_missing_and_empty_objects() {
357+
async fn test_delete_file_too_small_for_footer_fails() {
358358
let temp = TempDir::new().unwrap();
359359
let loader = BasicDeleteFileLoader::new(FileIO::new_with_fs(), ScanMetrics::new());
360-
let missing = temp.path().join("missing.parquet");
361-
let error = loader
362-
.parquet_to_batch_stream(missing.to_str().unwrap(), None, None)
363-
.await
364-
.err()
365-
.unwrap();
366-
assert!(error.to_string().contains("Failed to stat delete file"));
367-
// The storage error's kind and retryability are kept exactly.
368-
let storage_error = FileIO::new_with_fs()
369-
.new_input(missing.to_str().unwrap())
370-
.unwrap()
371-
.metadata()
372-
.await
373-
.err()
374-
.unwrap();
375-
assert_eq!(error.kind(), storage_error.kind());
376-
assert_eq!(error.retryable(), storage_error.retryable());
377360

378361
// A size too small for a Parquet footer fails the read, whether it was
379362
// resolved from storage or supplied by the task.
@@ -387,33 +370,5 @@ mod tests {
387370
.unwrap();
388371
assert!(error.to_string().contains("is less than footer"), "{error}");
389372
}
390-
391-
// A real file with an unknown size is sized lazily and read in full.
392-
let present = temp.path().join("present.parquet");
393-
let schema = Arc::new(arrow_schema::Schema::new(vec![arrow_schema::Field::new(
394-
"pos",
395-
arrow_schema::DataType::Int64,
396-
false,
397-
)]));
398-
let batch = arrow_array::RecordBatch::try_new(Arc::clone(&schema), vec![Arc::new(
399-
arrow_array::Int64Array::from(vec![1, 2, 3]),
400-
)])
401-
.unwrap();
402-
let mut writer = parquet::arrow::ArrowWriter::try_new(
403-
std::fs::File::create(&present).unwrap(),
404-
schema,
405-
None,
406-
)
407-
.unwrap();
408-
writer.write(&batch).unwrap();
409-
writer.close().unwrap();
410-
let batches: Vec<_> = loader
411-
.parquet_to_batch_stream(present.to_str().unwrap(), None, None)
412-
.await
413-
.unwrap()
414-
.try_collect()
415-
.await
416-
.unwrap();
417-
assert_eq!(batches.iter().map(|b| b.num_rows()).sum::<usize>(), 3);
418373
}
419374
}

0 commit comments

Comments
 (0)