From 312316088e689f2764614f0ceba265567c9e52d2 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Fri, 16 Jan 2009 23:02:44 +0000 Subject: [PATCH] Attempt at cleaning up r45764, r45769 (renamed indices for SQLite compat): * removing the indexName() hack and with it the /*i*/ stuff from tables.sql * undoing renames of formerly implicitly named indices * three indices have to be called different in SQLite because of naming conflicts, adding a patch to updaters.inc that does that --- includes/db/Database.php | 24 +-- includes/db/DatabasePostgres.php | 4 +- includes/db/DatabaseSqlite.php | 7 - maintenance/archives/patch-index-renames.sql | 11 ++ maintenance/tables.sql | 170 +++++++++---------- maintenance/updaters.inc | 1 + 6 files changed, 100 insertions(+), 117 deletions(-) create mode 100644 maintenance/archives/patch-index-renames.sql diff --git a/includes/db/Database.php b/includes/db/Database.php index a09bcd3752..e2175d108b 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -1574,18 +1574,6 @@ class Database { return implode(' ',array($straightJoins,$otherJoins) ); } - /** - * Get the name of an index in a given table - */ - function indexName( $index ) { - // Backwards-compatibility hack - if ( $index == 'ar_usertext_timestamp' ) { - return 'usertext_timestamp'; - } else { - return $index; - } - } - /** * Wrapper for addslashes() * @param $s String: to be slashed. @@ -1634,7 +1622,7 @@ class Database { * PostgreSQL doesn't have them and returns "" */ function useIndexClause( $index ) { - return "FORCE INDEX (" . $this->indexName( $index ) . ")"; + return "FORCE INDEX (" . $index . ")"; } /** @@ -2274,9 +2262,6 @@ class Database { $ins = preg_replace_callback( '!/\*(?:\$wgDBprefix|_)\*/([a-zA-Z_0-9]*)!', array( $this, 'tableNameCallback' ), $ins ); - // Index names - $ins = preg_replace_callback( '!/\*i\*/([a-zA-Z_0-9]*)!', - array( $this, 'indexNameCallback' ), $ins ); return $ins; } @@ -2288,13 +2273,6 @@ class Database { return $this->tableName( $matches[1] ); } - /** - * Index name callback - */ - protected function indexNameCallback( $matches ) { - return $this->indexName( $matches[1] ); - } - /* * Build a concatenation list to feed into a SQL query */ diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index f8c0eb5170..dec0284e7a 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -698,7 +698,7 @@ class DatabasePostgres extends Database { return NULL; } while ( $row = $this->fetchObject( $res ) ) { - if ( $row->indexname == $this->indexName( $index ) ) { + if ( $row->indexname == $index ) { return $row; } } @@ -708,7 +708,7 @@ class DatabasePostgres extends Database { function indexUnique ($table, $index, $fname = 'Database::indexUnique' ) { $sql = "SELECT indexname FROM pg_indexes WHERE tablename='{$table}'". " AND indexdef LIKE 'CREATE UNIQUE%(" . - $this->strencode( $this->indexName( $index ) ) . + $this->strencode( $index ) . ")'"; $res = $this->query( $sql, $fname ); if ( !$res ) diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 7a5956973f..c91374bb27 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -156,13 +156,6 @@ class DatabaseSqlite extends Database { return str_replace('`','',parent::tableName($name)); } - /** - * Index names have DB scope - */ - function indexName( $index ) { - return $index; - } - /** * This must be called after nextSequenceVal */ diff --git a/maintenance/archives/patch-index-renames.sql b/maintenance/archives/patch-index-renames.sql new file mode 100644 index 0000000000..d961731c96 --- /dev/null +++ b/maintenance/archives/patch-index-renames.sql @@ -0,0 +1,11 @@ +-- +-- patch-index-renames.sql +-- +-- Rename three indices because of naming conflicts + +DROP INDEX user_id ON /*_*/user_newtalk; +DROP INDEX user_ip ON /*_*/user_newtalk; +DROP INDEX usertext_timestamp ON /*_*/archive; +CREATE INDEX un_user_id ON /*_*/user_newtalk (user_id); +CREATE INDEX un_user_ip ON /*_*/user_newtalk (user_ip); +CREATE INDEX ar_usertext_timestamp ON /*_*/archive (ar_user_text,ar_timestamp); \ No newline at end of file diff --git a/maintenance/tables.sql b/maintenance/tables.sql index dd87795d97..a3b5b7a48b 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -129,8 +129,8 @@ CREATE TABLE /*_*/user ( user_editcount int ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/user_name ON /*_*/user (user_name); -CREATE INDEX /*i*/user_email_token ON /*_*/user (user_email_token); +CREATE UNIQUE INDEX user_name ON /*_*/user (user_name); +CREATE INDEX user_email_token ON /*_*/user (user_email_token); -- @@ -156,8 +156,8 @@ CREATE TABLE /*_*/user_groups ( ug_group varbinary(16) NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/ug_user_group ON /*_*/user_groups (ug_user,ug_group); -CREATE INDEX /*i*/ug_group ON /*_*/user_groups (ug_group); +CREATE UNIQUE INDEX ug_user_group ON /*_*/user_groups (ug_user,ug_group); +CREATE INDEX ug_group ON /*_*/user_groups (ug_group); -- Stores notifications of user talk page changes, for the display @@ -174,8 +174,8 @@ CREATE TABLE /*_*/user_newtalk ( ) /*$wgDBTableOptions*/; -- Indexes renamed for SQLite in 1.14 -CREATE INDEX /*i*/un_user_id ON /*_*/user_newtalk (user_id); -CREATE INDEX /*i*/un_user_ip ON /*_*/user_newtalk (user_ip); +CREATE INDEX un_user_id ON /*_*/user_newtalk (user_id); +CREATE INDEX un_user_ip ON /*_*/user_newtalk (user_ip); -- @@ -229,9 +229,9 @@ CREATE TABLE /*_*/page ( page_len int unsigned NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/name_title ON /*_*/page (page_namespace,page_title); -CREATE INDEX /*i*/page_random ON /*_*/page (page_random); -CREATE INDEX /*i*/page_len ON /*_*/page (page_len); +CREATE UNIQUE INDEX name_title ON /*_*/page (page_namespace,page_title); +CREATE INDEX page_random ON /*_*/page (page_random); +CREATE INDEX page_len ON /*_*/page (page_len); -- @@ -283,11 +283,11 @@ CREATE TABLE /*_*/revision ( ) /*$wgDBTableOptions*/ MAX_ROWS=10000000 AVG_ROW_LENGTH=1024; -- In case tables are created as MyISAM, use row hints for MySQL <5.0 to avoid 4GB limit -CREATE UNIQUE INDEX /*i*/rev_page_id ON /*_*/revision (rev_page, rev_id); -CREATE INDEX /*i*/rev_timestamp ON /*_*/revision (rev_timestamp); -CREATE INDEX /*i*/page_timestamp ON /*_*/revision (rev_page,rev_timestamp); -CREATE INDEX /*i*/user_timestamp ON /*_*/revision (rev_user,rev_timestamp); -CREATE INDEX /*i*/usertext_timestamp ON /*_*/revision (rev_user_text,rev_timestamp); +CREATE UNIQUE INDEX rev_page_id ON /*_*/revision (rev_page, rev_id); +CREATE INDEX rev_timestamp ON /*_*/revision (rev_timestamp); +CREATE INDEX page_timestamp ON /*_*/revision (rev_page,rev_timestamp); +CREATE INDEX user_timestamp ON /*_*/revision (rev_user,rev_timestamp); +CREATE INDEX usertext_timestamp ON /*_*/revision (rev_user_text,rev_timestamp); -- -- Holds text of individual page revisions. @@ -388,8 +388,8 @@ CREATE TABLE /*_*/archive ( ar_parent_id int unsigned default NULL ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/name_title_timestamp ON /*_*/archive (ar_namespace,ar_title,ar_timestamp); -CREATE INDEX /*i*/ar_usertext_timestamp ON /*_*/archive (ar_user_text,ar_timestamp); +CREATE INDEX name_title_timestamp ON /*_*/archive (ar_namespace,ar_title,ar_timestamp); +CREATE INDEX ar_usertext_timestamp ON /*_*/archive (ar_user_text,ar_timestamp); -- @@ -407,8 +407,8 @@ CREATE TABLE /*_*/pagelinks ( pl_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/pl_from ON /*_*/pagelinks (pl_from,pl_namespace,pl_title); -CREATE INDEX /*i*/pl_namespace_title ON /*_*/pagelinks (pl_namespace,pl_title,pl_from); +CREATE UNIQUE INDEX pl_from ON /*_*/pagelinks (pl_from,pl_namespace,pl_title); +CREATE INDEX pl_namespace ON /*_*/pagelinks (pl_namespace,pl_title,pl_from); -- @@ -426,8 +426,8 @@ CREATE TABLE /*_*/templatelinks ( tl_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/tl_from ON /*_*/templatelinks (tl_from,tl_namespace,tl_title); -CREATE INDEX /*i*/tl_namespace_title ON /*_*/templatelinks (tl_namespace,tl_title,tl_from); +CREATE UNIQUE INDEX tl_from ON /*_*/templatelinks (tl_from,tl_namespace,tl_title); +CREATE INDEX tl_namespace ON /*_*/templatelinks (tl_namespace,tl_title,tl_from); -- @@ -445,8 +445,8 @@ CREATE TABLE /*_*/imagelinks ( il_to varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/il_from ON /*_*/imagelinks (il_from,il_to); -CREATE INDEX /*i*/il_to ON /*_*/imagelinks (il_to,il_from); +CREATE UNIQUE INDEX il_from ON /*_*/imagelinks (il_from,il_to); +CREATE INDEX il_to ON /*_*/imagelinks (il_to,il_from); -- @@ -477,13 +477,13 @@ CREATE TABLE /*_*/categorylinks ( cl_timestamp timestamp NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/cl_from ON /*_*/categorylinks (cl_from,cl_to); +CREATE UNIQUE INDEX cl_from ON /*_*/categorylinks (cl_from,cl_to); -- We always sort within a given category... -CREATE INDEX /*i*/cl_sortkey ON /*_*/categorylinks (cl_to,cl_sortkey,cl_from); +CREATE INDEX cl_sortkey ON /*_*/categorylinks (cl_to,cl_sortkey,cl_from); -- Not really used? -CREATE INDEX /*i*/cl_timestamp ON /*_*/categorylinks (cl_to,cl_timestamp); +CREATE INDEX cl_timestamp ON /*_*/categorylinks (cl_to,cl_timestamp); -- @@ -513,10 +513,10 @@ CREATE TABLE /*_*/category ( cat_hidden tinyint unsigned NOT NULL default 0 ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/cat_title ON /*_*/category (cat_title); +CREATE UNIQUE INDEX cat_title ON /*_*/category (cat_title); -- For Special:Mostlinkedcategories -CREATE INDEX /*i*/cat_pages ON /*_*/category (cat_pages); +CREATE INDEX cat_pages ON /*_*/category (cat_pages); -- @@ -543,9 +543,9 @@ CREATE TABLE /*_*/externallinks ( el_index blob NOT NULL ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/el_from ON /*_*/externallinks (el_from, el_to(40)); -CREATE INDEX /*i*/el_to ON /*_*/externallinks (el_to(60), el_from); -CREATE INDEX /*i*/el_index ON /*_*/externallinks (el_index(60)); +CREATE INDEX el_from ON /*_*/externallinks (el_from, el_to(40)); +CREATE INDEX el_to ON /*_*/externallinks (el_to(60), el_from); +CREATE INDEX el_index ON /*_*/externallinks (el_index(60)); -- @@ -562,8 +562,8 @@ CREATE TABLE /*_*/langlinks ( ll_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/ll_from ON /*_*/langlinks (ll_from, ll_lang); -CREATE INDEX /*i*/ll_lang_title ON /*_*/langlinks (ll_lang, ll_title); +CREATE UNIQUE INDEX ll_from ON /*_*/langlinks (ll_from, ll_lang); +CREATE INDEX ll_lang_title ON /*_*/langlinks (ll_lang, ll_title); -- @@ -604,7 +604,7 @@ CREATE TABLE /*_*/site_stats ( ) /*$wgDBTableOptions*/; -- Pointless index to assuage developer superstitions -CREATE UNIQUE INDEX /*i*/ss_row_id ON /*_*/site_stats (ss_row_id); +CREATE UNIQUE INDEX ss_row_id ON /*_*/site_stats (ss_row_id); -- @@ -682,12 +682,12 @@ CREATE TABLE /*_*/ipblocks ( -- Unique index to support "user already blocked" messages -- Any new options which prevent collisions should be included -CREATE UNIQUE INDEX /*i*/ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only); +CREATE UNIQUE INDEX ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only); -CREATE INDEX /*i*/ipb_user ON /*_*/ipblocks (ipb_user); -CREATE INDEX /*i*/ipb_range ON /*_*/ipblocks (ipb_range_start(8), ipb_range_end(8)); -CREATE INDEX /*i*/ipb_timestamp ON /*_*/ipblocks (ipb_timestamp); -CREATE INDEX /*i*/ipb_expiry ON /*_*/ipblocks (ipb_expiry); +CREATE INDEX ipb_user ON /*_*/ipblocks (ipb_user); +CREATE INDEX ipb_range ON /*_*/ipblocks (ipb_range_start(8), ipb_range_end(8)); +CREATE INDEX ipb_timestamp ON /*_*/ipblocks (ipb_timestamp); +CREATE INDEX ipb_expiry ON /*_*/ipblocks (ipb_expiry); -- @@ -740,13 +740,13 @@ CREATE TABLE /*_*/image ( img_sha1 varbinary(32) NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/img_usertext_timestamp ON /*_*/image (img_user_text,img_timestamp); +CREATE INDEX img_usertext_timestamp ON /*_*/image (img_user_text,img_timestamp); -- Used by Special:Imagelist for sort-by-size -CREATE INDEX /*i*/img_size ON /*_*/image (img_size); +CREATE INDEX img_size ON /*_*/image (img_size); -- Used by Special:Newimages and Special:Imagelist -CREATE INDEX /*i*/img_timestamp ON /*_*/image (img_timestamp); +CREATE INDEX img_timestamp ON /*_*/image (img_timestamp); -- Used in API and duplicate search -CREATE INDEX /*i*/img_sha1 ON /*_*/image (img_sha1); +CREATE INDEX img_sha1 ON /*_*/image (img_sha1); -- @@ -780,11 +780,11 @@ CREATE TABLE /*_*/oldimage ( oi_sha1 varbinary(32) NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/oi_usertext_timestamp ON /*_*/oldimage (oi_user_text,oi_timestamp); -CREATE INDEX /*i*/oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp); +CREATE INDEX oi_usertext_timestamp ON /*_*/oldimage (oi_user_text,oi_timestamp); +CREATE INDEX oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp); -- oi_archive_name truncated to 14 to avoid key length overflow -CREATE INDEX /*i*/oi_name_archive_name ON /*_*/oldimage (oi_name,oi_archive_name(14)); -CREATE INDEX /*i*/oi_sha1 ON /*_*/oldimage (oi_sha1); +CREATE INDEX oi_name_archive_name ON /*_*/oldimage (oi_name,oi_archive_name(14)); +CREATE INDEX oi_sha1 ON /*_*/oldimage (oi_sha1); -- @@ -836,13 +836,13 @@ CREATE TABLE /*_*/filearchive ( ) /*$wgDBTableOptions*/; -- pick out by image name -CREATE INDEX /*i*/fa_name ON /*_*/filearchive (fa_name, fa_timestamp); +CREATE INDEX fa_name ON /*_*/filearchive (fa_name, fa_timestamp); -- pick out dupe files -CREATE INDEX /*i*/fa_group_key ON /*_*/filearchive (fa_storage_group, fa_storage_key); +CREATE INDEX fa_storage_group ON /*_*/filearchive (fa_storage_group, fa_storage_key); -- sort by deletion time -CREATE INDEX /*i*/fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp); +CREATE INDEX fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp); -- sort by uploader -CREATE INDEX /*i*/fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp); +CREATE INDEX fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp); -- @@ -918,13 +918,13 @@ CREATE TABLE /*_*/recentchanges ( rc_params blob NULL ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/rc_timestamp ON /*_*/recentchanges (rc_timestamp); -CREATE INDEX /*i*/rc_namespace_title ON /*_*/recentchanges (rc_namespace, rc_title); -CREATE INDEX /*i*/rc_cur_id ON /*_*/recentchanges (rc_cur_id); -CREATE INDEX /*i*/new_name_timestamp ON /*_*/recentchanges (rc_new,rc_namespace,rc_timestamp); -CREATE INDEX /*i*/rc_ip ON /*_*/recentchanges (rc_ip); -CREATE INDEX /*i*/rc_ns_usertext ON /*_*/recentchanges (rc_namespace, rc_user_text); -CREATE INDEX /*i*/rc_user_text ON /*_*/recentchanges (rc_user_text, rc_timestamp); +CREATE INDEX rc_timestamp ON /*_*/recentchanges (rc_timestamp); +CREATE INDEX rc_namespace_title ON /*_*/recentchanges (rc_namespace, rc_title); +CREATE INDEX rc_cur_id ON /*_*/recentchanges (rc_cur_id); +CREATE INDEX new_name_timestamp ON /*_*/recentchanges (rc_new,rc_namespace,rc_timestamp); +CREATE INDEX rc_ip ON /*_*/recentchanges (rc_ip); +CREATE INDEX rc_ns_usertext ON /*_*/recentchanges (rc_namespace, rc_user_text); +CREATE INDEX rc_user_text ON /*_*/recentchanges (rc_user_text, rc_timestamp); CREATE TABLE /*_*/watchlist ( @@ -943,8 +943,8 @@ CREATE TABLE /*_*/watchlist ( ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/wl_user_namespace_title ON /*_*/watchlist (wl_user, wl_namespace, wl_title); -CREATE INDEX /*i*/namespace_title ON /*_*/watchlist (wl_namespace, wl_title); +CREATE UNIQUE INDEX wl_user ON /*_*/watchlist (wl_user, wl_namespace, wl_title); +CREATE INDEX namespace_title ON /*_*/watchlist (wl_namespace, wl_title); -- @@ -969,7 +969,7 @@ CREATE TABLE /*_*/math ( math_mathml text ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/math_inputhash ON /*_*/math (math_inputhash); +CREATE UNIQUE INDEX math_inputhash ON /*_*/math (math_inputhash); -- @@ -991,9 +991,9 @@ CREATE TABLE /*_*/searchindex ( si_text mediumtext NOT NULL ) ENGINE=MyISAM; -CREATE UNIQUE INDEX /*i*/si_page ON /*_*/searchindex (si_page); -CREATE FULLTEXT INDEX /*i*/si_title ON /*_*/searchindex (si_title); -CREATE FULLTEXT INDEX /*i*/si_text ON /*_*/searchindex (si_text); +CREATE UNIQUE INDEX si_page ON /*_*/searchindex (si_page); +CREATE FULLTEXT INDEX si_title ON /*_*/searchindex (si_title); +CREATE FULLTEXT INDEX si_text ON /*_*/searchindex (si_text); -- @@ -1016,7 +1016,7 @@ CREATE TABLE /*_*/interwiki ( iw_trans tinyint NOT NULL default 0 ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/iw_prefix ON /*_*/interwiki (iw_prefix); +CREATE UNIQUE INDEX iw_prefix ON /*_*/interwiki (iw_prefix); -- @@ -1034,7 +1034,7 @@ CREATE TABLE /*_*/querycache ( qc_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/qc_type_value ON /*_*/querycache (qc_type,qc_value); +CREATE INDEX qc_type ON /*_*/querycache (qc_type,qc_value); -- @@ -1045,7 +1045,7 @@ CREATE TABLE /*_*/objectcache ( value mediumblob, exptime datetime ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/oc_exptime ON /*_*/objectcache (exptime); +CREATE INDEX exptime ON /*_*/objectcache (exptime); -- @@ -1057,7 +1057,7 @@ CREATE TABLE /*_*/transcache ( tc_time int NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/tc_url_idx ON /*_*/transcache (tc_url); +CREATE UNIQUE INDEX tc_url_idx ON /*_*/transcache (tc_url); CREATE TABLE /*_*/logging ( @@ -1091,10 +1091,10 @@ CREATE TABLE /*_*/logging ( log_deleted tinyint unsigned NOT NULL default 0 ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/type_time ON /*_*/logging (log_type, log_timestamp); -CREATE INDEX /*i*/user_time ON /*_*/logging (log_user, log_timestamp); -CREATE INDEX /*i*/page_time ON /*_*/logging (log_namespace, log_title, log_timestamp); -CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp); +CREATE INDEX type_time ON /*_*/logging (log_type, log_timestamp); +CREATE INDEX user_time ON /*_*/logging (log_user, log_timestamp); +CREATE INDEX page_time ON /*_*/logging (log_namespace, log_title, log_timestamp); +CREATE INDEX times ON /*_*/logging (log_timestamp); CREATE TABLE /*_*/trackbacks ( @@ -1105,7 +1105,7 @@ CREATE TABLE /*_*/trackbacks ( tb_ex text, tb_name varchar(255) ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/tb_page ON /*_*/trackbacks (tb_page); +CREATE INDEX tb_page ON /*_*/trackbacks (tb_page); -- Jobs performed by parallel apache threads or a command-line daemon @@ -1126,7 +1126,7 @@ CREATE TABLE /*_*/job ( job_params blob NOT NULL ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/job_cmd_namespace_title ON /*_*/job (job_cmd, job_namespace, job_title); +CREATE INDEX job_cmd ON /*_*/job (job_cmd, job_namespace, job_title); -- Details of updates to cached special pages @@ -1139,7 +1139,7 @@ CREATE TABLE /*_*/querycache_info ( qci_timestamp binary(14) NOT NULL default '19700101000000' ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/qci_type ON /*_*/querycache_info (qci_type); +CREATE UNIQUE INDEX qci_type ON /*_*/querycache_info (qci_type); -- For each redirect, this table contains exactly one row defining its target @@ -1155,7 +1155,7 @@ CREATE TABLE /*_*/redirect ( rd_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/rd_ns_title ON /*_*/redirect (rd_namespace,rd_title,rd_from); +CREATE INDEX rd_ns_title ON /*_*/redirect (rd_namespace,rd_title,rd_from); -- Used for caching expensive grouped queries that need two links (for example double-redirects) @@ -1175,9 +1175,9 @@ CREATE TABLE /*_*/querycachetwo ( qcc_titletwo varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/qcc_type ON /*_*/querycachetwo (qcc_type,qcc_value); -CREATE INDEX /*i*/qcc_title ON /*_*/querycachetwo (qcc_type,qcc_namespace,qcc_title); -CREATE INDEX /*i*/qcc_titletwo ON /*_*/querycachetwo (qcc_type,qcc_namespacetwo,qcc_titletwo); +CREATE INDEX qcc_type ON /*_*/querycachetwo (qcc_type,qcc_value); +CREATE INDEX qcc_title ON /*_*/querycachetwo (qcc_type,qcc_namespace,qcc_title); +CREATE INDEX qcc_titletwo ON /*_*/querycachetwo (qcc_type,qcc_namespacetwo,qcc_titletwo); -- Used for storing page restrictions (i.e. protection levels) @@ -1198,10 +1198,10 @@ CREATE TABLE /*_*/page_restrictions ( pr_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/pr_pagetype ON /*_*/page_restrictions (pr_page,pr_type); -CREATE UNIQUE INDEX /*i*/pr_typelevel ON /*_*/page_restrictions (pr_type,pr_level); -CREATE UNIQUE INDEX /*i*/pr_level ON /*_*/page_restrictions (pr_level); -CREATE UNIQUE INDEX /*i*/pr_cascade ON /*_*/page_restrictions (pr_cascade); +CREATE UNIQUE INDEX pr_pagetype ON /*_*/page_restrictions (pr_page,pr_type); +CREATE UNIQUE INDEX pr_typelevel ON /*_*/page_restrictions (pr_type,pr_level); +CREATE UNIQUE INDEX pr_level ON /*_*/page_restrictions (pr_level); +CREATE UNIQUE INDEX pr_cascade ON /*_*/page_restrictions (pr_cascade); -- Protected titles - nonexistent pages that have been protected @@ -1215,8 +1215,8 @@ CREATE TABLE /*_*/protected_titles ( pt_create_perm varbinary(60) NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/pt_namespace_title ON /*_*/protected_titles (pt_namespace,pt_title); -CREATE INDEX /*i*/pt_timestamp ON /*_*/protected_titles (pt_timestamp); +CREATE UNIQUE INDEX pt_namespace ON /*_*/protected_titles (pt_namespace,pt_title); +CREATE INDEX pt_timestamp ON /*_*/protected_titles (pt_timestamp); -- Name/value pairs indexed by page_id @@ -1226,7 +1226,7 @@ CREATE TABLE /*_*/page_props ( pp_value blob NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/pp_page_propname ON /*_*/page_props (pp_page,pp_propname); +CREATE UNIQUE INDEX pp_page ON /*_*/page_props (pp_page,pp_propname); -- A table to log updates, one text key row per update. diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index dade790b4e..094b14932a 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -149,6 +149,7 @@ $wgUpdates = array( array( 'add_field', 'site_stats', 'ss_active_users', 'patch-ss_active_users.sql' ), array( 'do_active_users_init' ), array( 'add_field', 'ipblocks', 'ipb_allow_usertalk', 'patch-ipb_allow_usertalk.sql' ), + array( 'add_index', 'user_newtalk', 'un_user_id', 'patch-index-renames.sql' ), ), 'sqlite' => array( -- 2.20.1