Skip to content
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.

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

DRAFT: SortFastq #38

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
80 changes: 80 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ bstr = "1.0.1"
clap = { version = "4.0.25", features = ["derive"] }
enum_dispatch = "0.3.8"
env_logger = "0.9.3"
ext-sort = "0.1.4"
fgoxide = "0.3.0"
flate2 = { version = "1.0.25", features = ["zlib-ng"] } # Force the faster backend that requires a C compiler
itertools = "0.10.5"
Expand Down
1 change: 1 addition & 0 deletions src/bin/commands/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pub mod command;
pub mod demux;
pub mod sort_fastq;
96 changes: 96 additions & 0 deletions src/bin/commands/sort_fastq.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
use crate::commands::command::Command;
use anyhow::Result;
use clap::Parser;
use ext_sort::{ExternalSorter, ExternalSorterBuilder, LimitedBufferBuilder};
use seq_io::fastq::Reader as FastqReader;
use seq_io::fastq::{OwnedRecord, Record};
use serde::{Deserialize, Serialize};
use std::cmp::Ordering;
use std::fs::File;
use std::io::BufWriter;
use std::path::{Path, PathBuf};

#[derive(Deserialize, Serialize)]
struct SortableFastqRecord(OwnedRecord);

impl PartialEq for SortableFastqRecord {
fn eq(&self, other: &Self) -> bool {
self.0.id().unwrap() == other.0.id().unwrap()
}
}

impl Eq for SortableFastqRecord {}

impl PartialOrd for SortableFastqRecord {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(&other))
}
}

impl Ord for SortableFastqRecord {
fn cmp(&self, other: &Self) -> Ordering {
self.0.id().unwrap().cmp(&other.0.id().unwrap())
}
}

////////////////////////////////////////////////////////////////////////////////
// SortFastq (main class) and it's impls
////////////////////////////////////////////////////////////////////////////////

/// Sorts the input FASTQ file by lexicographic ordering of its read names.
///
/// ## Example Command Line
///
/// ```
/// fqtk sort-fastq \
/// --input test.fq \
/// --output test.sorted.fq \
/// --max-records 1000000
/// ```
///
#[derive(Parser, Debug)]
#[command(version)]
pub(crate) struct SortFastq {
/// Input fastq file
#[clap(long, short = 'i', required = true)]
input: PathBuf,

/// Output fastq path
#[clap(long, short = 'o', required = true)]
output: PathBuf,

/// Maximum number of records to be kept in buffer
#[clap(long, short = 'm', default_value = "1000000")]
max_records: usize,
}

impl Command for SortFastq {
/// Executes the sort_fastq command
fn execute(&self) -> Result<()> {
let mut fq_reader = FastqReader::from_path(&self.input)?;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably want to use FastqReader::with_capacity(1024 * 1024) or something large like we do in the demux tool

let mut fq_writer = BufWriter::new(File::create(&self.output)?);

let sorter: ExternalSorter<
SortableFastqRecord,
seq_io::fastq::Error,
LimitedBufferBuilder,
> = ExternalSorterBuilder::new()
.with_tmp_dir(Path::new("./"))
.with_buffer(LimitedBufferBuilder::new(self.max_records, true))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. any reason not to expose the tmp dir on the command line, and have it by default be None (use the system default)?
  2. I would think a big win for this tool would be to use with_threads_number. Shall we use multiple threads?
  3. I would also try to use with_rw_buf_size with 1024 * 1024

.build()
.unwrap();

let sorted = sorter
.sort(
fq_reader.records().map(|record| record.map(|record| SortableFastqRecord(record))),
)
.unwrap();

for item in sorted.map(Result::unwrap) {
let _ =
seq_io::fastq::write_to(&mut fq_writer, &item.0.head, &item.0.seq, &item.0.qual);
}

Ok(())
}
}
2 changes: 2 additions & 0 deletions src/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use anyhow::Result;
use clap::Parser;
use commands::command::Command;
use commands::demux::Demux;
use commands::sort_fastq::SortFastq;
use enum_dispatch::enum_dispatch;
use env_logger::Env;

Expand All @@ -23,6 +24,7 @@ struct Args {
#[command(version)]
enum Subcommand {
Demux(Demux),
SortFastq(SortFastq),
}

fn main() -> Result<()> {
Expand Down