fix(dedupe): prevent duplicate test processing in batch dedupe command#14601
Merged
rossops merged 1 commit intoMar 30, 2026
Merged
Conversation
Finding.Meta.ordering includes multiple columns (numerical_severity, date,
title, epss_score, epss_percentile). When Django generates
SELECT DISTINCT test_id ... ORDER BY those columns, PostgreSQL requires
them in the SELECT list, so Django silently adds them. The DISTINCT then
operates on the full tuple instead of test_id alone, causing the same test
to appear multiple times in the iterator and be processed repeatedly.
Fix by calling .order_by("test_id") before .values_list().distinct() to
override the model-level ordering, so the query stays SELECT DISTINCT test_id
ORDER BY test_id.
Maffooch
approved these changes
Mar 28, 2026
blakeaowens
approved these changes
Mar 30, 2026
Jino-T
approved these changes
Mar 30, 2026
paulOsinski
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Finding.Meta.orderingdefines multiple columns (numerical_severity,date,title,epss_score,epss_percentile). When Django generatesSELECT DISTINCT test_id ... ORDER BY <those columns>, PostgreSQL requires allORDER BYcolumns to appear in theSELECTlist — so Django silently adds them to the projection. As a result,DISTINCToperates on the full tuple(test_id, numerical_severity, date, title, epss_score, epss_percentile)instead oftest_idalone.test_idsiterator inside_dedupe_batch_mode, so findings for that test are submitted to Celery over and over — visible as the dedupe command appearing to loop indefinitely on the same test..order_by("test_id")before.values_list("test_id", flat=True).distinct()to override the model-level ordering. The resulting query isSELECT DISTINCT test_id ORDER BY test_id, which correctly deduplicates by test only.