SONAR-11310 drop usage of tmp columns in CE_QUEUE and CE_ACTIVITY

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 213a996e172bc1729e4e5573b5d71c43be12a3c2..372c6a04d131ce5fcef9c984c7f717407cfac29f 100644 (file)
--- 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 id="clearMainIsLast" parameterType="map">
     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 ea523ace644f6a4b509d659dafa4949c2fb6d354..7abc359db512337621b1cb8e548abe65695d39ee 100644 (file)
--- 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 616c40056745b11c36ce1417ad62b36052484c7b..11565908fe401aeb6574c0b8a70b61cd90cbdcf7 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
@@ -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 5b127d927491d5710f007d53b9b5ced566235eab..9d6eee10437578c6f96d01d44be2bf377150d923 100644 (file)
--- 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 (file)
index 5a8cb42..0000000
--- 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();
-  }
-}