SONAR-7391 Drop unused DB index DUPLICATIONS_INDEX_PSID

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1113_remove_duplications_psid_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1113_remove_duplications_psid_index.rb
new file mode 100644 (file)
index 0000000..74ccc01
--- /dev/null
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1113_remove_duplications_psid_index.rb
@@ -0,0 +1,32 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2014 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube 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.
+#
+# SonarQube 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.
+#
+
+#
+# SonarQube 5.5
+# SONAR-7391
+#
+class RemoveDuplicationsPsidIndex < ActiveRecord::Migration
+
+  def self.up
+    remove_index :duplications_index, :name => 'duplications_index_psid'
+  end
+
+end
+

diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
index 67e20f40c64493e386478cb580962187c64ef792..a8a23f680f42d64280ed87e97e07401ba49ecb38 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -29,7 +29,7 @@ import org.sonar.db.MyBatis;
 
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 1111;
+  public static final int LAST_VERSION = 1113;
 
   /**
    * The minimum supported version which can be upgraded. Lower

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index d8da5b65e7fc0ca823dec420b1165aa7f1d87fe2..9857b88f5f7a14ac996913539dddb976426698ae 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -389,6 +389,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1108');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1109');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1110');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1111');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1113');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index 1ce64fed9890fc029ea0299f705b685df1a69530..8fec18146f660ba85d3becd19526089cf6db0007 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -563,8 +563,6 @@ CREATE INDEX "DUPLICATIONS_INDEX_HASH" ON "DUPLICATIONS_INDEX" ("HASH");
 
 CREATE INDEX "DUPLICATIONS_INDEX_SID" ON "DUPLICATIONS_INDEX" ("SNAPSHOT_ID");
 
-CREATE INDEX "DUPLICATIONS_INDEX_PSID" ON "DUPLICATIONS_INDEX" ("PROJECT_SNAPSHOT_ID");
-
 CREATE INDEX "INDEX_GROUPS_USERS_ON_GROUP_ID" ON "GROUPS_USERS" ("GROUP_ID");
 
 CREATE INDEX "INDEX_GROUPS_USERS_ON_USER_ID" ON "GROUPS_USERS" ("USER_ID");