From b391e3a5e12b624924b92ce61500ee047e567036 Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Mon, 21 Dec 2015 13:27:02 +0100 Subject: [PATCH] Fixed so that the aggregation will have less of a delay Former-commit-id: cf26badd0d108260c4c00934005599aa7aea2e47 --- src/se/koc/hal/deamon/DataAggregatorDaemon.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java index 2d3f5554..84f21694 100755 --- a/src/se/koc/hal/deamon/DataAggregatorDaemon.java +++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java @@ -80,9 +80,9 @@ public class DataAggregatorDaemon implements HalDaemon { logger.fine("Calculating periods... (from:"+ maxTimestampFoundForSensor +", to:"+ currentPeriodStartTimestamp +") with expected sample count: " + expectedSampleCount); stmt = db.getPreparedStatement("SELECT *, 1 AS confidence, timestamp AS timestamp_start FROM sensor_data_raw" +" WHERE sensor_id == ?" - + " AND ? < timestamp" - + " AND timestamp < ? " - +" ORDER BY timestamp ASC"); + + " AND ? < timestamp_start" + + " AND timestamp_start < ? " + +" ORDER BY timestamp_start ASC"); stmt.setLong(1, sensorId); stmt.setLong(2, maxTimestampFoundForSensor); stmt.setLong(3, currentPeriodStartTimestamp); @@ -120,7 +120,7 @@ public class DataAggregatorDaemon implements HalDaemon { stmt = db.getPreparedStatement("SELECT * FROM sensor_data_aggr" +" WHERE sensor_id == ?" + " AND ? < timestamp_start" - + " AND timestamp_start < ?" + + " AND timestamp_start <= ?" + " AND timestamp_end-timestamp_start == ?" +" ORDER BY timestamp_start ASC"); stmt.setLong(1, sensorId);