resourceloader: Remove obsolete msg_resource database table

No longer used as of 5d5b269e0e63641f3.

Change-Id: Ieb8448185cf39aa396e902e025e673f0886ac3c3

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0dbcc66..319f0d0 100644 (file)
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -175,6 +175,7 @@ changes to languages because of Phabricator reports.
 * Obsolete maintenance scripts clearCacheStats.php and showCacheStats.php
   were removed. The underlying data is sent to StatsD (see $wgStatsdServer).
 * Removed msg_resource_links database table and associated code.
+* Removed msg_resource database table and associated code.
 
 == Compatibility ==
 

diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
index 308f7b0..770f493 100644 (file)
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -67,6 +67,7 @@ class MssqlUpdater extends DatabaseUpdater {
 
                        // 1.27
                        array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
                );
        }
 

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index f7beb7c..add600d 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -183,7 +183,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ),
                        array( 'doClFieldsUpdate' ),
                        array( 'doCollationUpdate' ),
-                       array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
                        array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
                        array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ),
                        array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ),
@@ -278,6 +277,7 @@ class MysqlUpdater extends DatabaseUpdater {
 
                        // 1.27
                        array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
                );
        }
 

diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index d82009d..d3c2184 100644 (file)
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -110,6 +110,7 @@ class OracleUpdater extends DatabaseUpdater {
 
                        // 1.27
                        array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
 
                        // KEEP THIS AT THE BOTTOM!!
                        array( 'doRebuildDuplicateFunction' ),

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index 966f503..7880557 100644 (file)
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -85,7 +85,6 @@ class PostgresUpdater extends DatabaseUpdater {
                        array( 'addTable', 'log_search', 'patch-log_search.sql' ),
                        array( 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ),
                        array( 'addTable', 'iwlinks', 'patch-iwlinks.sql' ),
-                       array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
                        array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
                        array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
                        array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ),
@@ -427,6 +426,7 @@ class PostgresUpdater extends DatabaseUpdater {
 
                        // 1.27
                        array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
                );
        }
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 9f992ec..5279c2d 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -66,7 +66,6 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'dropIndex', 'iwlinks', 'iwl_prefix', 'patch-kill-iwl_prefix.sql' ),
                        array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ),
                        array( 'doCollationUpdate' ),
-                       array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
                        array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
                        array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ),
                        array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ),
@@ -147,6 +146,7 @@ class SqliteUpdater extends DatabaseUpdater {
 
                        // 1.27
                        array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
                );
        }
 

diff --git a/maintenance/archives/patch-msg_resource.sql b/maintenance/archives/patch-msg_resource.sql
deleted file mode 100644 (file)
index c2ede12..0000000
--- a/maintenance/archives/patch-msg_resource.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Table for storing JSON message blobs for ResourceLoader
-CREATE TABLE /*_*/msg_resource (
-  -- Resource name
-  mr_resource varbinary(255) NOT NULL,
-  -- Language code
-  mr_lang varbinary(32) NOT NULL,
-  -- JSON blob. This is an incomplete JSON object, i.e. without the wrapping {}
-  mr_blob mediumblob NOT NULL,
-  -- Timestamp of last update
-  mr_timestamp binary(14) NOT NULL
-) /*$wgDBTableOptions*/;
-CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource(mr_resource, mr_lang);

diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index d51e009..0e58563 100644 (file)
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -1224,19 +1224,6 @@ CREATE TABLE /*_*/l10n_cache (
 );
 CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
 
--- Table for caching JSON message texts for ResourceLoader
-CREATE TABLE /*_*/msg_resource (
-  -- Resource name
-  mr_resource nvarchar(255) NOT NULL,
-  -- Language code
-  mr_lang nvarchar(32) NOT NULL,
-  -- JSON blob
-  mr_blob varbinary(max) NOT NULL,
-  -- Timestamp of last update
-  mr_timestamp varchar(14) NOT NULL
-);
-CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource (mr_resource, mr_lang);
-
 -- Table caching which local files a module depends on that aren't
 -- registered directly, used for fast retrieval of file dependency.
 -- Currently only used for tracking images that CSS depends on

diff --git a/maintenance/oracle/archives/patch_16_17_schema_changes.sql b/maintenance/oracle/archives/patch_16_17_schema_changes.sql
index ecfc055..dfaaf5c 100644 (file)
--- a/maintenance/oracle/archives/patch_16_17_schema_changes.sql
+++ b/maintenance/oracle/archives/patch_16_17_schema_changes.sql
@@ -56,14 +56,6 @@ CREATE TABLE &mw_prefix.module_deps (
 );
 CREATE UNIQUE INDEX &mw_prefix.module_deps_u01 ON &mw_prefix.module_deps (md_module, md_skin);
 
