obitools/obitools4
2
0
Fork 0
mirror of https://github.com/metabarcoding/obitools4.git synced 2025-06-29 16:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch a concurrent access problem

Browse Source
This commit is contained in:
Eric Coissac
2025-06-17 12:05:42 +02:00
parent 1c6ab1c559
commit efc3f3af29
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/obioptions/version.go
View File

@ -8,7 +8,7 @@ import (
// corresponds to the last commit, and not the one when the file will be // corresponds to the last commit, and not the one when the file will be
// commited // commited
var _Commit = "38dcd98" var _Commit = "1c6ab1c"
var _Version = "Release 4.4.0" var _Version = "Release 4.4.0"
// Version returns the version of the obitools package. // Version returns the version of the obitools package.

5
pkg/obiseq/merge.go
View File

@ -174,12 +174,15 @@ func (sequence *BioSequence) StatsPlusOne(desc StatsOnDescription, toAdd *BioSeq
} }
sequence.annot_lock.Lock()
old, ok := stats[sval] old, ok := stats[sval]
if !ok { if !ok {
old = 0 old = 0
} }
stats[sval] = old + desc.Weight(toAdd) stats[sval] = old + desc.Weight(toAdd)
sequence.annot_lock.Unlock()
sequence.SetAttribute(StatsOnSlotName(desc.Name), stats) // TODO: check if this is necessary sequence.SetAttribute(StatsOnSlotName(desc.Name), stats) // TODO: check if this is necessary
return retval return retval
} }
@ -228,7 +231,9 @@ func (sequence *BioSequence) Merge(tomerge *BioSequence, na string, inplace bool
smk := sequence.StatsOn(desc, na) smk := sequence.StatsOn(desc, na)
mmk := tomerge.StatsOn(desc, na) mmk := tomerge.StatsOn(desc, na)
sequence.annot_lock.Lock()
annotations[StatsOnSlotName(key)] = smk.Merge(mmk) annotations[StatsOnSlotName(key)] = smk.Merge(mmk)
sequence.annot_lock.Unlock()
} else { } else {
sequence.StatsPlusOne(desc, tomerge, na) sequence.StatsPlusOne(desc, tomerge, na)
} }