From e4d7018e3ba6e4e2e027575c6c1746c36dbb3fe6 Mon Sep 17 00:00:00 2001 From: Zachary Rice Date: Fri, 26 Jan 2024 16:47:35 -0600 Subject: [PATCH] loops --- pkg/engine/engine.go | 46 +++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 186b338f6aed..5566d37e5de3 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -624,7 +624,6 @@ func (e *Engine) reverifierWorker(ctx context.Context) { wgReverify.Wait() for _, detector := range chunk.detectors { - nextDetector := false results := detectorResults[detector.Type().String()] // get all the results that are NOT part of this detector @@ -643,6 +642,8 @@ func (e *Engine) reverifierWorker(ctx context.Context) { } } + likelyDup := false + for _, res := range results { var val []byte if res.RawV2 != nil { @@ -661,42 +662,39 @@ func (e *Engine) reverifierWorker(ctx context.Context) { if e.reverificationTracking != nil { e.reverificationTracking.increment() } - wgDetect.Add(1) - chunk.chunk.Verify = false // DO NOT VERIFY - e.detectableChunksChan <- detectableChunk{ - chunk: chunk.chunk, - detector: detector, - decoder: chunk.decoder, - wgDoneFn: wgDetect.Done, - } - - delete(detectorsToVerify, detector.Type().String()) - - // Empty the dupes and detectors slice - chunkSecrets = chunkSecrets[:0] - nextDetector = true - } - if nextDetector { - break + likelyDup = true } } - for k, detector := range detectorsToVerify { + if likelyDup { wgDetect.Add(1) - chunk.chunk.Verify = e.verify + chunk.chunk.Verify = false // DO NOT VERIFY e.detectableChunksChan <- detectableChunk{ chunk: chunk.chunk, detector: detector, decoder: chunk.decoder, wgDoneFn: wgDetect.Done, } - delete(detectorsToVerify, k) + + delete(detectorsToVerify, detector.Type().String()) + + // Empty the dupes and detectors slice + chunkSecrets = chunkSecrets[:0] } + } - // for k := range detectorsToVerify { - // delete(detectorsToVerify, k) - // } + for k, detector := range detectorsToVerify { + wgDetect.Add(1) + chunk.chunk.Verify = e.verify + e.detectableChunksChan <- detectableChunk{ + chunk: chunk.chunk, + detector: detector, + decoder: chunk.decoder, + wgDoneFn: wgDetect.Done, + } + delete(detectorsToVerify, k) } + for k := range detectorResults { delete(detectorResults, k) }