From 2c1b4af586bb1040c6b2502480a83f25697cc03e Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 11 Dec 2015 23:52:35 +0100
Subject: [PATCH] Some refactoring in DataDeletionDaemon

Former-commit-id: ffcd854d70d4848fd026a154f7df3cc332710378
---
 src/se/koc/hal/deamon/DataDeletionDaemon.java | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/se/koc/hal/deamon/DataDeletionDaemon.java b/src/se/koc/hal/deamon/DataDeletionDaemon.java
index 8fd576d9..029af100 100755
--- a/src/se/koc/hal/deamon/DataDeletionDaemon.java
+++ b/src/se/koc/hal/deamon/DataDeletionDaemon.java
@@ -7,6 +7,7 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import se.koc.hal.HalContext;
@@ -29,18 +30,17 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
 			List<Sensor> sensorList = Sensor.getSensors(HalContext.getDB());
 			for(Sensor sensor : sensorList){
 				logger.fine("Deleting old data for sensor id: " + sensor.getId());
-				aggregateSensor(sensor.getId());
+				cleanupSensor(sensor.getId());
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
     }
 
-    public void aggregateSensor(long sensorId) {
+    public void cleanupSensor(long sensorId) {
     	DBConnection db = HalContext.getDB();
     	PreparedStatement stmt = null;
     	try {
-
     		Long maxDBTimestamp = null; 
     		
     		// delete too old 5 minute periods that already have been aggregated into hours
@@ -51,6 +51,7 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
     		maxDBTimestamp = DBConnection.exec(stmt, new SimpleSQLResult<Long>());
     		if(maxDBTimestamp == null)
     			maxDBTimestamp = 0l;
+
     		stmt = db.getPreparedStatement("SELECT * FROM sensor_data_aggr"
     				+" WHERE sensor_id == ? "
 	    				+ "AND timestamp_end < ? "
@@ -60,7 +61,7 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
     		stmt.setLong(2, maxDBTimestamp);
     		stmt.setLong(3, TimeConstants.FIVE_MINUTES_IN_MS-1);
     		stmt.setLong(4, System.currentTimeMillis()-TimeConstants.DAY_IN_MS);
-    		DBConnection.exec(stmt, new AggrDataDeletor(sensorId));
+    		DBConnection.exec(stmt, new AggregateDataDeleter(sensorId));
     		
     		// delete too old 1 hour periods that already have been aggregated into days
     		stmt = db.getPreparedStatement("SELECT MAX(timestamp_end) FROM sensor_data_aggr"
@@ -70,6 +71,7 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
     		maxDBTimestamp = DBConnection.exec(stmt, new SimpleSQLResult<Long>());
     		if(maxDBTimestamp == null)
     			maxDBTimestamp = 0l;
+
     		stmt = db.getPreparedStatement("SELECT * FROM sensor_data_aggr"
     				+" WHERE sensor_id == ? "
 	    				+ "AND timestamp_end < ? "
@@ -79,16 +81,16 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
     		stmt.setLong(2, maxDBTimestamp);
     		stmt.setLong(3, TimeConstants.HOUR_IN_MS-1);
     		stmt.setLong(4, System.currentTimeMillis()-TimeConstants.SEVEN_DAYS_IN_MS);
-    		DBConnection.exec(stmt, new AggrDataDeletor(sensorId));
+    		DBConnection.exec(stmt, new AggregateDataDeleter(sensorId));
 		} catch (SQLException e) {
-			e.printStackTrace();
+			logger.log(Level.SEVERE, null, e);
 		}
     }
     
-    private class AggrDataDeletor implements SQLResultHandler<Object>{
+    private class AggregateDataDeleter implements SQLResultHandler<Object>{
     	private long sensorId = -1;
     	
-    	public AggrDataDeletor(long sensorId){
+    	public AggregateDataDeleter(long sensorId){
     		this.sensorId = sensorId;
     	}
     	
@@ -96,28 +98,21 @@ public class DataDeletionDaemon extends TimerTask implements HalDaemon {
 		public Object handleQueryResult(Statement stmt, ResultSet result) throws SQLException {
 			try{
 				HalContext.getDB().getConnection().setAutoCommit(false);
-				boolean rollback = false;
 				PreparedStatement preparedDeleteStmt = HalContext.getDB().getPreparedStatement("DELETE FROM sensor_data_aggr WHERE sensor_id == ? AND sequence_id == ?");
 				while(result.next()){
 					if(sensorId != result.getInt("sensor_id")){
-						logger.severe("found entry for aggregation for the wrong sensorId (expecting: "+sensorId+", but was: "+result.getInt("sensor_id")+")");
-						rollback = true;
-						break;
+						throw new IllegalArgumentException("Found entry for aggregation for the wrong sensorId (expecting: "+sensorId+", but was: "+result.getInt("sensor_id")+")");
 					}
-					logger.finer("Deleted period: "+ result.getLong("timestamp_start"));
+                    logger.finer("Deleting sensor aggregate entry timestamp: "+ result.getLong("timestamp_start") +" - "+ result.getLong("timestamp_end"));
 					preparedDeleteStmt.setInt(1, result.getInt("sensor_id"));
 					preparedDeleteStmt.setLong(2, result.getLong("sequence_id"));
 					preparedDeleteStmt.addBatch();
 				}
-				if(!rollback){
-					DBConnection.execBatch(preparedDeleteStmt);
-					HalContext.getDB().getConnection().commit();
-				}else{
-					HalContext.getDB().getConnection().rollback();
-				}
+
+                DBConnection.execBatch(preparedDeleteStmt);
+                HalContext.getDB().getConnection().commit();
 			}catch(Exception e){
 				HalContext.getDB().getConnection().rollback();
-				e.printStackTrace();
 			}finally{
 				HalContext.getDB().getConnection().setAutoCommit(true);
 			}