From 154753de90486d89bed13e030942436d05cf3c8f Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Wed, 26 Jun 2024 18:46:47 +0200 Subject: [PATCH] Same bug but for fastq sequence writing only Former-commit-id: 86d208fe66828da9943c559df80ff095b07eaf7a --- cmd/obitools/obiconvert/main.go | 3 +++ pkg/obiformats/fastseq_write_fastq.go | 4 +++- pkg/obioptions/version.go | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/obitools/obiconvert/main.go b/cmd/obitools/obiconvert/main.go index 1d13181..1081bc0 100644 --- a/cmd/obitools/obiconvert/main.go +++ b/cmd/obitools/obiconvert/main.go @@ -12,6 +12,9 @@ import ( ) func main() { + obioptions.SetStrictReadWorker(2) + obioptions.SetStrictWriteWorker(2) + optionParser := obioptions.GenerateOptionParser(obiconvert.OptionSet) _, args := optionParser(os.Args) diff --git a/pkg/obiformats/fastseq_write_fastq.go b/pkg/obiformats/fastseq_write_fastq.go index 93c5e31..719d429 100644 --- a/pkg/obiformats/fastseq_write_fastq.go +++ b/pkg/obiformats/fastseq_write_fastq.go @@ -66,7 +66,9 @@ func FormatFastqBatch(batch obiiter.BioSequenceBatch, _formatFastq(&bs, seq, formater) if first { - bs.Grow(lt + (len(bs.Bytes())-seq.Len())*batch.Len()*5/4) + growing := lt + (len(bs.Bytes())-2*seq.Len())*batch.Len()*5/4 + log.Debugf("Grow Fastq block of %d", growing) + bs.Grow(growing) first = false } diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index 5417461..443b77f 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -7,7 +7,7 @@ import ( // TODO: The version number is extracted from git. This induces that the version // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "5073957" +var _Commit = "d208ff8" var _Version = "Release 4.2.0" // Version returns the version of the obitools package.