SONAR-5463 log the total number of processed rows

and add missing unit tests on DECIMAL columns

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 f361282677430b4f8c7ef5b7cf79e2601af4c7c9..4bf93b2a84563177309d70a6b0c3ada69b3997c9 100644 (file)
--- 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
@@ -89,9 +89,13 @@ public class MassUpdate {
         update.execute().commit();
       }
       update.close();
+
+      // log the total number of process rows
+      progressTask.log();
     } finally {
       timer.cancel();
       timer.purge();
+      timer = null;
     }
   }
 
@@ -111,6 +115,10 @@ public class MassUpdate {
 
     @Override
     public void run() {
+      log();
+    }
+
+    void log() {
       logger.info(String.format("%d %s processed", counter.get(), rowName));
     }
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java
index 2896cb6384b983ee4437468b22ef2774bcd379b6..c8190fe267f5e9a83138e24065c4f7067734dc7b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java
@@ -66,7 +66,7 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
       @Override
       public void execute(Context context) throws SQLException {
         persons.addAll(context
-          .prepareSelect("select id,login,age,enabled,updated_at from persons where id=2")
+          .prepareSelect("select id,login,age,enabled,updated_at,coeff from persons where id=2")
           .list(new UserReader()));
       }
     }.execute();
@@ -76,6 +76,7 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
     assertThat(persons.get(0)[2]).isEqualTo(14);
     assertThat(persons.get(0)[3]).isEqualTo(true);
     assertThat(persons.get(0)[4]).isNotNull();
+    assertThat(persons.get(0)[5]).isEqualTo(5.2);
   }
 
   @Test
@@ -138,11 +139,12 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
     new BaseDataChange(db.database()) {
       @Override
       public void execute(Context context) throws SQLException {
-        context.prepareUpsert("insert into persons(id,login,age,enabled) values (?,?,?,?)")
+        context.prepareUpsert("insert into persons(id,login,age,enabled,coeff) values (?,?,?,?,?)")
           .setLong(1, 10L)
           .setString(2, "kurt")
           .setInt(3, 27)
           .setBoolean(4, true)
+          .setDouble(5, 2.2)
           .execute().commit().close();
       }
     }.execute();
