Changeset 2809

Timestamp:

Oct 26, 2006, 10:59:58 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Preload features using a stateless session to decrease memory usage.

Location:

trunk/src/core

Files:

• common-queries.xml (modified) (1 diff)
• net/sf/basedb/core/RawDataBatcher.java (modified) (2 diffs)
• net/sf/basedb/core/data/ArrayDesignBlockData.java (modified) (1 diff)
• net/sf/basedb/core/data/ArrayDesignData.java (modified) (1 diff)

trunk/src/core/common-queries.xml

@@ -1230 +1230 @@
   </query>
 
+  <query id="COUNT_FEATURES_FOR_ARRAYDESIGN" type="HQL">
+    <sql>
+      SELECT count(*)
+      FROM FeatureData f
+      WHERE f.arrayDesignBlock.arrayDesign = :arrayDesign
+    </sql>
+    <description>
+      A Hibernate query that counts the number of
+      features on a given array design
+    </description>
+  </query>
+
+
   <query id="COUNT_CHILDWELLS_FOR_WELL" type="HQL">
     <sql>

trunk/src/core/net/sf/basedb/core/RawDataBatcher.java

@@ -166 +166 @@
     if (arrayDesign != null && arrayDesign.getHasFeatures())
     {
-      // TODO - use a predefined query to count featues instead because risk of PermissionDeniedException for call: getArrayDesign()
-      preloaded = new HashMap<FeatureCoordinate, FeatureData>((int)rawBioAssay.getArrayDesign().getFeatures().count(dc));
-      org.hibernate.Query preloadFeatures = HibernateUtil.getPredefinedQuery(dc.getHibernateSession(), "PRELOAD_FEATURES");
+      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(dc.getStatelessSession(), "COUNT_FEATURES_FOR_ARRAYDESIGN");
+      /*
+        SELECT count(*)
+        FROM FeatureData f
+        WHERE f.arrayDesignBlock.arrayDesign = :arrayDesign
+      */
+      query.setInteger("arrayDesign", arrayDesign.getId());
+      int numFeatures = HibernateUtil.loadData(Long.class, query).intValue();
+      preloaded = new HashMap<FeatureCoordinate, FeatureData>(numFeatures);
+      query = HibernateUtil.getPredefinedQuery(dc.getStatelessSession(), "PRELOAD_FEATURES");
       /*
         SELECT f 
@@ -176 +183 @@
         WHERE b.arrayDesign = :arrayDesign
       */
-      preloadFeatures.setInteger("arrayDesign", arrayDesign.getId());
-      ScrollIterator<FeatureData> si = HibernateUtil.loadIterator(FeatureData.class, preloadFeatures);
+      query.setInteger("arrayDesign", arrayDesign.getId());
+      ScrollIterator<FeatureData> si = HibernateUtil.loadIterator(FeatureData.class, query);
       while (si.hasNext())
       {

trunk/src/core/net/sf/basedb/core/data/ArrayDesignBlockData.java

@@ -35 +35 @@
   @see <a href="../../../../../../../development/overview/data/slides.html">Array LIMS - slides overview</a>
   @base.modified $Date$
-  @hibernate.class table="`ArrayDesignBlocks`" lazy="true"
+  @hibernate.class table="`ArrayDesignBlocks`" lazy="false"
 */
 public class ArrayDesignBlockData 

trunk/src/core/net/sf/basedb/core/data/ArrayDesignData.java

@@ -35 +35 @@
   @see <a href="../../../../../../../development/overview/data/slides.html">Array LIMS - slides overview</a>
   @base.modified $Date$
-  @hibernate.class table="`ArrayDesigns`" lazy="false"
+  @hibernate.class table="`ArrayDesigns`" lazy="true"
 */
 public class ArrayDesignData