Merge branch 'cli-speed-improvements-periodically-uncache-entities-wh…

…en-processing-many_7.6' into cli-speed-improvements-periodically-uncache-entities-when-processing-many_8-x # Conflicts: # dspace-api/src/main/java/org/dspace/core/Context.java # dspace-api/src/main/java/org/dspace/core/DBConnection.java # dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java
atmire · Jan 29, 2025 · f6d0cfb · f6d0cfb
2 parents 870f2d3 + e8a54e6
commit f6d0cfb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -72,6 +72,7 @@
 import org.dspace.discovery.indexobject.IndexableItem;
 import org.dspace.discovery.indexobject.factory.IndexFactory;
 import org.dspace.discovery.indexobject.factory.IndexObjectFactoryFactory;
+import org.dspace.discovery.indexobject.factory.ItemIndexFactory;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.GroupService;
@@ -341,13 +342,18 @@ public void updateIndex(Context context, boolean force, String type) {
         try {
             final List<IndexFactory> indexableObjectServices = indexObjectServiceFactory.
                 getIndexFactories();
+            int indexObject = 0;
             for (IndexFactory indexableObjectService : indexableObjectServices) {
                 if (type == null || StringUtils.equals(indexableObjectService.getType(), type)) {
                     final Iterator<IndexableObject> indexableObjects = indexableObjectService.findAll(context);
                     while (indexableObjects.hasNext()) {
                         final IndexableObject indexableObject = indexableObjects.next();
                         indexContent(context, indexableObject, force);
                         context.uncacheEntity(indexableObject.getIndexedObject());
+                        indexObject++;
+                        if ((indexObject % 100) == 0 && indexableObjectService instanceof ItemIndexFactory) {
+                            context.uncacheEntities();
+                        }
                     }
                 }
             }