diff options
author | Lukasz Jarocki <lukasz.jarocki@sonarsource.com> | 2023-06-27 10:24:50 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2023-06-29 20:05:14 +0000 |
commit | e999afdefa1060a504bde0889b969b88c18eca25 (patch) | |
tree | 276e15aba0313d0bcfd185db70b6f0fd8f7b03f8 /server/sonar-ce-task-projectanalysis | |
parent | 114a4deec2e278438cb9db6666b9bc8dfc46ab2c (diff) | |
download | sonarqube-e999afdefa1060a504bde0889b969b88c18eca25.tar.gz sonarqube-e999afdefa1060a504bde0889b969b88c18eca25.zip |
SONAR-19558 enabled snapshots to correctly use project/branch uuid
Diffstat (limited to 'server/sonar-ce-task-projectanalysis')
9 files changed, 20 insertions, 20 deletions
diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepIT.java index 47412e095b3..e7caa7ab9e3 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepIT.java @@ -120,7 +120,7 @@ public class ReportPersistAnalysisStepIT extends BaseStepTest { SnapshotDto projectSnapshot = getUnprocessedSnapshot(projectDto.uuid()); assertThat(projectSnapshot.getUuid()).isEqualTo(ANALYSIS_UUID); - assertThat(projectSnapshot.getComponentUuid()).isEqualTo(project.getUuid()); + assertThat(projectSnapshot.getRootComponentUuid()).isEqualTo(project.getUuid()); assertThat(projectSnapshot.getProjectVersion()).isEqualTo(projectVersion); assertThat(projectSnapshot.getBuildString()).isEqualTo(buildString); assertThat(projectSnapshot.getLast()).isFalse(); @@ -199,7 +199,7 @@ public class ReportPersistAnalysisStepIT extends BaseStepTest { private SnapshotDto getUnprocessedSnapshot(String componentUuid) { List<SnapshotDto> projectSnapshots = dbClient.snapshotDao().selectAnalysesByQuery(dbTester.getSession(), - new SnapshotQuery().setComponentUuid(componentUuid).setIsLast(false).setStatus(SnapshotDto.STATUS_UNPROCESSED)); + new SnapshotQuery().setRootComponentUuid(componentUuid).setIsLast(false).setStatus(SnapshotDto.STATUS_UNPROCESSED)); assertThat(projectSnapshots).hasSize(1); return projectSnapshots.get(0); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepIT.java index 5f93479a6a5..4c28414e9b3 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepIT.java @@ -106,7 +106,7 @@ public class ViewsPersistAnalysisStepIT extends BaseStepTest { SnapshotDto viewSnapshot = getUnprocessedSnapshot(viewDto.uuid()); assertThat(viewSnapshot.getUuid()).isEqualTo(ANALYSIS_UUID); - assertThat(viewSnapshot.getComponentUuid()).isEqualTo(view.getUuid()); + assertThat(viewSnapshot.getRootComponentUuid()).isEqualTo(view.getUuid()); assertThat(viewSnapshot.getProjectVersion()).isNull(); assertThat(viewSnapshot.getLast()).isFalse(); assertThat(viewSnapshot.getStatus()).isEqualTo("U"); @@ -140,7 +140,7 @@ public class ViewsPersistAnalysisStepIT extends BaseStepTest { private SnapshotDto getUnprocessedSnapshot(String componentUuid) { List<SnapshotDto> projectSnapshots = dbClient.snapshotDao().selectAnalysesByQuery(dbTester.getSession(), - new SnapshotQuery().setComponentUuid(componentUuid).setIsLast(false).setStatus(SnapshotDto.STATUS_UNPROCESSED)); + new SnapshotQuery().setRootComponentUuid(componentUuid).setIsLast(false).setStatus(SnapshotDto.STATUS_UNPROCESSED)); assertThat(projectSnapshots).hasSize(1); return projectSnapshots.get(0); } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java index 6c96fe0ac00..99176b7efae 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStepIT.java @@ -196,7 +196,7 @@ public class ExportAnalysesStepIT { return new SnapshotDto() .setUuid(uuid) .setCreatedAt(date) - .setComponentUuid(componentUuid) + .setRootComponentUuid(componentUuid) .setProjectVersion(version) .setBuildString(buildString) .setLast(isLast) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java index b1ffa6fabbf..d96797304a1 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportEventsStepIT.java @@ -117,7 +117,7 @@ public class ExportEventsStepIT { dbTester.getDbClient().eventDao().insert(dbTester.getSession(), new EventDto() .setUuid("E1") .setAnalysisUuid(snapshot.getUuid()) - .setComponentUuid(snapshot.getComponentUuid()) + .setComponentUuid(snapshot.getRootComponentUuid()) .setDate(IN_THE_PAST) .setCreatedAt(NOW) .setData("data") @@ -148,7 +148,7 @@ public class ExportEventsStepIT { dbTester.getDbClient().eventDao().insert(dbTester.getSession(), new EventDto() .setUuid(uuid) .setAnalysisUuid(snapshot.getUuid()) - .setComponentUuid(snapshot.getComponentUuid()) + .setComponentUuid(snapshot.getRootComponentUuid()) .setDate(IN_THE_PAST) .setCreatedAt(NOW) .setName(name)); @@ -158,7 +158,7 @@ public class ExportEventsStepIT { private SnapshotDto insertSnapshot() { SnapshotDto snapshot = new SnapshotDto() .setUuid("U1") - .setComponentUuid(PROJECT.uuid()) + .setRootComponentUuid(PROJECT.uuid()) .setStatus(STATUS_PROCESSED) .setLast(false); dbTester.getDbClient().snapshotDao().insert(dbTester.getSession(), snapshot); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java index 136b2dd1501..86c0c0387e0 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectexport/steps/ExportMeasuresStepIT.java @@ -244,7 +244,7 @@ public class ExportMeasuresStepIT { private SnapshotDto insertSnapshot(String snapshotUuid, ComponentDto project, String status) { SnapshotDto snapshot = new SnapshotDto() .setUuid(snapshotUuid) - .setComponentUuid(project.uuid()) + .setRootComponentUuid(project.uuid()) .setStatus(status) .setLast(true); dbTester.getDbClient().snapshotDao().insert(dbTester.getSession(), snapshot); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/NewCodePeriodResolver.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/NewCodePeriodResolver.java index c3480c7e872..41862ff63ef 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/NewCodePeriodResolver.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/NewCodePeriodResolver.java @@ -90,24 +90,24 @@ public class NewCodePeriodResolver { private Period resolveBySpecificAnalysis(DbSession dbSession, String rootUuid, String value) { SnapshotDto baseline = dbClient.snapshotDao().selectByUuid(dbSession, value) - .filter(t -> t.getComponentUuid().equals(rootUuid)) + .filter(t -> t.getRootComponentUuid().equals(rootUuid)) .orElseThrow(() -> new IllegalStateException("Analysis '" + value + "' of project '" + rootUuid + "' defined as the baseline does not exist")); LOG.debug("Resolving new code period with a specific analysis"); return newPeriod(NewCodePeriodType.SPECIFIC_ANALYSIS, value, baseline.getCreatedAt()); } - private Period resolveByPreviousVersion(DbSession dbSession, String projectUuid, String projectVersion) { - List<EventDto> versions = dbClient.eventDao().selectVersionsByMostRecentFirst(dbSession, projectUuid); + private Period resolveByPreviousVersion(DbSession dbSession, String rootComponentUuid, String projectVersion) { + List<EventDto> versions = dbClient.eventDao().selectVersionsByMostRecentFirst(dbSession, rootComponentUuid); if (versions.isEmpty()) { - return findOldestAnalysis(dbSession, projectUuid); + return findOldestAnalysis(dbSession, rootComponentUuid); } String mostRecentVersion = Optional.ofNullable(versions.iterator().next().getName()) .orElseThrow(() -> new IllegalStateException("selectVersionsByMostRecentFirst returned a DTO which didn't have a name")); if (versions.size() == 1 && projectVersion.equals(mostRecentVersion)) { - return findOldestAnalysis(dbSession, projectUuid); + return findOldestAnalysis(dbSession, rootComponentUuid); } return resolvePreviousVersion(dbSession, projectVersion, versions, mostRecentVersion); @@ -130,9 +130,9 @@ public class NewCodePeriodResolver { return newPeriod(dbSession, previousVersion); } - private Period findOldestAnalysis(DbSession dbSession, String projectUuid) { + private Period findOldestAnalysis(DbSession dbSession, String rootComponentUuid) { LOG.debug("Resolving first analysis as new code period as there is only one existing version"); - Optional<Period> period = dbClient.snapshotDao().selectOldestAnalysis(dbSession, projectUuid) + Optional<Period> period = dbClient.snapshotDao().selectOldestAnalysis(dbSession, rootComponentUuid) .map(dto -> newPeriod(NewCodePeriodType.PREVIOUS_VERSION, null, dto.getCreatedAt())); ensureNotOnFirstAnalysis(period.isPresent()); return period.get(); @@ -162,7 +162,7 @@ public class NewCodePeriodResolver { } private static SnapshotQuery createCommonQuery(String projectUuid) { - return new SnapshotQuery().setComponentUuid(projectUuid).setStatus(STATUS_PROCESSED); + return new SnapshotQuery().setRootComponentUuid(projectUuid).setStatus(STATUS_PROCESSED); } private static SnapshotDto findNearestSnapshotToTargetDate(List<SnapshotDto> snapshots, Instant targetDate) { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java index 4fe25256b75..2b8e262b9ba 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java @@ -107,7 +107,7 @@ public class PersistAnalysisStep implements ComputationStep { .setUuid(snapshotUuid) .setProjectVersion(projectVersion) .setBuildString(buildString) - .setComponentUuid(componentUuid) + .setRootComponentUuid(componentUuid) .setLast(false) .setStatus(SnapshotDto.STATUS_UNPROCESSED) .setCreatedAt(analysisDate) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStep.java index 5d88ab818b6..2db9737900c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/analysis/ExportAnalysesStep.java @@ -49,7 +49,7 @@ public class ExportAnalysesStep implements ComputationStep { " s.period1_mode, s.period1_param, s.period1_date," + " s.uuid, s.build_string" + " from snapshots s" + - " inner join components p on s.component_uuid=p.uuid" + + " inner join components p on s.root_component_uuid=p.uuid" + " inner join project_branches pb on pb.uuid=p.uuid" + " where pb.project_uuid=? and pb.branch_type = 'BRANCH' and pb.exclude_from_purge=? and s.status=? and p.enabled=?" + " order by s.build_date asc"; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/steps/ExportEventsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/steps/ExportEventsStep.java index e4e9f97ed2d..d1fcf70629b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/steps/ExportEventsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/steps/ExportEventsStep.java @@ -41,7 +41,7 @@ public class ExportEventsStep implements ComputationStep { " p.uuid, e.name, e.analysis_uuid, e.category, e.description, e.event_data, e.event_date, e.uuid" + " from events e" + " join snapshots s on s.uuid=e.analysis_uuid" + - " join components p on p.uuid=s.component_uuid" + + " join components p on p.uuid=s.root_component_uuid" + " join project_branches pb on pb.uuid=p.uuid" + " where pb.project_uuid=? and pb.branch_type = 'BRANCH' and pb.exclude_from_purge=? and s.status=? and p.enabled=?"; |