@@ -157,18 +159,20 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
     new BaseDataChange(db.database()) {
       @Override
       public void execute(Context context) throws SQLException {
-        Upsert upsert = context.prepareUpsert("insert into persons(id,login,age,enabled) values (?,?,?,?)");
+        Upsert upsert = context.prepareUpsert("insert into persons(id,login,age,enabled,coeff) values (?,?,?,?,?)");
         upsert
           .setLong(1, 10L)
           .setString(2, "kurt")
           .setInt(3, 27)
           .setBoolean(4, true)
+          .setDouble(5, 2.2)
           .addBatch();
         upsert
           .setLong(1, 11L)
           .setString(2, "courtney")
           .setInt(3, 25)
           .setBoolean(4, false)
+          .setDouble(5, 2.3)
           .addBatch();
         upsert.execute().commit().close();
       }
@@ -184,13 +188,14 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
     new BaseDataChange(db.database()) {
       @Override
       public void execute(Context context) throws SQLException {
-        Upsert upsert = context.prepareUpsert("update persons set login=?,age=?,enabled=?, updated_at=? where id=?");
+        Upsert upsert = context.prepareUpsert("update persons set login=?,age=?,enabled=?, updated_at=?, coeff=? where id=?");
         upsert
           .setString(1, null)
           .setInt(2, null)
           .setBoolean(3, null)
           .setDate(4, null)
-          .setLong(5, 2L)
+          .setDouble(5, null)
+          .setLong(6, 2L)
           .execute()
           .commit()
           .close();
@@ -208,13 +213,14 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
     new BaseDataChange(db.database()) {
       @Override
       public void execute(Context context) throws SQLException {
-        Upsert upsert = context.prepareUpsert("insert into persons(id,login,age,enabled) values (?,?,?,?)");
+        Upsert upsert = context.prepareUpsert("insert into persons(id,login,age,enabled,coeff) values (?,?,?,?,?)");
         for (int i = 0; i < count; i++) {
           upsert
             .setLong(1, 10L + i)
             .setString(2, "login" + i)
             .setInt(3, 10 + i)
             .setBoolean(4, true)
+            .setDouble(4, i + 0.5)
             .addBatch();
         }
         upsert.execute().commit().close();
@@ -332,7 +338,8 @@ public class BaseDataChangeTest extends AbstractDaoTestCase {
         row.getString(2),
         row.getInt(3),
         row.getBoolean(4),
-        row.getDate(5)
+        row.getDate(5),
+        row.getDouble(6),
       };
     }
   }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/batch-insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/batch-insert-result.xml
index b5598944c198d19b8adf71b84119fd4d4732e4f6..96ecbf4062ff1a95ddcf1b3ee913f9a93fa6bf7a 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/batch-insert-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/batch-insert-result.xml
@@ -1,8 +1,8 @@
 <dataset>
-  <persons id="1" login="barbara" age="56" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="emmerik" age="14" enabled="[true]" updated_at="2014-01-25"/>
-  <persons id="3" login="morgan" age="3" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="barbara" age="56" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="emmerik" age="14" enabled="[true]" coeff="5.2" updated_at="2014-01-25"/>
+  <persons id="3" login="morgan" age="3" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 
-  <persons id="10" login="kurt" age="27" enabled="[true]" updated_at="[null]"/>
-  <persons id="11" login="courtney" age="25" enabled="[false]" updated_at="[null]"/>
+  <persons id="10" login="kurt" age="27" enabled="[true]" coeff="2.2" updated_at="[null]"/>
+  <persons id="11" login="courtney" age="25" enabled="[false]" coeff="2.3" updated_at="[null]"/>
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/insert-result.xml
index 007c460660caf7a6d6203545f85df08474bc78e7..32b7ac03f067838394b56af28f471ed08b85b07e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/insert-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/insert-result.xml
@@ -1,7 +1,7 @@
 <dataset>
-  <persons id="1" login="barbara" age="56" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="emmerik" age="14" enabled="[true]" updated_at="2014-01-25"/>
-  <persons id="3" login="morgan" age="3" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="barbara" age="56" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="emmerik" age="14" enabled="[true]" coeff="5.2" updated_at="2014-01-25"/>
+  <persons id="3" login="morgan" age="3" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 
-  <persons id="10" login="kurt" age="27" enabled="[true]" updated_at="[null]"/>
+  <persons id="10" login="kurt" age="27" enabled="[true]" coeff="2.2" updated_at="[null]"/>
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/mass-update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/mass-update-result.xml
index bb49e5580c998867927b971b80d3021efd442089..9eb2317febfc668230af0178eee85f13c72227f7 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/mass-update-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/mass-update-result.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <persons id="1" login="barbara" age="56" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="login2" age="12" enabled="[true]" updated_at="2014-01-25"/>
-  <persons id="3" login="login3" age="13" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="barbara" age="56" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="login2" age="12" enabled="[true]" coeff="5.2" updated_at="2014-01-25"/>
+  <persons id="3" login="login3" age="13" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/persons.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/persons.xml
index 3bc2f0aa6d9492b77ddce98726ced6392c2ff6be..62c226d53b76838297f45a9c5b65c047a15b5ba4 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/persons.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/persons.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <persons id="1" login="barbara" age="56" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="emmerik" age="14" enabled="[true]" updated_at="2014-01-25"/>
-  <persons id="3" login="morgan" age="3" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="barbara" age="56" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="emmerik" age="14" enabled="[true]" coeff="5.2" updated_at="2014-01-25"/>
+  <persons id="3" login="morgan" age="3" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/schema.sql
index 8890f85d73cf741f3b26a230e04f047b371b0585..499b25b599dd6141f1058aad9a6cb9fc9cd17084 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/schema.sql
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/schema.sql
@@ -3,5 +3,6 @@ CREATE TABLE "PERSONS" (
   "LOGIN" VARCHAR(50),
   "AGE" INTEGER,
   "ENABLED" BOOLEAN,
-  "UPDATED_AT" TIMESTAMP
+  "UPDATED_AT" TIMESTAMP,
+  "COEFF" DOUBLE
 );

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/scroll-and-update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/scroll-and-update-result.xml
index 775a3663443b1aa0cd9ab9cb1fac5b9a5ea08584..0cf4e593d4d9d0342ce58ff72d6f1fd4a94b41c9 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/scroll-and-update-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/scroll-and-update-result.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <persons id="1" login="login1" age="11" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="login2" age="12" enabled="[true]" updated_at="2014-01-25"/>
-  <persons id="3" login="login3" age="13" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="login1" age="11" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="login2" age="12" enabled="[true]" coeff="5.2" updated_at="2014-01-25"/>
+  <persons id="3" login="login3" age="13" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/update-null-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/update-null-result.xml
index 9044f69354d7badc8abd72710281c2b77456b759..ec48c899b404703d9b4640e237a446af6e4861b6 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/update-null-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/BaseDataChangeTest/update-null-result.xml
@@ -1,5 +1,5 @@
 <dataset>
-  <persons id="1" login="barbara" age="56" enabled="[false]" updated_at="2014-01-25"/>
-  <persons id="2" login="[null]" age="[null]" enabled="[null]" updated_at="[null]"/>
-  <persons id="3" login="morgan" age="3" enabled="[true]" updated_at="2014-01-25"/>
+  <persons id="1" login="barbara" age="56" enabled="[false]" coeff="1.5" updated_at="2014-01-25"/>
+  <persons id="2" login="[null]" age="[null]" enabled="[null]" coeff="[null]" updated_at="[null]"/>
+  <persons id="3" login="morgan" age="3" enabled="[true]" coeff="5.4" updated_at="2014-01-25"/>
 </dataset>