fix: recalibrate perf counts to rebased dev + drop classic-search vuln-id lane

Second CI pass after the rebase onto newer dev:

- test_importers_performance: rebased dev shifted the baseline again (-1 on
  import/dedup steps, -2 more on reimport1). Reset all 22 affected counts to the
  current CI actuals; the warm-up primes FindingVulnerabilityReference.
- dojo/search/views.py: the classic /simple_search vuln-id lane queried the
  deleted Vulnerability_Id via watson. An earlier stub (authorized_vulnerability_ids
  = []) 500'd on watson.filter/.prefetch_related ('list' has no attribute ...),
  breaking search_test and any UI test that visits /simple_search. Remove the lane
  entirely (model is gone and unregistered from watson); Vue global search covers
  vuln ids. The dev DD_WATSON_SEARCH_ENABLED toggle still 410s when watson is off.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: Maffooch

dojo/search/views.py

@@ -1,4 +1,3 @@
-import itertools
 import logging
 import re
 import shlex
@@ -114,8 +113,6 @@ def simple_search(request):
                           "not-tag" in operators or "not-test-tag" in operators or "not-engagement-tag" in operators or "not-product-tag" in operators or \
                           "not-tags" in operators or "not-test-tags" in operators or "not-engagement-tags" in operators or "not-product-tags" in operators
 
-            search_vulnerability_ids = "vulnerability_id" in operators or not operators
-
             search_finding_id = "id" in operators
             search_findings = "finding" in operators or search_finding_id or search_tags or not operators
 
@@ -139,9 +136,8 @@ def simple_search(request):
                 authorized_endpoints = get_authorized_endpoints("view")
             authorized_finding_templates = Finding_Template.objects.all()
             authorized_app_analysis = get_authorized_app_analysis("view")
-            # Legacy watson-backed vuln-id search is retired (this view returns 410); the entity
-            # store has no classic-search reader. Vue global search covers vulnerability ids.
-            authorized_vulnerability_ids = []
+            # The legacy Vulnerability_Id watson index was removed (entity-only cutover), so classic
+            # search no longer has a vulnerability-id lane. The Vue global search covers vuln ids.
 
             # TODO: better get findings in their own query and match on id. that would allow filtering on additional fields such prod_id, etc.
 
@@ -151,7 +147,6 @@ def simple_search(request):
             products = authorized_products
             endpoints = authorized_endpoints
             app_analysis = authorized_app_analysis
-            vulnerability_ids = authorized_vulnerability_ids
 
             findings_filter = None
             title_words = None
@@ -330,26 +325,13 @@ def simple_search(request):
             else:
                 app_analysis = None
 
-            if search_vulnerability_ids:
-                logger.debug("searching vulnerability_ids")
-
-                vulnerability_ids = authorized_vulnerability_ids
-                vulnerability_ids = apply_vulnerability_id_filter(vulnerability_ids, operators)
-                if keywords_query:
-                    watson_results = watson.filter(vulnerability_ids, keywords_query)
-                    vulnerability_ids = vulnerability_ids.filter(id__in=[watson.id for watson in watson_results])
-                vulnerability_ids = vulnerability_ids.prefetch_related("finding__test__engagement__product", "finding__test__engagement__product__tags")
-                vulnerability_ids = vulnerability_ids[:max_results]
-            else:
-                vulnerability_ids = None
-
             if keywords_query:
                 logger.debug("searching generic")
                 logger.debug("going generic with: %s", keywords_query)
                 generic = watson.search(keywords_query, models=(
                     authorized_findings, authorized_tests, authorized_engagements,
                     authorized_products, authorized_endpoints,
-                    authorized_finding_templates, authorized_vulnerability_ids, authorized_app_analysis)) \
+                    authorized_finding_templates, authorized_app_analysis)) \
                     .prefetch_related("object")[:max_results]
             else:
                 generic = None
@@ -539,24 +521,6 @@ def apply_endpoint_filter(qs, operators):
     return qs
 
 
-def apply_vulnerability_id_filter(qs, operators):
-    if "vulnerability_id" in operators:
-        value = operators["vulnerability_id"]
-
-        # possible value:
-        # ['CVE-2020-6754]
-        # ['CVE-2020-6754,CVE-2018-7489']
-        # or when entered multiple times:
-        # ['CVE-2020-6754,CVE-2018-7489', 'CVE-2020-1234']
-
-        # so flatten like mad:
-        vulnerability_ids = list(itertools.chain.from_iterable([vulnerability_id.split(",") for vulnerability_id in value]))
-        logger.debug("vulnerability_id filter: %s", vulnerability_ids)
-        qs = qs.filter(Q(vulnerability_id__in=vulnerability_ids))
-
-    return qs
-
-
 def perform_keyword_search_for_operator(qs, operators, operator, keywords_query):
     watson_results = None
     operator_query = ""

