From c67e019238182ad95b341368ef6d97cabdb3d49a Mon Sep 17 00:00:00 2001 From: Guillaume Jambet Date: Tue, 5 Jun 2018 17:50:51 +0200 Subject: [PATCH] Revert "SONAR-10782 delete stale pull requests at the end of an analysis (#299)" (#326) This reverts commit b97313869139bb33c202ae3c68643c9a212fb6b1. --- .../java/org/sonar/db/purge/PurgeDao.java | 2 +- .../java/org/sonar/db/purge/PurgeMapper.java | 2 +- .../org/sonar/db/purge/PurgeMapper.xml | 4 +-- .../java/org/sonar/db/purge/PurgeDaoTest.java | 26 ------------------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeDao.java index 0c8316a92e8..1270cdde241 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeDao.java @@ -78,7 +78,7 @@ public class PurgeDao implements Dao { } LOG.debug("<- Purge stale branches"); - List branchUuids = mapper.selectStaleShortLivingBranchesAndPullRequests(rootUuid, dateToLong(maxDate.get())); + List branchUuids = mapper.selectStaleShortLivingBranches(rootUuid, dateToLong(maxDate.get())); for (String branchUuid : branchUuids) { deleteRootComponent(branchUuid, mapper, commands); diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeMapper.java index 510377605fa..bbf0be4b2d2 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/purge/PurgeMapper.java @@ -80,7 +80,7 @@ public interface PurgeMapper { List selectOldClosedIssueKeys(@Param("projectUuid") String projectUuid, @Nullable @Param("toDate") Long toDate); - List selectStaleShortLivingBranchesAndPullRequests(@Param("mainBranchProjectUuid") String mainBranchProjectUuid, @Param("toDate") Long toDate); + List selectStaleShortLivingBranches(@Param("mainBranchProjectUuid") String mainBranchProjectUuid, @Param("toDate") Long toDate); void deleteIssuesFromKeys(@Param("keys") List keys); 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 3216e49cf64..b1657baf79b 100644 --- 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 @@ -46,14 +46,14 @@ and not exists(select e.id from events e where e.analysis_uuid=s.uuid) - select pb.uuid from project_branches pb where pb.project_uuid=#{mainBranchProjectUuid,jdbcType=VARCHAR} - and (pb.branch_type='SHORT' or pb.branch_type='PULL_REQUEST') + and pb.branch_type='SHORT' and pb.updated_at < #{toDate} 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 75530fc4871..e40a4b59d28 100644 --- 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 @@ -136,32 +136,6 @@ public class PurgeDaoTest { assertThat(getUuidsInTableProjects()).containsOnly(project.uuid(), longBranch.uuid(), recentShortBranch.uuid()); } - @Test - public void purge_inactive_pull_request() { - when(system2.now()).thenReturn(new Date().getTime()); - RuleDefinitionDto rule = dbTester.rules().insert(); - ComponentDto project = dbTester.components().insertMainBranch(); - ComponentDto longBranch = dbTester.components().insertProjectBranch(project); - ComponentDto recentPullRequest = dbTester.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); - - // pull request with other components and issues, updated 31 days ago - when(system2.now()).thenReturn(DateUtils.addDays(new Date(), -31).getTime()); - ComponentDto pullRequest = dbTester.components().insertProjectBranch(project, b -> b.setBranchType(BranchType.PULL_REQUEST)); - ComponentDto module = dbTester.components().insertComponent(newModuleDto(pullRequest)); - ComponentDto subModule = dbTester.components().insertComponent(newModuleDto(module)); - ComponentDto file = dbTester.components().insertComponent(newFileDto(subModule)); - dbTester.issues().insert(rule, pullRequest, file); - dbTester.issues().insert(rule, pullRequest, subModule); - dbTester.issues().insert(rule, pullRequest, module); - - // back to present - when(system2.now()).thenReturn(new Date().getTime()); - underTest.purge(dbSession, newConfigurationWith30Days(system2, project.uuid()), PurgeListener.EMPTY, new PurgeProfiler()); - dbSession.commit(); - - assertThat(getUuidsInTableProjects()).containsOnly(project.uuid(), longBranch.uuid(), recentPullRequest.uuid()); - } - @Test public void shouldDeleteHistoricalDataOfDirectoriesAndFiles() { dbTester.prepareDbUnit(getClass(), "shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml"); -- 2.39.5