SONAR-4659 Create an DB index on 'characteristics.enabled' column

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index d43610feba2551a00397e75be1619bc0e264c1e9..3e4b2bb227bfc9d9c2d417909d9868b647461c3a 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 432;
+  public static final int LAST_VERSION = 433;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 09c80a569eeff345cae475576ff6dc95bee9ae58..f4d2b9031beaf17d572cefbd19b2cef839c6f265 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -175,6 +175,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('419');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('430');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('431');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('432');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('433');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 96471330f05f74eeec074df0427c1307b2a49cd9..52355a2665956c7ece5e654b167a83ec50c6b9ac 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -693,3 +693,5 @@ CREATE INDEX "SNAPSHOTS_ROOT_PROJECT_ID" ON "SNAPSHOTS" ("ROOT_PROJECT_ID");
 CREATE INDEX "GROUP_ROLES_ROLE" ON "GROUP_ROLES" ("ROLE");
 
 CREATE UNIQUE INDEX "RULES_PLUGIN_KEY_AND_NAME" ON "RULES" ("PLUGIN_RULE_KEY", "PLUGIN_NAME");
+
+CREATE INDEX "CHARACTERISTICS_ENABLED" ON "CHARACTERISTICS" ("ENABLED");

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb
new file mode 100644 (file)
index 0000000..0fdd2de
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb
@@ -0,0 +1,35 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2013 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.
+#
+
+#
+# Sonar 3.7.1
+# SONAR-4659
+#
+class AddIndexToCharacteristicsEnabled < ActiveRecord::Migration
+
+  def self.up
+    begin
+      add_index :characteristics, :enabled, :name => 'characteristics_enabled'
+    rescue
+      # already exists
+    end
+  end
+end
+