SONAR-7688 Decrease number of SQL requests

diff --git a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasures.java b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasures.java
index 4452552dc1c4a8c716ac70b2aed578be82f3d2ab..4a3c23827b25727e7bddb069ef727e7adf6f06d4 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasures.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasures.java
@@ -35,18 +35,18 @@ public class PopulateComponentUuidOfMeasures extends BaseDataChange {
   @Override
   public void execute(Context context) throws SQLException {
     MassUpdate massUpdate = context.prepareMassUpdate();
-    massUpdate.select("select pm.id, s.component_uuid from project_measures pm inner join snapshots s on s.id=pm.snapshot_id where pm.component_uuid is null");
-    massUpdate.update("UPDATE project_measures SET component_uuid=? WHERE id=?");
+    massUpdate.select("select distinct pm.project_id, s.component_uuid from project_measures pm inner join snapshots s on s.id=pm.snapshot_id where pm.component_uuid is null");
+    massUpdate.update("UPDATE project_measures SET component_uuid=? WHERE project_id=? and component_uuid is null");
     massUpdate.rowPluralName("measures");
     massUpdate.execute(this::handle);
   }
 
   public boolean handle(Select.Row row, SqlStatement update) throws SQLException {
-    long id = row.getLong(1);
+    long projectId = row.getLong(1);
 
     String componentUuid = row.getString(2);
     update.setString(1, componentUuid);
-    update.setLong(2, id);
+    update.setLong(2, projectId);
 
     return true;
   }

diff --git a/sonar-db/src/test/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasuresTest.java b/sonar-db/src/test/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasuresTest.java
index 2eb47532e3e2ad4dc9d24a84f0a9cfc906865ab7..f3bc7f5199effb3131c7ad33d67ac8d688f6d2ba 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasuresTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/v60/PopulateComponentUuidOfMeasuresTest.java
@@ -33,6 +33,19 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class PopulateComponentUuidOfMeasuresTest {
 
+  private static final int SNAPSHOT_ID_1 = 40;
+  private static final int SNAPSHOT_ID_2 = 50;
+  private static final int SNAPSHOT_ID_3 = 60;
+  private static final int SNAPSHOT_ID_4 = 70;
+  private static final int SNAPSHOT_ID_5 = 80;
+
+  private static final int COMPONENT_ID_1 = 400;
+  private static final int COMPONENT_ID_2 = 500;
+  private static final int COMPONENT_ID_3 = 600;
+
+  private static final String COMPONENT_UUID_1 = "U400";
+  private static final String COMPONENT_UUID_2 = "U500";
+
   @Rule
   public DbTester db = DbTester.createForSchema(System2.INSTANCE, PopulateComponentUuidOfMeasuresTest.class,
     "in_progress_measures_with_projects.sql");
@@ -49,36 +62,35 @@ public class PopulateComponentUuidOfMeasuresTest {
 
   @Test
   public void migration_updates_component_uuid_with_values_from_table_snapshots_when_they_exist() throws SQLException {
-    String uuid1 = insertSnapshot(40);
-    String uuid2 = insertSnapshot(50);
-    String uuid3 = insertSnapshot(60);
-    String uuid4 = insertSnapshot(70);
-
-    insertMeasure(1, 40);
-    insertMeasure(2, 60);
-    insertMeasure(3, 90); // 90 does not exist
-    insertMeasure(4, 100); // 100 does not exist
+    insertSnapshot(SNAPSHOT_ID_1, COMPONENT_UUID_1);
+    insertSnapshot(SNAPSHOT_ID_2, COMPONENT_UUID_1);
+    insertSnapshot(SNAPSHOT_ID_3, COMPONENT_UUID_2);
+    insertSnapshot(SNAPSHOT_ID_4, COMPONENT_UUID_2);
+
+    insertMeasure(1, SNAPSHOT_ID_1, COMPONENT_ID_1);
+    insertMeasure(2, SNAPSHOT_ID_2, COMPONENT_ID_1);
+    insertMeasure(3, SNAPSHOT_ID_3, COMPONENT_ID_2);
+    insertMeasure(4, SNAPSHOT_ID_5, COMPONENT_ID_3); // snapshot does not exist
     db.commit();
 
     underTest.execute();
 
-    verifyMeasure(1, 40, uuid1);
-    verifyMeasure(2, 60, uuid3);
-    verifyMeasure(3, 90, null);
-    verifyMeasure(4, 100, null);
+    verifyMeasure(1, SNAPSHOT_ID_1, COMPONENT_UUID_1);
+    verifyMeasure(2, SNAPSHOT_ID_2, COMPONENT_UUID_1);
+    verifyMeasure(3, SNAPSHOT_ID_3, COMPONENT_UUID_2);
+    verifyMeasure(4, SNAPSHOT_ID_5, null);
   }
 
   @Test
   public void migration_is_reentrant() throws SQLException {
-    String uuid1 = insertSnapshot(40);
-    String uuid2 = insertSnapshot(50);
-    insertMeasure(1, 40);
+    insertSnapshot(SNAPSHOT_ID_1, COMPONENT_UUID_1);
+    insertMeasure(1, SNAPSHOT_ID_1, COMPONENT_ID_1);
 
     underTest.execute();
-    verifyMeasure(1, 40, uuid1);
+    verifyMeasure(1, SNAPSHOT_ID_1, COMPONENT_UUID_1);
 
     underTest.execute();
-    verifyMeasure(1, 40, uuid1);
+    verifyMeasure(1, SNAPSHOT_ID_1, COMPONENT_UUID_1);
 
   }
 
@@ -90,24 +102,22 @@ public class PopulateComponentUuidOfMeasuresTest {
     assertThat(row.get("COMPONENT_UUID")).isEqualTo(componentUuid);
   }
 
-  private String insertSnapshot(long id) {
-    String uuid = "uuid_" + id;
+  private void insertSnapshot(long id, String componentUuid) {
     db.executeInsert(
       "snapshots",
       "id", valueOf(id),
-      "component_uuid", uuid,
-      "root_component_uuid", valueOf(id + 100));
-    return uuid;
+      "component_uuid", componentUuid,
+      "root_component_uuid", "ROOT_" + componentUuid);
   }
 
-  private void insertMeasure(long id, long snapshotId) {
+  private void insertMeasure(long id, long snapshotId, long componentId) {
     db.executeInsert(
       "project_measures",
       "ID", valueOf(id),
       "METRIC_ID", valueOf(id + 10),
       "SNAPSHOT_ID", valueOf(snapshotId),
       "VALUE", valueOf(id + 1000),
-      "PROJECT_ID", valueOf(snapshotId + 1000));
+      "PROJECT_ID", valueOf(componentId));
 
   }
 }