Start to use leveled log

This commit is contained in:
2022-02-24 12:14:52 +01:00
parent f18cc034bb
commit abcf02e488
43 changed files with 156 additions and 67 deletions

View File

@ -3,6 +3,8 @@ package obichunk
import (
"sync"
log "github.com/sirupsen/logrus"
"git.metabarcoding.org/lecasofts/go/obitools/pkg/obiiter"
"git.metabarcoding.org/lecasofts/go/obitools/pkg/obiseq"
)
@ -16,6 +18,10 @@ func IUniqueSequence(iterator obiiter.IBioSequenceBatch,
iUnique := obiiter.MakeIBioSequenceBatch(opts.BufferSize())
iterator = iterator.Speed("Splitting data set")
log.Infoln("Starting data splitting")
if opts.SortOnDisk() {
nworkers = 1
iterator, err = ISequenceChunkOnDisk(iterator,
@ -36,6 +42,8 @@ func IUniqueSequence(iterator obiiter.IBioSequenceBatch,
}
}
log.Infoln("End of the data splitting")
iUnique.Add(nworkers)
go func() {
@ -83,7 +91,12 @@ func IUniqueSequence(iterator obiiter.IBioSequenceBatch,
batch := input.Get()
if icat < 0 || len(batch.Slice()) == 1 {
iUnique.Push(batch.Reorder(nextOrder()))
if opts.NoSingleton() && len(batch.Slice()) == 1 && batch.Slice()[0].Count() == 1 {
batch.Slice()[0].Recycle()
batch.Recycle()
} else {
iUnique.Push(batch.Reorder(nextOrder()))
}
} else {
next.Push(batch.Reorder(o))
o++
@ -111,5 +124,5 @@ func IUniqueSequence(iterator obiiter.IBioSequenceBatch,
opts.BufferSize(),
)
return iMerged.Speed(), nil
return iMerged.Speed("Variants identified"), nil
}