ANW-1134: Avoid resolving top_containers where it's unnecessary

backend/app/model/search_resolver.rb

@@ -2,6 +2,7 @@ class SearchResolver
 
   # Theoretically someone might resolve a field that matches an unbounded number
   # of records, and this could cause an OOM.  Set an upper bound.
+  MAX_BOOLEAN_QUERIES = AppConfig[:max_boolean_queries]
   MAX_RESOLVE_RESULTS = AppConfig[:max_page_size] * 2
 
   def initialize(resolve_definitions)
@@ -30,10 +31,15 @@ def resolve(results)
 
         query = JSONModel.JSONModel(:advanced_query).from_hash('query' => boolean_query)
 
+        if query['query']['subqueries'].size > MAX_BOOLEAN_QUERIES
+          query['query']['subqueries'] = query['query']['subqueries'].take(MAX_BOOLEAN_QUERIES)
+          Log.warn("Query subqueries hit MAX_BOOLEAN_QUERIES. Result set may be incomplete: #{query.to_hash.inspect}")
+        end
+
         resolved_results = Solr.search(Solr::Query.create_advanced_search(query).pagination(1, MAX_RESOLVE_RESULTS))
 
         if resolved_results['total_hits'] > MAX_RESOLVE_RESULTS
-          Log.warn("Resolve query hit MAX_RESOLVE_RESULTS.  Result set may be incomplete: #{query.to_hash.inspect}")
+          Log.warn("Resolve query hit MAX_RESOLVE_RESULTS. Result set may be incomplete: #{query.to_hash.inspect}")
         end
 
         # Insert the resolved records into our original result set.

common/config/config-defaults.rb

@@ -157,6 +157,7 @@
 AppConfig[:solr_facet_limit] = 100
 
 AppConfig[:default_page_size] = 10
+AppConfig[:max_boolean_queries] = 1024 # ArchivesSpace Solr default
 AppConfig[:max_page_size] = 250
 
 # An option to change the length of the abstracts on the collections overview page

public/app/controllers/agents_controller.rb

@@ -11,7 +11,7 @@ class AgentsController < ApplicationController
   DEFAULT_AG_FACET_TYPES = %w{primary_type subjects}
   DEFAULT_AG_SEARCH_OPTS = {
     'sort' => 'title_sort asc',
-    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource', 'top_container_uri_u_sstr:id'],
+    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource'],
     'facet.mincount' => 1
   }
 

public/app/controllers/repositories_controller.rb

@@ -10,7 +10,7 @@ class RepositoriesController < ApplicationController
   DEFAULT_SEARCH_FACET_TYPES = ['primary_type', 'subjects', 'published_agents']
   DEFAULT_REPO_SEARCH_OPTS = {
      'sort' => 'title_sort asc',
-    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource', 'top_container_uri_u_sstr:id'],
+    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource'],
     'facet.mincount' => 1
   }
   DEFAULT_TYPES = %w{archival_object digital_object agent resource accession}

public/app/controllers/search_controller.rb

@@ -5,7 +5,7 @@ class SearchController < ApplicationController
   DEFAULT_SEARCH_FACET_TYPES = ['repository', 'primary_type', 'subjects', 'published_agents', 'langcode']
   DEFAULT_SEARCH_OPTS = {
 #    'sort' => 'title_sort asc',
-    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource', 'top_container_uri_u_sstr:id'],
+    'resolve[]' => ['repository:id', 'resource:id@compact_resource', 'ancestors:id@compact_resource'],
     'facet.mincount' => 1
   }
   DEFAULT_TYPES = %w{archival_object digital_object digital_object_component agent resource repository accession classification subject}