From 84ee6ecb75d2a68abb5990fe6907d2006f11ed72 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 1 Oct 2018 17:53:02 +0200 Subject: [PATCH] SONAR-11310 drop usage of tmp columns in CE_QUEUE and CE_ACTIVITY --- .../org/sonar/db/ce/CeActivityMapper.xml | 14 ---- .../org/sonar/db/ce/CeQueueMapper.xml | 4 -- .../java/org/sonar/db/purge/PurgeDaoTest.java | 2 +- .../platformlevel/PlatformLevel4.java | 2 - .../server/platform/ws/MigrateDataAction.java | 65 ------------------- 5 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDataAction.java diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml index 213a996e172..372c6a04d13 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml @@ -139,8 +139,6 @@ uuid, component_uuid, main_component_uuid, - tmp_component_uuid, - tmp_main_component_uuid, analysis_uuid, status, task_type, @@ -148,10 +146,6 @@ is_last_key, main_is_last, main_is_last_key, - tmp_is_last, - tmp_is_last_key, - tmp_main_is_last, - tmp_main_is_last_key, submitter_uuid, submitted_at, worker_uuid, @@ -169,8 +163,6 @@ #{uuid,jdbcType=VARCHAR}, #{componentUuid,jdbcType=VARCHAR}, #{mainComponentUuid,jdbcType=VARCHAR}, - #{componentUuid,jdbcType=VARCHAR}, - #{mainComponentUuid,jdbcType=VARCHAR}, #{analysisUuid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, @@ -178,10 +170,6 @@ #{isLastKey,jdbcType=VARCHAR}, #{mainIsLast,jdbcType=BOOLEAN}, #{mainIsLastKey,jdbcType=VARCHAR}, - #{isLast,jdbcType=BOOLEAN}, - #{isLastKey,jdbcType=VARCHAR}, - #{mainIsLast,jdbcType=BOOLEAN}, - #{mainIsLastKey,jdbcType=VARCHAR}, #{submitterUuid,jdbcType=VARCHAR}, #{submittedAt,jdbcType=BIGINT}, #{workerUuid,jdbcType=VARCHAR}, @@ -209,8 +197,6 @@ update ce_activity set main_is_last=${_false}, - tmp_is_last=${_false}, - tmp_main_is_last=${_false}, updated_at=#{updatedAt,jdbcType=BIGINT} where main_is_last=${_true} diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml index ea523ace644..7abc359db51 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml @@ -214,8 +214,6 @@ task_type, component_uuid, main_component_uuid, - tmp_component_uuid, - tmp_main_component_uuid, status, submitter_uuid, execution_count, @@ -227,8 +225,6 @@ #{taskType,jdbcType=VARCHAR}, #{componentUuid,jdbcType=VARCHAR}, #{mainComponentUuid,jdbcType=VARCHAR}, - #{componentUuid,jdbcType=VARCHAR}, - #{mainComponentUuid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{submitterUuid,jdbcType=VARCHAR}, 0, 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 616c4005674..11565908fe4 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 @@ -414,7 +414,7 @@ public class PurgeDaoTest { dbSession.commit(); assertThat(db.countRowsOfTable("ce_queue")).isEqualTo(1); - assertThat(db.countSql("select count(*) from ce_queue where tmp_main_component_uuid='" + projectToBeDeleted.uuid() + "'")).isEqualTo(0); + assertThat(db.countSql("select count(*) from ce_queue where main_component_uuid='" + projectToBeDeleted.uuid() + "'")).isEqualTo(0); } @Test diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 5b127d92749..9d6eee10437 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -128,7 +128,6 @@ import org.sonar.server.platform.ws.DbMigrationStatusAction; import org.sonar.server.platform.ws.HealthActionModule; import org.sonar.server.platform.ws.L10nWs; import org.sonar.server.platform.ws.LogsAction; -import org.sonar.server.platform.ws.MigrateDataAction; import org.sonar.server.platform.ws.MigrateDbAction; import org.sonar.server.platform.ws.PingAction; import org.sonar.server.platform.ws.RestartAction; @@ -513,7 +512,6 @@ public class PlatformLevel4 extends PlatformLevel { UpgradesAction.class, StatusAction.class, MigrateDbAction.class, - MigrateDataAction.class, LogsAction.class, ChangeLogLevelAction.class, DbMigrationStatusAction.class, diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDataAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDataAction.java deleted file mode 100644 index 5a8cb42cf86..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDataAction.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 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.server.platform.ws; - -import org.sonar.api.config.Configuration; -import org.sonar.api.config.internal.MapSettings; -import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.Response; -import org.sonar.api.server.ws.WebService; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; -import org.sonar.db.DbClient; -import org.sonar.server.platform.db.migration.version.v74.PopulateLastKeyColumnsToCeActivity; -import org.sonar.server.platform.db.migration.version.v74.PopulateMainComponentUuidColumnsToCeActivity; -import org.sonar.server.platform.db.migration.version.v74.PopulateMainComponentUuidColumnsToCeQueue; -import org.sonar.server.user.UserSession; - -public class MigrateDataAction implements SystemWsAction { - private static final Logger LOG = Loggers.get(MigrateDataAction.class); - - private final UserSession userSession; - private final DbClient dbClient; - - public MigrateDataAction(UserSession userSession, DbClient dbClient) { - this.userSession = userSession; - this.dbClient = dbClient; - } - - @Override - public void define(WebService.NewController controller) { - controller.createAction("migrate_data") - .setPost(true) - .setHandler(this); - } - - @Override - public void handle(Request request, Response response) throws Exception { - userSession.isSystemAdministrator(); - - Configuration emptyConfiguration = new MapSettings().asConfig(); - new PopulateMainComponentUuidColumnsToCeQueue(dbClient.getDatabase()).execute(); - new PopulateMainComponentUuidColumnsToCeActivity(dbClient.getDatabase(), emptyConfiguration).execute(); - new PopulateLastKeyColumnsToCeActivity(dbClient.getDatabase(), emptyConfiguration).execute(); - LOG.info("done"); - - response.noContent(); - } -} -- 2.39.5