aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-17 14:44:14 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-07-17 14:45:09 +0200
commit938581fa2a5573652eac94ae99326a296b1a6d48 (patch)
treedf3de10d53012adfc9853caa1cf5ad7399327576 /server/sonar-server
parenta78cbd8b4975dd11afcce5bc0dd57a1e5ceed889 (diff)
downloadsonarqube-938581fa2a5573652eac94ae99326a296b1a6d48.tar.gz
sonarqube-938581fa2a5573652eac94ae99326a296b1a6d48.zip
SONAR-5463 log progress status in data migrations
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java4
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java1
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java1
3 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java
index bc97fe5e889..f3612826774 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java
@@ -63,7 +63,7 @@ public class MassUpdate {
return this;
}
- public MassUpdate setRowPluralName(String s) {
+ public MassUpdate rowPluralName(String s) {
this.progressTask.setRowPluralName(s);
return this;
}
@@ -96,7 +96,7 @@ public class MassUpdate {
}
static class ProgressTask extends TimerTask {
- static final long PERIOD_MS = 10000L;
+ static final long PERIOD_MS = 60000L;
private final Logger logger = LoggerFactory.getLogger("DbMigration");
private final AtomicLong counter;
private String rowName = "rows";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java
index 91317aa94d3..37a43d0ed2f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java
@@ -59,6 +59,7 @@ public class TechnicalDebtMeasuresMigration extends BaseDataChange {
if (!metricIds.isEmpty()) {
MassUpdate massUpdate = context.prepareMassUpdate();
+ massUpdate.rowPluralName("measures");
SqlStatement select = massUpdate.select("SELECT pm.id, pm.value " +
", pm.variation_value_1 , pm.variation_value_2, pm.variation_value_3 " +
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java
index b83c8bbd6f1..e6aaf804c74 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java
@@ -51,6 +51,7 @@ public class FeedQProfileKeysMigration extends BaseDataChange {
MassUpdate massUpdate = context.prepareMassUpdate();
massUpdate.select("SELECT id,language,name FROM rules_profiles");
massUpdate.update("UPDATE rules_profiles SET kee=? WHERE id=?");
+ massUpdate.rowPluralName("profiles");
massUpdate.execute(new MassUpdate.Handler() {
@Override
public boolean handle(Select.Row row, SqlStatement update) throws SQLException {