diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-07-25 21:09:05 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-07-25 21:09:05 +0300 |
commit | 65d7ea10436e5c1ed3605cbcc4584cee2b0244c3 (patch) | |
tree | 7c6afc9c12fe041fc3c5248ef2ff990cb3feeb6d /db | |
parent | a0779cbb34338425a9a7842454f03097d05d31ed (diff) | |
parent | 5b4827fe65302557a2b2c6d060500752f228ec91 (diff) |
Merge branch 'ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slow' into 'master'
[CE Backport] Geo: Cache projects_count and wikis_count in SiteStatistic
See merge request gitlab-org/gitlab-ce!20413
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180629153018_create_site_statistics.rb | 18 | ||||
-rw-r--r-- | db/post_migrate/20180706223200_populate_site_statistics.rb | 25 | ||||
-rw-r--r-- | db/schema.rb | 5 |
3 files changed, 48 insertions, 0 deletions
diff --git a/db/migrate/20180629153018_create_site_statistics.rb b/db/migrate/20180629153018_create_site_statistics.rb new file mode 100644 index 00000000000..085ce1ba64b --- /dev/null +++ b/db/migrate/20180629153018_create_site_statistics.rb @@ -0,0 +1,18 @@ +class CreateSiteStatistics < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + create_table :site_statistics do |t| + t.integer :repositories_count, default: 0, null: false + t.integer :wikis_count, default: 0, null: false + end + + execute('INSERT INTO site_statistics (id) VALUES(1)') + end + + def down + drop_table :site_statistics + end +end diff --git a/db/post_migrate/20180706223200_populate_site_statistics.rb b/db/post_migrate/20180706223200_populate_site_statistics.rb new file mode 100644 index 00000000000..e78e9eb900a --- /dev/null +++ b/db/post_migrate/20180706223200_populate_site_statistics.rb @@ -0,0 +1,25 @@ +class PopulateSiteStatistics < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + transaction do + execute('SET LOCAL statement_timeout TO 0') if Gitlab::Database.postgresql? # see https://gitlab.com/gitlab-org/gitlab-ce/issues/48967 + + execute("UPDATE site_statistics SET repositories_count = (SELECT COUNT(*) FROM projects)") + end + + transaction do + execute('SET LOCAL statement_timeout TO 0') if Gitlab::Database.postgresql? # see https://gitlab.com/gitlab-org/gitlab-ce/issues/48967 + + execute("UPDATE site_statistics SET wikis_count = (SELECT COUNT(*) FROM project_features WHERE wiki_access_level != 0)") + end + end + + def down + # No downside in keeping the counter up-to-date + end +end diff --git a/db/schema.rb b/db/schema.rb index 3db11d8447e..8ae0197d1b4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1841,6 +1841,11 @@ ActiveRecord::Schema.define(version: 20180722103201) do add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree add_index "services", ["template"], name: "index_services_on_template", using: :btree + create_table "site_statistics", force: :cascade do |t| + t.integer "repositories_count", default: 0, null: false + t.integer "wikis_count", default: 0, null: false + end + create_table "snippets", force: :cascade do |t| t.string "title" t.text "content" |