Convert INDEX into PRIMARY KEY in l10n_cache

Bug: T146591
Change-Id: I85ab18bfa30e562e76253e3ef71653dbf46db041

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index fb69bfd..c104252 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -203,6 +203,8 @@ changes to languages because of Phabricator reports.
   templatelinks, text, transcache, user_former_groups, user_properties.
 * IDatabase::nextSequenceValue() is no longer needed by any database backends
   (formerly it was needed by PostgreSQL and Oracle), and is now deprecated.
+* (T146591) The lc_lang_key index on the l10n_cache table has been changed into a
+  PRIMARY KEY.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index b42ae46..aeecbb0 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -327,6 +327,8 @@ class MysqlUpdater extends DatabaseUpdater {
                                'patch-user_properties-fix-pk.sql' ],
                        [ 'addTable', 'comment', 'patch-comment-table.sql' ],
                        [ 'migrateComments' ],
+                       [ 'renameIndex', 'l10n_cache', 'lc_lang_key', 'PRIMARY', false,
+                               'patch-l10n_cache-primary-key.sql' ],
                ];
        }
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index d0ed822..9f71001 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -191,6 +191,8 @@ class SqliteUpdater extends DatabaseUpdater {
                                'patch-user_properties-fix-pk.sql' ],
                        [ 'addTable', 'comment', 'patch-comment-table.sql' ],
                        [ 'migrateComments' ],
+                       [ 'renameIndex', 'l10n_cache', 'lc_lang_key', 'PRIMARY', false,
+                               'patch-l10n_cache-primary-key.sql' ],
                ];
        }
 

diff --git a/maintenance/archives/patch-l10n_cache-primary-key.sql b/maintenance/archives/patch-l10n_cache-primary-key.sql
new file mode 100644 (file)
index 0000000..d583039
--- /dev/null
+++ b/maintenance/archives/patch-l10n_cache-primary-key.sql
@@ -0,0 +1,8 @@
+--
+-- patch-l10n_cache-primary-key.sql
+--
+-- Bug T146591. Add l10n_cache primary key
+
+DELETE FROM /*$wgDBprefix*/l10n_cache;
+
+ALTER TABLE /*$wgDBprefix*/l10n_cache DROP KEY /*i*/lc_lang_key, ADD PRIMARY KEY(lc_lang, lc_key);

diff --git a/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql b/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql
new file mode 100644 (file)
index 0000000..55df392
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql
@@ -0,0 +1,12 @@
+--
+-- patch-l10n_cache-primary-key.sql
+--
+-- Bug T146591. Add l10n_cache primary key
+DROP TABLE IF EXISTS /*_*/l10n_cache;
+
+CREATE TABLE /*$wgDBprefix*/l10n_cache (
+    lc_lang varbinary(32) NOT NULL,
+    lc_key varchar(255) NOT NULL,
+    lc_value mediumblob NOT NULL,
+    PRIMARY KEY (lc_lang, lc_key)
+) /*$wgDBTableOptions*/;

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index d6ef40c..bed80db 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1738,9 +1738,9 @@ CREATE TABLE /*_*/l10n_cache (
   -- Cache key
   lc_key varchar(255) NOT NULL,
   -- Value
-  lc_value mediumblob NOT NULL
+  lc_value mediumblob NOT NULL,
+  PRIMARY KEY (lc_lang, lc_key)
 ) /*$wgDBTableOptions*/;
-CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
 
 -- Table caching which local files a module depends on that aren't
 -- registered directly, used for fast retrieval of file dependency.