Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Log migration times.

Browse Source
This commit is contained in:
akwizgran
2019-06-19 16:17:53 +01:00
parent 4fd3970b4f
commit e2dbc92083
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
View File

@@ -447,10 +447,12 @@ abstract class JdbcDatabase implements Database<Connection> {
if (LOG.isLoggable(INFO))
LOG.info("Migrating from schema " + start + " to " + end);
if (listener != null) listener.onDatabaseMigration();
long startTime = now();
// Apply the migration
m.migrate(txn);
// Store the new schema version
storeSchemaVersion(txn, end);
logDuration(LOG, "Migration", startTime);
dataSchemaVersion = end;
}
}

9
bramble-core/src/main/java/org/briarproject/bramble/db/Migration47_48.java
View File

@@ -46,12 +46,9 @@ class Migration47_48 implements Migration<Connection> {
s = txn.createStatement();
s.execute("ALTER TABLE messages"
+ " ADD COLUMN deleted BOOLEAN DEFAULT FALSE NOT NULL");
LOG.info("Created column messages.deleted");
s.execute("UPDATE messages SET deleted = TRUE WHERE raw IS NULL");
LOG.info("Populated column messages.deleted");
s.execute("ALTER TABLE messages"
+ " ADD COLUMN blockCount INT DEFAULT 1 NOT NULL");
LOG.info("Created column messages.blockCount");
s.execute(dbTypes.replaceTypes("CREATE TABLE blocks"
+ " (messageId _HASH NOT NULL,"
+ " blockNumber INT NOT NULL,"
@@ -61,7 +58,6 @@ class Migration47_48 implements Migration<Connection> {
+ " FOREIGN KEY (messageId)"
+ " REFERENCES messages (messageId)"
+ " ON DELETE CASCADE)"));
LOG.info("Created table blocks");
rs = s.executeQuery("SELECT messageId, length, raw FROM messages");
ps = txn.prepareStatement("INSERT INTO blocks"
+ " (messageId, blockNumber, blockLength, data)"
@@ -85,11 +81,10 @@ class Migration47_48 implements Migration<Connection> {
}
ps.close();
rs.close();
s.execute("ALTER TABLE messages DROP COLUMN raw");
s.close();
if (LOG.isLoggable(INFO))
LOG.info("Migrated " + migrated + " messages");
s.execute("ALTER TABLE messages DROP COLUMN raw");
LOG.info("Dropped column messages.raw");
s.close();
} catch (SQLException e) {
tryToClose(ps, LOG, WARNING);
tryToClose(rs, LOG, WARNING);