forked from DSpace/DSpace
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dspace-cris-2023_02_x' into main-cris
- Loading branch information
Showing
91 changed files
with
5,237 additions
and
471 deletions.
There are no files selected for viewing
This file contains 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 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
49 changes: 49 additions & 0 deletions
49
dspace-api/src/main/java/org/dspace/content/dao/ItemForMetadataEnhancementUpdateDAO.java
This file contains 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,49 @@ | ||
| /** | ||
| * 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.content.dao; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.UUID; | ||
|
|
||
| import org.dspace.core.Context; | ||
|
|
||
| public interface ItemForMetadataEnhancementUpdateDAO { | ||
|
|
||
| /** | ||
| * Add to the metadata_enhancement_update table queue an entry of each items | ||
| * that is potentially affected by the update of the Item with the specified | ||
| * uuid. The items potentially affected are the one that have the provided uuid | ||
| * as value of a cris.virtualsource.* metadata | ||
| * | ||
| * @param context the DSpace Context object | ||
| * @param uuid the uuid of the updated item | ||
| * @return the number of affected items scheduled for update | ||
| * @throws SQLException if a problem with the database occurs | ||
| */ | ||
| int saveAffectedItemsForUpdate(Context context, UUID uuid); | ||
|
|
||
| /** | ||
| * Remove from the metadata_enhancement_update table queue the entry if any | ||
| * related to the specified id in older than the current date | ||
| * | ||
| * @param context the DSpace Context object | ||
| * @param itemToRemove the uuid of the processed item | ||
| * @throws SQLException if a problem with the database occurs | ||
| */ | ||
| void removeItemForUpdate(Context context, UUID itemToRemove); | ||
|
|
||
| /** | ||
| * Extract and remove from the table the first uuid to process from the | ||
| * itemupdate_metadata_enhancement table ordered by date queued asc (older | ||
| * first) | ||
| * | ||
| * @param context | ||
| * @return | ||
| */ | ||
| UUID pollItemToUpdate(Context context); | ||
| } |
152 changes: 152 additions & 0 deletions
152
...pi/src/main/java/org/dspace/content/dao/impl/ItemForMetadataEnhancementUpdateDAOImpl.java
This file contains 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,152 @@ | ||
| /** | ||
| * 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.content.dao.impl; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.UUID; | ||
|
|
||
| import org.dspace.content.MetadataSchema; | ||
| import org.dspace.content.dao.ItemForMetadataEnhancementUpdateDAO; | ||
| import org.dspace.content.factory.ContentServiceFactory; | ||
| import org.dspace.content.service.MetadataSchemaService; | ||
| import org.dspace.core.Context; | ||
| import org.dspace.core.DBConnection; | ||
| import org.dspace.services.ConfigurationService; | ||
| import org.dspace.utils.DSpace; | ||
| import org.hibernate.Session; | ||
| import org.hibernate.query.NativeQuery; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| /** | ||
| * Hibernate implementation of the Database Access Object interface class for | ||
| * the ItemForMetadataEnhancementUpdate object. This class is responsible for | ||
| * all database calls for the ItemForMetadataEnhancementUpdate object and is | ||
| * autowired by spring This class should never be accessed directly. | ||
| */ | ||
| public class ItemForMetadataEnhancementUpdateDAOImpl implements ItemForMetadataEnhancementUpdateDAO { | ||
| @Autowired | ||
| ConfigurationService configurationService; | ||
|
|
||
| @Override | ||
| public void removeItemForUpdate(Context context, UUID itemToRemove) { | ||
| try { | ||
| Session session = getHibernateSession(); | ||
| String sql = "DELETE FROM itemupdate_metadata_enhancement WHERE uuid = :uuid"; | ||
| NativeQuery<?> query = session.createNativeQuery(sql); | ||
| query.setParameter("uuid", itemToRemove); | ||
| query.executeUpdate(); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public UUID pollItemToUpdate(Context context) { | ||
| try { | ||
| Session session = getHibernateSession(); | ||
| String sql = "SELECT cast(uuid as varchar) FROM itemupdate_metadata_enhancement" | ||
| + " ORDER BY date_queued ASC LIMIT 1"; | ||
| NativeQuery<?> query = session.createNativeQuery(sql); | ||
| Object uuidObj = query.uniqueResult(); | ||
| if (uuidObj != null) { | ||
| UUID uuid; | ||
| if (uuidObj instanceof String) { | ||
| uuid = (UUID) UUID.fromString((String) uuidObj); | ||
| } else { | ||
| throw new RuntimeException("Unexpected result type from the database " + uuidObj); | ||
| } | ||
| removeItemForUpdate(context, uuid); | ||
| return uuid; | ||
| } else { | ||
| return null; | ||
| } | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public int saveAffectedItemsForUpdate(Context context, UUID uuid) { | ||
| try { | ||
| Session session = getHibernateSession(); | ||
| MetadataSchemaService schemaService = ContentServiceFactory.getInstance().getMetadataSchemaService(); | ||
| MetadataSchema schema = schemaService.find(context, "cris"); | ||
| String sqlInsertOrUpdate; | ||
| if ("org.h2.Driver".equals(configurationService.getProperty("db.driver"))) { | ||
| // H2 doesn't support the INSERT OR UPDATE statement so let's do in two steps | ||
| // update queued date for records already in the queue | ||
| String sqlUpdate = "UPDATE itemupdate_metadata_enhancement" | ||
| + " SET date_queued = CURRENT_TIMESTAMP" | ||
| + " WHERE uuid IN (" | ||
| + " SELECT dspace_object_id FROM metadatavalue " + " WHERE metadata_field_id IN" | ||
| + " ( SELECT metadata_field_id FROM metadatafieldregistry " | ||
| + " WHERE metadata_schema_id = :schema AND element = 'virtualsource')" | ||
| + " AND SUBSTRING(text_value,1,36) = :uuid)"; | ||
| String sqlInsert = | ||
| "INSERT INTO itemupdate_metadata_enhancement (uuid, date_queued)" | ||
| + " SELECT DISTINCT dspace_object_id, CURRENT_TIMESTAMP FROM metadatavalue " | ||
| + " WHERE metadata_field_id IN" | ||
| + " ( SELECT metadata_field_id FROM metadatafieldregistry " | ||
| + " WHERE metadata_schema_id = :schema AND element = 'virtualsource')" | ||
| + " AND SUBSTRING(text_value,1,36) = :uuid " | ||
| + " AND dspace_object_id NOT IN (" | ||
| + " SELECT uuid" | ||
| + " FROM itemupdate_metadata_enhancement" | ||
| + " )"; | ||
| NativeQuery<?> queryUpdate = session.createNativeQuery(sqlUpdate); | ||
| queryUpdate.setParameter("uuid", uuid.toString()); | ||
| queryUpdate.setParameter("schema", schema.getID()); | ||
| queryUpdate.executeUpdate(); | ||
| NativeQuery<?> queryInsert = session.createNativeQuery(sqlInsert); | ||
| queryInsert.setParameter("uuid", uuid.toString()); | ||
| queryInsert.setParameter("schema", schema.getID()); | ||
| return queryInsert.executeUpdate(); | ||
| } else { | ||
| sqlInsertOrUpdate = "INSERT INTO itemupdate_metadata_enhancement (uuid, date_queued) " | ||
| + " SELECT DISTINCT dspace_object_id, CURRENT_TIMESTAMP FROM metadatavalue " | ||
| + " WHERE metadata_field_id IN" | ||
| + " ( SELECT metadata_field_id FROM metadatafieldregistry " | ||
| + " WHERE metadata_schema_id = :schema AND element = 'virtualsource')" | ||
| + " AND substring(text_value,1,36) = :uuid " | ||
| + " ON CONFLICT (uuid) DO UPDATE" | ||
| + " SET date_queued = EXCLUDED.date_queued"; | ||
| NativeQuery<?> queryInsertOrUpdate = session.createNativeQuery(sqlInsertOrUpdate); | ||
| queryInsertOrUpdate.setParameter("uuid", uuid.toString()); | ||
| queryInsertOrUpdate.setParameter("schema", schema.getID()); | ||
| return queryInsertOrUpdate.executeUpdate(); | ||
| } | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * The Hibernate Session used in the current thread | ||
| * | ||
| * @return the current Session. | ||
| * @throws SQLException | ||
| */ | ||
| private Session getHibernateSession() throws SQLException { | ||
| DBConnection dbConnection = new DSpace().getServiceManager().getServiceByName(null, DBConnection.class); | ||
| return ((Session) dbConnection.getSession()); | ||
| } | ||
|
|
||
| public UUID ConvertByteArrayToUUID(byte[] bytea) { | ||
| long mostSigBits = 0; | ||
| long leastSigBits = 0; | ||
| for (int i = 0; i < 8; i++) { | ||
| mostSigBits = (mostSigBits << 8) | (bytea[i] & 0xff); | ||
| leastSigBits = (leastSigBits << 8) | (bytea[i + 8] & 0xff); | ||
| } | ||
|
|
||
| UUID uuid = new UUID(mostSigBits, leastSigBits); | ||
| return uuid; | ||
| } | ||
| } |
This file contains 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.