-CREATE TABLE &mw_prefix.msg_resource (
-  mr_resource VARCHAR2(255) NOT NULL,
-  mr_lang varchar2(32) NOT NULL,
-  mr_blob BLOB NOT NULL,
-  mr_timestamp TIMESTAMP(6) WITH TIME ZONE NOT NULL
-);
-CREATE UNIQUE INDEX &mw_prefix.msg_resource_u01 ON &mw_prefix.msg_resource (mr_resource, mr_lang);
-
 ALTER TABLE &mw_prefix.oldimage MODIFY oi_name DEFAULT 0;
 ALTER TABLE &mw_prefix.oldimage MODIFY oi_size DEFAULT 0;
 ALTER TABLE &mw_prefix.oldimage MODIFY oi_width DEFAULT 0;

diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql
index 3ab2d06..9a70b87 100644 (file)
--- a/maintenance/oracle/tables.sql
+++ b/maintenance/oracle/tables.sql
@@ -659,14 +659,6 @@ CREATE TABLE &mw_prefix.l10n_cache (
 );
 CREATE INDEX &mw_prefix.l10n_cache_u01 ON &mw_prefix.l10n_cache (lc_lang, lc_key);
 
-CREATE TABLE &mw_prefix.msg_resource (
-  mr_resource VARCHAR2(255) NOT NULL,
-  mr_lang varchar2(32) NOT NULL,
-  mr_blob BLOB NOT NULL,
-  mr_timestamp TIMESTAMP(6) WITH TIME ZONE NOT NULL
-);
-CREATE UNIQUE INDEX &mw_prefix.msg_resource_u01 ON &mw_prefix.msg_resource (mr_resource, mr_lang);
-
 CREATE TABLE &mw_prefix.module_deps (
   md_module VARCHAR2(255) NOT NULL,
   md_skin VARCHAR2(32) NOT NULL,

diff --git a/maintenance/postgres/archives/patch-msg_resource.sql b/maintenance/postgres/archives/patch-msg_resource.sql
deleted file mode 100644 (file)
index 68756d1..0000000
--- a/maintenance/postgres/archives/patch-msg_resource.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE msg_resource (
-       mr_resource TEXT NOT NULL,
-       mr_lang         TEXT NOT NULL,
-       mr_blob         TEXT NOT NULL,
-       mr_timestamp    TIMESTAMPTZ NOT NULL
-);
-
-CREATE UNIQUE INDEX mr_resource_lang ON msg_resource (mr_resource, mr_lang);

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 58fd61b..ad7bd9d 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -690,14 +690,6 @@ CREATE UNIQUE INDEX iwl_from ON iwlinks (iwl_from, iwl_prefix, iwl_title);
 CREATE UNIQUE INDEX iwl_prefix_title_from ON iwlinks (iwl_prefix, iwl_title, iwl_from);
 CREATE UNIQUE INDEX iwl_prefix_from_title ON iwlinks (iwl_prefix, iwl_from, iwl_title);
 
-CREATE TABLE msg_resource (
-  mr_resource   TEXT         NOT NULL,
-  mr_lang       TEXT         NOT NULL,
-  mr_blob       TEXT         NOT NULL,
-  mr_timestamp  TIMESTAMPTZ  NOT NULL
-);
-CREATE UNIQUE INDEX mr_resource_lang ON msg_resource (mr_resource, mr_lang);
-
 CREATE TABLE module_deps (
   md_module  TEXT  NOT NULL,
   md_skin    TEXT  NOT NULL,

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 3f143b2..756f6c0 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1496,19 +1496,6 @@ CREATE TABLE /*_*/l10n_cache (
 ) /*$wgDBTableOptions*/;
 CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
 
--- Table for caching JSON message blobs for ResourceLoader
-CREATE TABLE /*_*/msg_resource (
-  -- Resource name
-  mr_resource varbinary(255) NOT NULL,
-  -- Language code
-  mr_lang varbinary(32) NOT NULL,
-  -- JSON blob
-  mr_blob mediumblob NOT NULL,
-  -- Timestamp of last update
-  mr_timestamp binary(14) NOT NULL
-) /*$wgDBTableOptions*/;
-CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource (mr_resource, mr_lang);
-
 -- Table caching which local files a module depends on that aren't
 -- registered directly, used for fast retrieval of file dependency.
 -- Currently only used for tracking images that CSS depends on

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index e09a585..b91a5bc 100644 (file)
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -964,7 +964,7 @@ class ParserTest {
                        'site_stats', 'ipblocks', 'image', 'oldimage',
                        'recentchanges', 'watchlist', 'interwiki', 'logging',
                        'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
-                       'archive', 'user_groups', 'page_props', 'category', 'msg_resource'
+                       'archive', 'user_groups', 'page_props', 'category'
                );
 
                if ( in_array( $this->db->getType(), array( 'mysql', 'sqlite', 'oracle' ) ) ) {