From e2dbc92083e685b9d8b2eb51f1bb23f7de7ca928 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 19 Jun 2019 16:17:53 +0100
Subject: [PATCH] Log migration times.

---
 .../java/org/briarproject/bramble/db/JdbcDatabase.java   | 2 ++
 .../java/org/briarproject/bramble/db/Migration47_48.java | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
index 8b8535449..eca3c181c 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
@@ -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;
 			}
 		}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/Migration47_48.java b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration47_48.java
index 7ce6e6598..d3edd0b2a 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/db/Migration47_48.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration47_48.java
@@ -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);