SONAR-17720 New branches/PRs can be purged before they are first analyzed

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
index 94b0f1f028dd11496d0b3038f4a873d4411571a4..6105013fc92bfd0bf8707c240ad4603f45d2acac 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
@@ -59,6 +59,7 @@
         pb.project_uuid=#{projectUuid,jdbcType=VARCHAR}
         and (pb.branch_type = 'PULL_REQUEST' or pb.exclude_from_purge = ${_false})
         and (s.created_at is null or s.created_at < #{toDate})
+        and (pb.created_at < #{toDate})
 
   </select>
 

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
index 2cbdf4302a7d2fd3151e7a084aaa26afab6f4221..5a23573a5a0b1e8ad0c1e4091d0e6090341919ca 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
@@ -139,8 +139,27 @@ public class PurgeDaoTest {
     assertThat(uuidsOfAnalysesOfRoot(project)).containsOnly(pastAnalysis.getUuid(), lastAnalysis.getUuid());
   }
 
+  /**
+   * SONAR-17720
+   */
+  @Test
+  public void purge_inactive_branches_should_not_purge_newly_created_branches() {
+    when(system2.now()).thenReturn(new Date().getTime());
+    ComponentDto project = db.components().insertPublicProject();
+
+    // new branch without a snapshot (analysis not processed yet)
+    ComponentDto pr1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST));
+    underTest.purge(dbSession, newConfigurationWith30Days(System2.INSTANCE, project.uuid(), project.uuid()), PurgeListener.EMPTY, new PurgeProfiler());
+    dbSession.commit();
+
+    // pr not purged
+    assertThat(uuidsIn("components")).containsOnly(project.uuid(), pr1.uuid());
+    assertThat(uuidsIn("project_branches")).containsOnly(project.uuid(), pr1.uuid());
+  }
+
   @Test
   public void purge_inactive_branches() {
+    Date date31DaysAgo = DateUtils.addDays(new Date(), -31);
     when(system2.now()).thenReturn(new Date().getTime());
     RuleDto rule = db.rules().insert();
     ComponentDto project = db.components().insertPublicProject();
@@ -161,7 +180,7 @@ public class PurgeDaoTest {
 
     // branch last analysed 31 days ago but protected from purge
     ComponentDto branch5 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.BRANCH).setExcludeFromPurge(true));
-    db.components().insertSnapshot(branch5, dto -> dto.setCreatedAt(DateUtils.addDays(new Date(), -31).getTime()));
+    db.components().insertSnapshot(branch5, dto -> dto.setCreatedAt(date31DaysAgo.getTime()));
 
     // pull request last analysed 100 days ago
     ComponentDto pr2 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setExcludeFromPurge(false));
@@ -171,6 +190,8 @@ public class PurgeDaoTest {
     ComponentDto pr3 = db.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST).setExcludeFromPurge(true));
     addComponentsSnapshotsAndIssuesToBranch(pr3, rule, 100);
 
+    updateBranchCreationDate(date31DaysAgo, branch1.uuid(), branch2.uuid(), branch3.uuid(), branch4.uuid(), branch5.uuid(), pr1.uuid(), pr2.uuid(), pr3.uuid());
+
     underTest.purge(dbSession, newConfigurationWith30Days(System2.INSTANCE, project.uuid(), project.uuid()), PurgeListener.EMPTY, new PurgeProfiler());
     dbSession.commit();
 
@@ -179,6 +200,13 @@ public class PurgeDaoTest {
     assertThat(uuidsIn("projects")).containsOnly(project.uuid());
   }
 
+  private void updateBranchCreationDate(Date date, String... branchUuids) {
+    for (String branchUuid : branchUuids) {
+      db.executeUpdateSql("update project_branches set created_at = '" + date.getTime() + "' where uuid = '" + branchUuid + "'");
+    }
+    db.getSession().commit();
+  }
+
   @Test
   public void purge_inactive_pull_request() {
     RuleDto rule = db.rules().insert();
@@ -1409,7 +1437,7 @@ public class PurgeDaoTest {
     dbClient.scannerAnalysisCacheDao().insert(dbSession, branch.getUuid(), IOUtils.toInputStream("test1", UTF_8));
     dbClient.scannerAnalysisCacheDao().insert(dbSession, project.getUuid(), IOUtils.toInputStream("test2", UTF_8));
 
-    underTest.deleteProject(dbSession,project.getUuid(), Qualifiers.PROJECT, "project", "project");
+    underTest.deleteProject(dbSession, project.getUuid(), Qualifiers.PROJECT, "project", "project");
 
     assertThat(dbClient.scannerAnalysisCacheDao().selectData(dbSession, project.getUuid())).isNull();
     assertThat(dbClient.scannerAnalysisCacheDao().selectData(dbSession, branch.getUuid())).isNull();
@@ -1742,17 +1770,17 @@ public class PurgeDaoTest {
 
   private void insertPropertyFor(ComponentDto... components) {
     Stream.of(components).forEach(componentDto -> db.properties().insertProperty(new PropertyDto()
-      .setKey(randomAlphabetic(3))
-      .setValue(randomAlphabetic(3))
-      .setComponentUuid(componentDto.uuid()),
+        .setKey(randomAlphabetic(3))
+        .setValue(randomAlphabetic(3))
+        .setComponentUuid(componentDto.uuid()),
       componentDto.getKey(), componentDto.name(), componentDto.qualifier(), null));
   }
 
   private void insertPropertyFor(Collection<BranchDto> branches) {
     branches.stream().forEach(branchDto -> db.properties().insertProperty(new PropertyDto()
-      .setKey(randomAlphabetic(3))
-      .setValue(randomAlphabetic(3))
-      .setComponentUuid(branchDto.getUuid()),
+        .setKey(randomAlphabetic(3))
+        .setValue(randomAlphabetic(3))
+        .setComponentUuid(branchDto.getUuid()),
       null, branchDto.getKey(), null, null));
   }