unittests/test_importers_performance.py

@@ -343,9 +343,9 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         configure_pghistory_triggers()
 
         self._import_reimport_performance(
-            expected_num_queries1=163,
+            expected_num_queries1=162,
             expected_num_async_tasks1=2,
-            expected_num_queries2=131,
+            expected_num_queries2=129,
             expected_num_async_tasks2=1,
             expected_num_queries3=30,
             expected_num_async_tasks3=1,
@@ -367,9 +367,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._import_reimport_performance(
-            expected_num_queries1=182,
+            expected_num_queries1=181,
             expected_num_async_tasks1=2,
-            expected_num_queries2=141,
+            expected_num_queries2=139,
             expected_num_async_tasks2=1,
             expected_num_queries3=40,
             expected_num_async_tasks3=1,
@@ -392,9 +392,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self.system_settings(enable_product_grade=True)
 
         self._import_reimport_performance(
-            expected_num_queries1=192,
+            expected_num_queries1=191,
             expected_num_async_tasks1=5,
-            expected_num_queries2=151,
+            expected_num_queries2=149,
             expected_num_async_tasks2=4,
             expected_num_queries3=49,
             expected_num_async_tasks3=3,
@@ -526,9 +526,9 @@ def test_deduplication_performance_pghistory_async(self):
         self.system_settings(enable_deduplication=True)
 
         self._deduplication_performance(
-            expected_num_queries1=99,
+            expected_num_queries1=98,
             expected_num_async_tasks1=2,
-            expected_num_queries2=77,
+            expected_num_queries2=76,
             expected_num_async_tasks2=2,
             check_duplicates=False,  # Async mode - deduplication happens later
         )
@@ -547,9 +547,9 @@ def test_deduplication_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._deduplication_performance(
-            expected_num_queries1=118,
+            expected_num_queries1=117,
             expected_num_async_tasks1=2,
-            expected_num_queries2=97,
+            expected_num_queries2=96,
             expected_num_async_tasks2=2,
         )
 
@@ -580,9 +580,9 @@ def test_deduplication_performance_pghistory_async_wait(self):
         # returns instantly without executing dedup on the request's DB connection.
         with patch("celery.result.AsyncResult.get", return_value=None):
             self._deduplication_performance(
-                expected_num_queries1=100,
+                expected_num_queries1=99,
                 expected_num_async_tasks1=2,
-                expected_num_queries2=78,
+                expected_num_queries2=77,
                 expected_num_async_tasks2=2,
                 dedup_mode="async_wait",
                 check_duplicates=False,
@@ -670,9 +670,9 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         configure_pghistory_triggers()
 
         self._import_reimport_performance(
-            expected_num_queries1=170,
+            expected_num_queries1=169,
             expected_num_async_tasks1=2,
-            expected_num_queries2=140,
+            expected_num_queries2=138,
             expected_num_async_tasks2=1,
             expected_num_queries3=38,
             expected_num_async_tasks3=1,
@@ -694,9 +694,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._import_reimport_performance(
-            expected_num_queries1=191,
+            expected_num_queries1=190,
             expected_num_async_tasks1=2,
-            expected_num_queries2=152,
+            expected_num_queries2=150,
             expected_num_async_tasks2=1,
             expected_num_queries3=50,
             expected_num_async_tasks3=1,
@@ -719,9 +719,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self.system_settings(enable_product_grade=True)
 
         self._import_reimport_performance(
-            expected_num_queries1=204,
+            expected_num_queries1=203,
             expected_num_async_tasks1=5,
-            expected_num_queries2=165,
+            expected_num_queries2=163,
             expected_num_async_tasks2=4,
             expected_num_queries3=59,
             expected_num_async_tasks3=3,
@@ -826,9 +826,9 @@ def test_deduplication_performance_pghistory_async(self):
         self.system_settings(enable_deduplication=True)
 
         self._deduplication_performance(
-            expected_num_queries1=106,
+            expected_num_queries1=105,
             expected_num_async_tasks1=2,
-            expected_num_queries2=80,
+            expected_num_queries2=79,
             expected_num_async_tasks2=2,
             check_duplicates=False,  # Async mode - deduplication happens later
         )
@@ -846,8 +846,8 @@ def test_deduplication_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self._deduplication_performance(
-            expected_num_queries1=127,
+            expected_num_queries1=126,
             expected_num_async_tasks1=2,
-            expected_num_queries2=208,
+            expected_num_queries2=207,
             expected_num_async_tasks2=2,
         )