From 5f5597dae4ef1cf7f6466179ba5e8f39daa9007e Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Fri, 19 Feb 2016 10:08:33 +0100 Subject: [PATCH] Resolved a trace where a timestamp had an faulty offset of -1 in the aggregation deamon --- src/se/hal/deamon/SensorDataAggregatorDaemon.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java index 16d0983e..e0c3cea0 100755 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -110,7 +110,11 @@ public class SensorDataAggregatorDaemon implements HalDaemon { long latestCompletePeriodEndTimestamp = new UTCTimePeriod(aggregationStartTime, aggrPeriodLength).getPreviosPeriod().getEndTimestamp(); long oldestPeriodStartTimestamp = new UTCTimePeriod(aggregationStartTime-ageLimitInMs, aggrPeriodLength).getStartTimestamp(); - logger.fine("evaluating period: "+ maxTimestampFoundForSensor + "=>" + latestCompletePeriodEndTimestamp + " (" + UTCTimeUtility.getDateString(maxTimestampFoundForSensor) + "=>" + UTCTimeUtility.getDateString(latestCompletePeriodEndTimestamp) + ") with expected sample count: " + expectedSampleCount); + if(latestCompletePeriodEndTimestamp == oldestPeriodStartTimestamp){ + logger.fine("no new data to evaluate - aggregation is up to date"); + }else{ + logger.fine("evaluating period: "+ (maxTimestampFoundForSensor+1) + "=>" + latestCompletePeriodEndTimestamp + " (" + UTCTimeUtility.getDateString(maxTimestampFoundForSensor+1) + "=>" + UTCTimeUtility.getDateString(latestCompletePeriodEndTimestamp) + ") with expected sample count: " + expectedSampleCount); + } stmt = db.getPreparedStatement("SELECT *, 1 AS confidence FROM sensor_data_raw" +" WHERE sensor_id == ?"