Changeset 6582

Timestamp:

Oct 29, 2014, 12:38:28 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1876: Delay preloading array design feature in raw data batcher

File:

• branches/3.3-stable/src/core/net/sf/basedb/core/RawDataBatcher.java (modified) (4 diffs)

branches/3.3-stable/src/core/net/sf/basedb/core/RawDataBatcher.java

@@ -161 +161 @@
     @see FeatureIdentificationMethod
   */
-  private final Map<Object, FeatureData> preloaded;
+  private Map<Object, FeatureData> preloaded;
   
   /**
@@ -230 +230 @@
     }
     
-    // Preload features 
-    if (arrayDesign != null && arrayDesign.getHasFeatures() && rawBioAssay.getNumDbSpots() == 0)
-    {
-      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<Object, FeatureData>(numFeatures);
-      query = HibernateUtil.getPredefinedQuery(dc.getStatelessSession(), "PRELOAD_FEATURES");
-      /*
-        SELECT f 
-        FROM FeatureData f 
-        JOIN FETCH f.arrayDesignBlock b 
-        LEFT JOIN FETCH f.reporter 
-        WHERE b.arrayDesign = :arrayDesign
-      */
-      query.setInteger("arrayDesign", arrayDesign.getId());
-      ScrollIterator<FeatureData> si = null;
-      try
-      {
-        si = QueryExecutor.loadIterator(FeatureData.class, query, 
-            dc.getStatelessSession(), dc.getSessionControl());
-      }
-      catch (InterruptedException ex)
-      {
-        throw new SignalException("Aborted by user", ex);
-      }
-      while (si.hasNext())
-      {
-        ThreadSignalHandler.checkInterrupted();
-        FeatureData feature = si.next();
-        Object featureId = fiMethod.getIdentifier(feature);
-        if (preloaded.put(featureId, feature) != null)
-        {
-          throw new InvalidDataException("Can't identify features with " + fiMethod + 
-            ". Found duplicate feature: " + featureId);
-        }
-      }
-      si.close();
-    }
-    else
-    {
-      this.preloaded = null;
-    }
-    this.usedFeatures = new HashSet<Object>(preloaded == null ? 100 : preloaded.size());
     setDbControl(dc);
   }
@@ -529 +480 @@
     throws BaseException
   {
+    if (usedFeatures == null) preloadFeatures();
     if (externalReporterId != null) externalReporterId = externalReporterId.trim();
     if (preloaded == null)
@@ -601 +553 @@
   }
   
+  private void preloadFeatures()
+  {
+    // Preload features 
+    if (arrayDesign != null && arrayDesign.getHasFeatures() && rawBioAssay.getNumDbSpots() == 0)
+    {
+      DbControl dc = getDbControl();
+      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<Object, FeatureData>(numFeatures);
+      query = HibernateUtil.getPredefinedQuery(dc.getStatelessSession(), "PRELOAD_FEATURES");
+      /*
+        SELECT f 
+        FROM FeatureData f 
+        JOIN FETCH f.arrayDesignBlock b 
+        LEFT JOIN FETCH f.reporter 
+        WHERE b.arrayDesign = :arrayDesign
+      */
+      query.setInteger("arrayDesign", arrayDesign.getId());
+      ScrollIterator<FeatureData> si = null;
+      try
+      {
+        si = QueryExecutor.loadIterator(FeatureData.class, query, 
+            dc.getStatelessSession(), dc.getSessionControl());
+      }
+      catch (InterruptedException ex)
+      {
+        throw new SignalException("Aborted by user", ex);
+      }
+      while (si.hasNext())
+      {
+        ThreadSignalHandler.checkInterrupted();
+        FeatureData feature = si.next();
+        Object featureId = fiMethod.getIdentifier(feature);
+        if (preloaded.put(featureId, feature) != null)
+        {
+          throw new InvalidDataException("Can't identify features with " + fiMethod + 
+            ". Found duplicate feature: " + featureId);
+        }
+      }
+      si.close();
+    }
+    else
+    {
+      this.preloaded = null;
+    }
+    this.usedFeatures = new HashSet<Object>(preloaded == null ? 100 : preloaded.size());
+  }
+  
   /**
     Create a new raw data object. After you have set all