From 27a2aceb25308a54bb34b44323bde64f4790a2e0 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 28 Aug 2018 10:44:03 -0700 Subject: [PATCH] Drop the transcache table from the schema Bug: T189702 Change-Id: I3286a99165953392126fcff07d565738863de6a1 --- includes/installer/DatabaseUpdater.php | 15 --------------- includes/installer/MssqlUpdater.php | 1 + includes/installer/MysqlUpdater.php | 4 +--- includes/installer/OracleUpdater.php | 1 + includes/installer/PostgresUpdater.php | 1 + includes/installer/SqliteUpdater.php | 3 +-- maintenance/archives/patch-tc-timestamp.sql | 4 ---- maintenance/archives/patch-transcache-fix-pk.sql | 1 - maintenance/archives/patch-transcache.sql | 7 ------- maintenance/mssql/tables.sql | 12 ------------ maintenance/oracle/tables.sql | 7 ------- maintenance/postgres/tables.sql | 6 ------ maintenance/sqlite/archives/initial-indexes.sql | 8 -------- .../sqlite/archives/patch-tc-timestamp.sql | 3 --- .../sqlite/archives/patch-transcache-fix-pk.sql | 12 ------------ maintenance/tables.sql | 10 ---------- 16 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 maintenance/archives/patch-tc-timestamp.sql delete mode 100644 maintenance/archives/patch-transcache-fix-pk.sql delete mode 100644 maintenance/archives/patch-transcache.sql delete mode 100644 maintenance/sqlite/archives/patch-tc-timestamp.sql delete mode 100644 maintenance/sqlite/archives/patch-transcache-fix-pk.sql diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index e49a846679..e17d1635d2 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -1153,21 +1153,6 @@ abstract class DatabaseUpdater { } } - /** - * Updates the timestamps in the transcache table - * @return bool - */ - protected function doUpdateTranscacheField() { - if ( $this->updateRowExists( 'convert transcache field' ) ) { - $this->output( "...transcache tc_time already converted.\n" ); - - return true; - } - - return $this->applyPatch( 'patch-tc-timestamp.sql', false, - "Converting tc_time from UNIX epoch to MediaWiki timestamp" ); - } - /** * Update CategoryLinks collation */ diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php index 6ebf95e261..0181ab224b 100644 --- a/includes/installer/MssqlUpdater.php +++ b/includes/installer/MssqlUpdater.php @@ -145,6 +145,7 @@ class MssqlUpdater extends DatabaseUpdater { [ 'addIndex', 'page_props', 'PRIMARY', 'patch-page_props-pk.sql' ], [ 'addIndex', 'site_identifiers', 'PRIMARY', 'patch-site_identifiers-pk.sql' ], [ 'addIndex', 'recentchanges', 'rc_this_oldid', 'patch-recentchanges-rc_this_oldid-index.sql' ], + [ 'dropTable', 'transcache' ], ]; } diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index 408f2fbb36..9469cf29ac 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -84,7 +84,6 @@ class MysqlUpdater extends DatabaseUpdater { [ 'doUserGroupsUpdate' ], [ 'addField', 'site_stats', 'ss_total_pages', 'patch-ss_total_articles.sql' ], [ 'addTable', 'user_newtalk', 'patch-usernewtalk.sql' ], - [ 'addTable', 'transcache', 'patch-transcache.sql' ], [ 'addField', 'interwiki', 'iw_trans', 'patch-interwiki-trans.sql' ], // 1.6 @@ -172,7 +171,6 @@ class MysqlUpdater extends DatabaseUpdater { [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], [ 'addIndex', 'change_tag', 'change_tag_rc_tag', 'patch-change_tag-indexes.sql' ], [ 'addField', 'redirect', 'rd_interwiki', 'patch-rd_interwiki.sql' ], - [ 'doUpdateTranscacheField' ], [ 'doUpdateMimeMinorField' ], // 1.17 @@ -319,7 +317,6 @@ class MysqlUpdater extends DatabaseUpdater { [ 'renameIndex', 'querycache_info', 'qci_type', 'PRIMARY', false, 'patch-querycache_info-fix-pk.sql' ], [ 'renameIndex', 'site_stats', 'ss_row_id', 'PRIMARY', false, 'patch-site_stats-fix-pk.sql' ], - [ 'renameIndex', 'transcache', 'tc_url_idx', 'PRIMARY', false, 'patch-transcache-fix-pk.sql' ], [ 'renameIndex', 'user_former_groups', 'ufg_user_group', 'PRIMARY', false, 'patch-user_former_groups-fix-pk.sql' ], [ 'renameIndex', 'user_properties', 'user_properties_user_property', 'PRIMARY', false, @@ -368,6 +365,7 @@ class MysqlUpdater extends DatabaseUpdater { [ 'renameIndex', 'site_identifiers', 'site_ids_type', 'PRIMARY', false, 'patch-site_identifiers-fix-pk.sql' ], [ 'addIndex', 'recentchanges', 'rc_this_oldid', 'patch-recentchanges-rc_this_oldid-index.sql' ], + [ 'dropTable', 'transcache' ], ]; } diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index fbb7696b07..aa23d2c75a 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -156,6 +156,7 @@ class OracleUpdater extends DatabaseUpdater { [ 'addIndex', 'archive', 'ar_revid_uniq', 'patch-archive-ar_rev_id-unique.sql' ], [ 'populateContentTables' ], [ 'addIndex', 'recentchanges', 'rc_this_oldid', 'patch-recentchanges-rc_this_oldid-index.sql' ], + [ 'dropTable', 'transcache' ], // KEEP THIS AT THE BOTTOM!! [ 'doRebuildDuplicateFunction' ], diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index e8663fbbe3..1be837ad2b 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -591,6 +591,7 @@ class PostgresUpdater extends DatabaseUpdater { [ 'addIndex', 'protected_titles', 'protected_titles_pkey', 'patch-protected_titles-pk.sql' ], [ 'addIndex', 'site_identifiers', 'site_identifiers_pkey', 'patch-site_identifiers-pk.sql' ], [ 'addPgIndex', 'recentchanges', 'rc_this_oldid', '(rc_this_oldid)' ], + [ 'dropTable', 'transcache' ], ]; } diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 57bf38975d..b48ac9b5ce 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -56,7 +56,6 @@ class SqliteUpdater extends DatabaseUpdater { [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], [ 'addIndex', 'change_tag', 'change_tag_rc_tag', 'patch-change_tag-indexes.sql' ], [ 'addField', 'redirect', 'rd_interwiki', 'patch-rd_interwiki.sql' ], - [ 'doUpdateTranscacheField' ], [ 'sqliteSetupSearchindex' ], // 1.17 @@ -184,7 +183,6 @@ class SqliteUpdater extends DatabaseUpdater { [ 'renameIndex', 'querycache_info', 'qci_type', 'PRIMARY', false, 'patch-querycache_info-fix-pk.sql' ], [ 'renameIndex', 'site_stats', 'ss_row_id', 'PRIMARY', false, 'patch-site_stats-fix-pk.sql' ], - [ 'renameIndex', 'transcache', 'tc_url_idx', 'PRIMARY', false, 'patch-transcache-fix-pk.sql' ], [ 'renameIndex', 'user_former_groups', 'ufg_user_group', 'PRIMARY', false, 'patch-user_former_groups-fix-pk.sql' ], [ 'renameIndex', 'user_properties', 'user_properties_user_property', 'PRIMARY', false, @@ -232,6 +230,7 @@ class SqliteUpdater extends DatabaseUpdater { [ 'renameIndex', 'site_identifiers', 'site_ids_type', 'PRIMARY', false, 'patch-site_identifiers-fix-pk.sql' ], [ 'addIndex', 'recentchanges', 'rc_this_oldid', 'patch-recentchanges-rc_this_oldid-index.sql' ], + [ 'dropTable', 'transcache' ], ]; } diff --git a/maintenance/archives/patch-tc-timestamp.sql b/maintenance/archives/patch-tc-timestamp.sql deleted file mode 100644 index 3f7dde41e0..0000000000 --- a/maintenance/archives/patch-tc-timestamp.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE /*_*/transcache MODIFY tc_time binary(14); -UPDATE /*_*/transcache SET tc_time = DATE_FORMAT(FROM_UNIXTIME(tc_time), "%Y%c%d%H%i%s"); - -INSERT INTO /*_*/updatelog(ul_key) VALUES ('convert transcache field'); diff --git a/maintenance/archives/patch-transcache-fix-pk.sql b/maintenance/archives/patch-transcache-fix-pk.sql deleted file mode 100644 index 2e8fea1ba9..0000000000 --- a/maintenance/archives/patch-transcache-fix-pk.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE /*_*/transcache DROP KEY /*i*/tc_url_idx, ADD PRIMARY KEY (tc_url); diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql deleted file mode 100644 index 70870efa7a..0000000000 --- a/maintenance/archives/patch-transcache.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE /*$wgDBprefix*/transcache ( - tc_url varbinary(255) NOT NULL, - tc_contents TEXT, - tc_time binary(14) NOT NULL, - UNIQUE INDEX tc_url_idx(tc_url) -) /*$wgDBTableOptions*/; - diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql index ebbd6e3569..c9a1d12326 100644 --- a/maintenance/mssql/tables.sql +++ b/maintenance/mssql/tables.sql @@ -1149,18 +1149,6 @@ CREATE TABLE /*_*/objectcache ( CREATE INDEX /*i*/exptime ON /*_*/objectcache (exptime); --- --- Cache of interwiki transclusion --- -CREATE TABLE /*_*/transcache ( - tc_url nvarchar(255) NOT NULL, - tc_contents nvarchar(max), - tc_time varchar(14) NOT NULL -); - -CREATE UNIQUE INDEX /*i*/tc_url_idx ON /*_*/transcache (tc_url); - - CREATE TABLE /*_*/logging ( -- Log ID, for referring to this specific log entry, probably for deletion and such. log_id int NOT NULL PRIMARY KEY IDENTITY(0,1), diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index 7497c20bdb..3763d194ee 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -775,13 +775,6 @@ CREATE TABLE &mw_prefix.objectcache ( ); CREATE INDEX &mw_prefix.objectcache_i01 ON &mw_prefix.objectcache (exptime); -CREATE TABLE &mw_prefix.transcache ( - tc_url VARCHAR2(255) NOT NULL, - tc_contents CLOB NOT NULL, - tc_time TIMESTAMP(6) WITH TIME ZONE NOT NULL -); -CREATE UNIQUE INDEX &mw_prefix.transcache_u01 ON &mw_prefix.transcache (tc_url); - CREATE SEQUENCE logging_log_id_seq; CREATE TABLE &mw_prefix.logging ( diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index db68248d88..1a594f08c8 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -647,12 +647,6 @@ CREATE TABLE objectcache ( ); CREATE INDEX objectcacache_exptime ON objectcache (exptime); -CREATE TABLE transcache ( - tc_url TEXT NOT NULL UNIQUE, - tc_contents TEXT NOT NULL, - tc_time TIMESTAMPTZ NOT NULL -); - CREATE SEQUENCE logging_log_id_seq; CREATE TABLE logging ( diff --git a/maintenance/sqlite/archives/initial-indexes.sql b/maintenance/sqlite/archives/initial-indexes.sql index f6c55fcb42..ab273a5be4 100644 --- a/maintenance/sqlite/archives/initial-indexes.sql +++ b/maintenance/sqlite/archives/initial-indexes.sql @@ -394,14 +394,6 @@ CREATE UNIQUE INDEX /*i*/si_page ON /*_*/searchindex (si_page); CREATE INDEX /*i*/si_title ON /*_*/searchindex (si_title); CREATE INDEX /*i*/si_text ON /*_*/searchindex (si_text); -DROP TABLE IF EXISTS /*_*/transcache; -CREATE TABLE /*_*/transcache ( - tc_url varbinary(255) NOT NULL, - tc_contents text, - tc_time int NOT NULL -) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/tc_url_idx ON /*_*/transcache (tc_url); - DROP TABLE IF EXISTS /*_*/querycache_info; CREATE TABLE /*_*/querycache_info ( qci_type varbinary(32) NOT NULL default '', diff --git a/maintenance/sqlite/archives/patch-tc-timestamp.sql b/maintenance/sqlite/archives/patch-tc-timestamp.sql deleted file mode 100644 index 5c09bf3574..0000000000 --- a/maintenance/sqlite/archives/patch-tc-timestamp.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE /*_*/transcache SET tc_time = strftime('%Y%m%d%H%M%S', datetime(tc_time, 'unixepoch')); - -INSERT INTO /*_*/updatelog (ul_key) VALUES ('convert transcache field'); diff --git a/maintenance/sqlite/archives/patch-transcache-fix-pk.sql b/maintenance/sqlite/archives/patch-transcache-fix-pk.sql deleted file mode 100644 index 53f83e1f02..0000000000 --- a/maintenance/sqlite/archives/patch-transcache-fix-pk.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE /*_*/transcache_tmp ( - tc_url varbinary(255) NOT NULL PRIMARY KEY, - tc_contents text, - tc_time binary(14) NOT NULL -) /*$wgDBTableOptions*/; - -INSERT INTO /*_*/transcache_tmp - SELECT * FROM /*_*/transcache; - -DROP TABLE /*_*/transcache; - -ALTER TABLE /*_*/transcache_tmp RENAME TO /*_*/transcache; \ No newline at end of file diff --git a/maintenance/tables.sql b/maintenance/tables.sql index fe064f516a..245f35c739 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1584,16 +1584,6 @@ CREATE TABLE /*_*/objectcache ( CREATE INDEX /*i*/exptime ON /*_*/objectcache (exptime); --- --- Cache of interwiki transclusion --- -CREATE TABLE /*_*/transcache ( - tc_url varbinary(255) NOT NULL PRIMARY KEY, - tc_contents text, - tc_time binary(14) NOT NULL -) /*$wgDBTableOptions*/; - - CREATE TABLE /*_*/logging ( -- Log ID, for referring to this specific log entry, probably for deletion and such. log_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, -- 2.20.1