Performance improvement for the findToExport query

BernhardWebstudio · Dec 31, 2023 · d5e750c · d5e750c
1 parent f74945d
commit d5e750c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/GenericLifeCycle.java b/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/GenericLifeCycle.java
@@ -16,7 +16,7 @@
 public abstract class GenericLifeCycle<T> {
 
     private final Class<T> tCLass;
-    private final String idProperty;
+    protected final String idProperty;
     protected Logger log;
     boolean anon = false;
 

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/SpecimenLifeCycle.java b/src/main/java/edu/harvard/mcz/imagecapture/lifecycle/SpecimenLifeCycle.java
@@ -467,7 +467,6 @@ public List<Specimen> findAllPage(int startAt, int fetchSize) {
     public List<Specimen> findToExport() {
         try {
             Session session = this.getSession();
-            List<Specimen> results = null;
             try {
                 session.beginTransaction();
                 CriteriaBuilder cb = (CriteriaBuilder) session.getCriteriaBuilder();
@@ -477,8 +476,11 @@ public List<Specimen> findToExport() {
                 propertyValueRelations.add(cb.equal(root.get("nahimaExported"), false));
                 propertyValueRelations.add(cb.lessThan(root.get("dateLastNahimaUpdated"), root.get("dateLastUpdated")));
                 cr.where(cb.or(propertyValueRelations.toArray(new Predicate[propertyValueRelations.size()])));
-                Query<Specimen> q = session.createQuery(cr);
-                results = q.list();
+                cr.select(root.get(this.idProperty));
+                Query q = session.createQuery(cr);
+                List<Long> ids = q.list();
+                session.getTransaction().commit();
+                return this.findByIds(ids);
             } catch (HibernateException e) {
                 session.getTransaction().rollback();
                 log.error("find images failed", e);
@@ -487,11 +489,11 @@ public List<Specimen> findToExport() {
                 session.close();
             } catch (SessionException e) {
             }
-            return results;
         } catch (RuntimeException e) {
             log.error("Find to export failed", e);
             throw e;
         }
+        return null;
     }
 
     // Select distinct path from ICImage im WHERE im.path is not null ORDER BY