Skip to content

VSB-TUO/Fix bitstreamuuid query #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 2 commits into from
Nov 4, 2025
Merged

VSB-TUO/Fix bitstreamuuid query #1140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d87d59
revent PostgreSQL parameter limit error by batching bitstream UUID qu…
Paurikova2 Nov 4, 2025
745dd75
BATCH_SIZE as configurable constant
Paurikova2 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions ...src/main/java/org/dspace/content/dao/impl/clarin/ClarinLicenseResourceMappingDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.dspace.content.dao.impl.clarin;

import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import javax.persistence.Query;
Expand All @@ -23,6 +24,11 @@ protected ClarinLicenseResourceMappingDAOImpl() {
super();
}

/**
* Maximum number of UUIDs to include per query batch.
*/
private static final int BATCH_SIZE = 10_000;

@Override
public List<ClarinLicenseResourceMapping> findByBitstreamUUID(Context context, UUID bitstreamUUID)
throws SQLException {
Expand All @@ -42,12 +48,22 @@ public List<ClarinLicenseResourceMapping> findByBitstreamUUIDs(Context context,
if (bitstreamUUIDs == null || bitstreamUUIDs.isEmpty()) {
return List.of();
}
Query query = createQuery(context, "SELECT clrm " +
"FROM ClarinLicenseResourceMapping clrm " +
"WHERE clrm.bitstream.id IN :bitstreamUUIDs");
query.setParameter("bitstreamUUIDs", bitstreamUUIDs);
query.setHint("org.hibernate.cacheable", Boolean.TRUE);
return list(query);
List<ClarinLicenseResourceMapping> results = new ArrayList<>();

for (int i = 0; i < bitstreamUUIDs.size(); i += BATCH_SIZE) {
int end = Math.min(i + BATCH_SIZE, bitstreamUUIDs.size());
List<UUID> batch = bitstreamUUIDs.subList(i, end);

Query query = createQuery(context,
"SELECT clrm FROM ClarinLicenseResourceMapping clrm " +
"WHERE clrm.bitstream.id IN :bitstreamUUIDs");
query.setParameter("bitstreamUUIDs", batch);
query.setHint("org.hibernate.cacheable", Boolean.TRUE);

results.addAll(list(query));
}

return results;
}

@Override
Expand Down