From: <pn...@hy...> - 2009-10-25 02:19:39
|
Author: pnguyen Date: 2009-10-24 19:19:21 -0700 (Sat, 24 Oct 2009) New Revision: 13904 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13904 Modified: trunk/sql/measurement/Measurement.hbm.xml trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java Log: [HHQ-3475] use outer join and force hibernate to fetch baselinesBag Modified: trunk/sql/measurement/Measurement.hbm.xml =================================================================== --- trunk/sql/measurement/Measurement.hbm.xml 2009-10-24 08:48:43 UTC (rev 13903) +++ trunk/sql/measurement/Measurement.hbm.xml 2009-10-25 02:19:21 UTC (rev 13904) @@ -43,7 +43,7 @@ <column name="RESOURCE_ID"/> </many-to-one> - <bag inverse="true" cascade="all-delete-orphan" name="baselinesBag" table="EAM_MEASUREMENT_BL" fetch="join"> + <bag inverse="true" cascade="all-delete-orphan" name="baselinesBag" table="EAM_MEASUREMENT_BL"> <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-24 08:48:43 UTC (rev 13903) +++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java 2009-10-25 02:19:21 UTC (rev 13904) @@ -84,13 +84,12 @@ * retrieves List<Object[]> * [0] = Measurement * [1] = MeasurementTemplate - * [2] = Baseline */ List findAllEnabledMeasurementsAndTemplates() { String hql = new StringBuilder() .append("from Measurement m") .append(" join m.template t") - .append(" join m.baselinesBag b") + .append(" left outer join fetch m.baselinesBag b") .append(" where enabled = '1'") .toString(); return getSession().createQuery(hql).list(); |