From: <cl...@hy...> - 2007-11-28 18:18:14
|
Author: clee Date: 2007-11-28 10:18:09 -0800 (Wed, 28 Nov 2007) New Revision: 6965 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6965 Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java Log: [HHQ-1302] Restore the timestamp constraint so that we're not waiting on rows locked or end up with timestamp more recent than the unavailable time Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-11-28 11:03:19 UTC (rev 6964) +++ trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2007-11-28 18:18:09 UTC (rev 6965) @@ -104,7 +104,6 @@ private static final long MINUTE = 60 * 1000; // Table names - private static final String TAB_DATA = MeasurementConstants.TAB_DATA; private static final String TAB_DATA_1H = MeasurementConstants.TAB_DATA_1H; private static final String TAB_DATA_6H = MeasurementConstants.TAB_DATA_6H; private static final String TAB_DATA_1D = MeasurementConstants.TAB_DATA_1D; @@ -1754,8 +1753,8 @@ for (i = 0; i < tables.length; i++) { rs = stmt.executeQuery("SELECT max(timestamp) FROM " + tables[i] + - " WHERE " + - " measurement_id = " + id + + " WHERE timestamp < " + timeAfter + + " and measurement_id = " + id + " and not value = 0"); if (rs.next()) { |