Skip to content
Merged
Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions src/fastp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,29 @@ fn merge_adapter_counts(dicts: &[&Map<String, Value>]) -> Result<Map<String, Val

/// Merge filtering result objects by summing all count fields.
///
/// `adapter_dimer_reads` (added in newer fastp versions) is summed only when present.
/// If some chunks report it and others don't, `required_i64` errors — mixed-version
/// inputs fail loudly rather than silently dropping dimer counts.
///
/// Errors if any required count field is missing or not an integer.
fn merge_filtering_result(results: &[Value]) -> Result<Value> {
const FIELDS: &[&str] = &[
"passed_filter_reads",
"low_quality_reads",
"too_many_N_reads",
"adapter_dimer_reads",
"too_short_reads",
"too_long_reads",
];
let has_dimer = results
.iter()
.any(|r| r.get("adapter_dimer_reads").is_some());

let mut merged = Map::new();
for field in FIELDS {
if *field == "adapter_dimer_reads" && !has_dimer {
continue;
}
let mut sum = 0_i64;
for (i, result) in results.iter().enumerate() {
sum += required_i64(result, field).with_context(|| format!("filtering_result[{i}]"))?;
Expand Down
40 changes: 40 additions & 0 deletions tests/fastp_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,48 @@ fn test_merge_two_fixture_files_filtering_result() {
assert_eq!(fr["passed_filter_reads"].as_i64(), Some(2850));
assert_eq!(fr["low_quality_reads"].as_i64(), Some(90));
assert_eq!(fr["too_many_N_reads"].as_i64(), Some(30));
assert_eq!(fr["adapter_dimer_reads"].as_i64(), Some(408));
assert_eq!(fr["too_short_reads"].as_i64(), Some(30));
assert_eq!(fr["too_long_reads"].as_i64(), Some(0));

// adapter_dimer_reads must keep fastp's field order: between too_many_N_reads
// and too_short_reads.
let keys: Vec<&str> = fr.as_object().unwrap().keys().map(String::as_str).collect();
assert_eq!(
keys,
[
"passed_filter_reads",
"low_quality_reads",
"too_many_N_reads",
"adapter_dimer_reads",
"too_short_reads",
"too_long_reads",
]
);
}

#[test]
fn test_merge_filtering_result_omits_adapter_dimer_when_absent() {
// Older fastp versions predate adapter_dimer_reads; merging must not invent it.
let chunk = json!({
"summary": {
"before_filtering": {"total_reads": 10, "total_bases": 100, "q20_bases": 90, "q30_bases": 80},
"after_filtering": {"total_reads": 10, "total_bases": 100, "q20_bases": 90, "q30_bases": 80}
},
"filtering_result": {
"passed_filter_reads": 10,
"low_quality_reads": 0,
"too_many_N_reads": 0,
"too_short_reads": 0,
"too_long_reads": 0
},
"duplication": {"rate": 0.0},
"adapter_cutting": {"adapter_trimmed_reads": 0, "adapter_trimmed_bases": 0}
});
let merged = merge_jsons(&[chunk.clone(), chunk]).expect("merge should succeed");
let fr = &merged["filtering_result"];
assert!(fr.get("adapter_dimer_reads").is_none());
assert_eq!(fr["passed_filter_reads"].as_i64(), Some(20));
}
Comment on lines +214 to 236

#[test]
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/fastp_chunk1.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"passed_filter_reads": 950,
"low_quality_reads": 30,
"too_many_N_reads": 10,
"adapter_dimer_reads": 203,
"too_short_reads": 10,
"too_long_reads": 0
},
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/fastp_chunk2.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"passed_filter_reads": 1900,
"low_quality_reads": 60,
"too_many_N_reads": 20,
"adapter_dimer_reads": 205,
"too_short_reads": 20,
"too_long_reads": 0
},
Expand Down
Loading