From: Jacek Date: Mon, 15 Jun 2020 13:52:14 +0000 (+0200) Subject: SONAR-13444 Update 'need_issue_sync' column for project_branches when analysis indexe... X-Git-Tag: 8.4.0.35506~42 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56f5d246da089c357cf8d7c0326892b2ac4a9cce;p=sonarqube.git SONAR-13444 Update 'need_issue_sync' column for project_branches when analysis indexed issues --- diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java index ce338f8a442..c7d5ca07703 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java @@ -105,6 +105,7 @@ public class ReportComputationSteps extends AbstractComputationSteps { UpdateQualityProfilesLastUsedDateStep.class, PurgeDatastoresStep.class, IndexAnalysisStep.class, + UpdateNeedIssueSyncStep.class, // notifications are sent at the end, so that webapp displays up-to-date information SendIssueNotificationsStep.class, diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStep.java new file mode 100644 index 00000000000..1140b6187ea --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStep.java @@ -0,0 +1,55 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.ce.task.projectanalysis.step; + +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.step.ComputationStep; +import org.sonar.db.DbClient; +import org.sonar.db.DbSession; + +/** + * Updates need_issue_sync flag of project_branches so that tasks which are in progress, won't reindex again. + */ +public class UpdateNeedIssueSyncStep implements ComputationStep { + + private final DbClient dbClient; + private final TreeRootHolder treeRootHolder; + + public UpdateNeedIssueSyncStep(DbClient dbClient, TreeRootHolder treeRootHolder) { + this.dbClient = dbClient; + this.treeRootHolder = treeRootHolder; + } + + @Override + public void execute(ComputationStep.Context context) { + try (DbSession dbSession = dbClient.openSession(false)) { + Component project = treeRootHolder.getRoot(); + dbClient.branchDao().updateNeedIssueSync(dbSession, project.getUuid(), false); + dbSession.commit(); + } + } + + @Override + public String getDescription() { + return "Update need issue sync for branch"; + } + +} diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepTest.java new file mode 100644 index 00000000000..661b5fa7ed8 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateNeedIssueSyncStepTest.java @@ -0,0 +1,69 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.ce.task.projectanalysis.step; + +import org.junit.Rule; +import org.junit.Test; +import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.step.TestComputationStepContext; +import org.sonar.db.DbClient; +import org.sonar.db.DbTester; +import org.sonar.db.component.BranchDto; +import org.sonar.db.component.ComponentDto; + +import static org.assertj.core.api.Assertions.assertThat; + +public class UpdateNeedIssueSyncStepTest { + private static final Component PROJECT = ReportComponent.DUMB_PROJECT; + + @Rule + public DbTester db = DbTester.create(System2.INSTANCE); + + @Rule + public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(PROJECT); + + private DbClient dbClient = db.getDbClient(); + + UpdateNeedIssueSyncStep underTest = new UpdateNeedIssueSyncStep(dbClient, treeRootHolder); + + @Test + public void analysis_step_updates_need_issue_sync_flag() { + ComponentDto project = db.components() + .insertPrivateProject(c -> c.setUuid(PROJECT.getUuid()).setDbKey(PROJECT.getDbKey())); + dbClient.branchDao().updateNeedIssueSync(db.getSession(), PROJECT.getUuid(), true); + db.getSession().commit(); + + assertThat(dbClient.branchDao().selectByUuid(db.getSession(), project.uuid())) + .isNotEmpty() + .map(BranchDto::isNeedIssueSync) + .hasValue(true); + + underTest.execute(new TestComputationStepContext()); + + assertThat(dbClient.branchDao().selectByUuid(db.getSession(), project.uuid())) + .isNotEmpty() + .map(BranchDto::isNeedIssueSync) + .hasValue(false); + } + +}