BIS-294 / SP-440: Added FetchMode definitions to sample and metaproject DAOs...

BIS-294 / SP-440: Added FetchMode definitions to sample and metaproject DAOs to make database queries less complex (and thus, faster)

SVN: 27930

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java

@@ -107,7 +107,7 @@ public abstract class AbstractGenericEntityDAO<T extends IIdHolder> extends Abst
         criteria.add(Restrictions.eq("id", techId.getId()));
         for (String connection : connections)
         {
-            criteria.setFetchMode(connection, FetchMode.JOIN);
+            criteria.setFetchMode(connection, FetchMode.SELECT);
         }
         final T result = tryGetEntity(criteria.uniqueResult());
         if (operationLog.isDebugEnabled())

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java

@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.hibernate.FetchMode;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
@@ -124,6 +125,11 @@ public class MetaprojectDAO extends AbstractGenericEntityDAO<MetaprojectPE> impl
         criteria.createAlias("metaproject", "m");
         criteria.add(Restrictions.eq("m.owner", owner));
         criteria.add(Restrictions.eq(entity.getEntityKind().getLabel(), entity));
+        criteria.setFetchMode("experiment", FetchMode.SELECT);
+        criteria.setFetchMode("dataSet", FetchMode.SELECT);
+        criteria.setFetchMode("material", FetchMode.SELECT);
+        criteria.setFetchMode("sample", FetchMode.SELECT);
+
         final List<MetaprojectAssignmentPE> assignments =
                 cast(getHibernateTemplate().findByCriteria(criteria));