solr reindexing through events #873
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| /** | ||
| * The contents of this file are subject to the license and copyright | ||
| * detailed in the LICENSE and NOTICE files at the root of the source | ||
| * tree and available online at | ||
| * | ||
| * http://www.dspace.org/license/ | ||
| */ | ||
| package org.dspace.event; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.HashSet; | ||
| import java.util.Iterator; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.apache.log4j.Logger; | ||
| import org.dspace.content.Bitstream; | ||
| import org.dspace.content.Bundle; | ||
| import org.dspace.content.Collection; | ||
| import org.dspace.content.Community; | ||
| import org.dspace.content.DSpaceObject; | ||
| import org.dspace.content.Item; | ||
| import org.dspace.content.factory.ContentServiceFactory; | ||
| import org.dspace.content.service.ItemService; | ||
| import org.dspace.core.Constants; | ||
| import org.dspace.core.Context; | ||
| import org.dspace.xoai.app.BasicConfiguration; | ||
| import org.dspace.xoai.app.XOAI; | ||
| import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
|
|
||
| /** | ||
| * The OAIIndexEventConsumer determining which items need to be indexed or updated based on the event type and subject. | ||
| * It listens for changes to items, collections, communities, | ||
| * bundles, and bitstreams, and updates the OAI index accordingly. | ||
| * The indexing is done using the XOAI indexer after all relevant items are collected. | ||
| * | ||
| * Class is copied from UFAL/CLARIN-DSPACE (https://github.com/ufal/clarin-dspace) and modified by | ||
| * @author Michaela Paurikova (dspace at dataquest.sk) | ||
| */ | ||
milanmajchrak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public class OAIIndexEventConsumer implements Consumer { | ||
milanmajchrak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** | ||
| * log4j logger | ||
| */ | ||
| private static final Logger log = Logger.getLogger(OAIIndexEventConsumer.class); | ||
|
|
||
| ItemService itemService = ContentServiceFactory.getInstance().getItemService(); | ||
|
|
||
| // Collect Items, Collections, Communities that need indexing. | ||
|
There was a problem hiding this comment. This comment is slightly confusing. Either change it to (2) With (2) you'd avoid the need of few casting below in the code |
||
| private Set<Item> itemsToUpdate = null; | ||
|
|
||
| @Override | ||
| public void initialize() throws Exception { | ||
| // No-op. | ||
| } | ||
|
|
||
| /** | ||
| * Consume a content event -- just build the sets of objects to add (new) to | ||
| * the index, update, and delete. | ||
| * | ||
| * @param ctx DSpace context | ||
| * @param event Content event | ||
| */ | ||
| public void consume(Context ctx, Event event) throws Exception { | ||
|
|
||
| if (Objects.isNull(itemsToUpdate)) { | ||
| itemsToUpdate = new HashSet<Item>(); | ||
| } | ||
|
|
||
| int st = event.getSubjectType(); | ||
| if (!(st == Constants.ITEM || st == Constants.BUNDLE | ||
milanmajchrak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| || st == Constants.COLLECTION || st == Constants.COMMUNITY || st == Constants.BITSTREAM)) { | ||
| log | ||
| .warn("IndexConsumer should not have been given this kind of Subject in an event, skipping: " | ||
| + event.toString()); | ||
| return; | ||
| } | ||
|
|
||
| DSpaceObject subject = event.getSubject(ctx); | ||
| DSpaceObject object = event.getObject(ctx); | ||
|
|
||
milanmajchrak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| int et = event.getEventType(); | ||
|
There was a problem hiding this comment. I'd move this line below - to the place, where "et" number is actually needed. |
||
|
|
||
| if (Objects.nonNull(object) && event.getObjectType() == Constants.ITEM) { | ||
| // Just update the object. | ||
| itemsToUpdate.add((Item)object); | ||
| return; | ||
| } | ||
|
|
||
| if (Objects.isNull(subject)) { | ||
| return; | ||
| } | ||
|
|
||
| if (event.getSubjectType() == Constants.COLLECTION || event.getSubjectType() == Constants.COMMUNITY) { | ||
| if (et == Event.MODIFY || et == Event.MODIFY_METADATA || et == Event.REMOVE || et == Event.DELETE) { | ||
| // Must update all the items. | ||
| if (subject.getType() == Constants.COMMUNITY) { | ||
| for (Collection col : ((Community)subject).getCollections()) { | ||
| addAll(ctx, col); | ||
| } | ||
| } else { | ||
| addAll(ctx, (Collection)subject); | ||
| } | ||
| } | ||
| } else if (event.getSubjectType() == Constants.BITSTREAM || event.getSubjectType() == Constants.BUNDLE) { | ||
| // Must update owning items regardless the event. | ||
| if (subject.getType() == Constants.BITSTREAM) { | ||
| for (Bundle bun : ((Bitstream)subject).getBundles()) { | ||
| itemsToUpdate.addAll(bun.getItems()); | ||
| } | ||
| } else { | ||
| itemsToUpdate.addAll(((Bundle)subject).getItems()); | ||
| } | ||
| } else if (event.getSubjectType() == Constants.ITEM) { | ||
| // Any event reindex this item. | ||
| itemsToUpdate.add((Item)subject); | ||
| } | ||
milanmajchrak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| private void addAll(Context context, Collection col) throws SQLException { | ||
| Iterator<Item> i = itemService.findByCollection(context, col); | ||
| while (i.hasNext()) { | ||
| itemsToUpdate.add(i.next()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Process sets of objects to add, update, and delete in index. Correct for | ||
| * interactions between the sets -- e.g. objects which were deleted do not | ||
| * need to be added or updated, new objects don't also need an update, etc. | ||
| */ | ||
| public void end(Context ctx) throws Exception { | ||
|
|
||
| Context anonymousContext = null; | ||
| try { | ||
| if (Objects.isNull(itemsToUpdate)) { | ||
| return; | ||
| } | ||
|
|
||
| Set<Item> filtered = new HashSet<Item>(itemsToUpdate.size()); | ||
| for (Item item : itemsToUpdate) { | ||
|
There was a problem hiding this comment. Could be replaced with one line, I think: |
||
| if (Objects.isNull(item.getHandle())) { | ||
| // Probably submission item, skip. | ||
| continue; | ||
| } | ||
| filtered.add(item); | ||
| } | ||
|
|
||
| // "Free" the resources. | ||
| itemsToUpdate = null; | ||
|
|
||
| anonymousContext = new Context(); | ||
| XOAI indexer = new XOAI(anonymousContext, false, false); | ||
| AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext( | ||
| new Class[] { BasicConfiguration.class }); | ||
| applicationContext.getAutowireCapableBeanFactory() | ||
|
There was a problem hiding this comment. is this necessary because we are in dspace-oai? |
||
| .autowireBean(indexer); | ||
| indexer.indexItems(filtered); | ||
| applicationContext.close(); | ||
| } catch (Exception e) { | ||
| itemsToUpdate = null; | ||
|
There was a problem hiding this comment. I'd move (itemsToUpdate = null) to finally block. Similarly, line 149 (itemsToUpdate = null) can be removed |
||
| throw e; | ||
| } finally { | ||
| if (Objects.nonNull(anonymousContext)) { | ||
| anonymousContext.complete(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public void finish(Context ctx) throws Exception { | ||
| // No-op | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.