jenkins-bot has submitted this change and it was merged. Change subject: Drop ss_total_views and page_counter fields from MediaWiki ......................................................................
Drop ss_total_views and page_counter fields from MediaWiki Follows up removal of code using hitcounters in 90d90dad6 RFC: https://www.mediawiki.org/wiki/Requests_for_comment/Removing_hit_counters_from_MediaWiki_core Change-Id: Ieeb558f9523c11965cbc1941cad4f316c00c85c5 --- M includes/installer/Installer.php M includes/installer/MssqlUpdater.php M includes/installer/MysqlUpdater.php M includes/installer/OracleUpdater.php M includes/installer/PostgresUpdater.php M includes/installer/SqliteUpdater.php A maintenance/archives/patch-drop-page_counter.sql A maintenance/archives/patch-drop-ss_total_views.sql M maintenance/dictionary/mediawiki.dic M maintenance/mssql/tables.sql M maintenance/oracle/tables.sql M maintenance/postgres/compare_schemas.pl M maintenance/postgres/tables.sql M maintenance/sqlite/archives/initial-indexes.sql A maintenance/sqlite/archives/patch-drop-page_counter.sql M maintenance/sqlite/archives/patch-drop-ss_admins.sql A maintenance/sqlite/archives/patch-drop-ss_total_views.sql M maintenance/tables.sql 18 files changed, 74 insertions(+), 58 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 760254d..381f23c 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -674,7 +674,6 @@ 'site_stats', array( 'ss_row_id' => 1, - 'ss_total_views' => 0, 'ss_total_edits' => 0, 'ss_good_articles' => 0, 'ss_total_pages' => 0, diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php index ed11f8b..2d7afc1 100644 --- a/includes/installer/MssqlUpdater.php +++ b/includes/installer/MssqlUpdater.php @@ -42,6 +42,9 @@ // 1.24 array( 'addField', 'page', 'page_lang', 'patch-page-page_lang.sql'), + array( 'dropTable', 'hitcounter' ), + array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), + array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), // Constraint updates array( 'updateConstraints', 'category_types', 'categorylinks', 'cl_type' ), array( 'updateConstraints', 'major_mime', 'filearchive', 'fa_major_mime' ), diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index c3dedbc..d7b0dec 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -266,6 +266,9 @@ 'patch-oi_major_mime-chemical.sql' ), array( 'modifyField', 'filearchive', 'fa_major_mime', 'patch-fa_major_mime-chemical.sql' ), + array( 'dropTable', 'hitcounter' ), + array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), + array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), ); } @@ -516,7 +519,6 @@ page_namespace int NOT NULL, page_title varchar(255) binary NOT NULL, page_restrictions tinyblob NOT NULL, - page_counter bigint(20) unsigned NOT NULL default '0', page_is_redirect tinyint(1) unsigned NOT NULL default '0', page_is_new tinyint(1) unsigned NOT NULL default '0', page_random real unsigned NOT NULL, @@ -598,9 +600,9 @@ $this->output( "......Setting up page table.\n" ); $this->db->query( "INSERT INTO $page (page_id, page_namespace, page_title, - page_restrictions, page_counter, page_is_redirect, page_is_new, page_random, + page_restrictions, page_is_redirect, page_is_new, page_random, page_touched, page_latest, page_len) - SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, + SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_is_redirect, cur_is_new, cur_random, cur_touched, rev_id, LENGTH(cur_text) FROM $cur,$revision WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index 1846854..c731d98 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -102,6 +102,9 @@ // 1.24 array( 'addField', 'page', 'page_lang', 'patch-page-page_lang.sql' ), + array( 'dropTable', 'hitcounter' ), + array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), + array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), // KEEP THIS AT THE BOTTOM!! array( 'doRebuildDuplicateFunction' ), @@ -172,7 +175,6 @@ 'page_id' => 0, 'page_namespace' => 0, 'page_title' => ' ', - 'page_counter' => 0, 'page_is_redirect' => 0, 'page_is_new' => 0, 'page_random' => 0, diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index 9e8ee94..3b1c579 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -418,6 +418,9 @@ array( 'addPgField', 'pagelinks', 'pl_from_namespace', 'INTEGER NOT NULL DEFAULT 0' ), array( 'addPgField', 'templatelinks', 'tl_from_namespace', 'INTEGER NOT NULL DEFAULT 0' ), array( 'addPgField', 'imagelinks', 'il_from_namespace', 'INTEGER NOT NULL DEFAULT 0' ), + array( 'dropTable', 'hitcounter' ), + array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), + array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), ); } diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 91cbb04..490cdb7 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -137,6 +137,9 @@ array( 'addField', 'pagelinks', 'pl_from_namespace', 'patch-pl_from_namespace.sql' ), array( 'addField', 'templatelinks', 'tl_from_namespace', 'patch-tl_from_namespace.sql' ), array( 'addField', 'imagelinks', 'il_from_namespace', 'patch-il_from_namespace.sql' ), + array( 'dropTable', 'hitcounter' ), + array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), + array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), ); } diff --git a/maintenance/archives/patch-drop-page_counter.sql b/maintenance/archives/patch-drop-page_counter.sql new file mode 100644 index 0000000..1d8e701 --- /dev/null +++ b/maintenance/archives/patch-drop-page_counter.sql @@ -0,0 +1,2 @@ +-- field is deprecated and no longer updated as of 1.25 +ALTER TABLE /*_*/page DROP COLUMN page_counter; diff --git a/maintenance/archives/patch-drop-ss_total_views.sql b/maintenance/archives/patch-drop-ss_total_views.sql new file mode 100644 index 0000000..0059193 --- /dev/null +++ b/maintenance/archives/patch-drop-ss_total_views.sql @@ -0,0 +1,2 @@ +-- field is deprecated and no longer updated as of 1.24 +ALTER TABLE /*_*/site_stats DROP COLUMN ss_total_views; \ No newline at end of file diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index c6281fd..dd27c8c 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -1811,7 +1811,6 @@ historywarning hit hitcount -hitcounter hits hlist hmac diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql index b9cd715..5b09ffd 100644 --- a/maintenance/mssql/tables.sql +++ b/maintenance/mssql/tables.sql @@ -111,7 +111,6 @@ page_namespace INT NOT NULL, page_title NVARCHAR(255) NOT NULL, page_restrictions NVARCHAR(255) NOT NULL, - page_counter BIGINT NOT NULL DEFAULT 0, page_is_redirect BIT NOT NULL DEFAULT 0, page_is_new BIT NOT NULL DEFAULT 0, page_random real NOT NULL DEFAULT RAND(), @@ -422,9 +421,6 @@ -- The single row should contain 1 here. ss_row_id int NOT NULL, - -- Total number of page views, if hit counters are enabled. - ss_total_views bigint default 0, - -- Total number of edits performed. ss_total_edits bigint default 0, @@ -450,18 +446,6 @@ -- Pointless index to assuage developer superstitions CREATE UNIQUE INDEX /*i*/ss_row_id ON /*_*/site_stats (ss_row_id); - - --- --- Stores an ID for every time any article is visited; --- depending on $wgHitcounterUpdateFreq, it is --- periodically cleared and the page_counter column --- in the page table updated for all the articles --- that have been visited.) --- -CREATE TABLE /*_*/hitcounter ( - hc_id int NOT NULL -); -- diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index 36be16e..12f6518 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -69,7 +69,6 @@ page_namespace NUMBER DEFAULT 0 NOT NULL, page_title VARCHAR2(255) NOT NULL, page_restrictions VARCHAR2(255), - page_counter NUMBER DEFAULT 0 NOT NULL, page_is_redirect CHAR(1) DEFAULT '0' NOT NULL, page_is_new CHAR(1) DEFAULT '0' NOT NULL, page_random NUMBER(15,14) NOT NULL, @@ -247,7 +246,6 @@ CREATE TABLE &mw_prefix.site_stats ( ss_row_id NUMBER NOT NULL , - ss_total_views NUMBER DEFAULT 0, ss_total_edits NUMBER DEFAULT 0, ss_good_articles NUMBER DEFAULT 0, ss_total_pages NUMBER DEFAULT -1, @@ -256,10 +254,6 @@ ss_images NUMBER DEFAULT 0 ); CREATE UNIQUE INDEX &mw_prefix.site_stats_u01 ON &mw_prefix.site_stats (ss_row_id); - -CREATE TABLE &mw_prefix.hitcounter ( - hc_id NUMBER NOT NULL -); CREATE SEQUENCE ipblocks_ipb_id_seq; CREATE TABLE &mw_prefix.ipblocks ( diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl index 53aeb14..bb08237 100755 --- a/maintenance/postgres/compare_schemas.pl +++ b/maintenance/postgres/compare_schemas.pl @@ -395,7 +395,6 @@ ss_good_articles bigint INTEGER ss_total_edits bigint INTEGER ss_total_pages bigint INTEGER -ss_total_views bigint INTEGER ss_users bigint INTEGER ## True IP - keep an eye on these, coders tend to make textual assumptions diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 400050e..5391bd9 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -81,7 +81,6 @@ page_namespace SMALLINT NOT NULL, page_title TEXT NOT NULL, page_restrictions TEXT, - page_counter BIGINT NOT NULL DEFAULT 0, page_is_redirect SMALLINT NOT NULL DEFAULT 0, page_is_new SMALLINT NOT NULL DEFAULT 0, page_random NUMERIC(15,14) NOT NULL DEFAULT RANDOM(), @@ -262,7 +261,6 @@ CREATE TABLE site_stats ( ss_row_id INTEGER NOT NULL UNIQUE, - ss_total_views INTEGER DEFAULT 0, ss_total_edits INTEGER DEFAULT 0, ss_good_articles INTEGER DEFAULT 0, ss_total_pages INTEGER DEFAULT -1, @@ -270,10 +268,6 @@ ss_active_users INTEGER DEFAULT -1, ss_admins INTEGER DEFAULT -1, ss_images INTEGER DEFAULT 0 -); - -CREATE TABLE hitcounter ( - hc_id BIGINT NOT NULL ); diff --git a/maintenance/sqlite/archives/initial-indexes.sql b/maintenance/sqlite/archives/initial-indexes.sql index 954c85d..f322a03 100644 --- a/maintenance/sqlite/archives/initial-indexes.sql +++ b/maintenance/sqlite/archives/initial-indexes.sql @@ -69,7 +69,6 @@ page_namespace int NOT NULL, page_title varchar(255) binary NOT NULL, page_restrictions tinyblob NOT NULL, - page_counter bigint unsigned NOT NULL default 0, page_is_redirect tinyint unsigned NOT NULL default 0, page_is_new tinyint unsigned NOT NULL default 0, page_random real unsigned NOT NULL, @@ -164,7 +163,6 @@ CREATE TABLE /*_*/site_stats_tmp ( ss_row_id int unsigned NOT NULL, - ss_total_views bigint unsigned default 0, ss_total_edits bigint unsigned default 0, ss_good_articles bigint unsigned default 0, ss_total_pages bigint default '-1', diff --git a/maintenance/sqlite/archives/patch-drop-page_counter.sql b/maintenance/sqlite/archives/patch-drop-page_counter.sql new file mode 100644 index 0000000..ac8151d --- /dev/null +++ b/maintenance/sqlite/archives/patch-drop-page_counter.sql @@ -0,0 +1,31 @@ +-- field is deprecated and no longer updated as of 1.25 +CREATE TABLE /*_*/page_tmp ( + page_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, + page_namespace int NOT NULL, + page_title varchar(255) binary NOT NULL, + page_restrictions tinyblob NOT NULL, + page_is_redirect tinyint unsigned NOT NULL default 0, + page_is_new tinyint unsigned NOT NULL default 0, + page_random real unsigned NOT NULL, + page_touched binary(14) NOT NULL default '', + page_links_updated varbinary(14) NULL default NULL, + page_latest int unsigned NOT NULL, + page_len int unsigned NOT NULL, + page_content_model varbinary(32) DEFAULT NULL, + page_lang varbinary(35) DEFAULT NULL +) /*$wgDBTableOptions*/; + +INSERT INTO /*_*/page_tmp + SELECT page_id, page_namespace, page_title, page_restrictions, page_is_redirect, + page_is_new, page_random, page_touched, page_links_updated, page_latest, page_len, + page_content_model, page_lang + FROM /*_*/page; + +DROP TABLE /*_*/page; + +ALTER TABLE /*_*/page_tmp RENAME TO /*_*/page; + +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 INDEX /*i*/page_redirect_namespace_len ON /*_*/page (page_is_redirect, page_namespace, page_len); diff --git a/maintenance/sqlite/archives/patch-drop-ss_admins.sql b/maintenance/sqlite/archives/patch-drop-ss_admins.sql index 9951e17..3960663 100644 --- a/maintenance/sqlite/archives/patch-drop-ss_admins.sql +++ b/maintenance/sqlite/archives/patch-drop-ss_admins.sql @@ -1,7 +1,6 @@ -- field is deprecated and no longer updated as of 1.5 CREATE TABLE /*_*/site_stats_tmp ( ss_row_id int unsigned NOT NULL, - ss_total_views bigint unsigned default 0, ss_total_edits bigint unsigned default 0, ss_good_articles bigint unsigned default 0, ss_total_pages bigint default '-1', @@ -11,7 +10,7 @@ ) /*$wgDBTableOptions*/; INSERT INTO /*_*/site_stats_tmp - SELECT ss_row_id, ss_total_views, ss_total_edits, ss_good_articles, + SELECT ss_row_id, ss_total_edits, ss_good_articles, ss_total_pages, ss_users, ss_active_users, ss_images FROM /*_*/site_stats; diff --git a/maintenance/sqlite/archives/patch-drop-ss_total_views.sql b/maintenance/sqlite/archives/patch-drop-ss_total_views.sql new file mode 100644 index 0000000..ad80988 --- /dev/null +++ b/maintenance/sqlite/archives/patch-drop-ss_total_views.sql @@ -0,0 +1,21 @@ +-- field is deprecated and no longer updated as of 1.25 +CREATE TABLE /*_*/site_stats_tmp ( + ss_row_id int unsigned NOT NULL, + ss_total_edits bigint unsigned default 0, + ss_good_articles bigint unsigned default 0, + ss_total_pages bigint default '-1', + ss_users bigint default '-1', + ss_active_users bigint default '-1', + ss_images int default 0 +) /*$wgDBTableOptions*/; + +INSERT INTO /*_*/site_stats_tmp + SELECT ss_row_id, ss_total_edits, ss_good_articles, ss_total_pages, + ss_users, ss_active_users, ss_images + FROM /*_*/site_stats; + +DROP TABLE /*_*/site_stats; + +ALTER TABLE /*_*/site_stats_tmp RENAME TO /*_*/site_stats; + +CREATE UNIQUE INDEX /*i*/ss_row_id ON /*_*/site_stats (ss_row_id); diff --git a/maintenance/tables.sql b/maintenance/tables.sql index caf8ecc..112ac05 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -241,9 +241,6 @@ -- can move or edit the page. page_restrictions tinyblob NOT NULL, - -- Number of times this page has been viewed. - page_counter bigint unsigned NOT NULL default 0, - -- 1 indicates the article is a redirect. page_is_redirect tinyint unsigned NOT NULL default 0, @@ -704,9 +701,6 @@ -- The single row should contain 1 here. ss_row_id int unsigned NOT NULL, - -- Total number of page views, if hit counters are enabled. - ss_total_views bigint unsigned default 0, - -- Total number of edits performed. ss_total_edits bigint unsigned default 0, @@ -732,19 +726,6 @@ -- Pointless index to assuage developer superstitions CREATE UNIQUE INDEX /*i*/ss_row_id ON /*_*/site_stats (ss_row_id); - - --- --- Stores an ID for every time any article is visited; --- depending on $wgHitcounterUpdateFreq, it is --- periodically cleared and the page_counter column --- in the page table updated for all the articles --- that have been visited.) --- -CREATE TABLE /*_*/hitcounter ( - hc_id int unsigned NOT NULL -) ENGINE=MEMORY MAX_ROWS=25000; - -- -- The internet is full of jerks, alas. Sometimes it's handy -- To view, visit https://gerrit.wikimedia.org/r/167655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieeb558f9523c11965cbc1941cad4f316c00c85c5 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Chad <[email protected]> Gerrit-Reviewer: Jjanes <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Parent5446 <[email protected]> Gerrit-Reviewer: Springle <[email protected]> Gerrit-Reviewer: Umherirrender <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
