NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-23 07:56:44 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Clean up prefetch logic

Browse Source
This commit is contained in:
Jeremy Stretch 2023-11-01 14:24:16 -04:00
parent 47ebc983f5
commit d88a2c599f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netbox/netbox/search/backends.py
View File

@ -104,17 +104,17 @@ class CachedValueSearchBackend(SearchBackend):
def search(self, value, user=None, object_types=None, lookup=DEFAULT_LOOKUP_TYPE): def search(self, value, user=None, object_types=None, lookup=DEFAULT_LOOKUP_TYPE):
# Build the filter used to find relevant CachedValue records
query_filter = Q(**{f'value__{lookup}': value}) query_filter = Q(**{f'value__{lookup}': value})
if object_types: if object_types:
# Limit results by object type
query_filter &= Q(object_type__in=object_types) query_filter &= Q(object_type__in=object_types)
if lookup in (LookupTypes.STARTSWITH, LookupTypes.ENDSWITH): if lookup in (LookupTypes.STARTSWITH, LookupTypes.ENDSWITH):
# Partial string matches are valid only on string values # "Starts/ends with" matches are valid only on string values
query_filter &= Q(type=FieldTypes.STRING) query_filter &= Q(type=FieldTypes.STRING)
elif lookup == LookupTypes.PARTIAL:
if lookup == LookupTypes.PARTIAL:
try: try:
# If the value looks like an IP address, add an extra match for CIDR values
address = str(netaddr.IPNetwork(value.strip()).cidr) address = str(netaddr.IPNetwork(value.strip()).cidr)
query_filter |= Q(type=FieldTypes.CIDR) & Q(value__net_contains_or_equals=address) query_filter |= Q(type=FieldTypes.CIDR) & Q(value__net_contains_or_equals=address)
except (AddrFormatError, ValueError): except (AddrFormatError, ValueError):
@ -130,7 +130,9 @@ class CachedValueSearchBackend(SearchBackend):
) )
)[:MAX_RESULTS] )[:MAX_RESULTS]
# Find the ContentTypes for all objects present in the search results # Gather all ContentTypes present in the search results (used for prefetching related
# objects). This must be done before generating the final results list, which returns
# a RawQuerySet.
content_type_ids = set(queryset.values_list('object_type', flat=True)) content_type_ids = set(queryset.values_list('object_type', flat=True))
content_types = ContentType.objects.filter(pk__in=content_type_ids) content_types = ContentType.objects.filter(pk__in=content_type_ids)
@ -149,20 +151,23 @@ class CachedValueSearchBackend(SearchBackend):
params params
) )
# Prefetch display attributes # Iterate through each ContentType represented in the search results and prefetch any
# related objects necessary to render the prescribed display attributes (display_attrs).
for ct in content_types: for ct in content_types:
model = ct.model_class() model = ct.model_class()
indexer = registry['search'].get(content_type_identifier(ct)) indexer = registry['search'].get(content_type_identifier(ct))
display_attrs = getattr(indexer, 'display_attrs', None) if not (display_attrs := getattr(indexer, 'display_attrs', None)):
if not display_attrs:
continue continue
# Add ForeignKey fields to prefetch list
prefetch_fields = [] prefetch_fields = []
for attr in display_attrs: for attr in display_attrs:
field = model._meta.get_field(attr) field = model._meta.get_field(attr)
if type(field) is ForeignKey: if type(field) is ForeignKey:
prefetch_fields.append(f'object__{attr}') prefetch_fields.append(f'object__{attr}')
# Compile a list of all CachedValues referencing this object type, and prefetch
# any related objects
if prefetch_fields: if prefetch_fields:
objects = [r for r in results if r.object_type == ct] objects = [r for r in results if r.object_type == ct]
prefetch_related_objects(objects, *prefetch_fields) prefetch_related_objects(objects, *prefetch_fields)