ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Upgrade refactoring

Browse source
This commit is contained in:
Ziver Koc 2016-02-14 20:23:07 +01:00
parent 4a9f08cbb7
commit b93c8bc124
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/se/hal/HalContext.java
View file

@ -57,17 +57,12 @@ public class HalContext {
// Init DB // Init DB
File dbFile = FileUtil.find(DB_FILE); File dbFile = FileUtil.find(DB_FILE);
boolean firstTime = false;
if(dbFile == null){
firstTime = true;
logger.info("No database file found, creating new DB...");
}
db = new DBConnection(DBConnection.DBMS.SQLite, DB_FILE); db = new DBConnection(DBConnection.DBMS.SQLite, DB_FILE);
if(dbFile == null){
//Read DB conf logger.info("No database file found, creating new DB...");
if(firstTime){
dbConf = new Properties(); dbConf = new Properties();
}else{ }
else{
dbConf = db.exec("SELECT * FROM conf", new PropertiesSQLResult()); dbConf = db.exec("SELECT * FROM conf", new PropertiesSQLResult());
} }
@ -83,7 +78,7 @@ public class HalContext {
logger.info("DB version: "+ dbVersion); logger.info("DB version: "+ dbVersion);
if(defaultDBVersion > dbVersion ) { if(defaultDBVersion > dbVersion ) {
logger.info("Starting DB upgrade..."); logger.info("Starting DB upgrade...");
if(!firstTime){ if(dbFile != null){
File backupDB = FileUtil.getNextFile(dbFile); File backupDB = FileUtil.getNextFile(dbFile);
logger.fine("Backing up DB to: "+ backupDB); logger.fine("Backing up DB to: "+ backupDB);
FileUtil.copy(dbFile, backupDB); FileUtil.copy(dbFile, backupDB);
@ -123,13 +118,21 @@ public class HalContext {
new SQLResultHandler<Object>() { new SQLResultHandler<Object>() {
@Override @Override
public Object handleQueryResult(Statement stmt, ResultSet result) throws SQLException { public Object handleQueryResult(Statement stmt, ResultSet result) throws SQLException {
boolean clearExternalAggrData = false;
boolean clearInternalAggrData = false;
while(result.next()){ while(result.next()){
if(result.getBoolean("clear_external_aggr_data")){ if(result.getBoolean("clear_external_aggr_data"))
clearExternalAggrData = true;
if(result.getBoolean("clear_internal_aggr_data"))
clearInternalAggrData = true;
}
if(clearExternalAggrData){
logger.fine("Clearing external aggregate data"); logger.fine("Clearing external aggregate data");
db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id = " db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id = "
+ "(SELECT sensor.id FROM user, sensor WHERE user.external == 1 AND sensor.user_id = user.id)"); + "(SELECT sensor.id FROM user, sensor WHERE user.external == 1 AND sensor.user_id = user.id)");
} }
if(result.getBoolean("clear_internal_aggr_data")){ if(clearInternalAggrData){
logger.fine("Clearing local aggregate data"); logger.fine("Clearing local aggregate data");
db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id = " db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id = "
+ "(SELECT sensor.id FROM user, sensor WHERE user.external == 0 AND sensor.user_id = user.id)"); + "(SELECT sensor.id FROM user, sensor WHERE user.external == 0 AND sensor.user_id = user.id)");
@ -137,14 +140,13 @@ public class HalContext {
db.exec("UPDATE sensor SET aggr_version = (aggr_version+1) WHERE id = " db.exec("UPDATE sensor SET aggr_version = (aggr_version+1) WHERE id = "
+ "(SELECT sensor.id FROM user, sensor WHERE user.external == 0 AND sensor.user_id = user.id)"); + "(SELECT sensor.id FROM user, sensor WHERE user.external == 0 AND sensor.user_id = user.id)");
} }
}
return null; return null;
} }
}); });
// Check if there is a local user // Check if there is a local user
User localUser = User.getLocalUser(db); User localUser = User.getLocalUser(db);
if (localUser == null){ if (localUser == null){
logger.info("Creating local user."); logger.fine("Creating local user.");
localUser = new User(); localUser = new User();
localUser.setExternal(false); localUser.setExternal(false);
localUser.save(db); localUser.save(db);