[Hyperic-hq-discuss] hq r13901 - in trunk: etc sql/measurement src/org/hyperic/hq/measurement/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2009-10-23 16:05:53 -0700 (Fri, 23 Oct 2009)
New Revision: 13901
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13901

Modified:
   trunk/etc/startup_classes.txt
   trunk/sql/measurement/Measurement.hbm.xml
   trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java
Log:
[HHQ-3475] prefetch baselinesBag, reorder startup sequence to ensure that prefetched objects may be taken advantage of

Modified: trunk/etc/startup_classes.txt
===================================================================
--- trunk/etc/startup_classes.txt	2009-10-23 22:24:38 UTC (rev 13900)
+++ trunk/etc/startup_classes.txt	2009-10-23 23:05:53 UTC (rev 13901)
@@ -1,5 +1,4 @@
 org.hyperic.hq.product.server.session.ProductStartupListener
-org.hyperic.hq.events.server.session.RegisteredTriggerStartupListener
 org.hyperic.hq.authz.server.session.GroupingStartupListener
 org.hyperic.hq.authz.server.session.AuthzStartupListener
 org.hyperic.hq.common.server.session.CommonStartupListener
@@ -7,12 +6,13 @@
 org.hyperic.hq.autoinventory.server.session.AIStartupListener
 org.hyperic.hq.livedata.server.session.LiveDataStartupListener
 org.hyperic.hq.measurement.server.session.MeasurementStartupListener
+org.hyperic.hq.bizapp.server.session.BossStartupListener
+org.hyperic.hq.events.server.session.RegisteredTriggerStartupListener
 org.hyperic.hq.galerts.server.session.GalertStartupListener
 org.hyperic.hq.events.server.session.EventsStartupListener
 org.hyperic.hq.ui.server.session.UIStartupListener
 org.hyperic.hq.escalation.server.session.EscalationStartupListener
 org.hyperic.hq.control.server.session.ControlStartupListener
-org.hyperic.hq.bizapp.server.session.BossStartupListener
 org.hyperic.hq.ha.server.session.HAStartupListener
 org.hyperic.hq.events.server.session.HeartBeatServiceStartupListener
 org.hyperic.hq.events.server.session.HQDBHealthStartupListener

Modified: trunk/sql/measurement/Measurement.hbm.xml
===================================================================
--- trunk/sql/measurement/Measurement.hbm.xml	2009-10-23 22:24:38 UTC (rev 13900)
+++ trunk/sql/measurement/Measurement.hbm.xml	2009-10-23 23:05:53 UTC (rev 13901)
@@ -43,7 +43,7 @@
       <column name="RESOURCE_ID"/>
     </many-to-one>
 
-    <bag inverse="true" cascade="all-delete-orphan" name="baselinesBag" table="EAM_MEASUREMENT_BL">
+    <bag inverse="true" cascade="all-delete-orphan" name="baselinesBag" table="EAM_MEASUREMENT_BL" fetch="join">
       <cache usage="read-write"/>
       <key on-delete="cascade" column="MEASUREMENT_ID"/>
       <one-to-many class="Baseline"/>

Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java	2009-10-23 22:24:38 UTC (rev 13900)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java	2009-10-23 23:05:53 UTC (rev 13901)
@@ -80,17 +80,18 @@
     }
     
     /**
+     * Used primarily for preloaded 2nd level cache measurement objects
      * retrieves List<Object[]>
      * [0] = Measurement
      * [1] = MeasurementTemplate
+     * [2] = Baseline
      */
     List findAllEnabledMeasurementsAndTemplates() {
-        Dialect dialect = Util.getDialect();
         String hql = new StringBuilder()
             .append("from Measurement m")
             .append(" join m.template t")
-            .append(" where enabled = ")
-            .append(dialect.toBooleanValueString(true))
+            .append(" join m.baselinesBag b")
+            .append(" where enabled = '1'")
             .toString();
         return getSession().createQuery(hql).list();
     }