From b2101d7202425f3fc551ab15a3f03711316e2af7 Mon Sep 17 00:00:00 2001 From: Reedy Date: Wed, 11 Jul 2018 14:36:27 +0000 Subject: [PATCH] Rename index type_action to log_type_action Bug: T51199 Change-Id: I697fd5689e573bfa965ca75385f919c9a8403c14 --- includes/installer/MssqlUpdater.php | 2 ++ includes/installer/MysqlUpdater.php | 3 ++- includes/installer/PostgresUpdater.php | 1 + includes/installer/SqliteUpdater.php | 3 ++- maintenance/archives/patch-logging-drop-type-action-index.sql | 1 + maintenance/archives/patch-logging-log-type-action-index.sql | 1 + maintenance/archives/patch-logging-type-action-index.sql | 1 - maintenance/mssql/tables.sql | 2 +- maintenance/postgres/tables.sql | 1 + maintenance/sqlite/archives/patch-actor-table.sql | 2 +- maintenance/tables.sql | 2 +- 11 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 maintenance/archives/patch-logging-drop-type-action-index.sql create mode 100644 maintenance/archives/patch-logging-log-type-action-index.sql delete mode 100644 maintenance/archives/patch-logging-type-action-index.sql diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php index 485d758272..03b9c488b0 100644 --- a/includes/installer/MssqlUpdater.php +++ b/includes/installer/MssqlUpdater.php @@ -138,6 +138,8 @@ class MssqlUpdater extends DatabaseUpdater { [ 'addField', 'change_tag', 'ct_tag_id', 'patch-change_tag-tag_id.sql' ], [ 'addIndex', 'archive', 'ar_revid_uniq', 'patch-archive-ar_rev_id-unique.sql' ], [ 'populateContentTables' ], + [ 'addIndex', 'logging', 'log_type_action', 'patch-logging-log-type-action-index.sql' ], + [ 'dropIndex', 'logging', 'type_action', 'patch-logging-drop-type-action-index.sql' ], ]; } diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index b52cfb1955..f8b5408a5b 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -197,7 +197,6 @@ class MysqlUpdater extends DatabaseUpdater { [ 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ], // 1.19 - [ 'addIndex', 'logging', 'type_action', 'patch-logging-type-action-index.sql' ], [ 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1.sql' ], [ 'doMigrateUserOptions' ], [ 'dropField', 'user', 'user_options', 'patch-drop-user_options.sql' ], @@ -359,6 +358,8 @@ class MysqlUpdater extends DatabaseUpdater { [ 'addField', 'change_tag', 'ct_tag_id', 'patch-change_tag-tag_id.sql' ], [ 'addIndex', 'archive', 'ar_revid_uniq', 'patch-archive-ar_rev_id-unique.sql' ], [ 'populateContentTables' ], + [ 'addIndex', 'logging', 'log_type_action', 'patch-logging-log-type-action-index.sql' ], + [ 'dropIndex', 'logging', 'type_action', 'patch-logging-drop-type-action-index.sql' ], ]; } diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index b12bd55583..18ef881e8d 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -585,6 +585,7 @@ class PostgresUpdater extends DatabaseUpdater { [ 'addPgIndex', 'archive', 'ar_revid_uniq', '(ar_rev_id)', 'unique' ], [ 'dropPgIndex', 'archive', 'ar_revid' ], // Probably doesn't exist, but do it anyway. [ 'populateContentTables' ], + [ 'addPgIndex', 'logging', 'log_type_action', '( log_type, log_action, log_timestamp )' ], ]; } diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index d7713cba90..1139cbf6fb 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -77,7 +77,6 @@ class SqliteUpdater extends DatabaseUpdater { [ 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ], // 1.19 - [ 'addIndex', 'logging', 'type_action', 'patch-logging-type-action-index.sql' ], [ 'doMigrateUserOptions' ], [ 'dropField', 'user', 'user_options', 'patch-drop-user_options.sql' ], [ 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1.sql' ], @@ -223,6 +222,8 @@ class SqliteUpdater extends DatabaseUpdater { [ 'addField', 'change_tag', 'ct_tag_id', 'patch-change_tag-tag_id.sql' ], [ 'addIndex', 'archive', 'ar_revid_uniq', 'patch-archive-ar_rev_id-unique.sql' ], [ 'populateContentTables' ], + [ 'addIndex', 'logging', 'log_type_action', 'patch-logging-log-type-action-index.sql' ], + [ 'dropIndex', 'logging', 'type_action', 'patch-logging-drop-type-action-index.sql' ], ]; } diff --git a/maintenance/archives/patch-logging-drop-type-action-index.sql b/maintenance/archives/patch-logging-drop-type-action-index.sql new file mode 100644 index 0000000000..4b34bb876c --- /dev/null +++ b/maintenance/archives/patch-logging-drop-type-action-index.sql @@ -0,0 +1 @@ +DROP INDEX /*i*/type_action ON /*_*/logging; \ No newline at end of file diff --git a/maintenance/archives/patch-logging-log-type-action-index.sql b/maintenance/archives/patch-logging-log-type-action-index.sql new file mode 100644 index 0000000000..cda55feacd --- /dev/null +++ b/maintenance/archives/patch-logging-log-type-action-index.sql @@ -0,0 +1 @@ +CREATE INDEX /*i*/log_type_action ON /*_*/logging(log_type, log_action, log_timestamp); diff --git a/maintenance/archives/patch-logging-type-action-index.sql b/maintenance/archives/patch-logging-type-action-index.sql deleted file mode 100644 index 5edc61a5d5..0000000000 --- a/maintenance/archives/patch-logging-type-action-index.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX /*i*/type_action ON /*_*/logging(log_type, log_action, log_timestamp); diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql index f7db57408c..3ab7d8911a 100644 --- a/maintenance/mssql/tables.sql +++ b/maintenance/mssql/tables.sql @@ -1212,7 +1212,7 @@ CREATE INDEX /*i*/page_time ON /*_*/logging (log_namespace, log_title, log_times CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp); CREATE INDEX /*i*/log_user_type_time ON /*_*/logging (log_user, log_type, log_timestamp); CREATE INDEX /*i*/log_page_id_time ON /*_*/logging (log_page,log_timestamp); -CREATE INDEX /*i*/type_action ON /*_*/logging (log_type, log_action, log_timestamp); +CREATE INDEX /*i*/log_type_action ON /*_*/logging (log_type, log_action, log_timestamp); CREATE INDEX /*i*/log_user_text_type_time ON /*_*/logging (log_user_text, log_type, log_timestamp); CREATE INDEX /*i*/log_user_text_time ON /*_*/logging (log_user_text, log_timestamp); CREATE INDEX /*i*/actor_time ON /*_*/logging (log_actor, log_timestamp); diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 2f567720b4..f03424fa66 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -683,6 +683,7 @@ CREATE INDEX logging_page_id_time ON logging (log_page, log_timestamp); CREATE INDEX logging_user_text_type_time ON logging (log_user_text, log_type, log_timestamp); CREATE INDEX logging_user_text_time ON logging (log_user_text, log_timestamp); CREATE INDEX logging_actor_time ON logging (log_actor, log_timestamp); +CREATE INDEX logging_type_action ON logging (log_type, log_action, log_timestamp); CREATE TABLE log_search ( ls_field TEXT NOT NULL, diff --git a/maintenance/sqlite/archives/patch-actor-table.sql b/maintenance/sqlite/archives/patch-actor-table.sql index d9a018ef71..714726a31b 100644 --- a/maintenance/sqlite/archives/patch-actor-table.sql +++ b/maintenance/sqlite/archives/patch-actor-table.sql @@ -300,7 +300,7 @@ CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp); CREATE INDEX /*i*/log_user_type_time ON /*_*/logging (log_user, log_type, log_timestamp); CREATE INDEX /*i*/log_actor_type_time ON /*_*/logging (log_actor, log_type, log_timestamp); CREATE INDEX /*i*/log_page_id_time ON /*_*/logging (log_page,log_timestamp); -CREATE INDEX /*i*/type_action ON /*_*/logging (log_type, log_action, log_timestamp); +CREATE INDEX /*i*/log_type_action ON /*_*/logging (log_type, log_action, log_timestamp); CREATE INDEX /*i*/log_user_text_type_time ON /*_*/logging (log_user_text, log_type, log_timestamp); CREATE INDEX /*i*/log_user_text_time ON /*_*/logging (log_user_text, log_timestamp); diff --git a/maintenance/tables.sql b/maintenance/tables.sql index d8a47cb60e..802b0ef66f 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1658,7 +1658,7 @@ CREATE INDEX /*i*/log_actor_type_time ON /*_*/logging (log_actor, log_type, log_ CREATE INDEX /*i*/log_page_id_time ON /*_*/logging (log_page,log_timestamp); -- Special:Log action filter -CREATE INDEX /*i*/type_action ON /*_*/logging (log_type, log_action, log_timestamp); +CREATE INDEX /*i*/log_type_action ON /*_*/logging (log_type, log_action, log_timestamp); -- Special:Log filter by type and anonymous performer CREATE INDEX /*i*/log_user_text_type_time ON /*_*/logging (log_user_text, log_type, log_timestamp); -- 2.20.1