From 2fabd1ab29f6c1fc0896c88d2d59a19462d8ebd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20=C5=BDivkov?= Date: Wed, 12 Mar 2014 13:53:52 +0100 Subject: [PATCH] Add database index on patch_sets.revision Without that index the PatchSetAccess.byRevision was always doing a sequential table scan. Change-Id: Ief351d56794589fa0e1804fac5a6c38fea67e23c --- .../gerrit/reviewdb/server/index_generic.sql | 5 +++ .../gerrit/reviewdb/server/index_postgres.sql | 5 +++ .../gerrit/server/schema/SchemaVersion.java | 2 +- .../gerrit/server/schema/Schema_94.java | 38 +++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java diff --git a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_generic.sql b/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_generic.sql index 165c8be0a5..0b7f2c14f1 100644 --- a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_generic.sql +++ b/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_generic.sql @@ -100,6 +100,11 @@ CREATE INDEX patch_comment_drafts ON patch_comments (status, author_id); +-- ********************************************************************* +-- PatchSetAccess +CREATE INDEX patch_sets_byRevision +ON patch_sets (revision); + -- ********************************************************************* -- PatchSetAncestorAccess -- @PrimaryKey covers: ancestorsOf diff --git a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_postgres.sql b/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_postgres.sql index ad92293065..25e3fae86d 100644 --- a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_postgres.sql +++ b/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/index_postgres.sql @@ -151,6 +151,11 @@ ON patch_comments (author_id) WHERE status = 'd'; +-- ********************************************************************* +-- PatchSetAccess +CREATE INDEX patch_sets_byRevision +ON patch_sets (revision); + -- ********************************************************************* -- PatchSetAncestorAccess -- @PrimaryKey covers: ancestorsOf diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java index 8800929ccf..0e71b216c4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java @@ -32,7 +32,7 @@ import java.util.List; /** A version of the database schema. */ public abstract class SchemaVersion { /** The current schema version. */ - public static final Class C = Schema_93.class; + public static final Class C = Schema_94.class; public static class Module extends AbstractModule { @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java new file mode 100644 index 0000000000..3d45274265 --- /dev/null +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java @@ -0,0 +1,38 @@ +// Copyright (C) 2014 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.server.schema; + +import com.google.gerrit.reviewdb.server.ReviewDb; +import com.google.gwtorm.jdbc.JdbcSchema; +import com.google.inject.Inject; +import com.google.inject.Provider; + +import java.sql.SQLException; +import java.sql.Statement; + +public class Schema_94 extends SchemaVersion { + @Inject + Schema_94(Provider prior) { + super(prior); + } + + @Override + protected void migrateData(ReviewDb db, UpdateUI ui) throws SQLException { + try (Statement stmt = ((JdbcSchema) db).getConnection().createStatement()) { + stmt.execute("CREATE INDEX patch_sets_byRevision" + + " ON patch_sets (revision)"); + } + } +}