[DURACOM-477] Fix slow loading times when caching counts for items (DSpace#12344)

* [CST-25040] make cache count for items in collections/communities Asynch

* [CST-25040] fix cache implementation

* [CST-25040] fix cache implementation

* [DURACOM-477] cleanup

Author: steph-ieffam

dspace-api/src/main/java/org/dspace/browse/ItemCountDAOSolr.java

@@ -7,121 +7,62 @@
  */
 package org.dspace.browse;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.response.QueryResponse;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.dspace.discovery.DiscoverFacetField;
-import org.dspace.discovery.DiscoverQuery;
-import org.dspace.discovery.DiscoverResult;
-import org.dspace.discovery.DiscoverResult.FacetResult;
-import org.dspace.discovery.SearchService;
-import org.dspace.discovery.SearchServiceException;
-import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
+import org.dspace.discovery.SolrSearchCore;
 import org.dspace.discovery.indexobject.IndexableItem;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Discovery (Solr) driver implementing ItemCountDAO interface to look up item
- * count information in communities and collections. Caching operations are
- * intentionally not implemented because Solr already is our cache.
+ * count information in communities and collections.
+ * <p>
+ * Counts are computed by querying Solr for archived, non-withdrawn, discoverable
+ * items using {@code location.comm} / {@code location.coll} filters.
+ * The query returns only {@code numFound} (rows=0), making it very fast.
  */
 public class ItemCountDAOSolr implements ItemCountDAO {
-    /**
-     * Log4j logger
-     */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemCountDAOSolr.class);
-
-    /**
-     * Hold the communities item count obtained from SOLR after the first query. This only works
-     * well if the ItemCountDAO lifecycle is bound to the request lifecycle as
-     * it is now. If we switch to a Spring-based instantiation we should mark
-     * this bean as prototype
-     **/
-    private Map<String, Integer> communitiesCount = null;
-
-    /**
-     * Hold the collection item count obtained from SOLR after the first query
-     **/
-    private Map<String, Integer> collectionsCount = null;
 
+    private static final Logger log = LogManager.getLogger(ItemCountDAOSolr.class);
 
-    /**
-     * Solr search service
-     */
     @Autowired
-    protected SearchService searchService;
+    private SolrSearchCore solrSearchCore;
 
-    /**
-     * Get the count of the items in the given container.
-     *
-     * @param context DSpace context
-     * @param dso DspaceObject
-     * @return count
-     */
     @Override
     public int getCount(Context context, DSpaceObject dso) {
-        loadCount(context);
-        Integer val = null;
+        String locationFilter;
         if (dso instanceof Collection) {
-            val = collectionsCount.get(dso.getID().toString());
+            locationFilter = "location.coll:" + dso.getID().toString();
         } else if (dso instanceof Community) {
-            val = communitiesCount.get(dso.getID().toString());
-        }
-
-        if (val != null) {
-            return val;
+            locationFilter = "location.comm:" + dso.getID().toString();
         } else {
             return 0;
         }
-    }
 
-    /**
-     * make sure that the counts are actually fetched from Solr (if haven't been
-     * cached in a Map yet)
-     *
-     * @param context DSpace Context
-     */
-    private void loadCount(Context context) {
-        if (communitiesCount != null || collectionsCount != null) {
-            return;
-        }
-
-        communitiesCount = new HashMap<>();
-        collectionsCount = new HashMap<>();
-
-        DiscoverQuery query = new DiscoverQuery();
-        query.setFacetMinCount(1);
-        query.addFacetField(new DiscoverFacetField("location.comm",
-                                                   DiscoveryConfigurationParameters.TYPE_STANDARD, -1,
-                                                   DiscoveryConfigurationParameters.SORT.COUNT));
-        query.addFacetField(new DiscoverFacetField("location.coll",
-                                                   DiscoveryConfigurationParameters.TYPE_STANDARD, -1,
-                                                   DiscoveryConfigurationParameters.SORT.COUNT));
-        query.addFilterQueries("search.resourcetype:" + IndexableItem.TYPE);    // count only items
-        query.addFilterQueries("NOT(discoverable:false)");  // only discoverable
-        query.addFilterQueries("withdrawn:false");  // only not withdrawn
-        query.addFilterQueries("archived:true");  // only archived
-        query.setMaxResults(0);
-
-        DiscoverResult sResponse;
         try {
-            sResponse = searchService.search(context, query);
-            List<FacetResult> commCount = sResponse.getFacetResult("location.comm");
-            List<FacetResult> collCount = sResponse.getFacetResult("location.coll");
-            for (FacetResult c : commCount) {
-                communitiesCount.put(c.getAsFilterQuery(), (int) c.getCount());
-            }
-            for (FacetResult c : collCount) {
-                collectionsCount.put(c.getAsFilterQuery(), (int) c.getCount());
+            SolrClient solr = solrSearchCore.getSolr();
+            if (solr == null) {
+                return 0;
             }
-        } catch (SearchServiceException e) {
-            log.error("Could not initialize Community/Collection Item Counts from Solr: ", e);
+            SolrQuery query = new SolrQuery("*:*");
+            query.addFilterQuery(locationFilter);
+            query.addFilterQuery("search.resourcetype:" + IndexableItem.TYPE);
+            query.addFilterQuery("NOT(discoverable:false)");
+            query.addFilterQuery("withdrawn:false");
+            query.addFilterQuery("archived:true");
+            query.setRows(0);
+            QueryResponse response = solr.query(query, solrSearchCore.REQUEST_METHOD);
+            return (int) response.getResults().getNumFound();
+        } catch (Exception e) {
+            log.error("Error counting items in Solr for {}: ", dso.getID(), e);
         }
+        return 0;
     }
 }

dspace/config/spring/api/core-services.xml

@@ -33,7 +33,7 @@
     <bean class="org.dspace.authority.AuthorityServiceImpl"/>
 
     <bean class="org.dspace.browse.ItemCounter"/>
-    <bean id="itemCountDAO" class="org.dspace.browse.ItemCountDAOSolr" scope="prototype"/>
+    <bean id="itemCountDAO" class="org.dspace.browse.ItemCountDAOSolr"/>
 
     <bean class="org.dspace.checker.ChecksumHistoryServiceImpl"/>
     <bean class="org.dspace.checker.ChecksumResultServiceImpl"/>

dspace/solr/search/conf/schema.xml

@@ -294,7 +294,7 @@
     <field name="location.comm" type="lowerCaseSort" indexed="true" stored="true" multiValued="true" required="false" omitNorms="true" />
     <field name="location.coll" type="lowerCaseSort" indexed="true" stored="true" multiValued="true" required="false" omitNorms="true" />
     <field name="location.parent" type="lowerCaseSort" indexed="true" stored="true" multiValued="false" required="false" omitNorms="true" />
-  
+
     <field name="a_spell" type="textSpell" />
     <copyField source="fulltext" dest="a_spell" />
     <copyField source="fulltext" dest="fulltext_hl" />