From: <sc...@hy...> - 2007-06-24 19:29:21
|
Author: scottmf Date: 2007-06-24 12:29:17 -0700 (Sun, 24 Jun 2007) New Revision: 4901 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=4901 Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java Log: trunc metric table fix Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java 2007-06-24 12:46:49 UTC (rev 4900) +++ trunk/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java 2007-06-24 19:29:17 UTC (rev 4901) @@ -145,11 +145,14 @@ { long currtime = System.currentTimeMillis(); String currTable = MeasTabManagerUtil.getMeasTabname(currtime); - String delTable = MeasTabManagerUtil.getMeasTabname(truncateBefore); + long currTruncTime = truncateBefore; + //just in case truncateBefore is in the middle of a table + currTruncTime = MeasTabManagerUtil.getPrevMeasTabTime(currTruncTime); + String delTable = MeasTabManagerUtil.getMeasTabname(currTruncTime); if (delTable.equals(currTable)) { - long prev = MeasTabManagerUtil.getPrevMeasTabTime(currtime); - delTable = MeasTabManagerUtil.getMeasTabname(prev); + currTruncTime = MeasTabManagerUtil.getPrevMeasTabTime(currTruncTime); + delTable = MeasTabManagerUtil.getMeasTabname(currTruncTime); } log.info("Purging Raw Measurement Data older than " + TimeUtil.toString(truncateBefore)); @@ -161,7 +164,6 @@ DATASOURCE_NAME); stmt = conn.createStatement(); StopWatch watch = new StopWatch(); - long currTruncTime = truncateBefore; log.debug("Truncating tables, starting with -> "+delTable+" (currTable -> "+currTable+")"); while (!currTable.equals(delTable) && truncateBefore > currTruncTime) { |